Sort patch series in upstream-first order

diff --git a/debian/patches/reftest-compare-Treat-colour-channels-as-undefined-if-alp.patch b/debian/patches/reftest-compare-Treat-colour-channels-as-undefined-if-alp.patch
index 40a25441848df63c26ee5d0263b178927ae223a2..cfcdab4b38c807d7182146ade1c2c58fdb523e15 100644 (file)
--- a/debian/patches/reftest-compare-Treat-colour-channels-as-undefined-if-alp.patch
+++ b/debian/patches/reftest-compare-Treat-colour-channels-as-undefined-if-alp.patch
@@ -18,10 +18,10 @@ Applied-upstream: 4.5.0
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/testsuite/reftests/reftest-compare.c b/testsuite/reftests/reftest-compare.c
-index 9db00ab..ac72c61 100644
+index 5c682e1..5bccb69 100644
 --- a/testsuite/reftests/reftest-compare.c
 +++ b/testsuite/reftests/reftest-compare.c
-@@ -108,7 +108,12 @@ buffer_diff_core (const guchar *buf_a,
+@@ -104,7 +104,12 @@ buffer_diff_core (const guchar *buf_a,
            /* check if the pixels are the same */
            if (row_a[x] == row_b[x])
              continue;

diff --git a/debian/patches/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch b/debian/patches/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
index be071fcc486e74da8114203c6fafb3303d500974..4c2a9fc6febb929756f4e1ab0599359f62aca59e 100644 (file)
--- a/debian/patches/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
+++ b/debian/patches/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
@@ -74,7 +74,7 @@ index cd15396..3ae5413 100644
        cairo_surface_destroy (diff_image);
        g_test_fail ();
 diff --git a/testsuite/reftests/reftest-compare.c b/testsuite/reftests/reftest-compare.c
-index 5c682e1..9db00ab 100644
+index 5bccb69..ac72c61 100644
 --- a/testsuite/reftests/reftest-compare.c
 +++ b/testsuite/reftests/reftest-compare.c
 @@ -83,12 +83,16 @@ buffer_diff_core (const guchar *buf_a,
@@ -95,7 +95,7 @@ index 5c682e1..9db00ab 100644
  
    for (y = 0; y < height; y++)
      {
-@@ -124,6 +128,10 @@ buffer_diff_core (const guchar *buf_a,
+@@ -129,6 +133,10 @@ buffer_diff_core (const guchar *buf_a,
                guint channel_diff;
  
                channel_diff = ABS (value_a - value_b);
@@ -106,7 +106,7 @@ index 5c682e1..9db00ab 100644
                channel_diff *= 4;  /* emphasize */
                if (channel_diff)
                  channel_diff += 128; /* make sure it's visible */
-@@ -132,6 +140,8 @@ buffer_diff_core (const guchar *buf_a,
+@@ -137,6 +145,8 @@ buffer_diff_core (const guchar *buf_a,
                diff_pixel |= channel_diff << (channel * 8);
              }
  
@@ -115,7 +115,7 @@ index 5c682e1..9db00ab 100644
            if ((diff_pixel & 0x00ffffff) == 0)
              {
                /* alpha only difference, convert to luminance */
-@@ -143,12 +153,21 @@ buffer_diff_core (const guchar *buf_a,
+@@ -148,12 +158,21 @@ buffer_diff_core (const guchar *buf_a,
        }
    }
  
@@ -138,7 +138,7 @@ index 5c682e1..9db00ab 100644
  {
    int w1, h1, w2, h2, w, h;
    cairo_surface_t *coerced1, *coerced2, *diff;
-@@ -164,11 +183,14 @@ reftest_compare_surfaces (cairo_surface_t *surface1,
+@@ -169,11 +188,14 @@ reftest_compare_surfaces (cairo_surface_t *surface1,
                             cairo_image_surface_get_stride (coerced1),
                             cairo_image_surface_get_data (coerced2),
                             cairo_image_surface_get_stride (coerced2),

diff --git a/debian/patches/series b/debian/patches/series
index 1dd02235a5b5c81c05bc2b9c67087a73e00a7882..6dbc6f98c8e9d62563ebf78cbf2ddaca8235504a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,10 @@
-reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
-reftests-Allow-minor-differences-to-be-tolerated.patch
-debian/Disable-web-fonts-for-now.patch
-debian/templates-Remove-html5shiv.patch
 compose-Generate-endian-dependent-compact-Compose-data.patch
 compose-Document-how-to-get-compose-parse-input-from-libX.patch
 compose-Update-sequences-from-libX11-1.7.2.patch
 reftest-compare-Treat-colour-channels-as-undefined-if-alp.patch
+reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
+reftests-Allow-minor-differences-to-be-tolerated.patch
+debian/Disable-web-fonts-for-now.patch
+debian/templates-Remove-html5shiv.patch
 debian/testsuite-Don-t-test-the-old-gl-renderer.patch
 debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch