Wed Apr 19 04:54:03 2023 UTC ()
lxqt-build-tools: restore patch lost in last update


(gutteridge)
diff -r1.26 -r1.27 pkgsrc/devel/lxqt-build-tools/Makefile
diff -r1.11 -r1.12 pkgsrc/devel/lxqt-build-tools/distinfo
diff -r0 -r1.4 pkgsrc/devel/lxqt-build-tools/patches/patch-cmake_modules_LXQtCompilerSettings.cmake
cvs diff -r1.26 -r1.27 pkgsrc/devel/lxqt-build-tools/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/lxqt-build-tools/Makefile 2023/04/18 09:33:38 1.26
+++ pkgsrc/devel/lxqt-build-tools/Makefile 2023/04/19 04:54:03 1.27
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.26 2023/04/18 09:33:38 pin Exp $ 1# $NetBSD: Makefile,v 1.27 2023/04/19 04:54:03 gutteridge Exp $
2 2
3DISTNAME= lxqt-build-tools-0.13.0 3DISTNAME= lxqt-build-tools-0.13.0
 4PKGREVISION= 1
4CATEGORIES= devel 5CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GITHUB:=lxqt/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=lxqt/}
6GITHUB_RELEASE= ${PKGVERSION_NOREV} 7GITHUB_RELEASE= ${PKGVERSION_NOREV}
7EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/lxqt/lxqt-build-tools/ 11HOMEPAGE= https://github.com/lxqt/lxqt-build-tools/
11COMMENT= LXQt build tools 12COMMENT= LXQt build tools
12LICENSE= modified-bsd 13LICENSE= modified-bsd
13 14
14USE_CMAKE= yes 15USE_CMAKE= yes
15USE_TOOLS+= pkg-config perl 16USE_TOOLS+= pkg-config perl
16USE_LANGUAGES= c c++ # Needed to satisfy cmake 17USE_LANGUAGES= c c++ # Needed to satisfy cmake
cvs diff -r1.11 -r1.12 pkgsrc/devel/lxqt-build-tools/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/lxqt-build-tools/distinfo 2023/04/18 09:33:38 1.11
+++ pkgsrc/devel/lxqt-build-tools/distinfo 2023/04/19 04:54:03 1.12
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.11 2023/04/18 09:33:38 pin Exp $ 1$NetBSD: distinfo,v 1.12 2023/04/19 04:54:03 gutteridge Exp $
2 2
3BLAKE2s (lxqt-build-tools-0.13.0.tar.xz) = 885126d731d55f59c8910a880e2f38ac84a8cc5082b33921c181a600244321c6 3BLAKE2s (lxqt-build-tools-0.13.0.tar.xz) = 885126d731d55f59c8910a880e2f38ac84a8cc5082b33921c181a600244321c6
4SHA512 (lxqt-build-tools-0.13.0.tar.xz) = ffb300159d6bbbdbe9d43d261a5028342f24057c943cf8dab5093d53b72bf5700de8f545914d454993e949d64aba77e3d01cbe68e8a4b4f6ca9f9f9693de3e0b 4SHA512 (lxqt-build-tools-0.13.0.tar.xz) = ffb300159d6bbbdbe9d43d261a5028342f24057c943cf8dab5093d53b72bf5700de8f545914d454993e949d64aba77e3d01cbe68e8a4b4f6ca9f9f9693de3e0b
5Size (lxqt-build-tools-0.13.0.tar.xz) = 25480 bytes 5Size (lxqt-build-tools-0.13.0.tar.xz) = 25480 bytes
 6SHA1 (patch-cmake_modules_LXQtCompilerSettings.cmake) = 31f7a0743c726b2f9a9a1641351d2a53d4811be3
File Added: pkgsrc/devel/lxqt-build-tools/patches/patch-cmake_modules_LXQtCompilerSettings.cmake
$NetBSD: patch-cmake_modules_LXQtCompilerSettings.cmake,v 1.4 2023/04/19 04:54:03 gutteridge Exp $

Avoid -Bsymbolic* on SunOS.

--- cmake/modules/LXQtCompilerSettings.cmake.orig	2022-04-16 00:48:16.000000000 +0000
+++ cmake/modules/LXQtCompilerSettings.cmake
@@ -164,7 +164,11 @@ if (CMAKE_COMPILER_IS_GNUCXX OR LXQT_COM
         set(NO_UNDEFINED_FLAGS "-Wl,--no-undefined")
         # -Bsymbolic-functions: replace dynamic symbols used internally in
         #                       shared libs with direct addresses.
-        set(SYMBOLIC_FLAGS "-Wl,-Bsymbolic-functions")
+        if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
+            set(SYMBOLIC_FLAGS "")
+        else()
+            set(SYMBOLIC_FLAGS "-Wl,-Bsymbolic-functions")
+        endif()
     endif()
 
     set(CMAKE_SHARED_LINKER_FLAGS