From aabe4e69a6a6d060f720a8203b6025426a0c99c3 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 4 May 2022 11:28:03 +0100 Subject: [PATCH] Unfuzz gi-docgen patches --- ...ome-known-failing-tests-on-mips-family-architecture.patch | 5 +++-- .../{debian => gi-docgen}/Disable-web-fonts-for-now.patch | 2 +- .../{debian => gi-docgen}/templates-Remove-html5shiv.patch | 0 debian/patches/series | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) rename debian/patches/{debian => gi-docgen}/Disable-web-fonts-for-now.patch (99%) rename debian/patches/{debian => gi-docgen}/templates-Remove-html5shiv.patch (100%) diff --git a/debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch b/debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch index d7c031e839..c18e228706 100644 --- a/debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch +++ b/debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch @@ -9,10 +9,10 @@ Forwarded: no 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build -index 106661a..06e1d18 100644 +index 2fb0208..8c3ff1f 100644 --- a/testsuite/gsk/meson.build +++ b/testsuite/gsk/meson.build -@@ -77,15 +77,21 @@ compare_render_tests = [ +@@ -77,9 +77,7 @@ compare_render_tests = [ 'scale-up-down', 'shadow-in-opacity', 'texture-url', @@ -22,6 +22,7 @@ index 106661a..06e1d18 100644 'repeat-texture', 'transform-in-transform', 'transform-in-transform-in-transform', +@@ -87,6 +85,14 @@ compare_render_tests = [ 'rounded-clip-in-clip-3d', # not really 3d, but cairo fails it ] diff --git a/debian/patches/debian/Disable-web-fonts-for-now.patch b/debian/patches/gi-docgen/Disable-web-fonts-for-now.patch similarity index 99% rename from debian/patches/debian/Disable-web-fonts-for-now.patch rename to debian/patches/gi-docgen/Disable-web-fonts-for-now.patch index ff813eda47..bc3a1cc344 100644 --- a/debian/patches/debian/Disable-web-fonts-for-now.patch +++ b/debian/patches/gi-docgen/Disable-web-fonts-for-now.patch @@ -197,7 +197,7 @@ index ce790e7..0a01b93 100644 - font-display: swap; -} diff --git a/subprojects/gi-docgen/gidocgen/templates/basic/style.css b/subprojects/gi-docgen/gidocgen/templates/basic/style.css -index 188c9a7..954b5d8 100644 +index dfb6cf4..7297f8d 100644 --- a/subprojects/gi-docgen/gidocgen/templates/basic/style.css +++ b/subprojects/gi-docgen/gidocgen/templates/basic/style.css @@ -7,8 +7,6 @@ diff --git a/debian/patches/debian/templates-Remove-html5shiv.patch b/debian/patches/gi-docgen/templates-Remove-html5shiv.patch similarity index 100% rename from debian/patches/debian/templates-Remove-html5shiv.patch rename to debian/patches/gi-docgen/templates-Remove-html5shiv.patch diff --git a/debian/patches/series b/debian/patches/series index 83c9fc8f21..d94aadec07 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,7 +6,7 @@ GtkFileChooserWidget-check-for-empty-instead-of-NULL-GLis.patch GtkFileChooserWidget-return-empty-GListModel-in-get_files.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 +gi-docgen/Disable-web-fonts-for-now.patch +gi-docgen/templates-Remove-html5shiv.patch debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch debian/Disable-clipboard-test.patch -- 2.30.2