[neon/qt/qt5webkit/Neon/release] debian: Add a patch from openSUSE to fix build with GLib ≥ 2.68.

Dmitry Shachnev null at kde.org
Sat Apr 30 23:53:00 BST 2022


Git commit d39689da3c746d3ffb0f38dcec00707352f2b069 by Dmitry Shachnev.
Committed on 07/04/2021 at 17:26.
Pushed by sitter into branch 'Neon/release'.

Add a patch from openSUSE to fix build with GLib ≥ 2.68.

Thanks to Fabian Vogt!

M  +3    -0    debian/changelog
A  +18   -0    debian/patches/glib_2.68.diff
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt/qt5webkit/commit/d39689da3c746d3ffb0f38dcec00707352f2b069

diff --git a/debian/changelog b/debian/changelog
index 71e8c35..fba7ebd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtwebkit-opensource-src (5.212.0~alpha4-12) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Add a patch from openSUSE to fix build with GLib ≥ 2.68.
+    Thanks to Fabian Vogt!
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 07 Apr 2021 20:17:59 +0300
 
diff --git a/debian/patches/glib_2.68.diff b/debian/patches/glib_2.68.diff
new file mode 100644
index 0000000..3112b4c
--- /dev/null
+++ b/debian/patches/glib_2.68.diff
@@ -0,0 +1,18 @@
+Description: remove invalid g_object declarations to fix build with glib ≥ 2.68
+Origin: https://build.opensuse.org/package/view_file/KDE:Qt5/libqt5-qtwebkit/0001-Remove-invalid-g_object-declarations-to-fix-build-wi.patch
+Forwarded: https://github.com/qtwebkit/qtwebkit/pull/1058
+Last-Update: 2021-04-07
+
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -28,9 +28,7 @@
+ #include <wtf/GetPtr.h>
+ #include <wtf/RefPtr.h>
+ #include <algorithm>
+-
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
++#include <glib.h>
+ 
+ namespace WTF {
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0326844..a369709 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ support_riscv64.diff
 bison_3.7.diff
 no_pdf_image_plugin.diff
 python_3.9.diff
+glib_2.68.diff



More information about the Neon-commits mailing list