diff options
| author | Leo Famulari <leo@famulari.name> | 2021-08-11 00:23:02 -0400 |
|---|---|---|
| committer | Guillaume Le Vaillant <glv@posteo.net> | 2021-08-28 18:08:30 +0200 |
| commit | e3b037392a0d33b72f1c5e87b84f14ec92c04242 (patch) | |
| tree | b7a997192b91a05f66d754e100b8418e0615fc58 | |
| parent | fc137ffe099a2cad8121bd04523206afddc47f40 (diff) | |
gnu: QtWebKit: Fix building with glib 2.68.
* gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/qt.scm (qtwebkit)[source]: Use it.
Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch | 21 | ||||
| -rw-r--r-- | gnu/packages/qt.scm | 1 |
3 files changed, 23 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 47d725d90d..7d91538b9b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1659,6 +1659,7 @@ dist_patch_DATA = \ %D%/packages/patches/qtwebkit-pbutils-include.patch \ %D%/packages/patches/qtwebkit-fix-building-with-python-3.9.patch \ %D%/packages/patches/qtwebkit-fix-building-with-icu-68.patch \ + %D%/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch \ %D%/packages/patches/randomjungle-disable-static-build.patch \ %D%/packages/patches/rapicorn-isnan.patch \ %D%/packages/patches/rapidjson-gcc-compat.patch \ diff --git a/gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch b/gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch new file mode 100644 index 0000000000..63840f4bbc --- /dev/null +++ b/gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch @@ -0,0 +1,21 @@ +Fix building with glib 2.68: + +https://github.com/qtwebkit/qtwebkit/issues/1057 + +Patch copied from upstream pull request: + +https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b + +diff -aurN qtwebkit-5.212.0-alpha4/Source/WTF/wtf/glib/GRefPtr.h qtwebkit-5.212.0-alpha4-mod/Source/WTF/wtf/glib/GRefPtr.h +--- qtwebkit-5.212.0-alpha4/Source/WTF/wtf/glib/GRefPtr.h 2020-03-04 18:16:37.000000000 +0100 ++++ qtwebkit-5.212.0-alpha4-mod/Source/WTF/wtf/glib/GRefPtr.h 2021-04-05 06:58:44.763328636 +0200 +@@ -29,9 +29,6 @@ + #include <wtf/RefPtr.h> + #include <algorithm> + +-extern "C" void g_object_unref(gpointer); +-extern "C" gpointer g_object_ref_sink(gpointer); +- + namespace WTF { + + enum GRefPtrAdoptType { GRefPtrAdopt }; diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 525fe2f80b..a6b3f65f1f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2625,6 +2625,7 @@ different kinds of sliders, and much more.") (base32 "1rm9sjkabxna67dl7myx9d9vpdyfxfdhrk9w7b94srkkjbd2d8cw")) (patches (search-patches "qtwebkit-pbutils-include.patch" + "qtwebkit-fix-building-with-glib-2.68.patch" "qtwebkit-fix-building-with-icu-68.patch" "qtwebkit-fix-building-with-python-3.9.patch")))) (build-system cmake-build-system) |