Attachment #201141 for bug #234070




The first hunk puts the catch-all { *; } first in version scripts
so it has lowest priority when a symbol matches multiple patterns.

The second hunk fixes the install location of the pkconfig files:
  FreeBSD installs pkgconfig files to $LOCALBASE/libdata/pkgconfig
  qmake uses QMAKE_PKGCONFIG_DESTDIR as relative path to $$QT_LIBDIR.
  As this is now '${PREFIX}/lib/qt5' we need to go up two levels.

The third hunk stops qmake from generating la files.

--- mkspecs/features/qt_module.prf.orig	2018-12-03 11:15:26 UTC
+++ mkspecs/features/qt_module.prf
@@ -217,17 +217,18 @@ android: CONFIG += qt_android_deps no_linker_version_s
     internal_module {
         verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API { *; };"
     } else {
-        verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \
-                            "    qt_private_api_tag*;"
+        current = Qt_$$QT_MAJOR_VERSION
+        verscript_content = "$$current { *; };"
 
+        verscript_content += "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \
+                             "    qt_private_api_tag*;"
+
         private_api_headers = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.QPA_HEADER_FILES
 
         for(header, private_api_headers): \
             verscript_content += "    @FILE:$$header@"
         verscript_content += "};"
 
-        current = Qt_$$QT_MAJOR_VERSION
-        verscript_content += "$$current { *; };"
         isEmpty(QT_NAMESPACE): tag_symbol = qt_version_tag
         else:                  tag_symbol = qt_version_tag_$$QT_NAMESPACE
 
@@ -266,7 +267,7 @@ load(qt_targets)
 # this builds on top of qt_common
 !internal_module:if(unix|mingw) {
     CONFIG += create_pc
-    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+    QMAKE_PKGCONFIG_DESTDIR = ../../libdata/pkgconfig
     host_build: \
         QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS]
     else: \
@@ -291,7 +292,6 @@ load(qt_targets)
     QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace
 }
 !lib_bundle:unix {

Line 0 Link Here

(-)www/qt5-webengine/files/patch-src_core_api_core_api.pro (+11 lines)
	1	--- src/core/api/core_api.pro.orig 2018-04-10 14:50:39 UTC
	2	+++ src/core/api/core_api.pro
	3	@@ -53,7 +53,7 @@ SOURCES = \
	4	qwebengineurlschemehandler.cpp
	5
	6	### Qt6 Remove this workaround
	7	-unix:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!static {
	8	+linux:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!static {
	9	SOURCES += qtbug-60565.cpp \
	10	qtbug-61521.cpp
	11	}




malloc.h does not exist on FreeBSD, and neither do memalign(3) and pvalloc(3).
--- src/core/api/qtbug-61521.cpp
+++ src/core/api/qtbug-61521.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include <stdlib.h>
-#include <malloc.h>
+#include <unistd.h>
 
 #define SHIM_ALIAS_SYMBOL(fn) __attribute__((weak, alias(#fn)))
 #define SHIM_SYMBOL_VERSION(fn) __asm__(".symver __" #fn "," #fn "@Qt_5")
@@ -66,18 +66,10 @@ SHIM_SYMBOL_VERSION(cfree);
 void __cfree(void* ptr)
     SHIM_ALIAS_SYMBOL(ShimCFree);
 
-SHIM_SYMBOL_VERSION(memalign);
-void* __memalign(size_t align, size_t s)
-    SHIM_ALIAS_SYMBOL(ShimMemalign);
-
 SHIM_SYMBOL_VERSION(valloc);
 void* __valloc(size_t size)
     SHIM_ALIAS_SYMBOL(ShimValloc);
 
-SHIM_SYMBOL_VERSION(pvalloc);
-void* __pvalloc(size_t size)
-    SHIM_ALIAS_SYMBOL(ShimPvalloc);
-
 SHIM_SYMBOL_VERSION(posix_memalign);
 int __posix_memalign(void** r, size_t a, size_t s)
     SHIM_ALIAS_SYMBOL(ShimPosixMemalign);
@@ -102,18 +94,10 @@ SHIM_HIDDEN void ShimCFree(void* ptr) {
     free(ptr);
 }
 
-SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) {
-    return memalign(align,s);
-}
-
 SHIM_HIDDEN void* ShimValloc(size_t size) {
     return  valloc(size);
 }
 
-SHIM_HIDDEN void* ShimPvalloc(size_t size) {
-    return pvalloc(size);
-}
-
 SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) {
     return posix_memalign(r,a,s);
 }

Return to bug 234070

Lines 1-22 Link Here

(-)devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf (-6 / +32 lines)
1	The first hunk fixes the install location of the pkconfig files:	1	The first hunk puts the catch-all { *; } first in version scripts
		2	so it has lowest priority when a symbol matches multiple patterns.
		3
		4	The second hunk fixes the install location of the pkconfig files:
2	FreeBSD installs pkgconfig files to $LOCALBASE/libdata/pkgconfig	5	FreeBSD installs pkgconfig files to $LOCALBASE/libdata/pkgconfig
3	qmake uses QMAKE_PKGCONFIG_DESTDIR as relative path to $$QT_LIBDIR.	6	qmake uses QMAKE_PKGCONFIG_DESTDIR as relative path to $$QT_LIBDIR.
4	As this is now '${PREFIX}/lib/qt5' we need to go up two levels.	7	As this is now '${PREFIX}/lib/qt5' we need to go up two levels.
5		8
6	The second hunk stops qmake from generating la files.	9	The third hunk stops qmake from generating la files.
7		10
8	--- mkspecs/features/qt_module.prf.orig 2016-09-16 05:49:42 UTC	11	--- mkspecs/features/qt_module.prf.orig 2018-12-03 11:15:26 UTC
9	+++ mkspecs/features/qt_module.prf	12	+++ mkspecs/features/qt_module.prf
10	@@ -247,7 +247,7 @@ load(qt_targets)	13	@@ -217,17 +217,18 @@ android: CONFIG += qt_android_deps no_linker_version_s
		14	internal_module {
		15	verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API { *; };"
		16	} else {
		17	- verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \
		18	- " qt_private_api_tag*;"
		19	+ current = Qt_$$QT_MAJOR_VERSION
		20	+ verscript_content = "$$current { *; };"
		21
		22	+ verscript_content += "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \
		23	+ " qt_private_api_tag*;"
		24	+
		25	private_api_headers = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.QPA_HEADER_FILES
		26
		27	for(header, private_api_headers): \
		28	verscript_content += " @FILE:$$header@"
		29	verscript_content += "};"
		30
		31	- current = Qt_$$QT_MAJOR_VERSION
		32	- verscript_content += "$$current { *; };"
		33	isEmpty(QT_NAMESPACE): tag_symbol = qt_version_tag
		34	else: tag_symbol = qt_version_tag_$$QT_NAMESPACE
		35
		36	@@ -266,7 +267,7 @@ load(qt_targets)
11	# this builds on top of qt_common	37	# this builds on top of qt_common
12	!internal_module:!lib_bundle:if(unix\|mingw) {	38	!internal_module:if(unix\|mingw) {
13	CONFIG += create_pc	39	CONFIG += create_pc
14	- QMAKE_PKGCONFIG_DESTDIR = pkgconfig	40	- QMAKE_PKGCONFIG_DESTDIR = pkgconfig
15	+ QMAKE_PKGCONFIG_DESTDIR = ../../libdata/pkgconfig	41	+ QMAKE_PKGCONFIG_DESTDIR = ../../libdata/pkgconfig
16	host_build: \	42	host_build: \
17	QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS]	43	QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS]
18	else: \	44	else: \
19	@@ -267,7 +267,6 @@ load(qt_targets)	45	@@ -291,7 +292,6 @@ load(qt_targets)
20	QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace	46	QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace
21	}	47	}
22	!lib_bundle:unix {	48	!lib_bundle:unix {

Lines 1-50 Link Here

(-)www/qt5-webengine/files/patch-src_core_api_qtbug-61521.cpp (-50 lines)
1	malloc.h does not exist on FreeBSD, and neither do memalign(3) and pvalloc(3).
2	--- src/core/api/qtbug-61521.cpp
3	+++ src/core/api/qtbug-61521.cpp
4	@@ -38,7 +38,7 @@
5	****************************************************************************/
6
7	#include <stdlib.h>
8	-#include <malloc.h>
9	+#include <unistd.h>
10
11	#define SHIM_ALIAS_SYMBOL(fn) __attribute__((weak, alias(#fn)))
12	#define SHIM_SYMBOL_VERSION(fn) __asm__(".symver __" #fn "," #fn "@Qt_5")
13	@@ -66,18 +66,10 @@ SHIM_SYMBOL_VERSION(cfree);
14	void __cfree(void* ptr)
15	SHIM_ALIAS_SYMBOL(ShimCFree);
16
17	-SHIM_SYMBOL_VERSION(memalign);
18	-void* __memalign(size_t align, size_t s)
19	- SHIM_ALIAS_SYMBOL(ShimMemalign);
20	-
21	SHIM_SYMBOL_VERSION(valloc);
22	void* __valloc(size_t size)
23	SHIM_ALIAS_SYMBOL(ShimValloc);
24
25	-SHIM_SYMBOL_VERSION(pvalloc);
26	-void* __pvalloc(size_t size)
27	- SHIM_ALIAS_SYMBOL(ShimPvalloc);
28	-
29	SHIM_SYMBOL_VERSION(posix_memalign);
30	int __posix_memalign(void** r, size_t a, size_t s)
31	SHIM_ALIAS_SYMBOL(ShimPosixMemalign);
32	@@ -102,18 +94,10 @@ SHIM_HIDDEN void ShimCFree(void* ptr) {
33	free(ptr);
34	}
35
36	-SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) {
37	- return memalign(align,s);
38	-}
39	-
40	SHIM_HIDDEN void* ShimValloc(size_t size) {
41	return valloc(size);
42	}
43
44	-SHIM_HIDDEN void* ShimPvalloc(size_t size) {
45	- return pvalloc(size);
46	-}
47	-
48	SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) {
49	return posix_memalign(r,a,s);
50	}