[mingw-gtk3] Update to 3.7.14

Erik van Pienbroek epienbro at fedoraproject.org
Sun Mar 24 17:06:17 UTC 2013


commit 14aeddfdf4bdd95b4dba78e99b91475b78fde3e7
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Mar 24 18:06:13 2013 +0100

    Update to 3.7.14

 ...-gtk-launch-when-gio-unix-is-not-availabl.patch |   52 --------------------
 ...native-update-icon-cache-when-no-external.patch |   26 ----------
 commit-a2cd99.patch                                |   23 +++++++++
 mingw-gtk3.spec                                    |   16 +++---
 4 files changed, 30 insertions(+), 87 deletions(-)
---
diff --git a/commit-a2cd99.patch b/commit-a2cd99.patch
new file mode 100644
index 0000000..91e3d93
--- /dev/null
+++ b/commit-a2cd99.patch
@@ -0,0 +1,23 @@
+From a2cd9983c3e017238a9e0fa41674171a9adacdc4 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember at gmail.com>
+Date: Thu, 21 Mar 2013 21:26:02 +0000
+Subject: win32: link with -lwinmm
+
+... to resolve the timeBeginPeriod() / timeEndPeriod() symbols after
+commit 5dbf814f0c0c94733ef96d6dc3c8c5ddb7a63f3a.
+---
+diff --git a/configure.ac b/configure.ac
+index 7628684..34249fa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -350,7 +350,7 @@ if test "$enable_win32_backend" = "yes"; then
+   backend_immodules="$backend_immodules,ime"
+   GDK_WINDOWING="$GDK_WINDOWING
+ #define GDK_WINDOWING_WIN32"
+-  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid"
++  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm"
+   AM_CONDITIONAL(USE_WIN32, true)
+   PANGO_PACKAGES="pangowin32 pangocairo"
+ else
+--
+cgit v0.9.1
diff --git a/mingw-gtk3.spec b/mingw-gtk3.spec
index b1f7aaf..1b3f352 100644
--- a/mingw-gtk3.spec
+++ b/mingw-gtk3.spec
@@ -5,7 +5,7 @@
 %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
 
 Name:           mingw-gtk3
-Version:        3.7.6
+Version:        3.7.14
 Release:        1%{?dist}
 Summary:        MinGW Windows GTK+ library
 
@@ -16,13 +16,9 @@ Source0:        http://download.gnome.org/sources/gtk+/%{release_version}/gtk+-%
 # wine gtk-query-immodules-3.0.exe > gtk.immodules
 Source1:        gtk.immodules
 
-# The tool gtk-launch requires pieces from gio-unix which isn't available on Win32
-# https://bugzilla.gnome.org/show_bug.cgi?id=682824
-Patch0:         0001-Don-t-build-gtk-launch-when-gio-unix-is-not-availabl.patch
-
-# Only build native-update-icon-cache when no external update-icon-cache binary was found
-# https://bugzilla.gnome.org/show_bug.cgi?id=692637
-Patch1:         0002-Only-build-native-update-icon-cache-when-no-external.patch
+# Link with -lwinmm
+# https://git.gnome.org/browse/gtk+/commit/?id=a2cd9983c3e017238a9e0fa41674171a9adacdc4
+Patch0:         commit-a2cd99.patch
 
 # Don't use AC_CANONICAL_TARGET as it causes executables like gtk3-demo.exe to
 # be prefixed with %%{mingw32_target}- and %%{mingw64_target}-
@@ -115,7 +111,6 @@ This package contains the MinGW Windows cross compiled GTK+ 3 library.
 %prep
 %setup -q -n gtk+-%{version}
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 
 autoreconf -i --force
@@ -264,6 +259,9 @@ fi
 
 
 %changelog
+* Sun Mar 24 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.7.14-1
+- Update to 3.7.14
+
 * Sat Jan 26 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.7.6-1
 - Update to 3.7.6
 


More information about the scm-commits mailing list