diff -Nru gtk+3.0-3.20.6/debian/changelog gtk+3.0-3.20.6/debian/changelog --- gtk+3.0-3.20.6/debian/changelog 2016-05-24 05:47:58.000000000 +0000 +++ gtk+3.0-3.20.6/debian/changelog 2016-06-14 14:56:25.000000000 +0000 @@ -1,8 +1,174 @@ -gtk+3.0 (3.20.6-0ubuntu1~xenial0) xenial; urgency=medium +gtk+3.0 (3.20.6-1ubuntu1~ppa1) xenial; urgency=medium - * New upstream release + * Bump break/replaces on libgtk-3-bin to 3.20.6-1 + since the GNOME 3 Staging PPA didn't make that change until now - -- Rico Tzschichholz Tue, 24 May 2016 07:47:58 +0200 + -- Jeremy Bicha Tue, 14 Jun 2016 10:52:57 -0400 + +gtk+3.0 (3.20.6-1ubuntu1~ppa0) yakkety; urgency=medium + + * Merge with Debian. Remaining changes: + + Install the settings.ini file to set our themes + + Enable parallel builds + + Ubuntu specific patches: + - 073_treeview_almost_fixed.patch + - 074_eventbox_scroll_mask.patch + - bzg_gtkcellrenderer_grabbing_modifier.patch + - ubuntu_gtk_custom_menu_items.patch + - print-dialog-show-options-of-remote-dnssd-printers.patch + - uimanager-guard-against-nested-node-updates.patch + - x-canonical-accel.patch + - message-dialog-restore-traditional-look-on-unity.patch + - 0001-gtk-reftest-Force-icon-theme-to-Adwaita.patch + - restore_filechooser_typeaheadfind + - 0001-calendar-always-emit-day-selected-once.patch + - 0001-gtkwindow-set-transparent-background-color.patch + - ubuntu_fileselector_behaviour.patch + - unity-border-radius.patch + - unity-headerbar-maximized-mode.patch + + Install a gsettings override to start filechoosers in the cwd + + Enable Mir backend + + -- Iain Lane Tue, 14 Jun 2016 09:29:49 +0100 + +gtk+3.0 (3.20.6-1) unstable; urgency=medium + + * New upstream release. + * Drop revert-scrolledwindow-Remove-child-before-destroying.patch, merged + upstream. + * Re-enable test-suite. + + -- Michael Biebl Tue, 31 May 2016 21:33:34 +0200 + +gtk+3.0 (3.20.5-4) unstable; urgency=medium + + * Work around a bug in cdbs which causes the package to FTBFS; see #825135 + for further details. + + -- Michael Biebl Thu, 26 May 2016 08:08:16 +0200 + +gtk+3.0 (3.20.5-3) unstable; urgency=medium + + * Make it simpler to bootstrap the package by marking the build dependencies + which are required to run the test-suite with . + (Closes: #747392) + * Bump Build-Depends on debhelper to (>= 9.20141010) and dpkg-dev to + (>= 1.17.14) for build dependency restrictions support. + * Temporarily disable the test suite (and its build-dependencies) to allow + building the new gtk-update-icon-cache package. Our buildds don't support + build profiles yet, so we'll have to bootstrap manually for now. + + -- Michael Biebl Mon, 23 May 2016 01:01:27 +0200 + +gtk+3.0 (3.20.5-2) unstable; urgency=medium + + * Split gtk-update-icon-cache utility out of libgtk-3-bin into a separate + package called gtk-update-icon-cache to break a dependency cycle with + adwaita-icon-theme when building the package. (Closes: #824999) + As the gtk-update-icon-cache binary doesn't actually have any libgtk-3-0 + dependency, there is no longer a reason to ship a gtk2 and gtk3 variant. + So from now on we will only ship one implementation built from src:gtk+3.0 + and drop the Debian specific -3.0 suffix. To simplify the transition make + libgtk-3-bin depend on gtk-update-icon-cache. Once all theme packages have + been updated, this dependency can be dropped. + * Cherry-pick patch from upstream Git which reverts a commit that was + causing crashes in the filechooser in some applications. + + -- Michael Biebl Sun, 22 May 2016 08:52:19 +0200 + +gtk+3.0 (3.20.5-1) unstable; urgency=medium + + * New upstream release. + * Refresh patches. + * Bump Standards-Version to 3.9.8. + + -- Michael Biebl Sat, 21 May 2016 00:11:13 +0200 + +gtk+3.0 (3.20.4-1) unstable; urgency=medium + + * New upstream release. + + -- Andreas Henriksson Tue, 10 May 2016 14:29:37 +0200 + +gtk+3.0 (3.20.3-2) unstable; urgency=medium + + * Restore debian/patches/reftest-known-fail.patch so we can mark known + failing tests as non-fatal. + * Drop debian/patches/disable-flaky-textview-margins-reftest.patch and tag + textview-margins.ui as known-fail. + * Mark button-wrapping.ui reftest as known-fail, it currently fails on + mips(64)el and prevents testing migration and important fixes in other + packages reaching testing. + + -- Michael Biebl Mon, 02 May 2016 01:18:04 +0200 + +gtk+3.0 (3.20.3-1) unstable; urgency=medium + + * New upstream release. + * Drop debian/patches/git_window-Remove-suspicious-branch.patch, merged + upstream and refresh the remaining patches. + * Upload to unstable. + + -- Michael Biebl Sat, 16 Apr 2016 21:13:07 +0200 + +gtk+3.0 (3.20.2-1) experimental; urgency=medium + + * New upstream release. + * Drop debian/patches/git_fix_emacs.patch, included in release. + * Add debian/patches/git_window-Remove-suspicious-branch.patch + - from upstream git, reverts a revert in 3.20.2 that causes the + testsuite to fail. Emacs users watch out! + + -- Andreas Henriksson Mon, 11 Apr 2016 12:53:17 +0200 + +gtk+3.0 (3.20.1-2) experimental; urgency=medium + + * Add debian/patches/disable-flaky-textview-margins-reftest.patch + + -- Andreas Henriksson Wed, 30 Mar 2016 14:02:10 +0200 + +gtk+3.0 (3.20.1-1) experimental; urgency=medium + + * New upstream release. + * Drop debian/patches/git_a11y_GTK_CSD_distcheck.patch, included in release. + * Add debian/patches/git_fix_emacs.patch, cherry-picked from upstream git. + Thanks to Matteo F. Vescovi for verifying the commit fixed the emacs problem. + + -- Andreas Henriksson Wed, 30 Mar 2016 11:08:26 +0200 + +gtk+3.0 (3.20.0-1) experimental; urgency=medium + + * New upstream release. + * Make testsuite fatal again. + * Add debian/patches/git_a11y_GTK_CSD_distcheck.patch + - cherry-pick commit from upstream to use client-side decorations + for a11y tests when running under distcheck. + * Drop debian/patches/reftest-known-fail.patch + * Stop tagging reftests as known fail since they should be fixed now: + - style-properties-nth-child.ui + - label-text-shadow-changes-modify-clip.ui + * Add debian/patches/no-accessibility-dump.patch + - skip this test until someone figures out how to reliably run it + always with CSD enabled, to match testsuite expected data. + + -- Andreas Henriksson Wed, 23 Mar 2016 14:10:27 +0100 + +gtk+3.0 (3.19.12-1) experimental; urgency=medium + + * New upstream development release+snapshot. + * Update (build-)dependencies according to configure.ac changes: + - add wayland-protocols (>= 1.1) + - bump libwayland-dev to 1.9.91 + - add libharfbuzz-dev (>= 0.9), libpango1.0-dev + * Temporarily make testsuite non-fatal while investigating. + * libgtk-3-bin.install: + - ship new gtk-query-settings tool. + - ship gtk-builder gettext (its) files. + - run wrap-and-sort on this file while at it. + * Update debian/libgtk-3-0.symbols with new additions. + - also drops an internal unused wayland-related drag and drop symbol. + + -- Andreas Henriksson Tue, 15 Mar 2016 11:34:25 +0100 gtk+3.0 (3.18.9-1ubuntu3) xenial; urgency=medium diff -Nru gtk+3.0-3.20.6/debian/control gtk+3.0-3.20.6/debian/control --- gtk+3.0-3.20.6/debian/control 2016-05-24 05:48:04.000000000 +0000 +++ gtk+3.0-3.20.6/debian/control 2016-06-14 14:56:25.000000000 +0000 @@ -3,28 +3,28 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Debian GNOME Maintainers , Michael Biebl -Build-Depends: debhelper (>= 8.1.3), +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Michael Biebl +Build-Depends: debhelper (>= 9.20141010), cdbs (>= 0.4.93), gnome-pkg-tools (>= 0.11), - dpkg-dev (>= 1.16.0), + dpkg-dev (>= 1.17.14), gtk-doc-tools (>= 1.20), dh-autoreconf, gettext, pkg-config, autotools-dev, - dbus-x11, - gsettings-desktop-schemas, - adwaita-icon-theme, - at-spi2-core, + dbus-x11 , + gsettings-desktop-schemas , + adwaita-icon-theme , + at-spi2-core , libglib2.0-dev (>= 2.45.8), libgdk-pixbuf2.0-dev (>= 2.30.0), - libharfbuzz-dev (>= 0.9), libpango1.0-dev (>= 1.37.3), libatk1.0-dev (>= 2.15.1), libatk-bridge2.0-dev, libegl1-mesa-dev [linux-any], libepoxy-dev, + libharfbuzz-dev (>= 0.9), libwayland-dev (>= 1.9.91) [linux-any], wayland-protocols (>= 1.1) [linux-any], libxkbcommon-dev (>= 0.2.0), @@ -49,7 +49,7 @@ libjson-glib-dev, gobject-introspection (>= 1.41.3), libgirepository1.0-dev (>= 1.39.0), - xvfb, + xvfb , libmirclient-dev (>= 0.13.3), libmircookie-dev (>= 0.17.0) Build-Depends-Indep: docbook-xml, @@ -58,7 +58,7 @@ libatk1.0-doc, libpango1.0-doc, libcairo2-doc -Standards-Version: 3.9.7 +Standards-Version: 3.9.8 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gtk/ubuntugtk3 XS-Debian-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gtk+3.0/ XS-Debian-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gtk+3.0/ @@ -76,9 +76,7 @@ Suggests: librsvg2-common, gvfs Breaks: gnome-themes-standard (<< 3.6), - gtk3-engines-oxygen (<< 1.4.1-3), - gnome-shell (<< 3.16), - overlay-scrollbar (<< 0.2.17) + gtk3-engines-oxygen (<< 1.4.1-3) Pre-Depends: ${misc:Pre-Depends} Description: GTK+ graphical user interface library GTK+ is a multi-platform toolkit for creating graphical user @@ -130,7 +128,8 @@ Multi-Arch: foreign Depends: ${misc:Depends}, ${shlibs:Depends}, libgtk-3-0 (>= ${source:Version}), - libgtk-3-common (>= ${source:Version}) + libgtk-3-common (>= ${source:Version}), + gtk-update-icon-cache Description: programs for the GTK+ graphical user interface library GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable @@ -151,12 +150,12 @@ ${shlibs:Depends}, libglib2.0-dev (>= 2.43.4), libgdk-pixbuf2.0-dev (>= 2.30.0), - libharfbuzz-dev (>= 0.9), libpango1.0-dev (>= 1.37.3), libatk1.0-dev (>= 2.15.1), libatk-bridge2.0-dev, libcairo2-dev (>= 1.14.0), libepoxy-dev (>= 1.0), + libharfbuzz-dev (>= 0.9), libx11-dev, libxext-dev, libxinerama-dev, @@ -172,9 +171,7 @@ wayland-protocols (>= 1.1) [linux-any], libxkbcommon-dev, libmirclient-dev (>= 0.13.3), - libmircookie-dev (>= 0.17.0), -# workaround for broken libmircookie-dev deps, drop asap - nettle-dev, + libmircookie-dev (>= 0.17.0) Suggests: libgtk-3-doc Description: development files for the GTK+ library GTK+ is a multi-platform toolkit for creating graphical user @@ -257,6 +254,24 @@ This package can be used by other packages using the GIRepository format to generate dynamic bindings. +Package: gtk-update-icon-cache +Section: misc +Architecture: any +Multi-Arch: foreign +Depends: ${misc:Depends}, + ${shlibs:Depends} +Breaks: libgtk2.0-bin (<< 2.24.30-2), + libgtk-3-bin (<< 3.20.6-1) +Replaces: libgtk2.0-bin (<< 2.24.30-2), + libgtk-3-bin (<< 3.20.6-1) +Description: icon theme caching utility + gtk-update-icon-cache creates mmap()able cache files for icon themes. + . + GTK+ can use the cache files created by gtk-update-icon-cache to avoid a lot + of system call and disk seek overhead when the application starts. Since the + format of the cache files allows them to be mmap()ed shared between multiple + applications, the overall memory consumption is reduced as well. + Package: libgail-3-0 Architecture: any Multi-Arch: same diff -Nru gtk+3.0-3.20.6/debian/control.in gtk+3.0-3.20.6/debian/control.in --- gtk+3.0-3.20.6/debian/control.in 2016-05-24 05:48:07.000000000 +0000 +++ gtk+3.0-3.20.6/debian/control.in 2016-06-14 14:56:34.000000000 +0000 @@ -4,27 +4,27 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 8.1.3), +Build-Depends: debhelper (>= 9.20141010), cdbs (>= 0.4.93), gnome-pkg-tools (>= 0.11), - dpkg-dev (>= 1.16.0), + dpkg-dev (>= 1.17.14), gtk-doc-tools (>= 1.20), dh-autoreconf, gettext, pkg-config, autotools-dev, - dbus-x11, - gsettings-desktop-schemas, - adwaita-icon-theme, - at-spi2-core, + dbus-x11 , + gsettings-desktop-schemas , + adwaita-icon-theme , + at-spi2-core , libglib2.0-dev (>= 2.45.8), libgdk-pixbuf2.0-dev (>= 2.30.0), - libharfbuzz-dev (>= 0.9), libpango1.0-dev (>= 1.37.3), libatk1.0-dev (>= 2.15.1), libatk-bridge2.0-dev, libegl1-mesa-dev [linux-any], libepoxy-dev, + libharfbuzz-dev (>= 0.9), libwayland-dev (>= 1.9.91) [linux-any], wayland-protocols (>= 1.1) [linux-any], libxkbcommon-dev (>= 0.2.0), @@ -49,7 +49,7 @@ libjson-glib-dev, gobject-introspection (>= 1.41.3), libgirepository1.0-dev (>= 1.39.0), - xvfb, + xvfb , libmirclient-dev (>= 0.13.3), libmircookie-dev (>= 0.17.0) Build-Depends-Indep: docbook-xml, @@ -58,7 +58,7 @@ libatk1.0-doc, libpango1.0-doc, libcairo2-doc -Standards-Version: 3.9.7 +Standards-Version: 3.9.8 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gtk/ubuntugtk3 XS-Debian-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gtk+3.0/ XS-Debian-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gtk+3.0/ @@ -76,9 +76,7 @@ Suggests: librsvg2-common, gvfs Breaks: gnome-themes-standard (<< 3.6), - gtk3-engines-oxygen (<< 1.4.1-3), - gnome-shell (<< 3.16), - overlay-scrollbar (<< 0.2.17) + gtk3-engines-oxygen (<< 1.4.1-3) Pre-Depends: ${misc:Pre-Depends} Description: GTK+ graphical user interface library GTK+ is a multi-platform toolkit for creating graphical user @@ -130,7 +128,8 @@ Multi-Arch: foreign Depends: ${misc:Depends}, ${shlibs:Depends}, @SHARED_PKG@ (>= ${source:Version}), - @COMMON_PKG@ (>= ${source:Version}) + @COMMON_PKG@ (>= ${source:Version}), + gtk-update-icon-cache Description: programs for the GTK+ graphical user interface library GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable @@ -151,12 +150,12 @@ ${shlibs:Depends}, libglib2.0-dev (>= 2.43.4), libgdk-pixbuf2.0-dev (>= 2.30.0), - libharfbuzz-dev (>= 0.9), libpango1.0-dev (>= 1.37.3), libatk1.0-dev (>= 2.15.1), libatk-bridge2.0-dev, libcairo2-dev (>= 1.14.0), libepoxy-dev (>= 1.0), + libharfbuzz-dev (>= 0.9), libx11-dev, libxext-dev, libxinerama-dev, @@ -172,9 +171,7 @@ wayland-protocols (>= 1.1) [linux-any], libxkbcommon-dev, libmirclient-dev (>= 0.13.3), - libmircookie-dev (>= 0.17.0), -# workaround for broken libmircookie-dev deps, drop asap - nettle-dev, + libmircookie-dev (>= 0.17.0) Suggests: @DOC_PKG@ Description: development files for the GTK+ library GTK+ is a multi-platform toolkit for creating graphical user @@ -257,6 +254,24 @@ This package can be used by other packages using the GIRepository format to generate dynamic bindings. +Package: gtk-update-icon-cache +Section: misc +Architecture: any +Multi-Arch: foreign +Depends: ${misc:Depends}, + ${shlibs:Depends} +Breaks: libgtk2.0-bin (<< 2.24.30-2), + libgtk-3-bin (<< 3.20.6-1) +Replaces: libgtk2.0-bin (<< 2.24.30-2), + libgtk-3-bin (<< 3.20.6-1) +Description: icon theme caching utility + gtk-update-icon-cache creates mmap()able cache files for icon themes. + . + GTK+ can use the cache files created by gtk-update-icon-cache to avoid a lot + of system call and disk seek overhead when the application starts. Since the + format of the cache files allows them to be mmap()ed shared between multiple + applications, the overall memory consumption is reduced as well. + Package: libgail-3-0 Architecture: any Multi-Arch: same diff -Nru gtk+3.0-3.20.6/debian/copyright gtk+3.0-3.20.6/debian/copyright --- gtk+3.0-3.20.6/debian/copyright 2016-05-24 05:47:51.000000000 +0000 +++ gtk+3.0-3.20.6/debian/copyright 2016-06-14 14:56:25.000000000 +0000 @@ -1,6 +1,6 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: gtk+ -Source: http://ftp.gnome.org/pub/GNOME/sources/gtk+/ +Source: https://download.gnome.org/sources/gtk+/ Files: * Copyright: Copyright (C) 1986, 1987, 1998 The Open Group diff -Nru gtk+3.0-3.20.6/debian/gtk-update-icon-cache.install gtk+3.0-3.20.6/debian/gtk-update-icon-cache.install --- gtk+3.0-3.20.6/debian/gtk-update-icon-cache.install 1970-01-01 00:00:00.000000000 +0000 +++ gtk+3.0-3.20.6/debian/gtk-update-icon-cache.install 2016-06-14 14:56:25.000000000 +0000 @@ -0,0 +1,3 @@ +../../../debian/update-icon-caches usr/sbin/ +usr/bin/gtk-update-icon-cache +usr/share/man/man1/gtk-update-icon-cache.1 diff -Nru gtk+3.0-3.20.6/debian/gtk-update-icon-cache.manpages gtk+3.0-3.20.6/debian/gtk-update-icon-cache.manpages --- gtk+3.0-3.20.6/debian/gtk-update-icon-cache.manpages 1970-01-01 00:00:00.000000000 +0000 +++ gtk+3.0-3.20.6/debian/gtk-update-icon-cache.manpages 2016-06-14 14:56:25.000000000 +0000 @@ -0,0 +1 @@ +debian/update-icon-caches.8 diff -Nru gtk+3.0-3.20.6/debian/gtk-update-icon-cache.preinst gtk+3.0-3.20.6/debian/gtk-update-icon-cache.preinst --- gtk+3.0-3.20.6/debian/gtk-update-icon-cache.preinst 1970-01-01 00:00:00.000000000 +0000 +++ gtk+3.0-3.20.6/debian/gtk-update-icon-cache.preinst 2016-06-14 14:56:25.000000000 +0000 @@ -0,0 +1,14 @@ +#!/bin/sh +set -e + +# Clean up existing diversions from libgtk-3-bin +if dpkg --compare-versions "$2" lt "3.20.5-2" ; then + dpkg-divert --remove --package libgtk-3-bin --rename \ + --divert /usr/sbin/update-icon-caches.gtk2 \ + /usr/sbin/update-icon-caches + dpkg-divert --remove --package libgtk-3-bin --rename \ + --divert /usr/share/man/man8/update-icon-caches.gtk2.8.gz \ + /usr/share/man/man8/update-icon-caches.8.gz +fi + +#DEBHELPER# diff -Nru gtk+3.0-3.20.6/debian/libgtk-3-0.install.in gtk+3.0-3.20.6/debian/libgtk-3-0.install.in --- gtk+3.0-3.20.6/debian/libgtk-3-0.install.in 2016-05-24 05:47:51.000000000 +0000 +++ gtk+3.0-3.20.6/debian/libgtk-3-0.install.in 2016-06-14 14:56:25.000000000 +0000 @@ -1,5 +1,4 @@ usr/bin/gtk-query-immodules-3.0 @LIBDIR@/@SHARED_PKG@ -usr/bin/gtk-update-icon-cache @LIBDIR@/@SHARED_PKG@ @MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/printbackends/*.so @LIBDIR@/libgtk*.so.* diff -Nru gtk+3.0-3.20.6/debian/libgtk-3-0.symbols gtk+3.0-3.20.6/debian/libgtk-3-0.symbols --- gtk+3.0-3.20.6/debian/libgtk-3-0.symbols 2016-05-24 05:47:51.000000000 +0000 +++ gtk+3.0-3.20.6/debian/libgtk-3-0.symbols 2016-06-14 14:56:25.000000000 +0000 @@ -73,7 +73,7 @@ gdk_device_get_position@Base 3.0.0 gdk_device_get_position_double@Base 3.9.10 gdk_device_get_product_id@Base 3.16.2 - gdk_device_get_seat@Base 3.19.5 + gdk_device_get_seat@Base 3.19.12 gdk_device_get_source@Base 3.0.0 gdk_device_get_state@Base 3.0.0 gdk_device_get_type@Base 3.0.0 @@ -104,7 +104,7 @@ gdk_display_get_default_cursor_size@Base 3.0.0 gdk_display_get_default_group@Base 3.0.0 gdk_display_get_default_screen@Base 3.0.0 - gdk_display_get_default_seat@Base 3.19.5 + gdk_display_get_default_seat@Base 3.19.12 gdk_display_get_device_manager@Base 3.0.0 gdk_display_get_event@Base 3.0.0 gdk_display_get_maximal_cursor_size@Base 3.0.0 @@ -118,7 +118,7 @@ gdk_display_is_closed@Base 3.0.0 gdk_display_keyboard_ungrab@Base 3.0.0 gdk_display_list_devices@Base 3.0.0 - gdk_display_list_seats@Base 3.19.5 + gdk_display_list_seats@Base 3.19.12 gdk_display_manager_get@Base 3.0.0 gdk_display_manager_get_default_display@Base 3.0.0 gdk_display_manager_get_type@Base 3.0.0 @@ -149,23 +149,23 @@ gdk_drag_action_get_type@Base 3.0.0 gdk_drag_begin@Base 3.0.0 gdk_drag_begin_for_device@Base 3.0.0 - gdk_drag_begin_from_point@Base 3.19.5 - gdk_drag_cancel_reason_get_type@Base 3.19.9 + gdk_drag_begin_from_point@Base 3.19.12 + gdk_drag_cancel_reason_get_type@Base 3.19.12 gdk_drag_context_get_actions@Base 3.0.0 gdk_drag_context_get_dest_window@Base 3.0.0 gdk_drag_context_get_device@Base 3.0.0 - gdk_drag_context_get_drag_window@Base 3.19.4 + gdk_drag_context_get_drag_window@Base 3.19.12 gdk_drag_context_get_protocol@Base 3.0.0 gdk_drag_context_get_selected_action@Base 3.0.0 gdk_drag_context_get_source_window@Base 3.0.0 gdk_drag_context_get_suggested_action@Base 3.0.0 gdk_drag_context_get_type@Base 3.0.0 gdk_drag_context_list_targets@Base 3.0.0 - gdk_drag_context_manage_dnd@Base 3.19.7 + gdk_drag_context_manage_dnd@Base 3.19.12 gdk_drag_context_set_device@Base 3.0.0 - gdk_drag_context_set_hotspot@Base 3.19.5 + gdk_drag_context_set_hotspot@Base 3.19.12 gdk_drag_drop@Base 3.0.0 - gdk_drag_drop_done@Base 3.19.5 + gdk_drag_drop_done@Base 3.19.12 gdk_drag_drop_succeeded@Base 3.0.0 gdk_drag_find_window_for_screen@Base 3.0.0 gdk_drag_get_selection@Base 3.0.0 @@ -193,14 +193,14 @@ gdk_event_get_screen@Base 3.0.0 gdk_event_get_scroll_deltas@Base 3.3.18 gdk_event_get_scroll_direction@Base 3.2.1 - gdk_event_get_seat@Base 3.19.5 + gdk_event_get_seat@Base 3.19.12 gdk_event_get_source_device@Base 3.0.0 gdk_event_get_state@Base 3.0.0 gdk_event_get_time@Base 3.0.0 gdk_event_get_type@Base 3.0.0 gdk_event_get_window@Base 3.10.0 gdk_event_handler_set@Base 3.0.0 - gdk_event_is_scroll_stop_event@Base 3.19.7 + gdk_event_is_scroll_stop_event@Base 3.19.12 gdk_event_mask_get_type@Base 3.0.0 gdk_event_new@Base 3.0.0 gdk_event_peek@Base 3.0.0 @@ -254,7 +254,7 @@ gdk_gl_context_get_type@Base 3.16.2 gdk_gl_context_get_version@Base 3.16.2 gdk_gl_context_get_window@Base 3.16.2 - gdk_gl_context_is_legacy@Base 3.19.2 + gdk_gl_context_is_legacy@Base 3.19.12 gdk_gl_context_make_current@Base 3.16.2 gdk_gl_context_realize@Base 3.16.2 gdk_gl_context_set_debug_enabled@Base 3.16.2 @@ -328,7 +328,7 @@ gdk_property_state_get_type@Base 3.0.0 gdk_query_depths@Base 3.0.0 gdk_query_visual_types@Base 3.0.0 - gdk_rectangle_equal@Base 3.19.2 + gdk_rectangle_equal@Base 3.19.12 gdk_rectangle_get_type@Base 3.0.0 gdk_rectangle_intersect@Base 3.0.0 gdk_rectangle_union@Base 3.0.0 @@ -376,15 +376,15 @@ gdk_screen_width@Base 3.0.0 gdk_screen_width_mm@Base 3.0.0 gdk_scroll_direction_get_type@Base 3.0.0 - gdk_seat_capabilities_get_type@Base 3.19.5 - gdk_seat_get_capabilities@Base 3.19.5 - gdk_seat_get_display@Base 3.19.5 - gdk_seat_get_keyboard@Base 3.19.5 - gdk_seat_get_pointer@Base 3.19.5 - gdk_seat_get_slaves@Base 3.19.5 - gdk_seat_get_type@Base 3.19.5 - gdk_seat_grab@Base 3.19.5 - gdk_seat_ungrab@Base 3.19.5 + gdk_seat_capabilities_get_type@Base 3.19.12 + gdk_seat_get_capabilities@Base 3.19.12 + gdk_seat_get_display@Base 3.19.12 + gdk_seat_get_keyboard@Base 3.19.12 + gdk_seat_get_pointer@Base 3.19.12 + gdk_seat_get_slaves@Base 3.19.12 + gdk_seat_get_type@Base 3.19.12 + gdk_seat_grab@Base 3.19.12 + gdk_seat_ungrab@Base 3.19.12 gdk_selection_convert@Base 3.0.0 gdk_selection_owner_get@Base 3.0.0 gdk_selection_owner_get_for_display@Base 3.0.0 @@ -447,7 +447,7 @@ (arch=linux-any)gdk_wayland_display_get_xdg_shell@Base 3.11.5 (arch=linux-any)gdk_wayland_display_set_cursor_theme@Base 3.9.10 (arch=linux-any)gdk_wayland_gl_context_get_type@Base 3.16.2 - gdk_wayland_seat_get_wl_seat@Base 3.19.5 + (arch=linux-any)gdk_wayland_seat_get_wl_seat@Base 3.19.12 (arch=linux-any)gdk_wayland_selection_add_targets_libgtk_only@Base 3.13.8 (arch=linux-any)gdk_wayland_selection_clear_targets_libgtk_only@Base 3.13.8 (arch=linux-any)gdk_wayland_window_get_type@Base 3.9.10 @@ -957,12 +957,12 @@ gtk_application_set_app_menu@Base 3.3.16 gtk_application_set_menubar@Base 3.3.16 gtk_application_uninhibit@Base 3.3.16 - gtk_application_window_get_help_overlay@Base 3.19.2 + gtk_application_window_get_help_overlay@Base 3.19.12 gtk_application_window_get_id@Base 3.5.4 gtk_application_window_get_show_menubar@Base 3.3.16 gtk_application_window_get_type@Base 3.3.16 gtk_application_window_new@Base 3.3.16 - gtk_application_window_set_help_overlay@Base 3.19.2 + gtk_application_window_set_help_overlay@Base 3.19.12 gtk_application_window_set_show_menubar@Base 3.3.16 gtk_arrow_accessible_get_type@Base 3.7.10 gtk_arrow_get_type@Base 3.0.0 @@ -1808,12 +1808,12 @@ gtk_file_chooser_list_filters@Base 3.0.0 gtk_file_chooser_list_shortcut_folder_uris@Base 3.0.0 gtk_file_chooser_list_shortcut_folders@Base 3.0.0 - gtk_file_chooser_native_get_accept_label@Base 3.19.2 - gtk_file_chooser_native_get_cancel_label@Base 3.19.2 - gtk_file_chooser_native_get_type@Base 3.19.2 - gtk_file_chooser_native_new@Base 3.19.2 - gtk_file_chooser_native_set_accept_label@Base 3.19.2 - gtk_file_chooser_native_set_cancel_label@Base 3.19.2 + gtk_file_chooser_native_get_accept_label@Base 3.19.12 + gtk_file_chooser_native_get_cancel_label@Base 3.19.12 + gtk_file_chooser_native_get_type@Base 3.19.12 + gtk_file_chooser_native_new@Base 3.19.12 + gtk_file_chooser_native_set_accept_label@Base 3.19.12 + gtk_file_chooser_native_set_cancel_label@Base 3.19.12 gtk_file_chooser_remove_filter@Base 3.0.0 gtk_file_chooser_remove_shortcut_folder@Base 3.0.0 gtk_file_chooser_remove_shortcut_folder_uri@Base 3.0.0 @@ -2312,7 +2312,7 @@ gtk_im_context_set_cursor_location@Base 3.0.0 gtk_im_context_set_surrounding@Base 3.0.0 gtk_im_context_set_use_preedit@Base 3.0.0 - gtk_im_context_simple_add_compose_file@Base 3.19.2 + gtk_im_context_simple_add_compose_file@Base 3.19.12 gtk_im_context_simple_add_table@Base 3.0.0 gtk_im_context_simple_get_type@Base 3.0.0 gtk_im_context_simple_new@Base 3.0.0 @@ -2684,18 +2684,18 @@ gtk_mount_operation_set_parent@Base 3.0.0 gtk_mount_operation_set_screen@Base 3.0.0 gtk_movement_step_get_type@Base 3.0.0 - gtk_native_dialog_destroy@Base 3.19.2 - gtk_native_dialog_get_modal@Base 3.19.2 - gtk_native_dialog_get_title@Base 3.19.2 - gtk_native_dialog_get_transient_for@Base 3.19.2 - gtk_native_dialog_get_type@Base 3.19.2 - gtk_native_dialog_get_visible@Base 3.19.2 - gtk_native_dialog_hide@Base 3.19.2 - gtk_native_dialog_run@Base 3.19.2 - gtk_native_dialog_set_modal@Base 3.19.2 - gtk_native_dialog_set_title@Base 3.19.2 - gtk_native_dialog_set_transient_for@Base 3.19.2 - gtk_native_dialog_show@Base 3.19.2 + gtk_native_dialog_destroy@Base 3.19.12 + gtk_native_dialog_get_modal@Base 3.19.12 + gtk_native_dialog_get_title@Base 3.19.12 + gtk_native_dialog_get_transient_for@Base 3.19.12 + gtk_native_dialog_get_type@Base 3.19.12 + gtk_native_dialog_get_visible@Base 3.19.12 + gtk_native_dialog_hide@Base 3.19.12 + gtk_native_dialog_run@Base 3.19.12 + gtk_native_dialog_set_modal@Base 3.19.12 + gtk_native_dialog_set_title@Base 3.19.12 + gtk_native_dialog_set_transient_for@Base 3.19.12 + gtk_native_dialog_show@Base 3.19.12 gtk_notebook_accessible_get_type@Base 3.7.10 gtk_notebook_append_page@Base 3.0.0 gtk_notebook_append_page_menu@Base 3.0.0 @@ -2911,8 +2911,8 @@ gtk_policy_type_get_type@Base 3.0.0 gtk_popover_accessible_get_type@Base 3.12.0 gtk_popover_bind_model@Base 3.11.7 - gtk_popover_constraint_get_type@Base 3.19.4 - gtk_popover_get_constrain_to@Base 3.19.4 + gtk_popover_constraint_get_type@Base 3.19.12 + gtk_popover_get_constrain_to@Base 3.19.12 gtk_popover_get_default_widget@Base 3.17.9 gtk_popover_get_modal@Base 3.11.5 gtk_popover_get_pointing_to@Base 3.11.5 @@ -2925,7 +2925,7 @@ gtk_popover_menu_open_submenu@Base 3.16.2 gtk_popover_new@Base 3.11.5 gtk_popover_new_from_model@Base 3.11.7 - gtk_popover_set_constrain_to@Base 3.19.4 + gtk_popover_set_constrain_to@Base 3.19.12 gtk_popover_set_default_widget@Base 3.17.9 gtk_popover_set_modal@Base 3.11.5 gtk_popover_set_pointing_to@Base 3.11.5 @@ -3416,7 +3416,7 @@ gtk_render_activity@Base 3.0.0 gtk_render_arrow@Base 3.0.0 gtk_render_background@Base 3.0.0 - gtk_render_background_get_clip@Base 3.19.8 + gtk_render_background_get_clip@Base 3.19.12 gtk_render_check@Base 3.0.0 gtk_render_expander@Base 3.0.0 gtk_render_extension@Base 3.0.0 @@ -3577,17 +3577,17 @@ gtk_settings_get_type@Base 3.0.0 gtk_settings_install_property@Base 3.0.0 gtk_settings_install_property_parser@Base 3.0.0 - gtk_settings_reset_property@Base 3.19.2 + gtk_settings_reset_property@Base 3.19.12 gtk_settings_set_double_property@Base 3.0.0 gtk_settings_set_long_property@Base 3.0.0 gtk_settings_set_property_value@Base 3.0.0 gtk_settings_set_string_property@Base 3.0.0 gtk_shadow_type_get_type@Base 3.0.0 - gtk_shortcut_type_get_type@Base 3.19.4 - gtk_shortcuts_group_get_type@Base 3.19.2 - gtk_shortcuts_section_get_type@Base 3.19.2 - gtk_shortcuts_shortcut_get_type@Base 3.19.2 - gtk_shortcuts_window_get_type@Base 3.19.2 + gtk_shortcut_type_get_type@Base 3.19.12 + gtk_shortcuts_group_get_type@Base 3.19.12 + gtk_shortcuts_section_get_type@Base 3.19.12 + gtk_shortcuts_shortcut_get_type@Base 3.19.12 + gtk_shortcuts_window_get_type@Base 3.19.12 gtk_show_about_dialog@Base 3.0.0 gtk_show_uri@Base 3.0.0 gtk_size_group_add_widget@Base 3.0.0 @@ -3765,7 +3765,7 @@ gtk_style_context_new@Base 3.0.0 gtk_style_context_notify_state_change@Base 3.0.0 gtk_style_context_pop_animatable_region@Base 3.0.0 - gtk_style_context_print_flags_get_type@Base 3.19.6 + gtk_style_context_print_flags_get_type@Base 3.19.12 gtk_style_context_push_animatable_region@Base 3.0.0 gtk_style_context_remove_class@Base 3.0.0 gtk_style_context_remove_provider@Base 3.0.0 @@ -3785,7 +3785,7 @@ gtk_style_context_set_screen@Base 3.0.0 gtk_style_context_set_state@Base 3.0.0 gtk_style_context_state_is_running@Base 3.0.0 - gtk_style_context_to_string@Base 3.19.6 + gtk_style_context_to_string@Base 3.19.12 gtk_style_copy@Base 3.0.0 gtk_style_detach@Base 3.0.0 gtk_style_get@Base 3.0.0 @@ -4077,7 +4077,7 @@ gtk_text_iter_set_visible_line_offset@Base 3.0.0 gtk_text_iter_starts_line@Base 3.0.0 gtk_text_iter_starts_sentence@Base 3.0.0 - gtk_text_iter_starts_tag@Base 3.19.5 + gtk_text_iter_starts_tag@Base 3.19.12 gtk_text_iter_starts_word@Base 3.0.0 gtk_text_iter_toggles_tag@Base 3.0.0 gtk_text_layout_changed@Base 3.0.0 @@ -4135,7 +4135,7 @@ gtk_text_mark_new@Base 3.0.0 gtk_text_mark_set_visible@Base 3.0.0 gtk_text_search_flags_get_type@Base 3.0.0 - gtk_text_tag_changed@Base 3.19.2 + gtk_text_tag_changed@Base 3.19.12 gtk_text_tag_event@Base 3.0.0 gtk_text_tag_get_priority@Base 3.0.0 gtk_text_tag_get_type@Base 3.0.0 @@ -4198,7 +4198,7 @@ gtk_text_view_new@Base 3.0.0 gtk_text_view_new_with_buffer@Base 3.0.0 gtk_text_view_place_cursor_onscreen@Base 3.0.0 - gtk_text_view_reset_cursor_blink@Base 3.19.7 + gtk_text_view_reset_cursor_blink@Base 3.19.12 gtk_text_view_reset_im_context@Base 3.0.0 gtk_text_view_scroll_mark_onscreen@Base 3.0.0 gtk_text_view_scroll_to_iter@Base 3.0.0 @@ -4771,7 +4771,7 @@ gtk_widget_class_bind_template_callback_full@Base 3.9.10 gtk_widget_class_bind_template_child_full@Base 3.9.10 gtk_widget_class_find_style_property@Base 3.0.0 - gtk_widget_class_get_css_name@Base 3.19.2 + gtk_widget_class_get_css_name@Base 3.19.12 gtk_widget_class_install_style_property@Base 3.0.0 gtk_widget_class_install_style_property_parser@Base 3.0.0 gtk_widget_class_list_style_properties@Base 3.0.0 @@ -4779,7 +4779,7 @@ gtk_widget_class_set_accessible_role@Base 3.2.1 gtk_widget_class_set_accessible_type@Base 3.2.1 gtk_widget_class_set_connect_func@Base 3.9.10 - gtk_widget_class_set_css_name@Base 3.19.2 + gtk_widget_class_set_css_name@Base 3.19.12 gtk_widget_class_set_template@Base 3.9.10 gtk_widget_class_set_template_from_resource@Base 3.9.10 gtk_widget_compute_expand@Base 3.0.0 @@ -4797,7 +4797,7 @@ gtk_widget_get_action_group@Base 3.16.2 gtk_widget_get_allocated_baseline@Base 3.9.10 gtk_widget_get_allocated_height@Base 3.0.0 - gtk_widget_get_allocated_size@Base 3.19.2 + gtk_widget_get_allocated_size@Base 3.19.12 gtk_widget_get_allocated_width@Base 3.0.0 gtk_widget_get_allocation@Base 3.0.0 gtk_widget_get_ancestor@Base 3.0.0 @@ -4817,7 +4817,7 @@ gtk_widget_get_display@Base 3.0.0 gtk_widget_get_double_buffered@Base 3.0.0 gtk_widget_get_events@Base 3.0.0 - gtk_widget_get_focus_on_click@Base 3.19.2 + gtk_widget_get_focus_on_click@Base 3.19.12 gtk_widget_get_font_map@Base 3.17.9 gtk_widget_get_font_options@Base 3.17.9 gtk_widget_get_frame_clock@Base 3.7.10 @@ -4934,7 +4934,7 @@ gtk_widget_path_iter_clear_classes@Base 3.0.0 gtk_widget_path_iter_clear_regions@Base 3.0.0 gtk_widget_path_iter_get_name@Base 3.0.0 - gtk_widget_path_iter_get_object_name@Base 3.19.2 + gtk_widget_path_iter_get_object_name@Base 3.19.12 gtk_widget_path_iter_get_object_type@Base 3.0.0 gtk_widget_path_iter_get_sibling_index@Base 3.1.6 gtk_widget_path_iter_get_siblings@Base 3.1.6 @@ -4950,7 +4950,7 @@ gtk_widget_path_iter_remove_class@Base 3.0.0 gtk_widget_path_iter_remove_region@Base 3.0.0 gtk_widget_path_iter_set_name@Base 3.0.0 - gtk_widget_path_iter_set_object_name@Base 3.19.2 + gtk_widget_path_iter_set_object_name@Base 3.19.12 gtk_widget_path_iter_set_object_type@Base 3.0.0 gtk_widget_path_iter_set_state@Base 3.13.7 gtk_widget_path_length@Base 3.0.0 @@ -4961,7 +4961,7 @@ gtk_widget_path_unref@Base 3.1.6 gtk_widget_pop_composite_child@Base 3.0.0 gtk_widget_push_composite_child@Base 3.0.0 - gtk_widget_queue_allocate@Base 3.19.2 + gtk_widget_queue_allocate@Base 3.19.12 gtk_widget_queue_compute_expand@Base 3.0.0 gtk_widget_queue_draw@Base 3.0.0 gtk_widget_queue_draw_area@Base 3.0.0 @@ -4995,7 +4995,7 @@ gtk_widget_set_direction@Base 3.0.0 gtk_widget_set_double_buffered@Base 3.0.0 gtk_widget_set_events@Base 3.0.0 - gtk_widget_set_focus_on_click@Base 3.19.2 + gtk_widget_set_focus_on_click@Base 3.19.12 gtk_widget_set_font_map@Base 3.17.9 gtk_widget_set_font_options@Base 3.17.9 gtk_widget_set_halign@Base 3.0.0 @@ -5186,4 +5186,3 @@ ubuntu_menu_item_factory_create_menu_item@Base 3.8.2-0ubuntu2~build2 ubuntu_menu_item_factory_get_all@Base 3.10.2-0ubuntu3 ubuntu_menu_item_factory_get_type@Base 3.8.2-0ubuntu2~build2 - diff -Nru gtk+3.0-3.20.6/debian/libgtk-3-bin.install gtk+3.0-3.20.6/debian/libgtk-3-bin.install --- gtk+3.0-3.20.6/debian/libgtk-3-bin.install 2016-05-24 05:47:52.000000000 +0000 +++ gtk+3.0-3.20.6/debian/libgtk-3-bin.install 2016-06-14 14:56:25.000000000 +0000 @@ -1,13 +1,11 @@ +usr/bin/broadwayd +usr/bin/gtk-builder-tool +usr/bin/gtk-launch +usr/bin/gtk-query-settings usr/share/gettext/its/gtkbuilder.its usr/share/gettext/its/gtkbuilder.loc usr/share/man/man1/broadwayd.1 usr/share/man/man1/gtk-builder-tool.1 -usr/share/man/man1/gtk-update-icon-cache.1 +usr/share/man/man1/gtk-launch.1 usr/share/man/man1/gtk-query-immodules-3.0.1 usr/share/man/man1/gtk-query-settings.1 -usr/share/man/man1/gtk-launch.1 -usr/bin/broadwayd -usr/bin/gtk-builder-tool -usr/bin/gtk-launch -usr/bin/gtk-query-settings - diff -Nru gtk+3.0-3.20.6/debian/libgtk-3-bin.links.in gtk+3.0-3.20.6/debian/libgtk-3-bin.links.in --- gtk+3.0-3.20.6/debian/libgtk-3-bin.links.in 2016-05-24 05:47:52.000000000 +0000 +++ gtk+3.0-3.20.6/debian/libgtk-3-bin.links.in 2016-06-14 14:56:25.000000000 +0000 @@ -1,3 +1,2 @@ -@LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache-3.0 usr/bin/gtk-update-icon-cache-3.0 usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@BIN_PKG@/@NEWS@ usr/share/doc/@COMMON_PKG@/@README@ usr/share/doc/@BIN_PKG@/@README@ diff -Nru gtk+3.0-3.20.6/debian/libgtk-3-bin.manpages gtk+3.0-3.20.6/debian/libgtk-3-bin.manpages --- gtk+3.0-3.20.6/debian/libgtk-3-bin.manpages 2016-05-24 05:47:53.000000000 +0000 +++ gtk+3.0-3.20.6/debian/libgtk-3-bin.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/update-icon-caches.8 diff -Nru gtk+3.0-3.20.6/debian/libgtk-3-bin.postrm gtk+3.0-3.20.6/debian/libgtk-3-bin.postrm --- gtk+3.0-3.20.6/debian/libgtk-3-bin.postrm 2016-05-24 05:47:53.000000000 +0000 +++ gtk+3.0-3.20.6/debian/libgtk-3-bin.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -#!/bin/sh -e -set -e - -if [ "$1" = remove ] ; then - dpkg-divert --remove --package libgtk-3-bin --rename \ - --divert /usr/sbin/update-icon-caches.gtk2 \ - /usr/sbin/update-icon-caches - dpkg-divert --remove --package libgtk-3-bin --rename \ - --divert /usr/share/man/man8/update-icon-caches.gtk2.8.gz \ - /usr/share/man/man8/update-icon-caches.8.gz -fi - -#DEBHELPER# - -exit 0 diff -Nru gtk+3.0-3.20.6/debian/libgtk-3-bin.preinst gtk+3.0-3.20.6/debian/libgtk-3-bin.preinst --- gtk+3.0-3.20.6/debian/libgtk-3-bin.preinst 2016-05-24 05:47:53.000000000 +0000 +++ gtk+3.0-3.20.6/debian/libgtk-3-bin.preinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -#!/bin/sh -e -set -e - -if [ "$1" = install ] || [ "$1" = upgrade ] ; then - if dpkg-divert --listpackage /usr/sbin/update-icon-caches | grep -q libgtk3.0-bin; then - dpkg-divert --remove --package libgtk3.0-bin --rename \ - --divert /usr/sbin/update-icon-caches.gtk2 \ - /usr/sbin/update-icon-caches - dpkg-divert --remove --package libgtk3.0-bin --rename \ - --divert /usr/share/man/man8/update-icon-caches.gtk2.8.gz \ - /usr/share/man/man8/update-icon-caches.8.gz - fi - - dpkg-divert --add --package libgtk-3-bin --rename \ - --divert /usr/sbin/update-icon-caches.gtk2 \ - /usr/sbin/update-icon-caches - dpkg-divert --add --package libgtk-3-bin --rename \ - --divert /usr/share/man/man8/update-icon-caches.gtk2.8.gz \ - /usr/share/man/man8/update-icon-caches.8.gz -fi - -#DEBHELPER# - -exit 0 diff -Nru gtk+3.0-3.20.6/debian/patches/git_icon_fallback.patch gtk+3.0-3.20.6/debian/patches/git_icon_fallback.patch --- gtk+3.0-3.20.6/debian/patches/git_icon_fallback.patch 2016-05-24 05:47:56.000000000 +0000 +++ gtk+3.0-3.20.6/debian/patches/git_icon_fallback.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -From b6bf982289273c1416ba66281b8c09a1ee6a33a4 Mon Sep 17 00:00:00 2001 -From: Benjamin Otte -Date: Thu, 8 Oct 2015 14:34:39 +0200 -Subject: iconhelper: Track icon-name fallback usage in the GIcon - -Passing GTK_ICON_LOOKUP_GENERIC_FALLBACK to the icon lookup doesn't work -for GIcons, so we have to make sure we use the right GThemedIcon. - -Fixes image-icon-name-use-fallback reftest. ---- - gtk/gtkiconhelper.c | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c -index 7d42cb8..dfc95ff 100644 ---- a/gtk/gtkiconhelper.c -+++ b/gtk/gtkiconhelper.c -@@ -914,7 +914,10 @@ _gtk_icon_helper_set_icon_name (GtkIconHelper *self, - icon_name[0] != '\0') - { - self->priv->storage_type = GTK_IMAGE_ICON_NAME; -- self->priv->gicon = g_themed_icon_new (icon_name); -+ if (self->priv->use_fallback) -+ self->priv->gicon = g_themed_icon_new_with_default_fallbacks (icon_name); -+ else -+ self->priv->gicon = g_themed_icon_new (icon_name); - _gtk_icon_helper_set_icon_size (self, icon_size); - } - } -@@ -1025,6 +1028,16 @@ _gtk_icon_helper_set_use_fallback (GtkIconHelper *self, - { - self->priv->use_fallback = use_fallback; - _gtk_icon_helper_invalidate (self); -+ if (self->priv->storage_type == GTK_IMAGE_ICON_NAME) -+ { -+ GIcon *old_icon = self->priv->gicon; -+ const char *icon_name = g_themed_icon_get_names (G_THEMED_ICON (self->priv->gicon))[0]; -+ if (self->priv->use_fallback) -+ self->priv->gicon = g_themed_icon_new_with_default_fallbacks (icon_name); -+ else -+ self->priv->gicon = g_themed_icon_new (icon_name); -+ g_object_unref (old_icon); -+ } - return TRUE; - } - return FALSE; --- -cgit v0.11.2 - diff -Nru gtk+3.0-3.20.6/debian/patches/series gtk+3.0-3.20.6/debian/patches/series --- gtk+3.0-3.20.6/debian/patches/series 2016-05-24 05:47:56.000000000 +0000 +++ gtk+3.0-3.20.6/debian/patches/series 2016-06-14 14:56:25.000000000 +0000 @@ -3,8 +3,6 @@ 017_no_offscreen_device_grabbing.patch 018_gdkenumtypes.c_location.patch 022_disable-viqr-im-for-vi-locale.patch -#042_treeview_single-focus.patch -#043_notebook_scroll.patch 032_mips_treeview_row_separator_height.patch 060_ignore-random-icons.patch 071_fix-installation-of-HTML-images.patch @@ -23,5 +21,5 @@ #git-refresh-mir-backend.patch 0001-gtkwindow-set-transparent-background-color.patch ubuntu_fileselector_behaviour.patch -#unity-border-radius.patch -#unity-headerbar-maximized-mode.patch +unity-border-radius.patch +unity-headerbar-maximized-mode.patch diff -Nru gtk+3.0-3.20.6/debian/patches/unity-border-radius.patch gtk+3.0-3.20.6/debian/patches/unity-border-radius.patch --- gtk+3.0-3.20.6/debian/patches/unity-border-radius.patch 2016-05-24 05:47:56.000000000 +0000 +++ gtk+3.0-3.20.6/debian/patches/unity-border-radius.patch 2016-06-14 14:56:25.000000000 +0000 @@ -4,11 +4,11 @@ Author: Marco Trevisan Bug-Ubuntu: https://bugs.launchpad.net/bugs/1516403 -Index: gtk+3.0-3.18.8/gtk/gtkwindow.c +Index: b/gtk/gtkwindow.c =================================================================== ---- gtk+3.0-3.18.8.orig/gtk/gtkwindow.c -+++ gtk+3.0-3.18.8/gtk/gtkwindow.c -@@ -232,6 +232,7 @@ struct _GtkWindowPrivate +--- a/gtk/gtkwindow.c ++++ b/gtk/gtkwindow.c +@@ -256,6 +256,7 @@ guint csd_requested : 1; guint client_decorated : 1; /* Decorations drawn client-side */ guint use_client_shadow : 1; /* Decorations use client-side shadows */ @@ -16,7 +16,7 @@ guint maximized : 1; guint fullscreen : 1; guint tiled : 1; -@@ -3976,15 +3977,137 @@ gtk_window_set_geometry_hints (GtkWindow +@@ -4035,6 +4036,119 @@ } static void @@ -90,18 +90,12 @@ + GtkWindow *window) +{ + GtkStyleContext *context = gtk_widget_get_style_context (widget); -+ const GtkBitmask *changes = _gtk_style_context_get_changes (context); ++ const GtkBitmask *change = gtk_style_context_get_change (context); + -+ if (!changes) ++ if (!change || !gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_BORDER)) + return; + -+ if (_gtk_bitmask_get(changes, GTK_CSS_PROPERTY_BORDER_TOP_LEFT_RADIUS) || -+ _gtk_bitmask_get(changes, GTK_CSS_PROPERTY_BORDER_TOP_RIGHT_RADIUS) || -+ _gtk_bitmask_get(changes, GTK_CSS_PROPERTY_BORDER_BOTTOM_RIGHT_RADIUS) || -+ _gtk_bitmask_get(changes, GTK_CSS_PROPERTY_BORDER_BOTTOM_LEFT_RADIUS)) -+ { -+ unity_border_radius_update (window); -+ } ++ unity_border_radius_update (window); +} + +static void @@ -142,9 +136,7 @@ unset_titlebar (GtkWindow *window) { GtkWindowPrivate *priv = window->priv; - - if (priv->title_box != NULL) - { +@@ -4044,6 +4158,9 @@ g_signal_handlers_disconnect_by_func (priv->title_box, on_titlebar_title_notify, window); @@ -154,7 +146,7 @@ gtk_widget_unparent (priv->title_box); priv->title_box = NULL; priv->titlebar = NULL; -@@ -4043,13 +4169,16 @@ gtk_window_enable_csd (GtkWindow *window +@@ -4100,13 +4217,16 @@ GdkVisual *visual; /* We need a visual with alpha for client shadows */ @@ -172,7 +164,7 @@ } else { -@@ -4118,6 +4247,7 @@ gtk_window_set_titlebar (GtkWindow *wind +@@ -4175,6 +4295,7 @@ } priv->use_client_shadow = gtk_window_supports_client_shadow (window); @@ -180,7 +172,7 @@ gtk_window_enable_csd (window); priv->title_box = titlebar; -@@ -4129,6 +4259,8 @@ gtk_window_set_titlebar (GtkWindow *wind +@@ -4186,6 +4307,8 @@ on_titlebar_title_notify (GTK_HEADER_BAR (titlebar), NULL, window); } @@ -189,7 +181,7 @@ gtk_style_context_add_class (gtk_widget_get_style_context (titlebar), GTK_STYLE_CLASS_TITLEBAR); -@@ -5857,13 +5989,19 @@ create_decoration (GtkWidget *widget) +@@ -6067,13 +6190,19 @@ GtkWindowPrivate *priv = window->priv; priv->use_client_shadow = gtk_window_supports_client_shadow (window); @@ -212,7 +204,7 @@ if (priv->title_box == NULL) { -@@ -5871,6 +6009,8 @@ create_decoration (GtkWidget *widget) +@@ -6081,6 +6210,8 @@ gtk_widget_set_parent (priv->titlebar, widget); gtk_widget_show_all (priv->titlebar); priv->title_box = priv->titlebar; @@ -221,7 +213,7 @@ } update_window_buttons (window); -@@ -6547,6 +6687,9 @@ get_shadow_width (GtkWindow *window, +@@ -6694,6 +6825,9 @@ if (!priv->decorated) return; @@ -231,7 +223,7 @@ if (!priv->client_decorated && !(gtk_window_should_use_csd (window) && gtk_window_supports_client_shadow (window))) -@@ -7141,7 +7284,7 @@ gtk_window_realize (GtkWidget *widget) +@@ -7270,7 +7404,7 @@ attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL; @@ -240,7 +232,7 @@ { const gchar *cursor[8] = { "nw-resize", "n-resize", "ne-resize", -@@ -7223,6 +7366,12 @@ gtk_window_realize (GtkWidget *widget) +@@ -7352,6 +7486,12 @@ } #endif @@ -253,7 +245,7 @@ child_allocation.x = 0; child_allocation.y = 0; child_allocation.width = allocation.width; -@@ -10587,7 +10736,7 @@ gtk_window_set_screen (GtkWindow *window +@@ -10937,7 +11077,7 @@ } g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_SCREEN]); diff -Nru gtk+3.0-3.20.6/debian/patches/unity-headerbar-maximized-mode.patch gtk+3.0-3.20.6/debian/patches/unity-headerbar-maximized-mode.patch --- gtk+3.0-3.20.6/debian/patches/unity-headerbar-maximized-mode.patch 2016-05-24 05:47:56.000000000 +0000 +++ gtk+3.0-3.20.6/debian/patches/unity-headerbar-maximized-mode.patch 2016-06-14 14:56:25.000000000 +0000 @@ -4,11 +4,11 @@ Author: Marco Trevisan Bug-Ubuntu: https://launchpad.net/bugs/1515810 -Index: gtk+3.0-3.18.8/gtk/gtkheaderbar.c +Index: b/gtk/gtkheaderbar.c =================================================================== ---- gtk+3.0-3.18.8.orig/gtk/gtkheaderbar.c -+++ gtk+3.0-3.18.8/gtk/gtkheaderbar.c -@@ -31,6 +31,10 @@ +--- a/gtk/gtkheaderbar.c ++++ b/gtk/gtkheaderbar.c +@@ -34,6 +34,10 @@ #include @@ -19,7 +19,7 @@ /** * SECTION:gtkheaderbar * @Short_description: A box with a centered child -@@ -65,6 +69,7 @@ struct _GtkHeaderBarPrivate +@@ -68,6 +72,7 @@ GtkWidget *custom_title; gint spacing; gboolean has_subtitle; @@ -27,7 +27,7 @@ GList *children; -@@ -276,6 +281,36 @@ _gtk_header_bar_update_separator_visibil +@@ -262,6 +267,35 @@ gtk_widget_set_visible (priv->titlebar_end_separator, have_visible_at_end); } @@ -40,7 +40,6 @@ + if (!priv->title_label) + return; + -+ + if (priv->unity_environment) + { + GtkWidget *widget = GTK_WIDGET (bar); @@ -64,11 +63,11 @@ void _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar) { -@@ -307,6 +342,20 @@ _gtk_header_bar_update_window_buttons (G +@@ -294,6 +328,20 @@ } priv->titlebar_icon = NULL; -+ window = GTK_WINDOW (gtk_widget_get_toplevel (widget)); ++ window = GTK_WINDOW (toplevel); + + if (priv->unity_environment) + { @@ -85,15 +84,16 @@ if (!priv->shows_wm_decorations) return; -@@ -324,7 +373,6 @@ _gtk_header_bar_update_window_buttons (G +@@ -311,8 +359,6 @@ layout_desc = g_strdup (priv->decoration_layout); } -- window = GTK_WINDOW (gtk_widget_get_toplevel (widget)); - +- window = GTK_WINDOW (toplevel); +- if (!shown_by_shell && gtk_window_get_application (window)) menu = gtk_application_get_app_menu (gtk_window_get_application (window)); -@@ -580,6 +628,8 @@ construct_label_box (GtkHeaderBar *bar) + else +@@ -568,6 +614,8 @@ &priv->subtitle_label); gtk_header_bar_reorder_css_node (bar, GTK_PACK_START, priv->label_box); gtk_widget_set_parent (priv->label_box, GTK_WIDGET (bar)); @@ -101,8 +101,8 @@ + check_title_visibility (bar); } - static void -@@ -1808,6 +1858,22 @@ gtk_header_bar_realize (GtkWidget *widge + static gint +@@ -1815,6 +1863,22 @@ GTK_WIDGET_CLASS (gtk_header_bar_parent_class)->realize (widget); @@ -125,12 +125,3 @@ settings = gtk_widget_get_settings (widget); g_signal_connect_swapped (settings, "notify::gtk-shell-shows-app-menu", G_CALLBACK (_gtk_header_bar_update_window_buttons), widget); -@@ -1856,6 +1922,8 @@ gtk_header_bar_hierarchy_changed (GtkWid - if (toplevel) - g_signal_connect_after (toplevel, "window-state-event", - G_CALLBACK (window_state_changed), widget); -+ -+ check_title_visibility (GTK_HEADER_BAR (widget)); - } - - static void diff -Nru gtk+3.0-3.20.6/debian/rules gtk+3.0-3.20.6/debian/rules --- gtk+3.0-3.20.6/debian/rules 2016-05-24 05:47:58.000000000 +0000 +++ gtk+3.0-3.20.6/debian/rules 2016-06-14 14:56:25.000000000 +0000 @@ -114,12 +114,7 @@ # Get failing tests' stdout/err so we have some information when a build fails export VERBOSE=1 -# Cope with qemu-armhf ppa-builder problems -ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf)) -DEB_MAKE_CHECK_TARGET = -else DEB_MAKE_CHECK_TARGET = -k check || true -endif DEB_INSTALL_DOCS_ALL = AUTHORS DEB_INSTALL_DOCS_$(COMMON_PKG) = README NEWS DEB_INSTALL_DOCS_$(DOC_PKG) += -X.in @@ -168,27 +163,15 @@ pre-build:: # Mark reftests with known failures as non-fatal - touch testsuite/reftests/style-properties-nth-child.ui.known_fail - touch testsuite/reftests/label-text-shadow-changes-modify-clip.ui.known_fail + touch testsuite/reftests/textview-margins.ui.known_fail + touch testsuite/reftests/button-wrapping.ui.known_fail # So that gsettings can find the (uninstalled) gtk schemas mkdir -p debian/build/glib-2.0/schemas/ cp gtk/org.gtk.* debian/build/glib-2.0/schemas/ glib-compile-schemas debian/build/glib-2.0/schemas/ + # Work around a bug in cdbs, can be dropped once #825135 is fixed + mkdir -p debian/stamp-makefile-check/ # Add dependencies to generate files from the debian/*.in ones build-indep: $(call dh_subst_files,$(DEB_INDEP_PACKAGES)) build-arch: $(call dh_subst_files,$(DEB_ARCH_PACKAGES)) - -binary-install/$(SHARED_PKG):: - # Install the binaries with a -3.0 suffix - mv debian/$(SHARED_PKG)/$(LIBDIR)/$(SHARED_PKG)/gtk-update-icon-cache \ - debian/$(SHARED_PKG)/$(LIBDIR)/$(SHARED_PKG)/gtk-update-icon-cache-3.0 - # Install custom settings - install -D debian/settings.ini debian/$(SHARED_PKG)/$(CONFDIR)/settings.ini - -binary-install/$(BIN_PKG):: - # Install the binaries with a -3.0 suffix - mv debian/$(BIN_PKG)/usr/share/man/man1/gtk-update-icon-cache.1 \ - debian/$(BIN_PKG)/usr/share/man/man1/gtk-update-icon-cache-3.0.1 - install -m 0755 -D debian/update-icon-caches \ - debian/$(BIN_PKG)/usr/sbin/update-icon-caches diff -Nru gtk+3.0-3.20.6/debian/update-icon-caches gtk+3.0-3.20.6/debian/update-icon-caches --- gtk+3.0-3.20.6/debian/update-icon-caches 2016-05-24 05:47:58.000000000 +0000 +++ gtk+3.0-3.20.6/debian/update-icon-caches 2016-06-14 14:56:25.000000000 +0000 @@ -13,7 +13,7 @@ fi if [ -f "$dir"/index.theme ]; then # Generate or regenerate the cache - if ! gtk-update-icon-cache-3.0 --force --quiet "$dir"; then + if ! gtk-update-icon-cache --force --quiet "$dir"; then echo "WARNING: icon cache generation failed for $dir" fi else diff -Nru gtk+3.0-3.20.6/debian/watch gtk+3.0-3.20.6/debian/watch --- gtk+3.0-3.20.6/debian/watch 2016-05-24 05:47:58.000000000 +0000 +++ gtk+3.0-3.20.6/debian/watch 2016-06-14 14:56:25.000000000 +0000 @@ -1,3 +1,3 @@ -version=3 -http://download.gnome.org/sources/gtk+/([\d\.]+[02468])/ \ - gtk\+-(.*)\.tar\.xz +version=4 +https://download.gnome.org/sources/gtk+/([\d\.]+[02468])/ \ + gtk\+@ANY_VERSION@\.tar\.xz