diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2021-04-18 23:33:08 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2021-04-18 23:33:11 -0400 |
| commit | 25a7998633134fa5ed93cfa880e3fad27156e09f (patch) | |
| tree | 1ecdcb9426e7419918e107a6b64eafdd172f07be /dev-qt | |
| parent | app-office/gnucash: Fix build with glib-2.68 (diff) | |
| download | gentoo-25a7998633134fa5ed93cfa880e3fad27156e09f.tar.gz gentoo-25a7998633134fa5ed93cfa880e3fad27156e09f.tar.bz2 gentoo-25a7998633134fa5ed93cfa880e3fad27156e09f.zip | |
dev-qt/qtwebkit: Fix build with glib-2.68
Closes: https://bugs.gentoo.org/777759
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch | 28 | ||||
| -rw-r--r-- | dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch new file mode 100644 index 000000000000..f377a311362c --- /dev/null +++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch @@ -0,0 +1,28 @@ +https://github.com/qtwebkit/qtwebkit/pull/1058 + +From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001 +From: Fabian Vogt <fvogt@suse.de> +Date: Wed, 7 Apr 2021 13:38:09 +0200 +Subject: [PATCH] Remove invalid g_object declarations to fix build with glib + >= 2.68 + +g_object_ref_sink is defined as a macro meanwhile and so the build fails. +Just remove the declarations, glib.h is included anyway. +--- + Source/WTF/wtf/glib/GRefPtr.h | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h +index 06133d82cb35..d9a1d2f145f5 100644 +--- a/Source/WTF/wtf/glib/GRefPtr.h ++++ b/Source/WTF/wtf/glib/GRefPtr.h +@@ -29,9 +29,6 @@ + #include <algorithm> + #include <glib.h> + +-extern "C" void g_object_unref(gpointer); +-extern "C" gpointer g_object_ref_sink(gpointer); +- + namespace WTF { + + enum GRefPtrAdoptType { GRefPtrAdopt }; diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild index 26d118790a74..f2e91b79caf5 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild @@ -87,6 +87,7 @@ PATCHES=( "${FILESDIR}/${P}-bison-3.7.patch" # bug 736499 "${FILESDIR}/${P}-icu-68.patch" # bug 753260 "${FILESDIR}/${P}-python-3.9.patch" # bug 766303 + "${FILESDIR}/${P}-glib-2.68.patch" # bug 777759 ) _check_reqs() { |