CVS commit: pkgsrc/x11/qt5-qtwebkit

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Mar 28 23:10:44 UTC 2022

Modified Files:
        pkgsrc/x11/qt5-qtwebkit: Makefile distinfo
Added Files:
        pkgsrc/x11/qt5-qtwebkit/patches: patch-Source_cmake_OptionsCommon.cmake

Log Message:
qt5-qtwebkit: fix SunOS solib link issues


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 pkgsrc/x11/qt5-qtwebkit/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/qt5-qtwebkit/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsCommon.cmake

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

Modified files:

Index: pkgsrc/x11/qt5-qtwebkit/Makefile
diff -u pkgsrc/x11/qt5-qtwebkit/Makefile:1.94 pkgsrc/x11/qt5-qtwebkit/Makefile:1.95
--- pkgsrc/x11/qt5-qtwebkit/Makefile:1.94       Wed Dec  8 16:03:01 2021
+++ pkgsrc/x11/qt5-qtwebkit/Makefile    Mon Mar 28 23:10:44 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2021/12/08 16:03:01 adam Exp $
+# $NetBSD: Makefile,v 1.95 2022/03/28 23:10:44 tnn Exp $
 
 QTWKVERSION=   5.212.0-alpha4
 DISTNAME=      qtwebkit-${QTWKVERSION}
@@ -77,6 +77,11 @@ BUILDLINK_TRANSFORM+=        rpath:${WRKSRC}/li
 LDFLAGS+=      -Wl,--no-keep-memory
 .endif
 
+.if ${OPSYS} == "SunOS"
+CMAKE_ARGS+=   -DUSE_LINKER_VERSION_SCRIPT=OFF
+LDFLAGS+=      -lsocket -lnsl
+.endif
+
 # JavaScriptCore requires at least MIPS32.
 .if !empty(MACHINE_ARCH:Mmips64*)
 CFLAGS+=       -march=mips64

Index: pkgsrc/x11/qt5-qtwebkit/distinfo
diff -u pkgsrc/x11/qt5-qtwebkit/distinfo:1.25 pkgsrc/x11/qt5-qtwebkit/distinfo:1.26
--- pkgsrc/x11/qt5-qtwebkit/distinfo:1.25       Mon Mar 28 14:38:50 2022
+++ pkgsrc/x11/qt5-qtwebkit/distinfo    Mon Mar 28 23:10:44 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2022/03/28 14:38:50 tnn Exp $
+$NetBSD: distinfo,v 1.26 2022/03/28 23:10:44 tnn Exp $
 
 BLAKE2s (qtwebkit-5.212.0-alpha4.tar.xz) = 20858db08c7d297037d3ced34e441d4b657325c406b475e4e76dd367dc9c500c
 SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
@@ -29,4 +29,5 @@ SHA1 (patch-Source_WebCore_platform_text
 SHA1 (patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp) = 29b414e1ae18a0786f31d80143f665d6d68bcbe3
 SHA1 (patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp) = b175e1973a2019d746fda174dfc5708a3ca57d9b
 SHA1 (patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp) = d18013d0e07d7ad7e9d84cb6ef2d418d9bba4c7e
+SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 8fb8d11c4aab36e913a560ac48acce930f074635
 SHA1 (patch-Source_cmake_OptionsQt.cmake) = 35cc2b9904897cd2f1d540b473ce2905d95a0143

Added files:

Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsCommon.cmake
diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsCommon.cmake:1.1
--- /dev/null   Mon Mar 28 23:10:44 2022
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsCommon.cmake      Mon Mar 28 23:10:44 2022
@@ -0,0 +1,21 @@
+$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.1 2022/03/28 23:10:44 tnn Exp $
+
+Make ar(1) flags compatible with SunOS
+
+--- Source/cmake/OptionsCommon.cmake.orig      2020-03-04 17:16:37.000000000 +0000
++++ Source/cmake/OptionsCommon.cmake
+@@ -19,10 +19,10 @@ option(USE_THIN_ARCHIVES "Produce all st
+ if (USE_THIN_ARCHIVES)
+     execute_process(COMMAND ${CMAKE_AR} -V OUTPUT_VARIABLE AR_VERSION)
+     if ("${AR_VERSION}" MATCHES "^GNU ar")
+-        set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>")
+-        set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>")
+-        set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>")
+-        set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>")
++        set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> crs <TARGET> <LINK_FLAGS> <OBJECTS>")
++        set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> crs <TARGET> <LINK_FLAGS> <OBJECTS>")
++        set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> rs <TARGET> <LINK_FLAGS> <OBJECTS>")
++        set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> rs <TARGET> <LINK_FLAGS> <OBJECTS>")
+     endif ()
+ endif ()
+