diff -Nru gnome-control-center-3.28.1/debian/changelog gnome-control-center-3.28.1/debian/changelog --- gnome-control-center-3.28.1/debian/changelog 2018-04-11 16:20:17.000000000 +0000 +++ gnome-control-center-3.28.1/debian/changelog 2018-04-19 18:46:45.000000000 +0000 @@ -1,3 +1,12 @@ +gnome-control-center (1:3.28.1-1+rpi1) buster-staging; urgency=medium + + [changes brought forward from 1:3.24.3-1+rpi1 by Peter Michael Green at Wed, 13 Sep 2017 22:39:02 +0000] + * Make package built with non-wayland gtk. + [changes introduced in version 1:3.27.92-1+rpi1 by Peter Micheal Green] + * Disable wayland in meson_options.txt + + -- Raspbian forward porter Thu, 19 Apr 2018 18:46:45 +0000 + gnome-control-center (1:3.28.1-1) unstable; urgency=medium [ Gunnar Hjalmarsson ] diff -Nru gnome-control-center-3.28.1/debian/patches/disable-wayland-in-meson_options.txt.patch gnome-control-center-3.28.1/debian/patches/disable-wayland-in-meson_options.txt.patch --- gnome-control-center-3.28.1/debian/patches/disable-wayland-in-meson_options.txt.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.28.1/debian/patches/disable-wayland-in-meson_options.txt.patch 2018-04-19 18:46:45.000000000 +0000 @@ -0,0 +1,16 @@ +From: Peter Michael Green +Date: Mon, 19 Mar 2018 02:38:45 +0000 +X-Dgit-Generated: 1:3.27.92-1+rpi1 588d4bebfd09af9ee6f3d1e03712da57c719c2b7 +Subject: Disable wayland in meson_options.txt + + +--- + +--- gnome-control-center-3.27.92.orig/meson_options.txt ++++ gnome-control-center-3.27.92/meson_options.txt +@@ -2,4 +2,4 @@ option('cheese', type: 'boolean', value: + option('documentation', type: 'boolean', value: false, description: 'build documentation') + option('gnome_session_libexecdir', type: 'string', value: '', description: 'Directory for gnome-session\'s libexecdir') + option('ibus', type: 'boolean', value: true, description: 'build with IBus support') +-option('wayland', type: 'boolean', value: true, description: 'build with Wayland support') ++option('wayland', type: 'boolean', value: false, description: 'build with Wayland support') diff -Nru gnome-control-center-3.28.1/debian/patches/no-wayland.patch gnome-control-center-3.28.1/debian/patches/no-wayland.patch --- gnome-control-center-3.28.1/debian/patches/no-wayland.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.28.1/debian/patches/no-wayland.patch 2018-04-19 18:46:45.000000000 +0000 @@ -0,0 +1,27 @@ +Description: Make package built with non-wayland gtk. +Author: Peter Michael Green + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: 2017-09-13 + +--- gnome-control-center-3.24.3.orig/panels/common/gsd-device-manager-udev.c ++++ gnome-control-center-3.24.3/panels/common/gsd-device-manager-udev.c +@@ -24,7 +24,7 @@ + #include + #include + +-#include ++//#include + #include "gsd-device-manager-udev.h" + + struct _GsdUdevDeviceManager diff -Nru gnome-control-center-3.28.1/debian/patches/series gnome-control-center-3.28.1/debian/patches/series --- gnome-control-center-3.28.1/debian/patches/series 2018-04-11 16:20:17.000000000 +0000 +++ gnome-control-center-3.28.1/debian/patches/series 2018-04-19 18:46:45.000000000 +0000 @@ -3,3 +3,5 @@ 07_polkit_wheel_sudo_group.patch 0004-Expose-touchpad-settings-if-synaptics-is-in-use.patch 0005-Show-scrollbar-on-first-Language-window-if-needed.patch +no-wayland.patch +disable-wayland-in-meson_options.txt.patch