diff -Nru gtk+2.0-2.24.28/debian/changelog gtk+2.0-2.24.28/debian/changelog --- gtk+2.0-2.24.28/debian/changelog 2015-05-14 09:35:22.000000000 +0000 +++ gtk+2.0-2.24.28/debian/changelog 2015-09-04 10:48:49.000000000 +0000 @@ -1,3 +1,79 @@ +gtk+2.0 (2.24.28-1ubuntu1) wily; urgency=low + + * Merge from Debian unstable (LP: #1485548). Remaining changes: + - d/libgtk2.0-0.symbols: update symbols file. + - d/libgtk2.0-dev.manpages: add gtk-builder-convert.1 manpage. + - d/rules: enable manpage. + - d/update-icon-caches: run with "--include-image-data" flag. + - add Ubuntu patches: + + debian/patches/012_ubuntu-set-grab-add.patch + - Added ubuntu_gtk_widget_set_has_grab so we can grab sliders and + things in menus, needed by ido + + debian/patches/062_dnd_menubar.patch: + - Allow click on menubars for dnd + + debian/patches/063_treeview_almost_fixed.patch: + - Add an ubuntu-almost-fixed-height-mode property, (required for + software-center) + + debian/patches/071_no_offscreen_widgets_grabbing.patch: + - Don't let offscreen widgets do grabbing + + debian/patches/090_logging_file_saves.patch: + - improve the logging of saved files + + debian/patches/092_default_to_xdg_document_dir.patch: + - Use $XDG_DOCUMENTS_DIR as default directory rather than the home + directory for the 'Print to File' function. + + debian/patches/093_gtk3_gtkimage_fallbacks_use.patch: + - Backported gtk3 patch to add a "use-fallback" property to GtkImage, + using it "icon-name and GIcon type of GtkImages can use automatic + fallback names.", it will be useful for the indicator stack + + debian/patches/095_git_menus_scrolling.patch: + - backported gtk3 commit to fix menu scrolling issues + + debian/patches/096_git_gtkprintsettings.patch: + - upstream git commit backported from the gtk3 serie, don't ignore the + gtkprintsettings resolution settings + + debian/patches/097_statusicon_image_fallback.patch: Make GtkStatusIcon + images use fallbacks by default if the property is available. + + debian/patches/098_multiarch_module_path.patch: + - Fallback to the pre-multiarch directory for compatibility + + debian/patches/099_printer_filename_fix.patch + - Fix to the print dialog for print to file, make sure a non-hidden filename + is the default + + debian/patches/100_overlay_scrollbar_loading.patch + - support for dynamically loading overlay scrollbars + + debian/patches/gtk-shell-shows-menubar.patch: + - list gtk-shell-shows-menubar setting, that's required to have the local + menubars hidding under unity in favor of the unity ones, + + debian/patches/print-dialog-show-options-of-remote-dnssd-printers.patch: + - Make printing on remote DNS-SD/Bonjour-shared printers work + + debian/patches/backport_search_printer_location.patch + - The list of printers should be searchable/sortable + + debian/patches/menubar_toolbar_dragging.patch: + - Allow windows to be dragged using blank spaces in the toolbar as + well as the menubar + + debian/patches/use-secrets-service-for-cups-auth_info.patch + - Backport of auth_info storing + + debian/patches/printing-initialize-auth_info.patch + - Fix to an upstream bug: + https://bugzilla.gnome.org/show_bug.cgi?id=737777 + + -- Gianfranco Costamagna Mon, 17 Aug 2015 12:49:04 +0200 + +gtk+2.0 (2.24.28-1) unstable; urgency=medium + + * New upstream release. + * Refresh patches. + * Drop obsolete Breaks/Conflicts/Replaces from pre-wheezy. + * Stop including image data when generating the icon caches since the cache + files tend to grow rather large and aren't that useful anymore nowadays. + * Explicitly build the man pages, upstream no longer ships them in the dist + tarball. + * Add Build-Depends on docbook-xsl and libxml2-utils and move docbook-xml + and docbook-utils from Build-Depends-Indep to Build-Depends. Those are + required to build the man pages which are shipped in arch:any packages. + * Bump Standards-Version to 3.9.6. + * Don't enable introspection and man pages for udeb build. + + -- Michael Biebl Sun, 07 Jun 2015 17:00:08 +0200 + gtk+2.0 (2.24.28-0ubuntu1) wily; urgency=medium * New upstream bugfix release. @@ -34,6 +110,41 @@ -- Iain Lane Fri, 20 Feb 2015 17:48:37 +0000 +gtk+2.0 (2.24.25-3) unstable; urgency=medium + + * 0002-gdk-Fix-GdkWindowFilter-internal-refcounting.patch + 0003-gdkwindow-Fix-event-unref-iteration.patch: Cherry-pick two commits + from upstream gtk2 branch to fix refcounting errors in light of the + event_apply_filters change in the previous upload. This was causing + crashes in some applications, such as Spotify. + + -- Iain Lane Tue, 03 Mar 2015 18:39:45 +0000 + +gtk+2.0 (2.24.25-2) unstable; urgency=medium + + * debian/patches/0001-Make-gdk_event_apply_filters-safe-against-changes-in.patch: + Cherry-pick patch from upstream stable branch to protect + gdk_event_apply_filters_safe from changes in the filter list (Closes: + #777142) + + -- Iain Lane Mon, 02 Mar 2015 09:56:09 +0000 + +gtk+2.0 (2.24.25-1) unstable; urgency=medium + + * Team upload + * debian/watch: change http://download.gnome.org to https, uscan doesn't + like being redirected + * New upstream release + - tolerates incorrect use of gtk_main() after initializing threads + with gtk_init() but before taking the lock with gdk_threads_enter(), + which has historically worked on GNU systems because glibc's mutexes + are more permissive than the new implementation in GLib 2.42 + (Closes: #758619, #763602, #763625, #763690, #763735, + but the affected packages should still use Gdk's threading API properly) + - update debian/copyright + + -- Simon McVittie Fri, 10 Oct 2014 18:33:05 +0100 + gtk+2.0 (2.24.25-0ubuntu2) vivid; urgency=medium * debian/patches/use-secrets-service-for-cups-auth_info.patch @@ -55,6 +166,16 @@ -- Iain Lane Mon, 13 Oct 2014 18:05:44 +0100 +gtk+2.0 (2.24.24-1) unstable; urgency=medium + + * New upstream release 2.24.24. + * debian/patches/099_format_security_fixes.patch: Drop, included in this + upstream release. + * update-icon-caches: Pass the new --include-image-data flag to preserve + compatibility. + + -- Iain Lane Tue, 24 Jun 2014 11:43:22 +0100 + gtk+2.0 (2.24.24-0ubuntu3) utopic; urgency=medium * Apply patch from Adam Smith, backported from gtk+3.0, to allow windows to @@ -83,6 +204,16 @@ -- Iain Lane Tue, 24 Jun 2014 12:49:26 +0100 +gtk+2.0 (2.24.23-1) unstable; urgency=medium + + * New upstream release. + * Bump Standards-Version to 3.9.5. + * Enable hardening build flags using /usr/share/dpkg/buildflags.mk. + * debian/patches/099_format_security_fixes.patch: Fix a format string + vulnerability in the pixbuf engine. + + -- Michael Biebl Fri, 04 Apr 2014 15:34:45 +0200 + gtk+2.0 (2.24.23-0ubuntu1.1) trusty; urgency=medium * Backport GtkMountOperation signal fix (LP: #1316509) diff -Nru gtk+2.0-2.24.28/debian/control gtk+2.0-2.24.28/debian/control --- gtk+2.0-2.24.28/debian/control 2015-05-14 09:35:24.000000000 +0000 +++ gtk+2.0-2.24.28/debian/control 2015-09-04 10:50:02.000000000 +0000 @@ -3,10 +3,11 @@ Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Debian GNOME Maintainers +Uploaders: Debian GNOME Maintainers , Iain Lane , Michael Biebl Build-Depends: debhelper (>= 8.1.3), gettext, gtk-doc-tools (>= 1.11), + xsltproc, pkg-config, autotools-dev, dh-autoreconf, @@ -38,13 +39,14 @@ gawk, shared-mime-info, docbook-xml, + docbook-xsl, docbook-utils, - libxml2-utils, + libxml2-utils Build-Depends-Indep: libglib2.0-doc, libatk1.0-doc, libpango1.0-doc, libcairo2-doc -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gtk/ubuntu Homepage: http://www.gtk.org/ @@ -93,8 +95,6 @@ Architecture: all Depends: ${misc:Depends} Recommends: libgtk2.0-0 -Replaces: libgtk2.0-0 (<< 2.24.8-2) -Breaks: libgtk2.0-0 (<< 2.24.8-2) Multi-Arch: foreign Description: common files for the GTK+ graphical user interface library GTK+ is a multi-platform toolkit for creating graphical user @@ -147,7 +147,6 @@ Recommends: python (>= 2.4), debhelper Suggests: libgtk2.0-doc -Replaces: gir-repository-dev Description: development files for the GTK+ library GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable @@ -231,9 +230,6 @@ ${misc:Depends}, ${shlibs:Depends}, ${gir:Depends} -Conflicts: gobject-introspection-repository, - gir1.0-gtk-2.0 -Replaces: gir1.0-gtk-2.0 Description: GTK+ graphical user interface library -- gir bindings GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable @@ -263,7 +259,6 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libgail18 (= ${binary:Version}) -Breaks: libgnome2-0 (<< 2.32.1-2) Multi-Arch: same Description: GNOME Accessibility Implementation Library -- common modules Gail implements ATK interfaces for GTK+ widgets which are dynamically diff -Nru gtk+2.0-2.24.28/debian/control.in gtk+2.0-2.24.28/debian/control.in --- gtk+2.0-2.24.28/debian/control.in 2015-05-14 09:35:24.000000000 +0000 +++ gtk+2.0-2.24.28/debian/control.in 2015-09-04 10:50:02.000000000 +0000 @@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 8.1.3), gettext, gtk-doc-tools (>= 1.11), + xsltproc, pkg-config, autotools-dev, dh-autoreconf, @@ -38,13 +39,14 @@ gawk, shared-mime-info, docbook-xml, + docbook-xsl, docbook-utils, - libxml2-utils, + libxml2-utils Build-Depends-Indep: libglib2.0-doc, libatk1.0-doc, libpango1.0-doc, libcairo2-doc -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gtk/ubuntu Homepage: http://www.gtk.org/ @@ -93,8 +95,6 @@ Architecture: all Depends: ${misc:Depends} Recommends: @SHARED_PKG@ -Replaces: @SHARED_PKG@ (<< 2.24.8-2) -Breaks: @SHARED_PKG@ (<< 2.24.8-2) Multi-Arch: foreign Description: common files for the GTK+ graphical user interface library GTK+ is a multi-platform toolkit for creating graphical user @@ -147,7 +147,6 @@ Recommends: python (>= 2.4), debhelper Suggests: @DOC_PKG@ -Replaces: gir-repository-dev Description: development files for the GTK+ library GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable @@ -231,9 +230,6 @@ ${misc:Depends}, ${shlibs:Depends}, ${gir:Depends} -Conflicts: gobject-introspection-repository, - gir1.0-gtk-2.0 -Replaces: gir1.0-gtk-2.0 Description: GTK+ graphical user interface library -- gir bindings GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable @@ -263,7 +259,6 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libgail18 (= ${binary:Version}) -Breaks: libgnome2-0 (<< 2.32.1-2) Multi-Arch: same Description: GNOME Accessibility Implementation Library -- common modules Gail implements ATK interfaces for GTK+ widgets which are dynamically diff -Nru gtk+2.0-2.24.28/debian/copyright gtk+2.0-2.24.28/debian/copyright --- gtk+2.0-2.24.28/debian/copyright 2015-05-14 09:35:22.000000000 +0000 +++ gtk+2.0-2.24.28/debian/copyright 2014-10-10 22:15:45.000000000 +0000 @@ -13,7 +13,7 @@ Copyright: 1985, 1986, 1987, 1988, 1998 The Open Group Copyright: 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts Copyright: 1987 by Digital Equipment Corporation, Maynard, Massachusetts - Copyright: 1991-1999 Free Software Foundation, Inc + Copyright: 1991-2014 Free Software Foundation, Inc Copyright: 1991-1998 by LCS/Telegraphics Copyright: 1992-1994 The Regents of the University of California Copyright: 1993, Robert Nation @@ -106,6 +106,7 @@ Copyright: 2009 David Zeuthen Copyright: 2009 Ghee Teo Copyright: 2009 Stefan Walter + Copyright: 2009 Johan Dahlin Copyright: 2010 Christian Dywan Copyright: Christian Kellner Copyright: Federico Mena diff -Nru gtk+2.0-2.24.28/debian/libgtk2.0-dev.install.in gtk+2.0-2.24.28/debian/libgtk2.0-dev.install.in --- gtk+2.0-2.24.28/debian/libgtk2.0-dev.install.in 2015-05-14 09:35:22.000000000 +0000 +++ gtk+2.0-2.24.28/debian/libgtk2.0-dev.install.in 2015-06-07 14:44:29.000000000 +0000 @@ -8,5 +8,6 @@ debian/install/shared/@LIBDIR@/gtk-@APIVER@/include @LIBDIR@/gtk-@APIVER@ debian/install/shared/usr/share/aclocal usr/share debian/install/shared/usr/share/gir-1.0 usr/share +debian/install/shared/usr/share/man/man1/gtk-builder-convert.1 usr/share/man/man1 # from the static flavor debian/install/static/@LIBDIR@/libg?k*.a @LIBDIR@ diff -Nru gtk+2.0-2.24.28/debian/patches/003_gdk.pc_privates.patch gtk+2.0-2.24.28/debian/patches/003_gdk.pc_privates.patch --- gtk+2.0-2.24.28/debian/patches/003_gdk.pc_privates.patch 2015-05-14 09:35:22.000000000 +0000 +++ gtk+2.0-2.24.28/debian/patches/003_gdk.pc_privates.patch 2015-05-10 19:12:21.000000000 +0000 @@ -1,8 +1,8 @@ -Index: gtk+-2.24.19/configure.ac +Index: gtk+-2.24.27/configure.ac =================================================================== ---- gtk+-2.24.19.orig/configure.ac 2013-06-28 23:39:54.495262402 +0200 -+++ gtk+-2.24.19/configure.ac 2013-06-28 23:39:54.487262310 +0200 -@@ -1324,23 +1324,27 @@ +--- gtk+-2.24.27.orig/configure.ac 2015-05-10 21:12:17.911660688 +0200 ++++ gtk+-2.24.27/configure.ac 2015-05-10 21:12:17.911660688 +0200 +@@ -1322,23 +1322,27 @@ # Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c if test "x$gdktarget" = "xx11"; then @@ -35,10 +35,10 @@ AC_SUBST(GDK_EXTRA_LIBS) AC_SUBST(GDK_EXTRA_CFLAGS) AC_SUBST(GDK_DEP_LIBS) -Index: gtk+-2.24.19/gdk-2.0.pc.in +Index: gtk+-2.24.27/gdk-2.0.pc.in =================================================================== ---- gtk+-2.24.19.orig/gdk-2.0.pc.in 2013-06-28 23:39:54.495262402 +0200 -+++ gtk+-2.24.19/gdk-2.0.pc.in 2013-06-28 23:39:54.487262310 +0200 +--- gtk+-2.24.27.orig/gdk-2.0.pc.in 2015-05-10 21:12:17.911660688 +0200 ++++ gtk+-2.24.27/gdk-2.0.pc.in 2015-05-10 21:12:17.911660688 +0200 @@ -8,5 +8,6 @@ Description: GTK+ Drawing Kit (${target} target) Version: @VERSION@ diff -Nru gtk+2.0-2.24.28/debian/patches/005_support_disabling_x11_extensions.patch gtk+2.0-2.24.28/debian/patches/005_support_disabling_x11_extensions.patch --- gtk+2.0-2.24.28/debian/patches/005_support_disabling_x11_extensions.patch 2015-05-14 09:35:22.000000000 +0000 +++ gtk+2.0-2.24.28/debian/patches/005_support_disabling_x11_extensions.patch 2015-05-10 19:12:26.000000000 +0000 @@ -3,10 +3,10 @@ Support disabling X11 extensions -Index: gtk+-2.24.19/configure.ac +Index: gtk+-2.24.27/configure.ac =================================================================== ---- gtk+-2.24.19.orig/configure.ac 2013-06-28 23:39:59.259316868 +0200 -+++ gtk+-2.24.19/configure.ac 2013-06-28 23:39:59.255316823 +0200 +--- gtk+-2.24.27.orig/configure.ac 2015-05-10 21:12:24.060665181 +0200 ++++ gtk+-2.24.27/configure.ac 2015-05-10 21:12:24.060665181 +0200 @@ -241,6 +241,18 @@ [AC_HELP_STRING([--enable-xinerama], [support xinerama extension if available [default=yes]])],, @@ -26,7 +26,7 @@ AC_ARG_ENABLE(rebuilds, [AC_HELP_STRING([--disable-rebuilds], [disable all source autogeneration rules])],, -@@ -1192,7 +1204,8 @@ +@@ -1190,7 +1202,8 @@ AM_CONDITIONAL(XINPUT_XFREE, test x$with_xinput = xxfree || test x$with_xinput = xyes) # Check for the RANDR extension @@ -36,7 +36,7 @@ AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library]) X_PACKAGES="$X_PACKAGES xrandr" -@@ -1208,7 +1221,8 @@ +@@ -1206,7 +1219,8 @@ # Checks for XFixes extension @@ -46,7 +46,7 @@ AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension]) X_PACKAGES="$X_PACKAGES xfixes" -@@ -1217,7 +1231,8 @@ +@@ -1215,7 +1229,8 @@ # Checks for Xcomposite extension @@ -56,7 +56,7 @@ AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension]) X_PACKAGES="$X_PACKAGES xcomposite" -@@ -1226,7 +1241,7 @@ +@@ -1224,7 +1239,7 @@ # Checks for Xdamage extension diff -Nru gtk+2.0-2.24.28/debian/patches/098_multiarch_module_path.patch gtk+2.0-2.24.28/debian/patches/098_multiarch_module_path.patch --- gtk+2.0-2.24.28/debian/patches/098_multiarch_module_path.patch 2015-05-14 09:35:22.000000000 +0000 +++ gtk+2.0-2.24.28/debian/patches/098_multiarch_module_path.patch 2011-07-22 18:16:31.000000000 +0000 @@ -5,10 +5,10 @@ Author: Steve Langasek Forwarded: not-needed -Index: b/gtk/gtkmodules.c +Index: gtk+2.0-2.24.3/gtk/gtkmodules.c =================================================================== ---- a/gtk/gtkmodules.c -+++ b/gtk/gtkmodules.c +--- gtk+2.0-2.24.3.orig/gtk/gtkmodules.c ++++ gtk+2.0-2.24.3/gtk/gtkmodules.c @@ -60,6 +60,7 @@ gchar *home_gtk_dir = NULL; gchar *module_path; diff -Nru gtk+2.0-2.24.28/debian/rules gtk+2.0-2.24.28/debian/rules --- gtk+2.0-2.24.28/debian/rules 2015-05-14 09:35:22.000000000 +0000 +++ gtk+2.0-2.24.28/debian/rules 2015-09-04 10:41:23.000000000 +0000 @@ -5,6 +5,9 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk +DPKG_EXPORT_BUILDFLAGS = 1 +-include /usr/share/dpkg/buildflags.mk + GNOME_MODULE := gtk+ # Uncomment this to turn on verbose mode. @@ -125,9 +128,13 @@ shared_configure_flags := $(configure_flags) \ --enable-shared \ - --enable-introspection=yes \ + --enable-introspection \ + --enable-man \ --disable-static -shared_udeb_configure_flags := $(shared_configure_flags) \ +shared_udeb_configure_flags := $(configure_flags) \ + --enable-shared \ + --disable-static \ + --disable-introspection \ --disable-xcomposite \ --disable-xdamage \ --disable-xfixes \