From: Jeremy Bícha <jeremy.bicha@canonical.com>
Date: Tue, 8 Aug 2023 12:04:21 +0000 (-0400)
Subject: Drop patch marking the clipboard test flaky: applied upstream
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~57
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=db47764e953b68ebf450f1399d1dd86c7c4517d8;p=gtk4.git

Drop patch marking the clipboard test flaky: applied upstream
---

diff --git a/debian/patches/debian/Disable-clipboard-test.patch b/debian/patches/debian/Disable-clipboard-test.patch
deleted file mode 100644
index 2ed09f5322..0000000000
--- a/debian/patches/debian/Disable-clipboard-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Fri, 3 Sep 2021 15:08:08 +0100
-Subject: Disable clipboard test
-
-This regularly times out on buildds, but I can't reproduce the hang
-locally.
-
-Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4229
-Forwarded: no
----
- testsuite/gdk/meson.build | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/testsuite/gdk/meson.build b/testsuite/gdk/meson.build
-index 98b57cb..71f955f 100644
---- a/testsuite/gdk/meson.build
-+++ b/testsuite/gdk/meson.build
-@@ -12,7 +12,9 @@ clipboard_client = executable('clipboard-client',
- tests = [
-   { 'name': 'array' },
-   { 'name': 'cairo' },
--  { 'name': 'clipboard', 'parallel': false, },
-+  { 'name': 'clipboard',
-+    'parallel': false,
-+    'suites': ['flaky'], },
-   { 'name': 'contentformats' },
-   { 'name': 'contentserializer' },
-   { 'name': 'cursor' },
diff --git a/debian/patches/series b/debian/patches/series
index fc3f33fb0d..b395b66929 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ Revert-build-Drop-the-install-tests-option.patch
 debian/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
 debian/reftests-Allow-minor-differences-to-be-tolerated.patch
 debian/Disable-inscription-markup.ui-reftest.patch
-debian/Disable-clipboard-test.patch
 debian/subprojects-Add-gst-player-1.0-as-subporject.patch
 debian/gstreamer-player-1.0-Do-not-install-it-if-it-s-a-subproje.patch
 debian/media-Use-gstplayer-from-meson-subproject.patch