pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

webkit-gtk: fix introspection build problem



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Jan 29 00:26:31 2026 +0100
Changeset:	b02a3163e1c0af31bfefab7564e8255860c6646b

Modified Files:
	webkit-gtk/Makefile
	webkit-gtk/PLIST
	webkit-gtk/TODO

Log Message:
webkit-gtk: fix introspection build problem

by disabling relro

The other two problems are still there, update TODO

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b02a3163e1c0af31bfefab7564e8255860c6646b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 webkit-gtk/Makefile | 12 ++++++++----
 webkit-gtk/PLIST    |  4 ++--
 webkit-gtk/TODO     |  9 ++-------
 3 files changed, 12 insertions(+), 13 deletions(-)

diffs:
diff --git a/webkit-gtk/Makefile b/webkit-gtk/Makefile
index b9dfc0bd31..a95c02e141 100644
--- a/webkit-gtk/Makefile
+++ b/webkit-gtk/Makefile
@@ -30,6 +30,9 @@ CXXFLAGS+=	-I${PREFIX}/include/gstreamer-1.0
 CFLAGS+=		-Wno-unused-parameter -Wno-undef
 CXXFLAGS+=		-Wno-unused-parameter -Wno-undef
 
+# g-ir-scanner dumps core with full RELRO
+RELRO_SUPPORTED=	partial
+
 # From Arch Linux:
 # JITted code crashes when CET is used
 #CFLAGS+=		-fcf-protection=none
@@ -156,18 +159,19 @@ NOT_PAX_MPROTECT_SAFE+=		libexec/webkit2gtk-4.1/WebKitWebProcess
 #NOT_PAX_MPROTECT_SAFE+=	libexec/webkit2gtk-4.1/WebKitNetworkProcess
 NOT_PAX_MPROTECT_SAFE+=		libexec/webkit2gtk-4.1/jsc
 
+# TODO: fix shell portability issues in these files
 CHECK_PORTABILITY_SKIP+=	Source/JavaScriptCore/Scripts/check-xcfilelists.sh
 CHECK_PORTABILITY_SKIP+=	Source/JavaScriptCore/Scripts/create-symlink-to-altroot.sh
-#CHECK_PORTABILITY_SKIP+=	Source/JavaScriptCore/Scripts/generate-unified-sources.sh
+CHECK_PORTABILITY_SKIP+=	Source/JavaScriptCore/Scripts/generate-unified-sources.sh
 CHECK_PORTABILITY_SKIP+=	Source/WebCore/Scripts/check-xcfilelists.sh
 CHECK_PORTABILITY_SKIP+=	Source/WebCore/Scripts/create-symlink-to-altroot.sh
-#CHECK_PORTABILITY_SKIP+=	Source/WebCore/Scripts/generate-unified-sources.sh
+CHECK_PORTABILITY_SKIP+=	Source/WebCore/Scripts/generate-unified-sources.sh
 CHECK_PORTABILITY_SKIP+=	Source/WebKit/Scripts/check-xcfilelists.sh
 CHECK_PORTABILITY_SKIP+=	Source/WebKit/Scripts/create-symlink-to-altroot.sh
 CHECK_PORTABILITY_SKIP+=	Source/WebKit/Scripts/generate-feature-flags-plist.sh
-#CHECK_PORTABILITY_SKIP+=	Source/WebKit/Scripts/generate-unified-sources.sh
+CHECK_PORTABILITY_SKIP+=	Source/WebKit/Scripts/generate-unified-sources.sh
 CHECK_PORTABILITY_SKIP+=	Tools/TestWebKitAPI/Scripts/check-xcfilelists.sh
-#CHECK_PORTABILITY_SKIP+=	Tools/TestWebKitAPI/Scripts/generate-unified-sources.sh
+CHECK_PORTABILITY_SKIP+=	Tools/TestWebKitAPI/Scripts/generate-unified-sources.sh
 
 .include "options.mk"
 
diff --git a/webkit-gtk/PLIST b/webkit-gtk/PLIST
index b9b5535d0a..e3aab8491c 100644
--- a/webkit-gtk/PLIST
+++ b/webkit-gtk/PLIST
@@ -224,10 +224,10 @@ lib/girepository-1.0/WebKit2-4.1.typelib
 lib/girepository-1.0/WebKit2WebExtension-4.1.typelib
 lib/libjavascriptcoregtk-4.1.${RUBY_DLEXT}
 lib/libjavascriptcoregtk-4.1.so.0
-lib/libjavascriptcoregtk-4.1.so.0.9.6
+lib/libjavascriptcoregtk-4.1.so.0.9.9
 lib/libwebkit2gtk-4.1.${RUBY_DLEXT}
 lib/libwebkit2gtk-4.1.so.0
-lib/libwebkit2gtk-4.1.so.0.19.4
+lib/libwebkit2gtk-4.1.so.0.19.7
 lib/pkgconfig/javascriptcoregtk-4.1.pc
 lib/pkgconfig/webkit2gtk-4.1.pc
 lib/pkgconfig/webkit2gtk-web-extension-4.1.pc
diff --git a/webkit-gtk/TODO b/webkit-gtk/TODO
index 8686efce26..9736ed7408 100644
--- a/webkit-gtk/TODO
+++ b/webkit-gtk/TODO
@@ -1,10 +1,5 @@
-1. fails to build:
-[4/28] Generate bindings (WebCoreTestSupportBindings)
-...
- Command '['/tmp/wip/webkit-gtk/work/webkitgtk-2.50.4/tmp-introspecttz1ub1ts/WebKit2WebExtension-4.1', '--introspect-dump=/tmp/wip/webkit-gtk/work/webkitgtk-2.50.4/tmp-introspecttz1ub1ts/functions.txt,/tmp/wip/webkit-gtk/work/webkitgtk-2.50.4/tmp-introspecttz1ub1ts/dump.xml']' died with <Signals.SIGSEGV: 11>.
+pkg_add: webkit-gtk-2.50.4: missing required library: /tmp/wip/webkit-gtk/work/.buildlink/lib/libsqlite3.so
 
-2. pkg_add: webkit-gtk-2.48.5: missing required library: /scratch/wip/webkit-gtk-2.46/work/.buildlink/lib/libsqlite3.so
-
-3. Test with $PREFIX/libexec/webkit2gtk-4.1/MiniBrowser:
+Test with $PREFIX/libexec/webkit2gtk-4.1/MiniBrowser:
 
 start, but often gets 'WebProcess CRASHED' error


Home | Main Index | Thread Index | Old Index