Attachment 946397 Details for Bug 1152155 – update to 3.14.2

[patch] update to 3.14.2

0001-Update-to-3.14.2-1152155.patch (text/plain), 14.15 KB, created by David King on 2014-10-13 13:51:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David King

Created: 2014-10-13 13:51:59 UTC

Size: 14.15 KB

patch

obsolete

>From 0dfdd0778035f99d14c26ed60719ab81da567105 Mon Sep 17 00:00:00 2001
>From: David King <amigadave@amigadave.com>
>Date: Thu, 9 Oct 2014 13:09:33 +0100
>Subject: [PATCH 1/2] Update to 3.14.2 (#1152155)
>
>Refresh cross-compilation patch.
>---
> ...cross-compilation-broken-when-building-ex.patch | 62 -------------------
> gtk-workaround-extract-strings-breakage.patch      | 65 -------------------
> gtk3-bug-731013-fix-cross-compilation.patch        | 64 +++++++++++++++++++
> gtk3-commit-62254c.patch                           | 72 ----------------------
> mingw-gtk3.spec                                    | 27 ++++----
> sources                                            |  2 +-
> 6 files changed, 77 insertions(+), 215 deletions(-)
> delete mode 100644 0001-Bug-731013-cross-compilation-broken-when-building-ex.patch
> delete mode 100644 gtk-workaround-extract-strings-breakage.patch
> create mode 100644 gtk3-bug-731013-fix-cross-compilation.patch
> delete mode 100644 gtk3-commit-62254c.patch
>
>diff --git a/0001-Bug-731013-cross-compilation-broken-when-building-ex.patch b/0001-Bug-731013-cross-compilation-broken-when-building-ex.patch
>deleted file mode 100644
>index 16f243c..0000000
>--- a/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 <jehan@girinstud.io>
>-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/gtk-workaround-extract-strings-breakage.patch b/gtk-workaround-extract-strings-breakage.patch
>deleted file mode 100644
>index e7f75e4..0000000
>--- a/gtk-workaround-extract-strings-breakage.patch
>+++ /dev/null
>@@ -1,65 +0,0 @@
>---- util/Makefile.am.orig	2014-05-30 00:24:06.853095421 +0200
>-+++ util/Makefile.am	2014-05-30 00:24:13.575204172 +0200
>-@@ -7,5 +7,3 @@
>- extract-strings: $(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
>---- gtk/Makefile.am.orig	2014-05-30 17:14:19.419401875 +0200
>-+++ gtk/Makefile.am	2014-05-30 17:16:21.771362187 +0200
>-@@ -1311,9 +1311,9 @@
>- 
>- template_headers = $(COMPOSITE_TEMPLATES:.ui=.ui.h)
>- 
>--%.ui.h: %.ui
>-+%.ui.h: %.ui extract-strings$(BUILD_EXEEXT)
>- 	$(AM_V_GEN) mkdir -p $(dir $@) \
>--	&& $(top_builddir)/util/extract-strings$(BUILD_EXEEXT) $< > $@
>-+	&& ./extract-strings$(BUILD_EXEEXT) $< > $@
>- 
>- #
>- # rules to generate built sources
>-@@ -1606,6 +1606,17 @@
>- gtk_launch_LDADD = $(LDADDS)
>- gtk_launch_SOURCES = gtk-launch.c
>- 
>-+# The extract_strings tool is a build utility that runs on the build system.
>-+extract_strings_sources = $(top_srcdir)/util/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
>-+
>- .PHONY: files test test-debug
>- 
>- files:
>---- gtk/inspector/Makefile.am.orig	2014-05-30 17:16:43.237706126 +0200
>-+++ gtk/inspector/Makefile.am	2014-05-30 17:18:34.093482314 +0200
>-@@ -99,10 +99,19 @@
>- 
>- template_headers = $(templates:.ui=.ui.h)
>- 
>--extract_strings = $(top_builddir)/util/extract-strings
>-+%.ui.h : %.ui extract-strings$(BUILD_EXEEXT) 
>-+	$(AM_V_GEN) ./extract-strings$(BUILD_EXEEXT) $< > $@
>- 
>--%.ui.h : %.ui 
>--	$(AM_V_GEN) $(extract_strings) $< > $@
>-+# The extract_strings tool is a build utility that runs on the build system.
>-+extract_strings_sources = $(top_srcdir)/util/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
>- 
>- EXTRA_DIST += 				\
>- 	inspector.gresource.xml 	\
>diff --git a/gtk3-bug-731013-fix-cross-compilation.patch b/gtk3-bug-731013-fix-cross-compilation.patch
>new file mode 100644
>index 0000000..c0eccf0
>--- /dev/null
>+++ b/gtk3-bug-731013-fix-cross-compilation.patch
>@@ -0,0 +1,64 @@
>+From f62df4c82839453135097914fa28200253acbb05 Mon Sep 17 00:00:00 2001
>+From: Hib Eris <hib@hiberis.nl>
>+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/gtk3-commit-62254c.patch b/gtk3-commit-62254c.patch
>deleted file mode 100644
>index a6d51da..0000000
>--- a/gtk3-commit-62254c.patch
>+++ /dev/null
>@@ -1,72 +0,0 @@
>-From 62254ca3061a1309e836939df242140b53c79603 Mon Sep 17 00:00:00 2001
>-From: Rico Tzschichholz <ricotz@ubuntu.com>
>-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-gtk3.spec b/mingw-gtk3.spec
>index afbe5c5..29c6ef1 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.14.0
>+Version:        3.14.2
> Release:        1%{?dist}
> Summary:        MinGW Windows GTK+ library
> 
>@@ -19,9 +19,7 @@ Source1:        gtk.immodules
> # Cross-compilation is broken as of gtk+ 3.13.2
> # Apply a work-in-progress patch to fix compilation
> # https://bugzilla.gnome.org/show_bug.cgi?id=731013
>-Patch2:         0001-Bug-731013-cross-compilation-broken-when-building-ex.patch
>-# Revert this one first
>-Patch3:         gtk3-commit-62254c.patch
>+Patch0:         gtk3-bug-731013-fix-cross-compilation.patch
> 
> BuildArch:      noarch
> 
>@@ -60,14 +58,7 @@ BuildRequires:  gtk2
> # Native one for gdk-pixbuf-csource
> BuildRequires:  gdk-pixbuf2-devel
> 
>-# Upstream packaging has gone wrong:
>-#
>-# make[2]: Entering directory `/builddir/build/BUILD/gtk+-3.9.8/build_win32/gdk'
>-#  cd ../.. && /bin/sh /builddir/build/BUILD/gtk+-3.9.8/build-aux/missing automake-1.13 --gnu gdk/Makefile
>-# /builddir/build/BUILD/gtk+-3.9.8/build-aux/missing: line 81: automake-1.13: command not found
>-# WARNING: 'automake-1.13' is missing on your system.
>-#
>-# Workaround this for now
>+# Used by autoreconf.
> BuildRequires:  autoconf automake libtool gobject-introspection-devel
> 
> 
>@@ -115,9 +106,8 @@ This package contains the MinGW Windows cross compiled GTK+ 3 library.
> 
> %prep
> %setup -q -n gtk+-%{version}
>-%patch3 -p1 -b .extract_strings -R
>-%patch2 -p1 -b .extract_strings
>-autoreconf -i --force
>+%patch0 -p1 -b .extract_strings
>+autoreconf --install --force
> 
> 
> %build
>@@ -146,6 +136,10 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
> rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.def
> rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/*.def
> 
>+# Remove files used only for tests.
>+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libgtkreftestprivate.a
>+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libgtkreftestprivate.a
>+
> rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
> rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/*.la
> rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/*.dll.a
>@@ -279,6 +273,9 @@ fi
> 
> 
> %changelog
>+* Thu Oct 09 2014 David King <amigadave@amigadave.com> - 3.14.2-1
>+- Update to 3.14.2
>+
> * Tue Sep 23 2014 Erik van Pienbroek <epienbro@fedoraproject.org> - 3.14.0-1
> - Update to 3.14.0
> 
>diff --git a/sources b/sources
>index dc3af3a..0fad93c 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-2e4e64a29e0373f36fbc98e1531da2db  gtk+-3.14.0.tar.xz
>+49fba3678fc62ce404f89e21658e45c0  gtk+-3.14.2.tar.xz
>-- 
>2.1.0
>

Actions: View | Diff

Attachments on bug 1152155: 946397 | 946398 | 946748 | 946749