kalev pushed to mingw-gtk3 (f22). "Update to 3.16.0"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Mar 25 21:07:54 UTC 2015
>From 392934d641c0437537c2ef92e71e2c2b2bf20154 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember at gmail.com>
Date: Wed, 25 Mar 2015 21:59:48 +0100
Subject: Update to 3.16.0
diff --git a/0001-window-GtkPlug-is-conditionally-supported-on-X11-onl.patch b/0001-window-GtkPlug-is-conditionally-supported-on-X11-onl.patch
deleted file mode 100644
index b9a71ee..0000000
--- a/0001-window-GtkPlug-is-conditionally-supported-on-X11-onl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0b8f666e022d983db2cefaffb24315dc34b26673 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi at gnome.org>
-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 e846c41..7f5aae7 100644
---- a/gtk/gtkwindow.c
-+++ b/gtk/gtkwindow.c
-@@ -1601,10 +1601,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
-
diff --git a/gtk3-bug-731013-fix-cross-compilation.patch b/gtk3-bug-731013-fix-cross-compilation.patch
deleted file mode 100644
index c0eccf0..0000000
--- a/gtk3-bug-731013-fix-cross-compilation.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From f62df4c82839453135097914fa28200253acbb05 Mon Sep 17 00:00:00 2001
-From: Hib Eris <hib at 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/mingw-gtk3.spec b/mingw-gtk3.spec
index 2eec89c..97af1a7 100644
--- a/mingw-gtk3.spec
+++ b/mingw-gtk3.spec
@@ -6,10 +6,10 @@
# Only enable if using patches that touches configure.ac,
# Makefile.am or other build system related files
-%define enable_autoreconf 1
+%define enable_autoreconf 0
Name: mingw-gtk3
-Version: 3.14.5
+Version: 3.16.0
Release: 1%{?dist}
Summary: MinGW Windows GTK+ library
@@ -20,14 +20,6 @@ Source0: http://download.gnome.org/sources/gtk+/%{release_version}/gtk+-%
# wine gtk-query-immodules-3.0.exe | sed -e 's at Z:/usr/i686-w64-mingw32/sys-root/mingw at ..@' -e 's@/usr/i686-w64-mingw32/sys-root/mingw at ..@' > gtk.immodules
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
-Patch0: gtk3-bug-731013-fix-cross-compilation.patch
-
-# Backported upstream patch to fix the build
-Patch1: 0001-window-GtkPlug-is-conditionally-supported-on-X11-onl.patch
-
BuildArch: noarch
BuildRequires: mingw32-filesystem >= 98
@@ -47,6 +39,8 @@ BuildRequires: mingw32-gettext
BuildRequires: mingw64-gettext
BuildRequires: mingw32-glib2
BuildRequires: mingw64-glib2
+BuildRequires: mingw32-libepoxy
+BuildRequires: mingw64-libepoxy
BuildRequires: mingw32-win-iconv
BuildRequires: mingw64-win-iconv
BuildRequires: mingw32-pango
@@ -117,8 +111,6 @@ This package contains the MinGW Windows cross compiled GTK+ 3 library.
%prep
%setup -q -n gtk+-%{version}
-%patch0 -p1 -b .extract_strings
-%patch1 -p1
%if 0%{?enable_autoreconf}
autoreconf --install --force
%endif
@@ -151,8 +143,10 @@ 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_bindir}/libgtkreftestprivate-0.dll
+rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/libgtkreftestprivate-0.dll
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libgtkreftestprivate.dll.a
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libgtkreftestprivate.dll.a
rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/*.la
@@ -202,6 +196,7 @@ fi
%{mingw32_bindir}/gtk-encode-symbolic-svg.exe
%{mingw32_bindir}/gtk-launch.exe
%{mingw32_bindir}/gtk-query-immodules-3.0.exe
+%{mingw32_bindir}/gtk-update-icon-cache.exe
%{mingw32_bindir}/libgdk-3-0.dll
%{mingw32_bindir}/libgailutil-3-0.dll
%{mingw32_bindir}/libgtk-3-0.dll
@@ -248,6 +243,7 @@ fi
%{mingw64_bindir}/gtk-encode-symbolic-svg.exe
%{mingw64_bindir}/gtk-launch.exe
%{mingw64_bindir}/gtk-query-immodules-3.0.exe
+%{mingw64_bindir}/gtk-update-icon-cache.exe
%{mingw64_bindir}/libgdk-3-0.dll
%{mingw64_bindir}/libgailutil-3-0.dll
%{mingw64_bindir}/libgtk-3-0.dll
@@ -287,6 +283,9 @@ fi
%changelog
+* Wed Mar 25 2015 Kalev Lember <kalevlember at gmail.com> - 3.16.0-1
+- Update to 3.16.0
+
* Sat Nov 15 2014 Kalev Lember <kalevlember at gmail.com> - 3.14.5-1
- Update to 3.14.5
diff --git a/sources b/sources
index 9dc1ab6..a9f7491 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c6b72b1cec82061167759b9e6cec9bab gtk+-3.14.5.tar.xz
+11c97ce2527956e0ddb5ad5b236e4572 gtk+-3.16.0.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/mingw-gtk3.git/commit/?h=f22&id=392934d641c0437537c2ef92e71e2c2b2bf20154
More information about the scm-commits
mailing list