diff -Nru mutter-3.30.0/debian/changelog mutter-3.30.0/debian/changelog --- mutter-3.30.0/debian/changelog 2018-09-05 10:30:26.000000000 +0000 +++ mutter-3.30.0/debian/changelog 2018-09-22 11:59:57.000000000 +0000 @@ -1,3 +1,16 @@ +mutter (3.30.0-1+rpi1) buster-staging; urgency=medium + + [changes brought forward from 3.28.0-2+rpi1 by Peter Michael Green at Wed, 04 Apr 2018 10:10:12 +0000] + * Add build-depends on libmtdev-dev. + * Disable parallel building. + * Fix clean target + [changes introduced in 3.28.1-1+rpi1 by Peter Michael Green] + * Add build-depends on libgles2-mesa-dev + [changes introduce in 3.30.0-1+rpi1 by Peter Michael Green] + * Hack one of the test programs to build with non wayland gtk/gdk + + -- Peter Michael Green Sat, 22 Sep 2018 11:59:57 +0000 + mutter (3.30.0-1) unstable; urgency=medium [ Didier Roche ] diff -Nru mutter-3.30.0/debian/control mutter-3.30.0/debian/control --- mutter-3.30.0/debian/control 2018-09-05 10:30:26.000000000 +0000 +++ mutter-3.30.0/debian/control 2018-09-22 11:59:57.000000000 +0000 @@ -55,7 +55,9 @@ xauth , xkb-data, xvfb , - zenity + zenity, + libmtdev-dev, + libgles2-mesa-dev Rules-Requires-Root: no Standards-Version: 4.2.1 Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git diff -Nru mutter-3.30.0/debian/control.in mutter-3.30.0/debian/control.in --- mutter-3.30.0/debian/control.in 2018-09-05 10:30:26.000000000 +0000 +++ mutter-3.30.0/debian/control.in 2018-09-22 11:59:57.000000000 +0000 @@ -51,7 +51,9 @@ xauth , xkb-data, xvfb , - zenity + zenity, + libmtdev-dev, + libgles2-mesa-dev Rules-Requires-Root: no Standards-Version: 4.2.1 Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git diff -Nru mutter-3.30.0/debian/patches/further-hacks-to-test-program-to-make-it.patch mutter-3.30.0/debian/patches/further-hacks-to-test-program-to-make-it.patch --- mutter-3.30.0/debian/patches/further-hacks-to-test-program-to-make-it.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutter-3.30.0/debian/patches/further-hacks-to-test-program-to-make-it.patch 2018-09-22 11:59:57.000000000 +0000 @@ -0,0 +1,40 @@ +From: Peter Michael Green +Date: Sun, 23 Sep 2018 16:48:47 +0000 +X-Dgit-Generated: 3.30.0-1+rpi1 1c35db523471108e343f628e29236dde0ceaae94 +Subject: Further hacks to test program to make it build with non-wayland gtk/gdk. + + +--- + +--- mutter-3.30.0.orig/src/tests/test-client.c ++++ mutter-3.30.0/src/tests/test-client.c +@@ -39,9 +39,9 @@ window_export_handle_cb (GdkWindow *win + { + GdkWindow *gdk_window = gtk_widget_get_window (GTK_WIDGET (user_data)); + +- if (!gdk_wayland_window_set_transient_for_exported (gdk_window, +- (gchar *) handle_str)) +- g_print ("Fail to set transient_for exported window handle %s", handle_str); ++// if (!gdk_wayland_window_set_transient_for_exported (gdk_window, ++// (gchar *) handle_str)) ++// g_print ("Fail to set transient_for exported window handle %s", handle_str); + gdk_window_set_modal_hint (gdk_window, TRUE); + } + +@@ -188,11 +188,11 @@ process_line (const char *line) + } + + GdkWindow *parent_gdk_window = gtk_widget_get_window (parent_window); +- if (!gdk_wayland_window_export_handle (parent_gdk_window, +- window_export_handle_cb, +- window, +- NULL)) +- g_print ("Fail to export handle for window id %s", argv[2]); ++ //if (!gdk_wayland_window_export_handle (parent_gdk_window, ++ // window_export_handle_cb, ++ // window, ++ // NULL)) ++ // g_print ("Fail to export handle for window id %s", argv[2]); + } + else if (strcmp (argv[0], "show") == 0) + { diff -Nru mutter-3.30.0/debian/patches/hack-one-of-the-test-programs-to-build-w.patch mutter-3.30.0/debian/patches/hack-one-of-the-test-programs-to-build-w.patch --- mutter-3.30.0/debian/patches/hack-one-of-the-test-programs-to-build-w.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutter-3.30.0/debian/patches/hack-one-of-the-test-programs-to-build-w.patch 2018-09-22 11:59:57.000000000 +0000 @@ -0,0 +1,19 @@ +From: Peter Michael Green +Date: Sun, 23 Sep 2018 15:39:44 +0000 +X-Dgit-Generated: 3.30.0-1+rpi1 56f308467b94e943ef2b32a78affe8e6a21c56bd +Subject: Hack one of the test programs to build with non wayland gtk/gdk + + +--- + +--- mutter-3.30.0.orig/src/tests/test-client.c ++++ mutter-3.30.0/src/tests/test-client.c +@@ -20,7 +20,7 @@ + #include + #include + #include +-#include ++//#include + #include + #include + #include diff -Nru mutter-3.30.0/debian/patches/series mutter-3.30.0/debian/patches/series --- mutter-3.30.0/debian/patches/series 2018-09-05 10:30:26.000000000 +0000 +++ mutter-3.30.0/debian/patches/series 2018-09-22 11:59:57.000000000 +0000 @@ -5,3 +5,5 @@ debian/synaptics-support.patch debian/skip-failing-tests.patch debian/skip-failing-tests-325.patch +hack-one-of-the-test-programs-to-build-w.patch +further-hacks-to-test-program-to-make-it.patch diff -Nru mutter-3.30.0/debian/rules mutter-3.30.0/debian/rules --- mutter-3.30.0/debian/rules 2018-09-05 10:30:26.000000000 +0000 +++ mutter-3.30.0/debian/rules 2018-09-22 11:59:57.000000000 +0000 @@ -4,7 +4,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: - dh $@ --with gir,gnome + dh $@ --with gir,gnome --no-parallel override_dh_autoreconf: dh_autoreconf --as-needed @@ -59,3 +59,35 @@ override_dh_strip: dh_strip --dbgsym-migration='mutter-dbg (<< 3.18.3-2~)' + +override_dh_auto_clean: + dh_auto_clean + rm -f src/gtk-primary-selection-protocol.c + rm -f src/gtk-primary-selection-server-protocol.h + rm -f src/gtk-shell-protocol.c + rm -f src/gtk-shell-server-protocol.h + rm -f src/gtk-text-input-protocol.c + rm -f src/gtk-text-input-server-protocol.h + rm -f src/keyboard-shortcuts-inhibit-unstable-v1-protocol.c + rm -f src/keyboard-shortcuts-inhibit-unstable-v1-server-protocol.h + rm -f src/linux-dmabuf-unstable-v1-protocol.c + rm -f src/linux-dmabuf-unstable-v1-server-protocol.h + rm -f src/pointer-constraints-unstable-v1-protocol.c + rm -f src/pointer-constraints-unstable-v1-server-protocol.h + rm -f src/pointer-gestures-unstable-v1-protocol.c + rm -f src/pointer-gestures-unstable-v1-server-protocol.h + rm -f src/relative-pointer-unstable-v1-protocol.c + rm -f src/relative-pointer-unstable-v1-server-protocol.h + rm -f src/tablet-unstable-v2-protocol.c + rm -f src/tablet-unstable-v2-server-protocol.h + rm -f src/xdg-foreign-unstable-v1-protocol.c + rm -f src/xdg-foreign-unstable-v1-server-protocol.h + rm -f src/xdg-output-unstable-v1-protocol.c + rm -f src/xdg-output-unstable-v1-server-protocol.h + rm -f src/xdg-shell-protocol.c + rm -f src/xdg-shell-server-protocol.h + rm -f src/xdg-shell-unstable-v6-protocol.c + rm -f src/xdg-shell-unstable-v6-server-protocol.h + rm -f src/xwayland-keyboard-grab-unstable-v1-protocol.c + rm -f src/xwayland-keyboard-grab-unstable-v1-server-protocol.h +