Accepting request 695738 from GNOME:Factory

Scripted push of project GNOME:Next (forwarded request 695566 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/695738
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk2?expand=0&rev=170

0001-build-support-automake-1.16.patch

@@ -1,47 +0,0 @@
-From 2dbf31c0ea4f17a817b931c731f8de14c278300d Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Tue, 27 Mar 2018 16:24:02 +0200
-Subject: [PATCH] build: support automake 1.16
-
----
- autogen.sh | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/autogen.sh b/autogen.sh
-index 078f483f5a..63e2d5c495 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -48,7 +48,10 @@ fi
- 	DIE=1
- }
- 
--if automake-1.15 --version < /dev/null > /dev/null 2>&1 ; then
-+if automake-1.16 --version < /dev/null > /dev/null 2>&1 ; then
-+    AUTOMAKE=automake-1.16
-+    ACLOCAL=aclocal-1.16
-+else if automake-1.15 --version < /dev/null > /dev/null 2>&1 ; then
-     AUTOMAKE=automake-1.15
-     ACLOCAL=aclocal-1.15
- else if automake-1.14 --version < /dev/null > /dev/null 2>&1 ; then
-@@ -71,8 +74,8 @@ else if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
-     ACLOCAL=aclocal-1.7
- else
- 	echo
--	echo "You must have automake 1.7.x, 1,10.x, 1.11.x, 1.12.x, 1.13.x, 1.14.x"
--	echo "or 1.15.x installed to compile $PROJECT."
-+	echo "You must have automake 1.7.x, 1,10.x, 1.11.x, 1.12.x, 1.13.x, 1.14.x,"
-+	echo "1.15.x or 1.16.x installed to compile $PROJECT."
- 	echo "Install the appropriate package for your distribution,"
- 	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
- 	DIE=1
-@@ -83,6 +86,7 @@ fi
- fi
- fi
- fi
-+fi
- 
- if test "$DIE" -eq 1; then
- 	exit 1
--- 
-2.16.2
-

_service

@@ -2,8 +2,8 @@
   <service mode="disabled" name="tar_scm">
     <param name="url">https://gitlab.gnome.org/GNOME/gtk.git</param>
     <param name="scm">git</param>
-    <param name="revision">2.24.32</param>
+    <param name="revision">gtk-2-24</param>
-    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
     <param name="changesgenerate">enable</param>
   </service>
   <service mode="disabled" name="recompress">

_servicedata

@@ -1,4 +1,6 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">git://git.gnome.org/gtk+</param>
-              <param name="changesrevision">ed7d3e25f8b6debae6ccc8b50d1329155338cab8</param></service></servicedata>
+              <param name="changesrevision">ed7d3e25f8b6debae6ccc8b50d1329155338cab8</param></service><service name="tar_scm">
+                <param name="url">https://gitlab.gnome.org/GNOME/gtk.git</param>
+              <param name="changesrevision">c505d3fcf8571876fa5767411bbe0229591ce104</param></service></servicedata>

gtk+-2.24.32.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e5387d5604c7a2a2eb8f5a518dbfde0800786b93099476854a0cc603bcfd156b
-size 9181176

gtk-2.24.32+54.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0733258f347f0737518a78ab2137b1de4a7b6d28469472b8cb8dd8795cd0063c
+size 9092004

gtk2.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Apr 16 19:24:13 UTC 2019 - bjorn.lie@gmail.com
+
+- Update to version 2.24.32+54:
+  + Force redraw on Mojave and later when processing updates.
+  + Fix UAC manifest RC file
+  + atk key: Always convert control character events into key names
+  + icontheme: Fix annotations on array arguments
+  + MSVC introspection: Make more robust and avoid confusion
+  + Revert "gdk: deactivation/activate window on keyboard grabs"
+  + gtk/gtkiconcache.c: Fix running on GLib-2.57.3 or later on
+    Windows
+  + MSVC builds: Fix pkg-config file generation
+  + MSVC builds: Improve pkg-config files generation
+  + [gdk|gtk]/Makefile.am: Fix CFlags passed to introspecion on
+    MSVC
+- Switch to gitcheckout of stable branch again, upstream is not
+  making releases.
+- Drop 0001-build-support-automake-1.16.patch: Fixed upstream.
+
 -------------------------------------------------------------------
 Thu Aug  9 11:33:37 UTC 2018 - tchvatal@suse.com
 

gtk2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gtk2
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,15 +12,15 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 # When updating the binary version, do not forget to also update baselibs.conf
 %define gtk_binary_version 2.10.0
-%define _name gtk+
+%define _name gtk
 Name:           gtk2
-Version:        2.24.32
+Version:        2.24.32+54
 Release:        0
 # FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
 Summary:        The GTK+ toolkit library (version 2)
@@ -39,7 +39,7 @@ Patch0:         gtk2-GTK_PATH64.patch
 Patch1:         bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff
 # PATCH-FIX-UPSTREAM gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages
 Patch2:         gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff
-# PATCH-FIX-OPENSUSE gtk-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474
+# PATCH-FIX-OPENSUSE gtk-path-local.patch Search in /usr/local/%%{_lib} by default. bnc369696 bgo534474
 Patch3:         gtk-path-local.patch
 # PATCH-FIX-UPSTREAM gtk2-default-printer.patch bgo#577642 mgorse@suse.com -- Save selected printer as default
 Patch4:         gtk2-default-printer.patch
@@ -51,8 +51,7 @@ Patch6:         gtk2-bgo743166-remember-printing-authentication.patch
 Patch7:         gtk2-converter-python3.patch
 # PATCH-FEATURE-OPENSUSE gtk2-updateiconcache_sort.patch olh@opensuse.org -- Have gtp-update-icon-cache sort the file list before producing a cache
 Patch8:         gtk2-updateiconcache_sort.patch
-# PATCH-FIX-UPSTREAM 0001-build-support-automake-1.16.patch dimstar@opensuse.org -- Support automake 1.16
+
-Patch9:         0001-build-support-automake-1.16.patch
 BuildRequires:  atk-devel
 BuildRequires:  cairo-devel
 BuildRequires:  cups-devel
@@ -106,7 +105,7 @@ Recommends:     %{name}-immodule-tigrigna = %{version}
 Recommends:     %{name}-immodule-vietnamese = %{version}
 Recommends:     %{name}-lang
 Recommends:     gvfs
-# Provide %{name} to make the lang and immodules packages installable
+# Provide %%{name} to make the lang and immodules packages installable
 Provides:       %{name} = %{version}
 Obsoletes:      %{name} < %{version}
 # gail is part of gtk+ as of 2.13.x
@@ -330,7 +329,6 @@ cp -a %{SOURCE2} .
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 gnome-patch-translation-update
 
 %build
@@ -379,7 +377,7 @@ cp %{SOURCE5} %{buildroot}%{_sysconfdir}/rpm
 # Note: when updating scriptlets, don't forget to also update baselibs.conf
 ###########################################################################
 
-# Convenient %define for the scriplets
+# Convenient %%define for the scriplets
 %if "%{_lib}" == "lib64"
 %define _gtk_query_immodules %{_bindir}/gtk-query-immodules-2.0-64
 %else
@@ -392,7 +390,7 @@ cp %{SOURCE5} %{buildroot}%{_sysconfdir}/rpm
 %if 0
 # In case libgtk-2_0-0 gets installed before gtk2-tools, we don't want to fail.
 # So we make the call to gtk-query-immodules-2.0 dependent on the existence of
-# the binary. This is why we also have a %post for gtk2-tools.
+# the binary. This is why we also have a %%post for gtk2-tools.
 %endif
 if test -f %{_gtk_query_immodules}; then
   %{_gtk_query_immodules_update_cache}
@@ -423,7 +421,7 @@ fi
 %if 0
 # If we install gtk2-tools for the first time, then we should run it in case
 # libgtk-2_0-0 was installed first (ie, if
-# %{_libdir}/gtk-2.0/%{gtk_binary_version} already exists) which means
+# %%{_libdir}/gtk-2.0/%%{gtk_binary_version} already exists) which means
 # gtk-query-immodules-2.0 couldn't run there.
 %endif
 if [ $1 = 1 ]; then