diff options
| author | frealgagu | 2021-04-21 12:45:53 -0500 |
|---|---|---|
| committer | frealgagu | 2021-04-21 12:45:53 -0500 |
| commit | ebcc8c0d9fe79b07915ddab546268691106b1b16 (patch) | |
| tree | 825abb661d221ae9d7edf58c61ac0590dceb42c0 | |
| parent | 26668735f9fcc362c3e99eedd2917762baaf5636 (diff) | |
| download | aur-ebcc8c0d9fe79b07915ddab546268691106b1b16.tar.gz | |
Add patch for glib 2.68.0 API changes
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | glib-2.68.0.patch | 29 |
2 files changed, 38 insertions, 1 deletions
@@ -2,10 +2,11 @@ # Contributor: Chih-Hsuan Yen <yan12125@archlinux.org> # Contributor: foutrelis # Contributor: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Chiwan Park <chiwanpark@hotmail.com> pkgname=webkitgtk2 pkgver=2.4.11 -pkgrel=22 +pkgrel=23 epoch=3 pkgdesc="Legacy Web content engine for GTK+ 2" arch=("armv7h" "i686" "x86_64") @@ -32,6 +33,7 @@ source=( "icu68.patch" "gtk-doc.patch" "grammar.patch" + "glib-2.68.0.patch" ) sha256sums=( "588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7" @@ -42,6 +44,7 @@ sha256sums=( "d1a9ccc1ae5cb042bc47ae846ff84513ca7b9c7bc999c546ffba48572f0373a0" "7341eb4c229656046be6ac526f94b9f4a742a66178412caf22a988677f5bf9d9" "5a62fbd0df69c6951562e72cd7b3c58cae7f2807338ced7b4a1973440b3dd193" + "453e826ad09cdceb12cad750e16cf6b9d43d8810eb1ea14bd291e5556a14d9df" ) prepare() { @@ -83,6 +86,11 @@ build() ( --disable-webkit2 \ --disable-gtk-doc + # patch for glib>=2.68.0 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np0 -i "${srcdir}/glib-2.68.0.patch" + cd "${srcdir}/build-gtk" + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i "s/ -shared / -Wl,-O1,--as-needed\0/g" "${srcdir}/build-gtk2/libtool" diff --git a/glib-2.68.0.patch b/glib-2.68.0.patch new file mode 100644 index 000000000000..a5ef51700ba1 --- /dev/null +++ b/glib-2.68.0.patch @@ -0,0 +1,29 @@ +--- Source/WTF/wtf/gobject/GRefPtr.h 2021-04-22 00:32:56.644133999 +0900 ++++ Source/WTF/wtf/gobject/GRefPtr.h 2021-04-22 00:33:57.755315484 +0900 +@@ -25,11 +25,11 @@ + + #if USE(GLIB) + ++#include <glib-object.h> ++ + #include <wtf/RefPtr.h> + #include <algorithm> + +-extern "C" void g_object_unref(gpointer); +-extern "C" gpointer g_object_ref_sink(gpointer); + + namespace WTF { + +--- GNUmakefile.in 2021-04-22 00:35:24.846905490 +0900 ++++ GNUmakefile.in 2021-04-22 00:42:04.543194694 +0900 +@@ -96250,8 +96250,8 @@ + @true + + stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST) +- $(AM_V_GEN) echo "extern \"C\" {" > $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \ +- $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \ ++ $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \ ++ sed -i '1,10s/#ifdef/extern "C" {\n#ifdef/gm' $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \ + echo '}' >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \ + echo timestamp > $(@F) + |