From c1876990552b2f0f4d8f63cd39c4fd6f45d24bfe Mon Sep 17 00:00:00 2001 From: Ting-Wei Lan Date: Mon, 10 Nov 2014 18:09:32 +0800 Subject: mingw-w64-gtk3: 3.14.4 -> 3.14.5 --- ...cross-compilation-broken-when-building-ex.patch | 62 ------------------- mingw-w64-gtk3/PKGBUILD | 23 +++---- .../gtk3-bug-731013-fix-cross-compilation.patch | 64 +++++++++++++++++++ mingw-w64-gtk3/gtk3-commit-62254c.patch | 72 ---------------------- ...kPlug-is-conditionally-supported-on-X11-o.patch | 38 ++++++++++++ 5 files changed, 114 insertions(+), 145 deletions(-) delete mode 100644 mingw-w64-gtk3/0001-Bug-731013-cross-compilation-broken-when-building-ex.patch create mode 100644 mingw-w64-gtk3/gtk3-bug-731013-fix-cross-compilation.patch delete mode 100644 mingw-w64-gtk3/gtk3-commit-62254c.patch create mode 100644 mingw-w64-gtk3/window-GtkPlug-is-conditionally-supported-on-X11-o.patch diff --git a/mingw-w64-gtk3/0001-Bug-731013-cross-compilation-broken-when-building-ex.patch b/mingw-w64-gtk3/0001-Bug-731013-cross-compilation-broken-when-building-ex.patch deleted file mode 100644 index 16f243c..0000000 --- a/mingw-w64-gtk3/0001-Bug-731013-cross-compilation-broken-when-building-ex.patch +++ /dev/null @@ -1,62 +0,0 @@ -From cd93006829d56782d605b4202c45e1aad7ce1746 Mon Sep 17 00:00:00 2001 -From: Jehan -Date: Wed, 13 Aug 2014 05:08:08 +0000 -Subject: [PATCH 1/3] Bug 731013 - cross-compilation broken when building - extract-strings - -It is actually a bad idea to use noinst_PROGRAMS for build tools, -because it adds a $(EXEEXT). It is best to override the all target -with all-local to trigger the tool build. ---- - gtk/Makefile.am | 2 +- - gtk/inspector/Makefile.am | 2 +- - util/Makefile.am | 6 +++--- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 5c31084..7b78fb8 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -1566,7 +1566,7 @@ distclean-local: - if test $(srcdir) != .; then \ - rm -f $(MAINTAINERCLEANFILES); \ - rm -rf stock-icons; \ -- rm -f extract-strings$(EXEEXT); \ -+ rm -f extract-strings$(BUILD_EXEEXT); \ - rm -f $(template_headers); \ - fi - -diff --git a/gtk/inspector/Makefile.am b/gtk/inspector/Makefile.am -index 9e14945..7b1876f 100644 ---- a/gtk/inspector/Makefile.am -+++ b/gtk/inspector/Makefile.am -@@ -114,7 +114,7 @@ templates = \ - - template_headers = $(templates:.ui=.ui.h) - --extract_strings = $(top_builddir)/util/extract-strings -+extract_strings = $(top_builddir)/util/extract-strings$(BUILD_EXEEXT) - - %.ui.h : %.ui - $(AM_V_GEN) $(extract_strings) $< > $@ -diff --git a/util/Makefile.am b/util/Makefile.am -index e8cf8fd..d0aa488 100644 ---- a/util/Makefile.am -+++ b/util/Makefile.am -@@ -4,10 +4,10 @@ extract_strings_cppflags = - extract_strings_cflags = $(GLIB_CFLAGS_FOR_BUILD) - extract_strings_ldadd = $(GLIB_LIBS_FOR_BUILD) - --extract-strings$(EXEEXT): $(extract_strings_sources) -- @rm -f extract-strings -+extract-strings$(BUILD_EXEEXT): $(extract_strings_sources) -+ @rm -f extract-strings$(BUILD_EXEEXT) - $(AM_V_CCLD)$(CC_FOR_BUILD) $(extract_strings_cppflags) $(CPPFLAGS_FOR_BUILD) $(extract_strings_cflags) $(CFLAGS_FOR_BUILD) $^ $(LDFLAGS_FOR_BUILD) $(extract_strings_ldadd) $(LIBS_FOR_BUILD) -o $@ - --noinst_PROGRAMS = extract-strings -+all-local: extract-strings$(BUILD_EXEEXT) - - -include $(top_srcdir)/git.mk --- -1.8.1.2 - diff --git a/mingw-w64-gtk3/PKGBUILD b/mingw-w64-gtk3/PKGBUILD index ff1b95c..35e0821 100644 --- a/mingw-w64-gtk3/PKGBUILD +++ b/mingw-w64-gtk3/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: lantw44 at gmail dot com pkgname=mingw-w64-gtk3 -pkgver=3.14.4 +pkgver=3.14.5 pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3) (mingw-w64)" arch=(any) @@ -20,24 +20,25 @@ options=(!strip !buildflags staticlibs) source=( "http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz" -"gtk3-commit-62254c.patch" -"0001-Bug-731013-cross-compilation-broken-when-building-ex.patch" -"0005-Remove-gobject-introspection.patch") +"0005-Remove-gobject-introspection.patch" +"gtk3-bug-731013-fix-cross-compilation.patch" +"window-GtkPlug-is-conditionally-supported-on-X11-o.patch") -# The second and the third patch are downloaded from Fedora Project +# The third patch is downloaded from Fedora Project +# The fourth patch: https://bugzilla.gnome.org/show_bug.cgi?id=739885 -sha256sums=('a006c716d723dab0c623491566e3292af84c87d9198a30199051d23cfc7bef2f' - '1c8812f68446d509e019b3f26863348f2cfc469dbb8866bbdfa3213e55a7c433' - 'd2825227188cf60740540086cd71c56f8e5c6d9c9b9ad7c0869e6746ad0caebe' - 'ae632ad20c87032c326dbb1cda086e33a5078909f89174b2ba232be1b48c32a3') +sha256sums=('ba70f5ccde6646c6d8aa5a6398794b7bcf23fc45af22580a215d258f392dbbe2' + 'ae632ad20c87032c326dbb1cda086e33a5078909f89174b2ba232be1b48c32a3' + '2dd763d32f7b7de08a325d32b811e87266277edb6055a043632d10c146ffc6d3' + '32be72eb4e6cead4c94a90a23c636adc76f41ac33fc6328740c0764ae02fdd9b') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" build() { cd "${srcdir}/gtk+-${pkgver}" - patch -Np1 -R < "../gtk3-commit-62254c.patch" - patch -Np1 < "../0001-Bug-731013-cross-compilation-broken-when-building-ex.patch" patch -Np1 < "../0005-Remove-gobject-introspection.patch" + patch -Np1 < "../gtk3-bug-731013-fix-cross-compilation.patch" + patch -Np1 < "../window-GtkPlug-is-conditionally-supported-on-X11-o.patch" autoreconf -i for _arch in ${_architectures}; do unset LDFLAGS diff --git a/mingw-w64-gtk3/gtk3-bug-731013-fix-cross-compilation.patch b/mingw-w64-gtk3/gtk3-bug-731013-fix-cross-compilation.patch new file mode 100644 index 0000000..c0eccf0 --- /dev/null +++ b/mingw-w64-gtk3/gtk3-bug-731013-fix-cross-compilation.patch @@ -0,0 +1,64 @@ +From f62df4c82839453135097914fa28200253acbb05 Mon Sep 17 00:00:00 2001 +From: Hib Eris +Date: Wed, 24 Sep 2014 23:08:02 +0200 +Subject: [PATCH] Fix cross compilation + +https://bugzilla.gnome.org/show_bug.cgi?id=731013 +--- + gtk/Makefile.am | 2 +- + gtk/inspector/Makefile.am | 2 +- + util/Makefile.am | 14 ++++++++++---- + 3 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/gtk/Makefile.am b/gtk/Makefile.am +index 17ca614..7a71cde 100644 +--- a/gtk/Makefile.am ++++ b/gtk/Makefile.am +@@ -1330,7 +1330,7 @@ template_headers = $(COMPOSITE_TEMPLATES:.ui=.ui.h) + + %.ui.h: %.ui + $(AM_V_GEN) mkdir -p $(dir $@) \ +- && $(top_builddir)/util/extract-strings$(EXEEXT) $< > $@ ++ && $(top_builddir)/util/extract-strings$(BUILD_EXEEXT) $< > $@ + + # + # rules to generate built sources +diff --git a/gtk/inspector/Makefile.am b/gtk/inspector/Makefile.am +index dfd54e0..fec2672 100644 +--- a/gtk/inspector/Makefile.am ++++ b/gtk/inspector/Makefile.am +@@ -114,7 +114,7 @@ templates = \ + template_headers = $(templates:.ui=.ui.h) + + %.ui.h : %.ui +- $(AM_V_GEN) $(top_builddir)/util/extract-strings$(EXEEXT) $< > $@ ++ $(AM_V_GEN) $(top_builddir)/util/extract-strings$(BUILD_EXEEXT) $< > $@ + + EXTRA_DIST += \ + inspector.gresource.xml \ +diff --git a/util/Makefile.am b/util/Makefile.am +index 414dc68..3d82b7e 100644 +--- a/util/Makefile.am ++++ b/util/Makefile.am +@@ -1,9 +1,15 @@ + # The extract_strings tool is a build utility that runs on the build system. + +-noinst_PROGRAMS = extract-strings ++extract_strings_sources = extract-strings.c ++extract_strings_cppflags = ++extract_strings_cflags = $(GLIB_CFLAGS_FOR_BUILD) ++extract_strings_ldadd = $(GLIB_LIBS_FOR_BUILD) ++extract-strings$(BUILD_EXEEXT): $(extract_strings_sources) ++ @rm -f extract-strings$(BUILD_EXEEXT) ++ $(AM_V_CCLD)$(CC_FOR_BUILD) $(extract_strings_cppflags) $(CPPFLAGS_FOR_BUILD) $(extract_strings_cflags) $(CFLAGS_FOR_BUILD) $^ $(LDFLAGS_FOR_BUILD) $(extract_strings_ldadd) $(LIBS_FOR_BUILD) -o $@ ++EXTRA_DIST = $(extract_strings_sources) ++DISTCLEANFILES = extract-strings + +-extract_strings_SOURCES = extract-strings.c +-extract_strings_CFLAGS = $(GLIB_CFLAGS_FOR_BUILD) +-extract_strings_LDADD = $(GLIB_LIBS_FOR_BUILD) ++all: extract-strings$(BUILD_EXEEXT) + + -include $(top_srcdir)/git.mk +-- +1.9.1 \ No newline at end of file diff --git a/mingw-w64-gtk3/gtk3-commit-62254c.patch b/mingw-w64-gtk3/gtk3-commit-62254c.patch deleted file mode 100644 index a6d51da..0000000 --- a/mingw-w64-gtk3/gtk3-commit-62254c.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 62254ca3061a1309e836939df242140b53c79603 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Fri, 15 Aug 2014 17:56:39 +0200 -Subject: util/extract-strings: Use autotools syntax for building - -Always refer to it as "extract-strings$(EXEEXT)" where needed to take -cross-compilation into account. - -https://bugzilla.gnome.org/show_bug.cgi?id=731013 - -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 3e0d5f8..45de10c 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -1336,7 +1336,7 @@ template_headers = $(COMPOSITE_TEMPLATES:.ui=.ui.h) - - %.ui.h: %.ui - $(AM_V_GEN) mkdir -p $(dir $@) \ -- && $(top_builddir)/util/extract-strings$(BUILD_EXEEXT) $< > $@ -+ && $(top_builddir)/util/extract-strings$(EXEEXT) $< > $@ - - # - # rules to generate built sources -@@ -1566,7 +1566,6 @@ distclean-local: - if test $(srcdir) != .; then \ - rm -f $(MAINTAINERCLEANFILES); \ - rm -rf stock-icons; \ -- rm -f extract-strings$(EXEEXT); \ - rm -f $(template_headers); \ - fi - -diff --git a/gtk/inspector/Makefile.am b/gtk/inspector/Makefile.am -index 9e14945..25580e6 100644 ---- a/gtk/inspector/Makefile.am -+++ b/gtk/inspector/Makefile.am -@@ -114,10 +114,8 @@ templates = \ - - template_headers = $(templates:.ui=.ui.h) - --extract_strings = $(top_builddir)/util/extract-strings -- - %.ui.h : %.ui -- $(AM_V_GEN) $(extract_strings) $< > $@ -+ $(AM_V_GEN) $(top_builddir)/util/extract-strings$(EXEEXT) $< > $@ - - EXTRA_DIST += \ - inspector.gresource.xml \ -diff --git a/util/Makefile.am b/util/Makefile.am -index e8cf8fd..414dc68 100644 ---- a/util/Makefile.am -+++ b/util/Makefile.am -@@ -1,13 +1,9 @@ - # The extract_strings tool is a build utility that runs on the build system. --extract_strings_sources = extract-strings.c --extract_strings_cppflags = --extract_strings_cflags = $(GLIB_CFLAGS_FOR_BUILD) --extract_strings_ldadd = $(GLIB_LIBS_FOR_BUILD) -- --extract-strings$(EXEEXT): $(extract_strings_sources) -- @rm -f extract-strings -- $(AM_V_CCLD)$(CC_FOR_BUILD) $(extract_strings_cppflags) $(CPPFLAGS_FOR_BUILD) $(extract_strings_cflags) $(CFLAGS_FOR_BUILD) $^ $(LDFLAGS_FOR_BUILD) $(extract_strings_ldadd) $(LIBS_FOR_BUILD) -o $@ - - noinst_PROGRAMS = extract-strings - -+extract_strings_SOURCES = extract-strings.c -+extract_strings_CFLAGS = $(GLIB_CFLAGS_FOR_BUILD) -+extract_strings_LDADD = $(GLIB_LIBS_FOR_BUILD) -+ - -include $(top_srcdir)/git.mk --- -cgit v0.10.1 - diff --git a/mingw-w64-gtk3/window-GtkPlug-is-conditionally-supported-on-X11-o.patch b/mingw-w64-gtk3/window-GtkPlug-is-conditionally-supported-on-X11-o.patch new file mode 100644 index 0000000..8e6c0b7 --- /dev/null +++ b/mingw-w64-gtk3/window-GtkPlug-is-conditionally-supported-on-X11-o.patch @@ -0,0 +1,38 @@ +From e9201c0d6d9818f23c8712b2af8316f67d9d6be3 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Mon, 10 Nov 2014 14:08:20 +0000 +Subject: [PATCH] window: GtkPlug is conditionally supported on X11 only + +We cannot do a type check on it if we don't have the X11 backend +compiled in. + +https://bugzilla.gnome.org/show_bug.cgi?id=739885 +--- + gtk/gtkwindow.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c +index 0d0fb88..6cb355b 100644 +--- a/gtk/gtkwindow.c ++++ b/gtk/gtkwindow.c +@@ -1610,10 +1610,17 @@ gtk_window_constructed (GObject *object) + { + GtkWindow *window = GTK_WINDOW (object); + GtkWindowPrivate *priv = window->priv; ++ gboolean is_plug; + + G_OBJECT_CLASS (gtk_window_parent_class)->constructed (object); + +- if (priv->type == GTK_WINDOW_TOPLEVEL && !GTK_IS_PLUG (window)) ++#ifdef GDK_WINDOWING_X11 ++ is_plug = GTK_IS_PLUG (window); ++#else ++ is_plug = FALSE; ++#endif ++ ++ if (priv->type == GTK_WINDOW_TOPLEVEL && !is_plug) + { + priv->multipress_gesture = gtk_gesture_multi_press_new (GTK_WIDGET (object)); + gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->multipress_gesture), 0); +-- +2.1.0 \ No newline at end of file -- cgit v1.2.3