Accepting request 418745 from GNOME:Factory

1

OBS-URL: https://build.opensuse.org/request/show/418745
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk3?expand=0&rev=97

gtk+-3.20.6.tar.xz

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

gtk+-3.20.8.tar.xz

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

gtk3-gtkwindow-realize-toplevel-before-popover.patch

@@ -1,31 +0,0 @@
-From 46cdb44fdd7466f0d524eeb4eec6c504fd64208b Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 14 Apr 2016 11:05:00 +0200
-Subject: GtkWindow: Ensure the toplevel is realized before realizing popovers
-
-Otherwise those get a NULL parent window, which is toplevel-y enough
-to disembody the popover.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=764060
----
- gtk/gtkwindow.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
-index b19a643..7a3d13c 100644
---- a/gtk/gtkwindow.c
-+++ b/gtk/gtkwindow.c
-@@ -12291,7 +12291,8 @@ _gtk_window_set_popover_position (GtkWindow                   *window,
-   data->rect = *rect;
-   data->pos = pos;
- 
--  if (gtk_widget_is_visible (popover) && !data->window)
-+  if (gtk_widget_is_visible (popover) && !data->window &&
-+      gtk_widget_get_realized (GTK_WIDGET (window)))
-     {
-       popover_realize (popover, data, window);
-       popover_map (popover, data);
--- 
-cgit v0.12
-
-

gtk3.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Thu Aug 11 11:04:51 UTC 2016 - dimstar@opensuse.org
+
+- Fix update-alternatives usage.
+
+-------------------------------------------------------------------
+Thu Aug  4 18:51:18 UTC 2016 - dimstar@opensuse.org
+
+- Update to version 3.20.8:
+  + Revert an unintentional bump of the GLib requirement in 3.20.7.
+
+-------------------------------------------------------------------
+Thu Aug  4 15:47:55 UTC 2016 - dimstar@opensuse.org
+
+- Update to version 3.20.7:
+  + Bugs fixed: bgo#118959, bgo#674215, bgo#708148, bgo#745622,
+    bgo#747206, bgo#764060, bgo#764203, bgo#765924, bgo#766120,
+    bgo#766122, bgo#766341, bgo#766643, bgo#766782, bgo#767058,
+    bgo#767468, bgo#767705, bgo#767766, bgo#767795, bgo#767848,
+    bgo#767851, bgo#768016, bgo#768025, bgo#768082, bgo#768142,
+    bgo#768177, bgo#768485, bgo#768657, bgo#768930, bgo#769003,
+    bgo#769047.
+  + Updated translations.
+- Drop gtk3-gtkwindow-realize-toplevel-before-popover.patch: fixed
+  upstream.
+
 -------------------------------------------------------------------
 Mon Jul  4 08:18:05 UTC 2016 - badshah400@gmail.com
 

gtk3.spec

@@ -29,7 +29,7 @@
 
 Name:           gtk3
 %define _name gtk+
-Version:        3.20.6
+Version:        3.20.8
 Release:        0
 Summary:        The GTK+ toolkit library (version 3)
 License:        LGPL-2.1+
@@ -44,8 +44,6 @@ Source99:       baselibs.conf
 Patch0:         gtk3-GTK_PATH64.patch
 # PATCH-FIX-OPENSUSE gtk3-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474
 Patch1:         gtk3-path-local.patch
-# PATCH-FIX-UPSTREAM gtk3-gtkwindow-realize-toplevel-before-popover.patch bgo#764060 badshah400@gmail.com -- GtkWindow: Ensure the toplevel is realized before realizing popovers
-Patch2:         gtk3-gtkwindow-realize-toplevel-before-popover.patch
 BuildRequires:  cups-devel >= 1.2
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
@@ -336,7 +334,6 @@ cp -a %{S:1} .
 %patch0 -p1
 %endif
 %patch1 -p0
-%patch2 -p1
 
 %build
 # Needed for patch1
@@ -375,12 +372,12 @@ mkdir %{buildroot}%{_libdir}/gtk-3.0/modules
 # create theming-engines directory that should have been created during the build
 test ! -d %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/theming-engines
 mkdir %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/theming-engines
-# Alternatives for gtk-update-icon-cache and gtk-builder-convert
+# Alternatives for gtk-update-icon-cache (binary and manpage)
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 mv %{buildroot}%{_bindir}/gtk-update-icon-cache %{buildroot}%{_bindir}/gtk-update-icon-cache-3.0
+ln -s -f %{_sysconfdir}/alternatives/gtk-update-icon-cache %{buildroot}%{_bindir}/gtk-update-icon-cache
 mv %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1 %{buildroot}%{_mandir}/man1/gtk-update-icon-cache-3.0.1
-touch %{buildroot}%{_bindir}/gtk-update-icon-cache
+ln -s -f %{_sysconfdir}/alternatives/gtk-update-icon-cache.1%{ext_man} %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1%{ext_man}
-touch %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1
-chmod a+x %{buildroot}%{_bindir}/gtk-update-icon-cache
 # Install rpm macros
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cp %{S:3} %{buildroot}%{_sysconfdir}/rpm
@@ -584,7 +581,8 @@ fi
 %{_bindir}/gtk-query-immodules-3.0*
 %{_bindir}/gtk-query-settings
 %{_bindir}/gtk-update-icon-cache-3.0
-%ghost %{_bindir}/gtk-update-icon-cache
+%{_bindir}/gtk-update-icon-cache
+%ghost %{_sysconfdir}/alternatives/gtk-update-icon-cache
 %{_datadir}/applications/gtk3-icon-browser.desktop
 %{_mandir}/man1/broadwayd.1%{?ext_man}
 %{_mandir}/man1/gtk3-icon-browser.1%{ext_man}
@@ -593,8 +591,9 @@ fi
 %{_mandir}/man1/gtk-launch.1%{?ext_man}
 %{_mandir}/man1/gtk-query-immodules-3.0*.1*
 %{_mandir}/man1/gtk-query-settings.1%{?ext_man}
-%{_mandir}/man1/gtk-update-icon-cache-3.0.1*
+%{_mandir}/man1/gtk-update-icon-cache-3.0.1%{?ext_man}
-%ghost %{_mandir}/man1/gtk-update-icon-cache.1*
+%{_mandir}/man1/gtk-update-icon-cache.1%{?ext_man}
+%ghost %{_sysconfdir}/alternatives/gtk-update-icon-cache.1%{?ext_man}
 
 %files data
 %defattr(-,root,root)