diff -Nru gtk+3.0-3.22.24/debian/changelog gtk+3.0-3.22.24/debian/changelog --- gtk+3.0-3.22.24/debian/changelog 2017-10-04 23:07:15.000000000 +0000 +++ gtk+3.0-3.22.24/debian/changelog 2017-10-12 12:10:43.000000000 +0000 @@ -1,3 +1,16 @@ +gtk+3.0 (3.22.24-1+rpi1) buster-staging; urgency=medium + + [changes brought forward from 3.16.6-1+rpi1 by Peter Michael Green at Fri, 25 Sep 2015 01:49:45 +0000] + * Disable wayland backend in debian/rules + * Move libegl1-mesa-dev and libwayland-dev from Depends and Build-Depends to + Build-Conflicts + * Add symbols file hack for wayland changes. + * Fix clean target. + [changes introduced in 3.20.6-2+rpi1 by Peter Michael Green] + * Disable testsuite. + + -- Raspbian forward porter Thu, 12 Oct 2017 12:10:43 +0000 + gtk+3.0 (3.22.24-1) unstable; urgency=low * New upstream release (LP: #1712011, #1719047) diff -Nru gtk+3.0-3.22.24/debian/control gtk+3.0-3.22.24/debian/control --- gtk+3.0-3.22.24/debian/control 2017-10-03 18:02:59.000000000 +0000 +++ gtk+3.0-3.22.24/debian/control 2017-10-12 12:10:43.000000000 +0000 @@ -17,12 +17,9 @@ libpango1.0-dev (>= 1.40.5), libatk1.0-dev (>= 2.15.1), libatk-bridge2.0-dev, - libegl1-mesa-dev [linux-any], libepoxy-dev, libfontconfig1-dev, libharfbuzz-dev (>= 0.9), - libwayland-dev (>= 1.9.91) [linux-any], - wayland-protocols (>= 1.9) [linux-any], libxkbcommon-dev (>= 0.2.0), libx11-dev, libxext-dev, @@ -44,6 +41,9 @@ libgirepository1.0-dev (>= 1.39.0), xauth , xvfb , +Build-Conflicts: + libegl1-mesa-dev, + libwayland-dev Build-Depends-Indep: libglib2.0-doc, libatk1.0-doc, libpango1.0-doc, @@ -159,9 +159,6 @@ libxcomposite-dev, libxdamage-dev, pkg-config, - libegl1-mesa-dev [linux-any], - libwayland-dev (>= 1.9.91) [linux-any], - wayland-protocols (>= 1.9) [linux-any], libxkbcommon-dev Suggests: libgtk-3-doc Description: development files for the GTK+ library diff -Nru gtk+3.0-3.22.24/debian/control.in gtk+3.0-3.22.24/debian/control.in --- gtk+3.0-3.22.24/debian/control.in 2017-10-04 23:07:15.000000000 +0000 +++ gtk+3.0-3.22.24/debian/control.in 2017-10-12 12:10:43.000000000 +0000 @@ -17,12 +17,9 @@ libpango1.0-dev (>= 1.40.5), libatk1.0-dev (>= 2.15.1), libatk-bridge2.0-dev, - libegl1-mesa-dev [linux-any], libepoxy-dev, libfontconfig1-dev, libharfbuzz-dev (>= 0.9), - libwayland-dev (>= 1.9.91) [linux-any], - wayland-protocols (>= 1.9) [linux-any], libxkbcommon-dev (>= 0.2.0), libx11-dev, libxext-dev, @@ -44,6 +41,9 @@ libgirepository1.0-dev (>= 1.39.0), xauth , xvfb , +Build-Conflicts: + libegl1-mesa-dev, + libwayland-dev Build-Depends-Indep: libglib2.0-doc, libatk1.0-doc, libpango1.0-doc, @@ -159,9 +159,6 @@ libxcomposite-dev, libxdamage-dev, pkg-config, - libegl1-mesa-dev [linux-any], - libwayland-dev (>= 1.9.91) [linux-any], - wayland-protocols (>= 1.9) [linux-any], libxkbcommon-dev Suggests: @DOC_PKG@ Description: development files for the GTK+ library diff -Nru gtk+3.0-3.22.24/debian/patches/auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248 gtk+3.0-3.22.24/debian/patches/auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248 --- gtk+3.0-3.22.24/debian/patches/auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248 1970-01-01 00:00:00.000000000 +0000 +++ gtk+3.0-3.22.24/debian/patches/auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248 2017-10-12 12:10:41.000000000 +0000 @@ -0,0 +1,41 @@ +From: Raspbian forward porter +Subject: Automatically generated patch (3.22.11-1+rpi1) + +Last (up to) 3 git changes, FYI: + +commit bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf +Merge: 8dc1994 b5996af +Author: Peter Michael Green +Date: Sat Apr 8 14:51:40 2017 +0000 + + Manual merge of version 3.22.9-4+rpi1 and 3.22.11-1 to produce 3.22.11-1+rpi1 + +commit 8dc19947087b7f92ada55db0d61b47f2e8856918 +Author: Peter Michael Green +Date: Thu Mar 30 18:23:22 2017 +0000 + + Commit Debian 3.0 (quilt) metadata + + [dgit (3.10) quilt-fixup] + +commit 537bcf2d325d5c0caae20681a9735d5a10edd506 +Author: Peter Michael Green +Date: Thu Mar 30 18:21:47 2017 +0000 + + Apply changes resulting from build process. +--- + +--- gtk+3.0-3.22.11.orig/gtk/gtkresources.h ++++ /dev/null +@@ -1,11 +0,0 @@ +-#ifndef __RESOURCE__gtk_H__ +-#define __RESOURCE__gtk_H__ +- +-#include +- +-extern GResource *_gtk_get_resource (void); +- +-extern void _gtk_register_resource (void); +-extern void _gtk_unregister_resource (void); +- +-#endif diff -Nru gtk+3.0-3.22.24/debian/patches/series gtk+3.0-3.22.24/debian/patches/series --- gtk+3.0-3.22.24/debian/patches/series 2017-10-04 21:18:22.000000000 +0000 +++ gtk+3.0-3.22.24/debian/patches/series 2017-10-12 12:10:43.000000000 +0000 @@ -9,3 +9,4 @@ 0001-Adwaita-Fix-typo-.backgrounf-.background.patch 0002-theme-Fix-Adwaita-headerbars.patch 0003-display-x11-Unset-tiled-state-if-_GTK_EDGE_CONSTRAIN.patch +auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248 diff -Nru gtk+3.0-3.22.24/debian/rules gtk+3.0-3.22.24/debian/rules --- gtk+3.0-3.22.24/debian/rules 2017-09-11 21:17:20.000000000 +0000 +++ gtk+3.0-3.22.24/debian/rules 2017-10-12 12:10:41.000000000 +0000 @@ -109,11 +109,11 @@ configure_flags_deb += --disable-colord endif -ifeq (linux,$(DEB_HOST_ARCH_OS)) -configure_flags_deb += --enable-wayland-backend -else +#ifeq (linux,$(DEB_HOST_ARCH_OS)) +#configure_flags_deb += --enable-wayland-backend +#else configure_flags_deb += --disable-wayland-backend -endif +#endif ifeq ($(filter %-doc,$(binaries)),) configure_flags_deb += --disable-gtk-doc --disable-man @@ -140,6 +140,8 @@ rm -f $(call dh_subst_files,$(binaries)) rm -f testsuite/reftests/*.ui.known_fail rm -rf debian/build debian/install + sed -i s/optional=nowayland/arch=linux-any/ debian/libgtk-3-0.symbols + rm -rf debian/build debian/install dh_clean # Add dependencies to generate files from the debian/*.in ones @@ -149,6 +151,7 @@ dh_autoreconf "NOCONFIGURE=true ./autogen.sh" override_dh_auto_configure: debian/control + sed -i s/arch=linux-any/optional=nowayland/ debian/libgtk-3-0.symbols dh_auto_configure \ --builddirectory=debian/build/deb \ -- \