diff -Nru gtk+3.0-3.24.1/debian/changelog gtk+3.0-3.24.1/debian/changelog --- gtk+3.0-3.24.1/debian/changelog 2018-09-30 15:45:24.000000000 +0000 +++ gtk+3.0-3.24.1/debian/changelog 2018-10-04 08:49:44.000000000 +0000 @@ -1,3 +1,21 @@ +gtk+3.0 (3.24.1-2+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. + [changes introduced in 3.24.0-3+rpi1 by Peter Michael Green] + * Manually mark a symbol that was not caught by our symbols file hack as + optional. + [changes introduced in 3.24.1-2+rpi1 by Peter Michael Green] + * Remove depends and build-depends on libepoxy-dev + + -- Peter Michael Green Thu, 04 Oct 2018 08:49:44 +0000 + gtk+3.0 (3.24.1-2) unstable; urgency=medium * Team upload diff -Nru gtk+3.0-3.24.1/debian/control gtk+3.0-3.24.1/debian/control --- gtk+3.0-3.24.1/debian/control 2018-09-30 15:45:24.000000000 +0000 +++ gtk+3.0-3.24.1/debian/control 2018-10-04 08:49:44.000000000 +0000 @@ -16,8 +16,6 @@ libcairo2-dev (>= 1.14.0), libcolord-dev (>= 0.1.9), libcups2-dev (>= 1.2), - libegl1-mesa-dev [linux-any], - libepoxy-dev (>= 1.4), libfontconfig1-dev, libgdk-pixbuf2.0-dev (>= 2.30.0), libgirepository1.0-dev (>= 1.39.0), @@ -26,7 +24,7 @@ libjson-glib-dev, libpango1.0-dev (>= 1.41.0), librest-dev, - libwayland-dev (>= 1.9.91) [linux-any], + libxkbcommon-dev (>= 0.2.0), libx11-dev, libxcomposite-dev, libxcursor-dev, @@ -35,7 +33,6 @@ libxfixes-dev, libxi-dev, libxinerama-dev, - libxkbcommon-dev (>= 0.2.0), libxkbfile-dev, libxml2-utils, libxrandr-dev (>= 2:1.5.0), @@ -43,6 +40,9 @@ wayland-protocols (>= 1.12) [linux-any], xauth , xvfb +Build-Conflicts: + libegl1-mesa-dev, + libwayland-dev Build-Depends-Indep: docbook-xml, docbook-xsl, libatk1.0-doc, @@ -131,16 +131,17 @@ Section: libdevel Architecture: any Multi-Arch: same -Depends: gir1.2-gtk-3.0 (= ${binary:Version}), - libatk-bridge2.0-dev, +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libgtk-3-common, + libgtk-3-0 (= ${binary:Version}),gir1.2-gtk-3.0 (= ${binary:Version}), libglib2.0-dev (>= 2.49.4), + libgdk-pixbuf2.0-dev (>= 2.30.0), + libpango1.0-dev (>= 1.41), libatk1.0-dev (>= 2.15.1), + libatk-bridge2.0-dev, libcairo2-dev (>= 1.14.0), libegl1-mesa-dev [linux-any], - libepoxy-dev (>= 1.0), libfontconfig1-dev, - libgdk-pixbuf2.0-dev (>= 2.30.0), - libglib2.0-dev (>= 2.49.4), - libpango1.0-dev (>= 1.41), libwayland-dev (>= 1.9.91) [linux-any], libx11-dev, libxcomposite-dev, @@ -152,12 +153,7 @@ libxinerama-dev, libxkbcommon-dev, libxrandr-dev, - pkg-config, - wayland-protocols (>= 1.12) [linux-any], - ${misc:Depends}, - ${shlibs:Depends}, - libgtk-3-common, - libgtk-3-0 (= ${binary:Version}) + pkg-config Suggests: libgtk-3-doc Description: development files for the GTK+ library GTK+ is a multi-platform toolkit for creating graphical user diff -Nru gtk+3.0-3.24.1/debian/control.in gtk+3.0-3.24.1/debian/control.in --- gtk+3.0-3.24.1/debian/control.in 2018-09-30 15:45:24.000000000 +0000 +++ gtk+3.0-3.24.1/debian/control.in 2018-10-04 08:49:44.000000000 +0000 @@ -16,8 +16,6 @@ libcairo2-dev (>= 1.14.0), libcolord-dev (>= 0.1.9), libcups2-dev (>= 1.2), - libegl1-mesa-dev [linux-any], - libepoxy-dev (>= 1.4), libfontconfig1-dev, libgdk-pixbuf2.0-dev (>= 2.30.0), libgirepository1.0-dev (>= 1.39.0), @@ -26,7 +24,7 @@ libjson-glib-dev, libpango1.0-dev (>= 1.41.0), librest-dev, - libwayland-dev (>= 1.9.91) [linux-any], + libxkbcommon-dev (>= 0.2.0), libx11-dev, libxcomposite-dev, libxcursor-dev, @@ -35,7 +33,6 @@ libxfixes-dev, libxi-dev, libxinerama-dev, - libxkbcommon-dev (>= 0.2.0), libxkbfile-dev, libxml2-utils, libxrandr-dev (>= 2:1.5.0), @@ -43,6 +40,9 @@ wayland-protocols (>= 1.12) [linux-any], xauth , xvfb +Build-Conflicts: + libegl1-mesa-dev, + libwayland-dev Build-Depends-Indep: docbook-xml, docbook-xsl, libatk1.0-doc, @@ -131,16 +131,17 @@ Section: libdevel Architecture: any Multi-Arch: same -Depends: gir1.2-gtk-3.0 (= ${binary:Version}), - libatk-bridge2.0-dev, +Depends: ${misc:Depends}, + ${shlibs:Depends}, + @COMMON_PKG@, + @SHARED_PKG@ (= ${binary:Version}),gir1.2-gtk-3.0 (= ${binary:Version}), libglib2.0-dev (>= 2.49.4), + libgdk-pixbuf2.0-dev (>= 2.30.0), + libpango1.0-dev (>= 1.41), libatk1.0-dev (>= 2.15.1), + libatk-bridge2.0-dev, libcairo2-dev (>= 1.14.0), libegl1-mesa-dev [linux-any], - libepoxy-dev (>= 1.0), libfontconfig1-dev, - libgdk-pixbuf2.0-dev (>= 2.30.0), - libglib2.0-dev (>= 2.49.4), - libpango1.0-dev (>= 1.41), libwayland-dev (>= 1.9.91) [linux-any], libx11-dev, libxcomposite-dev, @@ -152,12 +153,7 @@ libxinerama-dev, libxkbcommon-dev, libxrandr-dev, - pkg-config, - wayland-protocols (>= 1.12) [linux-any], - ${misc:Depends}, - ${shlibs:Depends}, - @COMMON_PKG@, - @SHARED_PKG@ (= ${binary:Version}) + pkg-config Suggests: @DOC_PKG@ Description: development files for the GTK+ library GTK+ is a multi-platform toolkit for creating graphical user diff -Nru gtk+3.0-3.24.1/debian/libgtk-3-0.symbols gtk+3.0-3.24.1/debian/libgtk-3-0.symbols --- gtk+3.0-3.24.1/debian/libgtk-3-0.symbols 2018-09-30 15:45:24.000000000 +0000 +++ gtk+3.0-3.24.1/debian/libgtk-3-0.symbols 2018-10-04 08:49:44.000000000 +0000 @@ -498,7 +498,7 @@ (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_announce_csd@Base 3.22.25 - (arch=linux-any)gdk_wayland_window_announce_ssd@Base 3.23.1 + (optional=manualnowayland)gdk_wayland_window_announce_ssd@Base 3.23.1 (arch=linux-any)gdk_wayland_window_export_handle@Base 3.21.5 (arch=linux-any)gdk_wayland_window_get_type@Base 3.9.10 (arch=linux-any)gdk_wayland_window_get_wl_surface@Base 3.9.10 diff -Nru gtk+3.0-3.24.1/debian/patches/auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248 gtk+3.0-3.24.1/debian/patches/auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248 --- gtk+3.0-3.24.1/debian/patches/auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248 1970-01-01 00:00:00.000000000 +0000 +++ gtk+3.0-3.24.1/debian/patches/auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248 2018-10-04 08:49:44.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.24.1/debian/patches/series gtk+3.0-3.24.1/debian/patches/series --- gtk+3.0-3.24.1/debian/patches/series 2018-09-30 15:45:24.000000000 +0000 +++ gtk+3.0-3.24.1/debian/patches/series 2018-10-04 08:49:44.000000000 +0000 @@ -5,3 +5,4 @@ 060_ignore-random-icons.patch reftest-known-fail.patch Don-t-test-default-constructed-GdkPixbuf-properties.patch +auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248 diff -Nru gtk+3.0-3.24.1/debian/rules gtk+3.0-3.24.1/debian/rules --- gtk+3.0-3.24.1/debian/rules 2018-09-30 15:45:24.000000000 +0000 +++ gtk+3.0-3.24.1/debian/rules 2018-10-04 08:49:44.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,$(built_binaries)),) configure_flags_deb += --disable-gtk-doc --disable-man @@ -140,6 +140,8 @@ rm -f $(call dh_subst_files,$(all_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 # The build system does not automatically update the GResource files # when resources change. Force an update in case we ship a patch which # modifies the theme CSS files. @@ -153,6 +155,7 @@ NOCONFIGURE=true dh_autoreconf ./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 \ -- \