Refresh patches

Gbp-Dch: Ignore

diff --git a/debian/patches/Revert-build-Drop-the-install-tests-option.patch b/debian/patches/Revert-build-Drop-the-install-tests-option.patch
index 6fa1599f87d0817ebe57b08fa1344c9527056159..f1736490b1ae312e660d765f092bb5f8552c070b 100644 (file)
--- a/debian/patches/Revert-build-Drop-the-install-tests-option.patch
+++ b/debian/patches/Revert-build-Drop-the-install-tests-option.patch
@@ -22,10 +22,10 @@ This reverts commit 3121f88265ac61733e257f5335473d6f139f158c.
  12 files changed, 353 insertions(+), 43 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index b7717e1..9870c07 100644
+index 2e6cb1e..0a4b1ef 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -915,6 +915,7 @@ summary('Documentation', get_option('gtk_doc'), section: 'Build')
+@@ -924,6 +924,7 @@ summary('Documentation', get_option('documentation'), section: 'Build')
  summary('Man pages', get_option('man-pages'), section: 'Build')
  summary('Testsuite', get_option('build-testsuite'), section: 'Build')
  summary('Tests', get_option('build-tests'), section: 'Build')
@@ -34,10 +34,10 @@ index b7717e1..9870c07 100644
  summary('Examples', get_option('build-examples'), section: 'Build')
  
 diff --git a/meson_options.txt b/meson_options.txt
-index f4399d3..0ca7936 100644
+index 4b794e7..a3e0f5e 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -144,3 +144,8 @@ option('build-tests',
+@@ -158,3 +158,8 @@ option('build-tests',
         type: 'boolean',
         value: true,
         description : 'Build tests')
@@ -404,7 +404,7 @@ index 7fc4036..52c962c 100644
 +  install_data(test_data, install_dir: testexecdir)
 +endif
 diff --git a/testsuite/gdk/meson.build b/testsuite/gdk/meson.build
-index 32a31da..67c08ab 100644
+index 2cc27d5..92dc6ab 100644
 --- a/testsuite/gdk/meson.build
 +++ b/testsuite/gdk/meson.build
 @@ -1,10 +1,13 @@
@@ -477,7 +477,7 @@ index 32a31da..67c08ab 100644
 +  install_subdir('image-data', install_dir: testexecdir)
 +endif
 diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
-index 1a57cfa..9b29ba0 100644
+index e48e9a3..8ba45b8 100644
 --- a/testsuite/gsk/meson.build
 +++ b/testsuite/gsk/meson.build
 @@ -1,12 +1,22 @@
@@ -505,7 +505,7 @@ index 1a57cfa..9b29ba0 100644
  )
  
  compare_render_tests = [
-@@ -368,9 +378,11 @@ foreach t : tests
+@@ -370,9 +380,11 @@ foreach t : tests
    test_extra_ldflags = t.get(3, [])
  
    test_exe = executable(test_name, test_srcs,
@@ -518,7 +518,7 @@ index 1a57cfa..9b29ba0 100644
    )
  
    test(test_name, test_exe,
-@@ -399,11 +411,12 @@ foreach t : internal_tests
+@@ -401,11 +413,12 @@ foreach t : internal_tests
    test_extra_cargs = t.get(2, [])
    test_extra_ldflags = t.get(3, [])
  

diff --git a/debian/patches/Revert-tests-Stop-copying-the-tool-tests.patch b/debian/patches/Revert-tests-Stop-copying-the-tool-tests.patch
index 5908fb35c0e0515aee912235531263b6d285c92c..9223f53461f6278fa306fe25a440a84d2141be61 100644 (file)
--- a/debian/patches/Revert-tests-Stop-copying-the-tool-tests.patch
+++ b/debian/patches/Revert-tests-Stop-copying-the-tool-tests.patch
@@ -18,6 +18,9 @@ which we also had to revert dropping (in a separate patch)
  testsuite/tools/simplify.in      | 47 ++++++++++++++++++++++++++++++++++++++++
  testsuite/tools/validate         | 37 -------------------------------
  testsuite/tools/validate.in      | 37 +++++++++++++++++++++++++++++++
+ 11 files changed, 194 insertions(+), 190 deletions(-)
+ delete mode 100755 testsuite/tools/enumerate
+ create mode 100755 testsuite/tools/enumerate.in
  delete mode 100755 testsuite/tools/settings
  create mode 100755 testsuite/tools/settings.in
  delete mode 100755 testsuite/tools/simplify
@@ -114,7 +117,7 @@ index 0000000..8abd9d6
 +  I=$((I+1))
 +done
 diff --git a/testsuite/tools/meson.build b/testsuite/tools/meson.build
-index 96ac7fd..986c2d6 100644
+index 239e1b0..e19a819 100644
 --- a/testsuite/tools/meson.build
 +++ b/testsuite/tools/meson.build
 @@ -3,8 +3,12 @@ if bash.found()
@@ -163,6 +166,7 @@ new file mode 100755
 index 0000000..3c5ce69
 --- /dev/null
 +++ b/testsuite/tools/settings.in
+@@ -0,0 +1,20 @@
 +#! /bin/bash
 +
 +GTK_QUERY_SETTINGS=${GTK_QUERY_SETTINGS:-gtk4-query-settings}
@@ -397,7 +401,7 @@ index 0000000..12b4cea
 +done
 diff --git a/testsuite/tools/validate b/testsuite/tools/validate
 deleted file mode 100755
-index 42048ef..0000000
+index 414a505..0000000
 --- a/testsuite/tools/validate
 +++ /dev/null
 @@ -1,37 +0,0 @@
@@ -440,7 +444,7 @@ index 42048ef..0000000
 -done
 diff --git a/testsuite/tools/validate.in b/testsuite/tools/validate.in
 new file mode 100755
-index 0000000..42048ef
+index 0000000..414a505
 --- /dev/null
 +++ b/testsuite/tools/validate.in
 @@ -0,0 +1,37 @@

diff --git a/debian/patches/debian/Disable-inscription-markup.ui-reftest.patch b/debian/patches/debian/Disable-inscription-markup.ui-reftest.patch
index 855565cc8c6cd888d72db160af4c93a5b1d931cb..b890c17b98f5aa5079922bb834c7c5132fd4c193 100644 (file)
--- a/debian/patches/debian/Disable-inscription-markup.ui-reftest.patch
+++ b/debian/patches/debian/Disable-inscription-markup.ui-reftest.patch
@@ -12,10 +12,10 @@ Forwarded: not-needed, workaround
  1 file changed, 2 insertions(+)
 
 diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build
-index 1cc8a43..47d0864 100644
+index 7aa0498..f83c14a 100644
 --- a/testsuite/reftests/meson.build
 +++ b/testsuite/reftests/meson.build
-@@ -616,6 +616,8 @@ flaky = [
+@@ -615,6 +615,8 @@ flaky = [
    'shorthand-entry-border.ui',
    # blinking cursors and timing issues make this unreliable
    'fixed-widget-stacking.ui',

diff --git a/debian/patches/debian/gstreamer-player-Use-GtkName-Prefix-to-avoid-issues-if-ac.patch b/debian/patches/debian/gstreamer-player-Use-GtkName-Prefix-to-avoid-issues-if-ac.patch
index 52f17e734af02b093f48841e75a1626033d8fc4b..d26bb728d0ffcff1290896d9b7f9866843b40d16 100644 (file)
--- a/debian/patches/debian/gstreamer-player-Use-GtkName-Prefix-to-avoid-issues-if-ac.patch
+++ b/debian/patches/debian/gstreamer-player-Use-GtkName-Prefix-to-avoid-issues-if-ac.patch
@@ -49,10 +49,10 @@ Forwarded: not-needed
  40 files changed, 2859 insertions(+), 2859 deletions(-)
 
 diff --git a/modules/media/gtkgstmediafile.c b/modules/media/gtkgstmediafile.c
-index 7353539..857b454 100644
+index 5487bb0..8e956b7 100644
 --- a/modules/media/gtkgstmediafile.c
 +++ b/modules/media/gtkgstmediafile.c
-@@ -38,7 +38,7 @@ struct _GtkGstMediaFile
+@@ -29,7 +29,7 @@ struct _GtkGstMediaFile
  {
    GtkMediaFile parent_instance;
  
@@ -61,7 +61,7 @@ index 7353539..857b454 100644
    GdkPaintable *paintable;
  };
  
-@@ -141,20 +141,20 @@ g_io_module_query (void)
+@@ -132,20 +132,20 @@ g_io_module_query (void)
  static void
  gtk_gst_media_file_ensure_prepared (GtkGstMediaFile *self)
  {
@@ -88,7 +88,7 @@ index 7353539..857b454 100644
                                          duration == GST_CLOCK_TIME_NONE ? 0 : FROM_GST_TIME (duration));
  
        g_object_unref (media_info);
-@@ -175,7 +175,7 @@ gtk_gst_media_file_ensure_prepared (GtkGstMediaFile *self)
+@@ -166,7 +166,7 @@ gtk_gst_media_file_ensure_prepared (GtkGstMediaFile *self)
  }
  
  static void
@@ -97,7 +97,7 @@ index 7353539..857b454 100644
                                          GstClockTime     time,
                                          GtkGstMediaFile *self)
  {
-@@ -185,16 +185,16 @@ gtk_gst_media_file_position_updated_cb (GstPlayer       *player,
+@@ -176,16 +176,16 @@ gtk_gst_media_file_position_updated_cb (GstPlayer       *player,
  }
  
  static void
@@ -118,7 +118,7 @@ index 7353539..857b454 100644
    if (clock_time == 0 || clock_time == -1)
      return;
  
-@@ -202,7 +202,7 @@ gtk_gst_media_file_media_info_updated_cb (GstPlayer          *player,
+@@ -193,7 +193,7 @@ gtk_gst_media_file_media_info_updated_cb (GstPlayer          *player,
  }
  
  static void
@@ -127,7 +127,7 @@ index 7353539..857b454 100644
                                   GstClockTime     time,
                                   GtkGstMediaFile *self)
  {
-@@ -213,7 +213,7 @@ gtk_gst_media_file_seek_done_cb (GstPlayer       *player,
+@@ -204,7 +204,7 @@ gtk_gst_media_file_seek_done_cb (GstPlayer       *player,
  }
  
  static void
@@ -136,7 +136,7 @@ index 7353539..857b454 100644
                               GError          *error,
                               GtkGstMediaFile *self)
  {
-@@ -225,7 +225,7 @@ gtk_gst_media_file_error_cb (GstPlayer       *player,
+@@ -216,7 +216,7 @@ gtk_gst_media_file_error_cb (GstPlayer       *player,
  }
  
  static void
@@ -145,7 +145,7 @@ index 7353539..857b454 100644
                                       GtkGstMediaFile *self)
  {
    gtk_gst_media_file_ensure_prepared (self);
-@@ -235,7 +235,7 @@ gtk_gst_media_file_end_of_stream_cb (GstPlayer       *player,
+@@ -226,7 +226,7 @@ gtk_gst_media_file_end_of_stream_cb (GstPlayer       *player,
  
    if (gtk_media_stream_get_loop (GTK_MEDIA_STREAM (self)))
      {
@@ -154,7 +154,7 @@ index 7353539..857b454 100644
        return;
      }
  
-@@ -265,8 +265,8 @@ gtk_gst_media_file_create_player (GtkGstMediaFile *file)
+@@ -256,8 +256,8 @@ gtk_gst_media_file_create_player (GtkGstMediaFile *file)
    if (self->player != NULL)
      return;
  
@@ -165,7 +165,7 @@ index 7353539..857b454 100644
    g_signal_connect (self->player, "media-info-updated", G_CALLBACK (gtk_gst_media_file_media_info_updated_cb), self);
    g_signal_connect (self->player, "position-updated", G_CALLBACK (gtk_gst_media_file_position_updated_cb), self);
    g_signal_connect (self->player, "end-of-stream", G_CALLBACK (gtk_gst_media_file_end_of_stream_cb), self);
-@@ -289,7 +289,7 @@ gtk_gst_media_file_open (GtkMediaFile *media_file)
+@@ -280,7 +280,7 @@ gtk_gst_media_file_open (GtkMediaFile *media_file)
        /* XXX: This is technically incorrect because GFile uris aren't real uris */
        char *uri = g_file_get_uri (file);
  
@@ -174,7 +174,7 @@ index 7353539..857b454 100644
  
        g_free (uri);
      }
-@@ -299,7 +299,7 @@ gtk_gst_media_file_open (GtkMediaFile *media_file)
+@@ -290,7 +290,7 @@ gtk_gst_media_file_open (GtkMediaFile *media_file)
        g_assert_not_reached ();
      }
  
@@ -183,7 +183,7 @@ index 7353539..857b454 100644
  }
  
  static void
-@@ -318,7 +318,7 @@ gtk_gst_media_file_play (GtkMediaStream *stream)
+@@ -309,7 +309,7 @@ gtk_gst_media_file_play (GtkMediaStream *stream)
    if (self->player == NULL)
      return FALSE;
  
@@ -192,7 +192,7 @@ index 7353539..857b454 100644
  
    return TRUE;
  }
-@@ -328,7 +328,7 @@ gtk_gst_media_file_pause (GtkMediaStream *stream)
+@@ -319,7 +319,7 @@ gtk_gst_media_file_pause (GtkMediaStream *stream)
  {
    GtkGstMediaFile *self = GTK_GST_MEDIA_FILE (stream);
  
@@ -201,7 +201,7 @@ index 7353539..857b454 100644
  }
  
  static void
-@@ -337,7 +337,7 @@ gtk_gst_media_file_seek (GtkMediaStream *stream,
+@@ -328,7 +328,7 @@ gtk_gst_media_file_seek (GtkMediaStream *stream,
  {
    GtkGstMediaFile *self = GTK_GST_MEDIA_FILE (stream);
  
@@ -210,7 +210,7 @@ index 7353539..857b454 100644
  }
  
  static void
-@@ -347,8 +347,8 @@ gtk_gst_media_file_update_audio (GtkMediaStream *stream,
+@@ -338,8 +338,8 @@ gtk_gst_media_file_update_audio (GtkMediaStream *stream,
  {
    GtkGstMediaFile *self = GTK_GST_MEDIA_FILE (stream);
  
@@ -222,7 +222,7 @@ index 7353539..857b454 100644
  
  static void
 diff --git a/modules/media/gtkgstpaintable.c b/modules/media/gtkgstpaintable.c
-index 0a4309b..76e178a 100644
+index 8abf4a2..835e207 100644
 --- a/modules/media/gtkgstpaintable.c
 +++ b/modules/media/gtkgstpaintable.c
 @@ -111,8 +111,8 @@ gtk_gst_paintable_paintable_init (GdkPaintableInterface *iface)

diff --git a/debian/patches/debian/reftests-Allow-minor-differences-to-be-tolerated.patch b/debian/patches/debian/reftests-Allow-minor-differences-to-be-tolerated.patch
index 87b9eb53fd61db7a6c0f09bb349bb8e0c48d4f3b..421111bf78686c8951db47bbbaf8d1f67392b713 100644 (file)
--- a/debian/patches/debian/reftests-Allow-minor-differences-to-be-tolerated.patch
+++ b/debian/patches/debian/reftests-Allow-minor-differences-to-be-tolerated.patch
@@ -28,7 +28,7 @@ Applied-upstream: no, upstream want reftests to be a strict pass/fail with ident
  3 files changed, 62 insertions(+), 3 deletions(-)
 
 diff --git a/testsuite/gsk/compare-render.c b/testsuite/gsk/compare-render.c
-index 05a13bf..19c0024 100644
+index e26b16c..e9ad421 100644
 --- a/testsuite/gsk/compare-render.c
 +++ b/testsuite/gsk/compare-render.c
 @@ -102,6 +102,12 @@ get_output_file (const char *file,