diff options
author | joerg <joerg@pkgsrc.org> | 2020-05-24 23:06:46 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2020-05-24 23:06:46 +0000 |
commit | e42edd2f3f4e312a9bb8453c54472bb4371abf16 (patch) | |
tree | 51162d33b1ae35a86b642214068884f1dedf355f /converters | |
parent | 7376bef71f9ecaffde27f83bc84b0bcdb6cd842f (diff) | |
download | pkgsrc-e42edd2f3f4e312a9bb8453c54472bb4371abf16.tar.gz |
Drop check for ancient GCC versions. Allow building with modern clang.
Diffstat (limited to 'converters')
3 files changed, 37 insertions, 25 deletions
diff --git a/converters/wkhtmltopdf/distinfo b/converters/wkhtmltopdf/distinfo index 618be9c5067..551eaac7744 100644 --- a/converters/wkhtmltopdf/distinfo +++ b/converters/wkhtmltopdf/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2020/04/24 09:35:16 manu Exp $ +$NetBSD: distinfo,v 1.4 2020/05/24 23:06:46 joerg Exp $ SHA1 (wkhtmltox-0.12.4.tar.bz2) = 6a0ca9b01d5e37af3fb451bbd934afff43cf26ae RMD160 (wkhtmltox-0.12.4.tar.bz2) = 665abd76618cdfac27585e62caa52b33d09990fa @@ -10,7 +10,7 @@ SHA1 (patch-qt_config.tests_unix_libjpeg_libjpeg.pro) = 5012c36257fb1f2cef7f086e SHA1 (patch-qt_config.tests_unix_libpng_libpng.pro) = be0dead445dbbfeef9bc2a816ef5efd85aba0411 SHA1 (patch-qt_config.tests_x11_mitshm_mitshm.pro) = 5a411a67f6a99f87a9f22698a2a6e1e01b1a38e7 SHA1 (patch-qt_config.tests_x11_xrender_xrender.pro) = a1120252f1f6b289caafa3835e2f2d42be69446c -SHA1 (patch-qt_configure) = 823e039d8fc8da6d2518301413dcf8195021c3e2 +SHA1 (patch-qt_configure) = 50fca3b905a203d314bcc7fbb162fdc257d039af SHA1 (patch-qt_mkspecs_netbsd-g++_qmake.conf) = 508b1f25735d3a8f29a1da08a988f608186751bf SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_bytecompiler_BytecodeGenerator.cpp) = b8ef0623e9cd666d708295c006b5e72693ac715e SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.cpp) = 79ad51f005e68156d2e339d0d925fc79ab79f059 @@ -19,7 +19,7 @@ SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_parser_JSParser.cpp) = SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_runtime_Identifier.cpp) = a82582dd815b63cb7e6c15d3adb40cf1f216fde4 SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_runtime_JSONObject.cpp) = e49fc03256fde8a615e984921874dda9b8f2f7a4 SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_runtime_StringPrototype.cpp) = e5041f4cb61d57cc71b83be761b8b5f9402e92c9 -SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h) = 88580505164ab1b3961c70296a26f1dca4502728 +SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h) = fe13906014d059a4169c5dedb65d46819ca01130 SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_HashSet.h) = 979b874cf3d47fe9568b82f78eb1dd66b065513e SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_ThreadSafeRefCounted.h) = 674e895fb9ae64376c2d88e62596db332cbf961a SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_text_AtomicString.cpp) = 5ec061aab070a3ac4d6680ccfe2f9cfcb0fbdf9a diff --git a/converters/wkhtmltopdf/patches/patch-qt_configure b/converters/wkhtmltopdf/patches/patch-qt_configure index 34443a28b96..456a01dc5a4 100644 --- a/converters/wkhtmltopdf/patches/patch-qt_configure +++ b/converters/wkhtmltopdf/patches/patch-qt_configure @@ -1,12 +1,11 @@ -$NetBSD: patch-qt_configure,v 1.2 2020/04/24 09:35:17 manu Exp $ +$NetBSD: patch-qt_configure,v 1.3 2020/05/24 23:06:47 joerg Exp $ Fix == operator in shell script Allow building with recent GCC --- qt/configure.orig 2016-08-23 06:13:28.000000000 +0000 -+++ qt/configure 2020-04-20 09:06:51.824967933 +0000 -@@ -3570,9 +3570,9 @@ - # with the default mkspec. The 10.4u SDK does not support gcc 4.2. ++++ qt/configure +@@ -3571,7 +3573,7 @@ fi if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then # get the darwin version. 10.0.0 and up means snow leopard. VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'` @@ -15,9 +14,7 @@ Allow building with recent GCC echo echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. " echo - fi -@@ -7202,17 +7202,17 @@ - +@@ -7203,7 +7205,7 @@ fi # select Carbon on 10.4 Tiger. if [ "$PLATFORM_MAC" = "yes" ]; then VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'` @@ -26,7 +23,7 @@ Allow building with recent GCC CFG_MAC_COCOA="no"; CFG_MAC_CARBON="yes"; fi - fi +@@ -7211,7 +7213,7 @@ fi # select Carbon when using the 10.4u SDK if [ "$PLATFORM_MAC" = "yes" ] && [ -n "$CFG_SDK" ]; then @@ -35,15 +32,22 @@ Allow building with recent GCC echo "Carbon on"; CFG_MAC_COCOA="no"; CFG_MAC_CARBON="yes"; - fi -@@ -7733,9 +7733,9 @@ +@@ -7732,18 +7734,6 @@ case "$XPLATFORM" in + canBuildQtXmlPatterns="no" ;; *-g++*) - # Check gcc's version - case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in +- # Check gcc's version +- case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in - 5*|4*|3.4*) -+ 9*|8*|7*|6*|5*|4*|3.4*) - ;; - 3.3*) - canBuildWebKit="no" - ;; +- ;; +- 3.3*) +- canBuildWebKit="no" +- ;; +- *) +- canBuildWebKit="no" +- canBuildQtXmlPatterns="no" +- ;; +- esac + ;; + solaris-cc*) + # Check the compiler version diff --git a/converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h b/converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h index b5ac6e12b05..9197fd67dc4 100644 --- a/converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h +++ b/converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h @@ -1,17 +1,25 @@ -$NetBSD: patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h,v 1.1 2017/09/10 19:58:36 joerg Exp $ +$NetBSD: patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h,v 1.2 2020/05/24 23:06:47 joerg Exp $ --- qt/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h.orig 2016-08-23 06:13:30.000000000 +0000 +++ qt/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h -@@ -69,6 +69,8 @@ +@@ -60,6 +60,7 @@ + #define Atomics_h + + #include "Platform.h" ++#include <ciso646> + + #if OS(WINDOWS) + #include <windows.h> +@@ -69,6 +70,8 @@ #include <cutils/atomic.h> #elif OS(QNX) #include <atomic.h> -+#elif __cplusplus >= 201103L ++#elif __cplusplus >= 201103L || defined(_LIBCPP_VERSION) +#include <atomic> #elif COMPILER(GCC) && !OS(SYMBIAN) #if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) #include <ext/atomicity.h> -@@ -106,6 +108,11 @@ inline int atomicDecrement(int volatile* +@@ -106,6 +109,11 @@ inline int atomicDecrement(int volatile* inline int atomicIncrement(int volatile* addend) { return (int) atomic_add_value((unsigned int volatile*)addend, 1); } inline int atomicDecrement(int volatile* addend) { return (int) atomic_sub_value((unsigned int volatile*)addend, 1); } @@ -23,7 +31,7 @@ $NetBSD: patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h,v 1.1 #elif COMPILER(GCC) && !CPU(SPARC64) && !OS(SYMBIAN) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1 -@@ -114,9 +121,15 @@ inline int atomicDecrement(int volatile* +@@ -114,9 +122,15 @@ inline int atomicDecrement(int volatile* #endif |