Attachment 201141 Details for Bug 234070 – qt5-version.2.patch

[patch] qt5-version.2.patch

qt5-version.2.patch (text/plain), 5.74 KB, created by Tijl Coosemans on 2019-01-14 21:56:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2019-01-14 21:56:30 UTC

Size: 5.74 KB

patch

obsolete

>Index: devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf
>===================================================================
>--- devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf	(revision 489951)
>+++ devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf	(working copy)
>@@ -1,22 +1,48 @@
>-The first hunk fixes the install location of the pkconfig files:
>+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 second hunk stops qmake from generating la files.
>+The third hunk stops qmake from generating la files.
> 
>---- mkspecs/features/qt_module.prf.orig	2016-09-16 05:49:42 UTC
>+--- mkspecs/features/qt_module.prf.orig	2018-12-03 11:15:26 UTC
> +++ mkspecs/features/qt_module.prf
>-@@ -247,7 +247,7 @@ load(qt_targets)
>+@@ -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:!lib_bundle:if(unix|mingw) {
>+ !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: \
>-@@ -267,7 +267,6 @@ load(qt_targets)
>+@@ -291,7 +292,6 @@ load(qt_targets)
>      QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace
>  }
>  !lib_bundle:unix {
>Index: www/qt5-webengine/files/patch-src_core_api_core_api.pro
>===================================================================
>--- www/qt5-webengine/files/patch-src_core_api_core_api.pro	(nonexistent)
>+++ www/qt5-webengine/files/patch-src_core_api_core_api.pro	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/core/api/core_api.pro.orig	2018-04-10 14:50:39 UTC
>++++ src/core/api/core_api.pro
>+@@ -53,7 +53,7 @@ SOURCES = \
>+     qwebengineurlschemehandler.cpp
>+ 
>+ ### Qt6 Remove this workaround
>+-unix:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!static {
>++linux:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!static {
>+     SOURCES += qtbug-60565.cpp \
>+                qtbug-61521.cpp
>+ }
>
>Property changes on: www/qt5-webengine/files/patch-src_core_api_core_api.pro
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/qt5-webengine/files/patch-src_core_api_qtbug-61521.cpp
>===================================================================
>--- www/qt5-webengine/files/patch-src_core_api_qtbug-61521.cpp	(revision 489951)
>+++ www/qt5-webengine/files/patch-src_core_api_qtbug-61521.cpp	(nonexistent)
>@@ -1,50 +0,0 @@
>-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);
>- }
>
>Property changes on: www/qt5-webengine/files/patch-src_core_api_qtbug-61521.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 234070: 200601 | 201141