Hi ports@,

diff below fix x11/qt5 -debug FLAVOR on amd64[1] and W^X violation in:

/usr/local/lib/qt5/bin/designer
/usr/local/lib/qt5/bin/assistant

[1]: https://marc.info/?l=openbsd-ports&m=147855534726608&w=2

Comments? OK?

Kind regrads,

Rafael


Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/qt5/Makefile,v
retrieving revision 1.55
diff -u -p -u -p -r1.55 Makefile
--- Makefile    8 Nov 2016 14:47:22 -0000       1.55
+++ Makefile    20 Nov 2016 11:58:32 -0000
@@ -19,7 +19,7 @@ COMMENT-sqlite2 =     SQLite 2.x plugin for 
 COMMENT-tds =          TDS plugin for Qt5
 
 PKGNAME-main =         qt5-${VERSION}
-REVISION-main =                4
+REVISION-main =                5
 PKGNAME-examples =     qt5-examples-${VERSION}
 REVISION-examples =    0
 PKGNAME-html =         qt5-html-${VERSION}
Index: patches/patch-qttools_src_assistant_assistant_assistant_pro
===================================================================
RCS file: patches/patch-qttools_src_assistant_assistant_assistant_pro
diff -N patches/patch-qttools_src_assistant_assistant_assistant_pro
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-qttools_src_assistant_assistant_assistant_pro 20 Nov 2016 
11:58:32 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- qttools/src/assistant/assistant/assistant.pro.ports.orig   Sun Nov 20 
12:53:03 2016
++++ qttools/src/assistant/assistant/assistant.pro      Sun Nov 20 12:53:19 2016
+@@ -113,6 +113,8 @@ mac {
+     QMAKE_INFO_PLIST = Info_mac.plist
+ }
+ 
++LIBS += -Wl,-z,wxneeded
++
+ contains(SQLPLUGINS, sqlite):QTPLUGIN += qsqlite
+ 
+ load(qt_app)
Index: patches/patch-qttools_src_designer_src_designer_designer_pro
===================================================================
RCS file: patches/patch-qttools_src_designer_src_designer_designer_pro
diff -N patches/patch-qttools_src_designer_src_designer_designer_pro
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-qttools_src_designer_src_designer_designer_pro        20 Nov 
2016 11:58:32 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- qttools/src/designer/src/designer/designer.pro.ports.orig  Sat Nov 19 
23:24:58 2016
++++ qttools/src/designer/src/designer/designer.pro     Sat Nov 19 23:25:14 2016
+@@ -63,6 +63,8 @@ win32 {
+    RC_FILE      = designer.rc
+ }
+ 
++LIBS += -Wl,-z,wxneeded
++
+ mac {
+     ICON = designer.icns
+     QMAKE_INFO_PLIST = Info_mac.plist
Index: patches/patch-qtwebkit_Source_JavaScriptCore_dfg_DFGOperations_cpp
===================================================================
RCS file: patches/patch-qtwebkit_Source_JavaScriptCore_dfg_DFGOperations_cpp
diff -N patches/patch-qtwebkit_Source_JavaScriptCore_dfg_DFGOperations_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-qtwebkit_Source_JavaScriptCore_dfg_DFGOperations_cpp  20 Nov 
2016 11:58:32 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Fix "hidden symbol `getHostCallReturnValue' isn't defined" if the --debug flag 
is
+given
+
+--- qtwebkit/Source/JavaScriptCore/dfg/DFGOperations.cpp.ports.orig    Sat Nov 
 5 13:45:34 2016
++++ qtwebkit/Source/JavaScriptCore/dfg/DFGOperations.cpp       Sat Nov  5 
13:45:57 2016
+@@ -67,6 +67,7 @@
+ 
+ #define FUNCTION_WRAPPER_WITH_RETURN_ADDRESS(function, register) \
+     asm( \
++    ".text" "\n" \
+     ".globl " SYMBOL_STRING(function) "\n" \
+     HIDE_SYMBOL(function) "\n" \
+     SYMBOL_STRING(function) ":" "\n" \
+@@ -1796,6 +1797,7 @@ namespace JSC {
+ 
+ #if COMPILER(GCC) && CPU(X86_64)
+ asm (
++".text" "\n" \
+ ".globl " SYMBOL_STRING(getHostCallReturnValue) "\n"
+ HIDE_SYMBOL(getHostCallReturnValue) "\n"
+ SYMBOL_STRING(getHostCallReturnValue) ":" "\n"

Reply via email to