From 35a4c0995824c2db508be1d19eb54415d04f5529 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 12 Aug 2020 11:14:16 +0100 Subject: [PATCH] Drop patch that was applied upstream --- ...esource-related-symbols-with-newer-G.patch | 62 ------------------- ...s-tests-Don-t-distribute-built-files.patch | 8 +-- ...stribute-generated-files-in-tarballs.patch | 4 +- ...-Really-don-t-distribute-built-files.patch | 10 +-- debian/patches/series | 1 - 5 files changed, 11 insertions(+), 74 deletions(-) delete mode 100644 debian/patches/build-Don-t-export-GResource-related-symbols-with-newer-G.patch diff --git a/debian/patches/build-Don-t-export-GResource-related-symbols-with-newer-G.patch b/debian/patches/build-Don-t-export-GResource-related-symbols-with-newer-G.patch deleted file mode 100644 index 858c233d75..0000000000 --- a/debian/patches/build-Don-t-export-GResource-related-symbols-with-newer-G.patch +++ /dev/null @@ -1,62 +0,0 @@ -From: Simon McVittie -Date: Thu, 9 Jul 2020 16:57:42 +0100 -Subject: build: Don't export GResource-related symbols with newer GLib - -This makes the desired behaviour explicit, and matches the behaviour -seen with Meson, where "external : false" is the default. - -Before GNOME/glib!1468, not passing --internal to the resource compiler -meant "no special export attribute, do what you would normally do", -so these symbols were not exported due to our global use of --fvisibility=hidden. - -However, since GNOME/glib!1468, not passing --internal to the resource -compiler results in the symbols being decorated with G_MODULE_EXPORT, -which overrides -fvisibility=hidden. This was necessary because Windows -DLLs normally behave a bit like the equivalent of ELF libraries with --fvisibility=hidden. - -Signed-off-by: Simon McVittie -Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/2919 -Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2218 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=964679 -Applied-upstream: 3.24.22, commit:b4d120fcb415f01966c62ce2010c89867e079057 ---- - gdk/Makefile.am | 4 ++-- - gtk/Makefile.am | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/gdk/Makefile.am b/gdk/Makefile.am -index 3635864..3f915b6 100644 ---- a/gdk/Makefile.am -+++ b/gdk/Makefile.am -@@ -491,10 +491,10 @@ resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --gener - - gdkresources.h: gdk.gresource.xml - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ \ -- --sourcedir=$(srcdir) --c-name _gdk --generate-header --manual-register -+ --sourcedir=$(srcdir) --c-name _gdk --generate-header --manual-register --internal - gdkresources.c: gdk.gresource.xml $(resource_files) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ \ -- --sourcedir=$(srcdir) --c-name _gdk --generate-source --manual-register -+ --sourcedir=$(srcdir) --c-name _gdk --generate-source --manual-register --internal - - # ------------------- MSVC Build Items ---------------- - MSVCPROJS = gdk-3 -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 9559595..c703024 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -1421,10 +1421,10 @@ resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --gener - - gtkresources.h: gtk.gresource.xml - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \ -- --target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-header --manual-register -+ --target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-header --manual-register --internal - gtkresources.c: gtk.gresource.xml $(resource_files) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \ -- --target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-source --manual-register -+ --target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-source --manual-register --internal - - gtkprivatetypebuiltins.h: stamp-gtkprivatetypebuiltins.h - @true diff --git a/debian/patches/demos-examples-tests-Don-t-distribute-built-files.patch b/debian/patches/demos-examples-tests-Don-t-distribute-built-files.patch index c9eafe8668..7694575845 100644 --- a/debian/patches/demos-examples-tests-Don-t-distribute-built-files.patch +++ b/debian/patches/demos-examples-tests-Don-t-distribute-built-files.patch @@ -23,7 +23,7 @@ Bug: https://gitlab.gnome.org/GNOME/gtk/issues/357 14 files changed, 58 insertions(+), 28 deletions(-) diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am -index f035c76..444979d 100644 +index 4a2f827..c303551 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am @@ -133,13 +133,14 @@ demos.h: $(demos) geninclude.pl @@ -69,9 +69,9 @@ index f035c76..444979d 100644 +gtk3_demo_application_FILES = $(gtk3_demo_application_SOURCES) $(nodist_gtk3_demo_application_SOURCES) gtk3_demo_application_EXCLUDES = dummy - include $(top_srcdir)/build/Makefile.msvcproj + include $(top_srcdir)/win32/Makefile.msvcproj diff --git a/demos/icon-browser/Makefile.am b/demos/icon-browser/Makefile.am -index d5f933b..627b724 100644 +index bf8425c..b168bbb 100644 --- a/demos/icon-browser/Makefile.am +++ b/demos/icon-browser/Makefile.am @@ -20,11 +20,12 @@ gtk3_icon_browser_SOURCES = \ @@ -98,7 +98,7 @@ index d5f933b..627b724 100644 +gtk3_icon_browser_FILES = $(gtk3_icon_browser_SOURCES) $(nodist_gtk3_icon_browser_SOURCES) gtk3_icon_browser_EXCLUDES = dummy - include $(top_srcdir)/build/Makefile.msvcproj + include $(top_srcdir)/win32/Makefile.msvcproj diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am index c33a6d0..a0d6239 100644 --- a/demos/widget-factory/Makefile.am diff --git a/debian/patches/gdk-Don-t-distribute-generated-files-in-tarballs.patch b/debian/patches/gdk-Don-t-distribute-generated-files-in-tarballs.patch index bc66902928..9455d9e10d 100644 --- a/debian/patches/gdk-Don-t-distribute-generated-files-in-tarballs.patch +++ b/debian/patches/gdk-Don-t-distribute-generated-files-in-tarballs.patch @@ -17,7 +17,7 @@ Bug: https://gitlab.gnome.org/GNOME/gtk/issues/357 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/gdk/Makefile.am b/gdk/Makefile.am -index 3f915b6..8672ea4 100644 +index 710a548..fbdd193 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -203,16 +203,8 @@ nodist_gdkinclude_HEADERS = gdkconfig.h gdkenumtypes.h gdkversionmacros.h @@ -62,7 +62,7 @@ index 3f915b6..8672ea4 100644 gdk_3_HEADERS_DIR = $(gdkincludedir) @@ -553,20 +543,13 @@ dist-hook: \ - $(top_builddir)/build/win32/vs9/gdk-3.headers \ + $(top_builddir)/win32/vs9/gdk-3.headers \ $(INTROSPECTION_INTERMEDIATE_ITEMS) -DISTCLEANFILES = gdkconfig.h stamp-gc-h diff --git a/debian/patches/gtk-Really-don-t-distribute-built-files.patch b/debian/patches/gtk-Really-don-t-distribute-built-files.patch index 2a44f042be..98aee0caa1 100644 --- a/debian/patches/gtk-Really-don-t-distribute-built-files.patch +++ b/debian/patches/gtk-Really-don-t-distribute-built-files.patch @@ -12,7 +12,7 @@ Bug: https://gitlab.gnome.org/GNOME/gtk/issues/357 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index c703024..a5d40ed 100644 +index 1d22172..2b8830a 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -554,7 +554,6 @@ gtk_private_h_sources = \ @@ -23,7 +23,7 @@ index c703024..a5d40ed 100644 gtkroundedboxprivate.h \ gtksearchengine.h \ gtksearchenginesimple.h \ -@@ -1172,20 +1171,18 @@ gtk_extra_sources = \ +@@ -1179,20 +1178,18 @@ gtk_extra_sources = \ # # setup GTK+ sources and their dependencies # @@ -47,7 +47,7 @@ index c703024..a5d40ed 100644 pkgdatadir = $(datadir)/gtk-$(GTK_API_VERSION) -@@ -1456,7 +1453,8 @@ $(srcdir)/gtktestutils.c: gtktypefuncs.inc +@@ -1463,7 +1460,8 @@ $(srcdir)/gtktestutils.c: gtktypefuncs.inc lib_LTLIBRARIES = libgtk-3.la gtkincludedir = $(includedir)/gtk-3.0/gtk @@ -57,7 +57,7 @@ index c703024..a5d40ed 100644 a11yincludedir = $(includedir)/gtk-3.0/gtk/a11y a11yinclude_HEADERS= $(a11y_h_sources) -@@ -1515,6 +1513,7 @@ gtk_3_HEADERS_DIR = $(gtkincludedir) +@@ -1522,6 +1520,7 @@ gtk_3_HEADERS_DIR = $(gtkincludedir) gtk_3_HEADERS_INST = \ $(gtkinclude_HEADERS) \ @@ -65,7 +65,7 @@ index c703024..a5d40ed 100644 $(a11y_h_sources) \ $(deprecated_h_sources) -@@ -1596,7 +1595,7 @@ distclean-local: +@@ -1603,7 +1602,7 @@ distclean-local: fi if HAVE_INTROSPECTION diff --git a/debian/patches/series b/debian/patches/series index 25b63b0118..269c959e00 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -build-Don-t-export-GResource-related-symbols-with-newer-G.patch updateiconcache-Sort-list-of-entries.patch gdk-Don-t-distribute-generated-files-in-tarballs.patch gtk-Really-don-t-distribute-built-files.patch