[mingw-gtk3] Update to 3.7.6
Erik van Pienbroek
epienbro at fedoraproject.org
Sun Jan 27 14:52:02 UTC 2013
commit b63e31724f2786202a38f8b7fb8539b009f4e621
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sun Jan 27 15:51:46 2013 +0100
Update to 3.7.6
...-t-build-gtk-launch-on-Win32-environments.patch | 40 ---------------
...-gtk-launch-when-gio-unix-is-not-availabl.patch | 52 ++++++++++++++++++++
...native-update-icon-cache-when-no-external.patch | 26 ++++++++++
0003-Don-t-use-AC_CANONICAL_TARGET.patch | 32 ++++++++++++
mingw-gtk3.spec | 18 ++++++-
sources | 2 +-
6 files changed, 127 insertions(+), 43 deletions(-)
---
diff --git a/0001-Don-t-build-gtk-launch-when-gio-unix-is-not-availabl.patch b/0001-Don-t-build-gtk-launch-when-gio-unix-is-not-availabl.patch
new file mode 100644
index 0000000..f9745aa
--- /dev/null
+++ b/0001-Don-t-build-gtk-launch-when-gio-unix-is-not-availabl.patch
@@ -0,0 +1,52 @@
+From 9e6d08c51a5647c833ff58d9aea32ef6c7296621 Mon Sep 17 00:00:00 2001
+From: Erik van Pienbroek <epienbro at fedoraproject.org>
+Date: Sun, 27 Jan 2013 15:14:35 +0100
+Subject: Don't build gtk-launch when gio-unix is not available
+
+---
+ configure.ac | 1 +
+ gtk/Makefile.am | 7 ++++---
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6908f89..0fa3543 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1239,6 +1239,7 @@ if test "$have_gio_unix" = "yes"; then
+ else
+ GDK_GIO_PACKAGE=gio-2.0
+ fi
++AM_CONDITIONAL(HAVE_GIO_UNIX, test "$have_gio_unix" = "yes")
+
+ # Check for Pango flags
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 19c8e10..7a8cb95 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1304,9 +1304,7 @@ endif
+ #
+ # Installed tools
+ #
+-bin_PROGRAMS = \
+- gtk-query-immodules-3.0 \
+- gtk-launch
++bin_PROGRAMS = gtk-query-immodules-3.0
+
+ if BUILD_ICON_CACHE
+ bin_PROGRAMS += gtk-update-icon-cache
+@@ -1353,8 +1351,11 @@ gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
+ gtk_update_icon_cache_SOURCES = updateiconcache.c
+ endif
+
++if HAVE_GIO_UNIX
++bin_PROGRAMS += gtk-launch
+ gtk_launch_LDADD = $(LDADDS)
+ gtk_launch_SOURCES = gtk-launch.c
++endif
+
+ .PHONY: files test test-debug
+
+--
+1.8.1
+
diff --git a/0002-Only-build-native-update-icon-cache-when-no-external.patch b/0002-Only-build-native-update-icon-cache-when-no-external.patch
new file mode 100644
index 0000000..a6d1fd8
--- /dev/null
+++ b/0002-Only-build-native-update-icon-cache-when-no-external.patch
@@ -0,0 +1,26 @@
+From f5e21439ca32a7609f19004a043db745ae398f03 Mon Sep 17 00:00:00 2001
+From: Erik van Pienbroek <epienbro at fedoraproject.org>
+Date: Sun, 27 Jan 2013 15:17:32 +0100
+Subject: Only build native-update-icon-cache when no external
+ update-icon-cache binary was found
+
+---
+ gtk/native/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtk/native/Makefile.am b/gtk/native/Makefile.am
+index 17f0015..20416ce 100644
+--- a/gtk/native/Makefile.am
++++ b/gtk/native/Makefile.am
+@@ -4,7 +4,7 @@ CPP = @CPP_FOR_BUILD@
+ CPPFLAGS = @CPPFLAGS_FOR_BUILD@
+ LDFLAGS = @LDFLAGS_FOR_BUILD@
+
+-if CROSS_COMPILING
++if !USE_EXTERNAL_ICON_CACHE
+ noinst_PROGRAMS = native-update-icon-cache
+ native_update_icon_cache_CFLAGS = $(NATIVE_GDKPIXBUF_CFLAGS)
+ native_update_icon_cache_LDADD = $(NATIVE_GDKPIXBUF_LIBS)
+--
+1.8.1
+
diff --git a/0003-Don-t-use-AC_CANONICAL_TARGET.patch b/0003-Don-t-use-AC_CANONICAL_TARGET.patch
new file mode 100644
index 0000000..4155dd8
--- /dev/null
+++ b/0003-Don-t-use-AC_CANONICAL_TARGET.patch
@@ -0,0 +1,32 @@
+From 3c68befe24788ae1f28aae9f528965a28acbd579 Mon Sep 17 00:00:00 2001
+From: Erik van Pienbroek <epienbro at fedoraproject.org>
+Date: Sun, 27 Jan 2013 15:19:34 +0100
+Subject: Don't use AC_CANONICAL_TARGET
+
+This autoconf macro should only be used for building compilers
+(or compiler tools) for a specific target. The current effect of
+it in GTK3 is that it causes various executables like gtk3-demo
+to be prefixed with $target- when the --target configure flag
+is set or when cross-compiling. When cross-compiling GTK3 on
+Linux for the Win32 target this causes the gtk3-demo binary
+to be named i686-w64-mingw32-gtk3-demo.exe instead of just
+gtk3-demo.exe (like it was before commit 53083ea7b423482b)
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0fa3543..d880141 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,6 @@ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_AUX_DIR([build-aux])
+
+ AC_CANONICAL_HOST
+-AC_CANONICAL_TARGET
+
+ # Define a string for the earliest version that this release has
+ # backwards binary compatibility with for all interfaces a module
+--
+1.8.1
+
diff --git a/mingw-gtk3.spec b/mingw-gtk3.spec
index e29b810..b1f7aaf 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.0
+Version: 3.7.6
Release: 1%{?dist}
Summary: MinGW Windows GTK+ library
@@ -18,7 +18,16 @@ 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-on-Win32-environments.patch
+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
+
+# Don't use AC_CANONICAL_TARGET as it causes executables like gtk3-demo.exe to
+# be prefixed with %%{mingw32_target}- and %%{mingw64_target}-
+# https://bugzilla.gnome.org/show_bug.cgi?id=692638
+Patch2: 0003-Don-t-use-AC_CANONICAL_TARGET.patch
BuildArch: noarch
@@ -106,6 +115,8 @@ 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
@@ -253,6 +264,9 @@ fi
%changelog
+* Sat Jan 26 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.7.6-1
+- Update to 3.7.6
+
* Fri Nov 9 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.7.0-1
- Update to 3.7.0
diff --git a/sources b/sources
index 4d77596..85e2837 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f00883cd2c8568484e1de40343977c4 gtk+-3.7.0.tar.xz
+76c5ee266b31c8b8c615a233a883984c gtk+-3.7.6.tar.xz
More information about the scm-commits
mailing list