callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop patches that partially reverted each other

Browse Source
This commit is contained in:
Simon McVittie
2019-07-18 09:43:10 +01:00
parent 2bcd09057e
commit e77ec40c0c
5 changed files with 13 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
gtk+3.0 (3.24.10-2) UNRELEASED; urgency=medium
* d/p/018_gdkenumtypes.c_location.patch:
Drop patch that was rejected upstream. The issue that it solved
was solved more correctly upstream, by introspecting the built files.
* d/p/gdk-Generate-gdkenumtypes.-ch-in-the-builddir.patch:
Drop patch that partially reverted the one described above.
-- Simon McVittie <smcv@debian.org> Thu, 18 Jul 2019 09:40:24 +0100
gtk+3.0 (3.24.10-1) unstable; urgency=medium
* Team upload

67
debian/patches/018_gdkenumtypes.c_location.patch vendored
View File

@ -1,67 +0,0 @@
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Thu, 8 Sep 2011 09:14:02 +0200
Subject: Consistently treat gdkenumtypes.[hc] as source files
Always generate gdk/gdkenumtypes.c in the source tree, and fix path in the
introspection sources. With this, gdkenumtypes.c is correctly included with
separate build trees, too. This fixes missing GTypes in the .gir when using a
separate build tree.
Also remove the gdk/stamp-gdkenumtypes.h target. It was forcing the
regeneration of gdk/gdkenumtypes.h even if it was already present and current
in the source tree.
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=647729
Bug-Ubuntu: https://launchpad.net/bugs/769256
Forwarded: yes
---
gdk/Makefile.am | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 6373e26..1b11d72 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -184,8 +184,8 @@ gdk_c_sources = \
gdkwindowimpl.c
gdk_built_sources = \
- gdkenumtypes.h \
- gdkenumtypes.c \
+ $(srcdir)/gdkenumtypes.h \
+ $(srcdir)/gdkenumtypes.c \
gdkmarshalers.h \
gdkmarshalers.c \
gdkresources.h \
@@ -417,7 +417,7 @@ endif
lib_LTLIBRARIES = libgdk-3.la
-MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
+MAINTAINERCLEANFILES = $(gdk_built_sources)
EXTRA_DIST += \
$(gdk_built_sources) \
fallback-c89.c
@@ -431,18 +431,15 @@ BUILT_SOURCES = \
$(gdk_built_sources) \
gdkconfig.h
-gdkenumtypes.h: stamp-gdkenumtypes.h
- @true
-stamp-gdkenumtypes.h: $(gdk_h_sources) gdkenumtypes.h.template
+gdkenumtypes.h: $(gdk_public_h_sources) $(srcdir)/gdkenumtypes.h.template
$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.h.template \
$(gdk_h_sources) ) >> xgen-geth \
- && (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \
- && rm -f xgen-geth \
- && echo timestamp > $(@F)
+ && (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth $(srcdir)/gdkenumtypes.h ) \
+ && rm -f xgen-geth
gdkenumtypes.c: $(gdk_h_sources) gdkenumtypes.c.template
$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.c.template \
$(gdk_h_sources) ) > xgen-getc \
- && cp xgen-getc gdkenumtypes.c \
+ && cp xgen-getc $(srcdir)/gdkenumtypes.c \
&& rm -f xgen-getc
#

6
debian/patches/gdk-Don-t-distribute-generated-files-in-tarballs.patch vendored
View File

@ -13,7 +13,7 @@ Signed-off-by: Simon McVittie <smcv@debian.org>
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 525c5a0..64e5b17 100644
index 6373e26..bd093f0 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -203,16 +203,8 @@ nodist_gdkinclude_HEADERS = gdkconfig.h gdkenumtypes.h gdkversionmacros.h
@ -39,12 +39,12 @@ index 525c5a0..64e5b17 100644
lib_LTLIBRARIES = libgdk-3.la
-MAINTAINERCLEANFILES = $(gdk_built_sources)
-MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
+DISTCLEANFILES = $(gdk_built_sources)
EXTRA_DIST += \
$(gdk_built_sources) \
fallback-c89.c
@@ -562,13 +554,6 @@ install-data-local: install-ms-lib install-def-file
@@ -565,13 +557,6 @@ install-data-local: install-ms-lib install-def-file
uninstall-local: uninstall-ms-lib uninstall-def-file
rm -f $(DESTDIR)$(configexecincludedir)/gdkconfig.h

33
debian/patches/gdk-Generate-gdkenumtypes.-ch-in-the-builddir.patch vendored
View File

@ -1,33 +0,0 @@
From: Simon McVittie <smcv@debian.org>
Date: Wed, 17 Jul 2019 13:48:50 +0100
Subject: gdk: Generate gdkenumtypes.[ch] in the $(builddir)
Signed-off-by: Simon McVittie <smcv@debian.org>
---
gdk/Makefile.am | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 1b11d72..525c5a0 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -184,8 +184,8 @@ gdk_c_sources = \
gdkwindowimpl.c
gdk_built_sources = \
- $(srcdir)/gdkenumtypes.h \
- $(srcdir)/gdkenumtypes.c \
+ gdkenumtypes.h \
+ gdkenumtypes.c \
gdkmarshalers.h \
gdkmarshalers.c \
gdkresources.h \
@@ -434,7 +434,7 @@ BUILT_SOURCES = \
gdkenumtypes.h: $(gdk_public_h_sources) $(srcdir)/gdkenumtypes.h.template
$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.h.template \
$(gdk_h_sources) ) >> xgen-geth \
- && (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth $(srcdir)/gdkenumtypes.h ) \
+ && (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \
&& rm -f xgen-geth
gdkenumtypes.c: $(gdk_h_sources) gdkenumtypes.c.template
$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.c.template \

2
debian/patches/series vendored
View File

@ -2,11 +2,9 @@ docs-Add-gtk_file_chooser_add_choice-and-related-function.patch
Fix-a-string-leak.patch
016_no_offscreen_widgets_grabbing.patch
017_no_offscreen_device_grabbing.patch
018_gdkenumtypes.c_location.patch
022_disable-viqr-im-for-vi-locale.patch
060_ignore-random-icons.patch
reftest-known-fail.patch
Don-t-test-default-constructed-GdkPixbuf-properties.patch
gdk-Generate-gdkenumtypes.-ch-in-the-builddir.patch
gdk-Don-t-distribute-generated-files-in-tarballs.patch
Disable-accessibility-dump-aka-a11ytests-test.patch