From: Simon McVittie Date: Wed, 16 Feb 2022 10:32:34 +0000 (+0000) Subject: Drop patches that were applied upstream X-Git-Tag: archive/raspbian/4.6.5+ds-1+rpi1~1^2~59 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=85af617a0f7095c548f4355de8f98e4c7602b0cc;p=gtk4.git Drop patches that were applied upstream --- diff --git a/debian/patches/Make-our-stack-noexec.patch b/debian/patches/Make-our-stack-noexec.patch deleted file mode 100644 index 46b5d6814c..0000000000 --- a/debian/patches/Make-our-stack-noexec.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Matthias Clasen -Date: Tue, 4 Jan 2022 07:51:56 -0500 -Subject: Make our stack noexec - -The change to use ld and objcopy for resources -had some side-effects: it leaked a few symbols -and made our stack executable. We don't want that. - -Use -z nonexecstack and --strip-all to avoid this. - -Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4598 ---- - gtk/meson.build | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gtk/meson.build b/gtk/meson.build -index 91aefe1..6ce2c18 100644 ---- a/gtk/meson.build -+++ b/gtk/meson.build -@@ -927,6 +927,7 @@ if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy. - input : gtk_gresource, - output : 'gtkresources_blob.o', - command : [ld, -+ '-z', 'noexecstack', - '-r', - '-b','binary', - '@INPUT@', -@@ -937,6 +938,7 @@ if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy. - input : gtk_resources_binary, - output : 'gtkresources_blob2.o', - command : [objcopy, -+ '--strip-all', - '--add-symbol','_gtk_resource_data=.data:0', - '@INPUT@', - '@OUTPUT@']) diff --git a/debian/patches/build-Tell-glib-compile-resources-to-make-symbols-interna.patch b/debian/patches/build-Tell-glib-compile-resources-to-make-symbols-interna.patch deleted file mode 100644 index 38a68920be..0000000000 --- a/debian/patches/build-Tell-glib-compile-resources-to-make-symbols-interna.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Simon McVittie -Date: Tue, 4 Jan 2022 17:41:34 +0000 -Subject: build: Tell glib-compile-resources to make symbols internal where - possible - -Partial solution to https://gitlab.gnome.org/GNOME/gtk/-/issues/4598 - -Signed-off-by: Simon McVittie -Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4334 ---- - gtk/meson.build | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/gtk/meson.build b/gtk/meson.build -index 6ce2c18..201af63 100644 ---- a/gtk/meson.build -+++ b/gtk/meson.build -@@ -883,6 +883,7 @@ if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy. - depfile : 'gtk.gresource.d', - command : [glib_compile_resources, - '--generate', -+ '--internal', - '--target=@OUTPUT@', - '--dependency-file=@DEPFILE@', - '--sourcedir=' + meson.current_source_dir(), -@@ -897,6 +898,7 @@ if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy. - depfile : 'gtkresources.c.d', - command : [glib_compile_resources, - '--generate-source', -+ '--internal', - '--target=@OUTPUT@', - '--dependency-file=@DEPFILE@', - '--sourcedir=' + meson.current_source_dir(), -@@ -913,6 +915,7 @@ if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy. - depfile : 'gtkresources.h.d', - command : [glib_compile_resources, - '--generate-header', -+ '--internal', - '--target=@OUTPUT@', - '--dependency-file=@DEPFILE@', - '--sourcedir=' + meson.current_source_dir(), diff --git a/debian/patches/debian/Disable-optimized-GResource-embedding.patch b/debian/patches/debian/Disable-optimized-GResource-embedding.patch index 240cfe409b..9ced54453c 100644 --- a/debian/patches/debian/Disable-optimized-GResource-embedding.patch +++ b/debian/patches/debian/Disable-optimized-GResource-embedding.patch @@ -15,10 +15,10 @@ Forwarded: no 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build -index 5b79dfa..294d66f 100644 +index f594cd5..0200246 100644 --- a/demos/gtk-demo/meson.build +++ b/demos/gtk-demo/meson.build -@@ -164,7 +164,7 @@ endif +@@ -160,7 +160,7 @@ endif ld = find_program('ld', required : false) @@ -28,7 +28,7 @@ index 5b79dfa..294d66f 100644 # Create the resource blob diff --git a/demos/widget-factory/meson.build b/demos/widget-factory/meson.build -index 800230b..d78f9f6 100644 +index 9a083eb..162a66a 100644 --- a/demos/widget-factory/meson.build +++ b/demos/widget-factory/meson.build @@ -8,7 +8,7 @@ endif @@ -41,7 +41,7 @@ index 800230b..d78f9f6 100644 # Create the resource blob diff --git a/gtk/meson.build b/gtk/meson.build -index 201af63..8c7c56e 100644 +index 9e01201..9b20626 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -872,7 +872,7 @@ endif diff --git a/debian/patches/debian/Disable-web-fonts-for-now.patch b/debian/patches/debian/Disable-web-fonts-for-now.patch index 4263fa29f8..ff813eda47 100644 --- a/debian/patches/debian/Disable-web-fonts-for-now.patch +++ b/debian/patches/debian/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 4a92097..7fd9a68 100644 +index 188c9a7..954b5d8 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/png-Correct-endianness-for-big-endian-machines.patch b/debian/patches/png-Correct-endianness-for-big-endian-machines.patch deleted file mode 100644 index 86670826f4..0000000000 --- a/debian/patches/png-Correct-endianness-for-big-endian-machines.patch +++ /dev/null @@ -1,73 +0,0 @@ -From: Simon McVittie -Date: Sat, 8 Jan 2022 16:39:36 +0000 -Subject: png: Correct endianness for big-endian machines - -libpng wants to receive samples in either RGB or RGBA order, whether -each sample is big-endian or not. This resolves test failures in -testsuite/gdk/memorytexture.c (and a lot of reftests) on s390x, and -probably the PowerPC family too. - -Modifying the test to show the color in use and write out the PNG bytes -to a file, and running the memorytexture test on s390x, produces a PNG -that loads with the correct color values in GIMP (on an x86_64 machine), -which seems like evidence that this is the correct change and not just -compensating errors. - -Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4616 -Signed-off-by: Simon McVittie -Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4357 ---- - gdk/loaders/gdkpng.c | 16 ---------------- - 1 file changed, 16 deletions(-) - -diff --git a/gdk/loaders/gdkpng.c b/gdk/loaders/gdkpng.c -index b998deb..2071121 100644 ---- a/gdk/loaders/gdkpng.c -+++ b/gdk/loaders/gdkpng.c -@@ -222,11 +222,7 @@ gdk_load_png (GBytes *bytes, - case PNG_COLOR_TYPE_RGB_ALPHA: - if (depth == 8) - { --#if G_BYTE_ORDER == G_LITTLE_ENDIAN - format = GDK_MEMORY_R8G8B8A8; --#elif G_BYTE_ORDER == G_BIG_ENDIAN -- format = GDK_MEMORY_A8B8G8R8; --#endif - } - else - { -@@ -236,11 +232,7 @@ gdk_load_png (GBytes *bytes, - case PNG_COLOR_TYPE_RGB: - if (depth == 8) - { --#if G_BYTE_ORDER == G_LITTLE_ENDIAN - format = GDK_MEMORY_R8G8B8; --#elif G_BYTE_ORDER == G_BIG_ENDIAN -- format = GDK_MEMORY_B8G8R8; --#endif - } - else if (depth == 16) - { -@@ -325,22 +317,14 @@ gdk_save_png (GdkTexture *texture) - case GDK_MEMORY_A8R8G8B8: - case GDK_MEMORY_R8G8B8A8: - case GDK_MEMORY_A8B8G8R8: --#if G_BYTE_ORDER == G_LITTLE_ENDIAN - format = GDK_MEMORY_R8G8B8A8; --#elif G_BYTE_ORDER == G_BIG_ENDIAN -- format = GDK_MEMORY_A8B8G8R8; --#endif - png_format = PNG_COLOR_TYPE_RGB_ALPHA; - depth = 8; - break; - - case GDK_MEMORY_R8G8B8: - case GDK_MEMORY_B8G8R8: --#if G_BYTE_ORDER == G_LITTLE_ENDIAN - format = GDK_MEMORY_R8G8B8; --#elif G_BYTE_ORDER == G_BIG_ENDIAN -- format = GDK_MEMORY_B8G8R8; --#endif - png_format = PNG_COLOR_TYPE_RGB; - depth = 8; - break; 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 40dabe4fc4..f48bd7ad70 100644 --- 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 @@ -42,7 +42,7 @@ index 919957e..7145363 100644 g_object_unref (diff_texture); success = FALSE; diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c -index 3872f55..12d202f 100644 +index 4d3d57d..5136efa 100644 --- a/testsuite/reftests/gtk-reftest.c +++ b/testsuite/reftests/gtk-reftest.c @@ -331,6 +331,9 @@ test_ui_file (GFile *file) diff --git a/debian/patches/reftests-Allow-minor-differences-to-be-tolerated.patch b/debian/patches/reftests-Allow-minor-differences-to-be-tolerated.patch index aeae1c951c..b56477259e 100644 --- a/debian/patches/reftests-Allow-minor-differences-to-be-tolerated.patch +++ b/debian/patches/reftests-Allow-minor-differences-to-be-tolerated.patch @@ -82,7 +82,7 @@ index 7145363..2d5fdf9 100644 } diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c -index 12d202f..5970b1d 100644 +index 5136efa..aa4d3c7 100644 --- a/testsuite/reftests/gtk-reftest.c +++ b/testsuite/reftests/gtk-reftest.c @@ -292,6 +292,12 @@ save_image (GdkTexture *texture, diff --git a/debian/patches/series b/debian/patches/series index 203f46fa89..f2ed1520c5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,3 @@ -Make-our-stack-noexec.patch -build-Tell-glib-compile-resources-to-make-symbols-interna.patch -png-Correct-endianness-for-big-endian-machines.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