From 6fdb91eb95eb9daea428fbe9cc3ea9161fe3696f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 5 Dec 2020 12:06:39 +0700 Subject: [PATCH 1/3] jsoncpp: build with meson - Upstream recommends meson - cmake will depends on jsoncpp-devel --- srcpkgs/jsoncpp/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/jsoncpp/template b/srcpkgs/jsoncpp/template index b3151788310..2143dee6e7c 100644 --- a/srcpkgs/jsoncpp/template +++ b/srcpkgs/jsoncpp/template @@ -1,10 +1,9 @@ -# Template build file for 'jsoncpp'. +# Template file for 'jsoncpp' pkgname=jsoncpp version=1.9.4 -revision=1 -build_style=cmake -configure_args="-DBUILD_STATIC_LIBS=1 -DBUILD_SHARED_LIBS=1 -DJSONCPP_WITH_TESTS=0" -short_desc="A JSON implementation in C++" +revision=2 +build_style=meson +short_desc="JSON implementation in C++" maintainer="Orphaned " license="Public Domain, MIT" homepage="https://github.com/open-source-parsers/jsoncpp" @@ -23,7 +22,6 @@ jsoncpp-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/*.a vmove usr/lib/*.so } } From 666c6916011117f780c0590da68f1781f600b2a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 5 Dec 2020 12:15:44 +0700 Subject: [PATCH 2/3] cmake: update to 3.19.1 - build with system jsoncpp, too --- srcpkgs/cmake/patches/musl-test.patch | 15 +++++++++++++++ srcpkgs/cmake/template | 21 +++++++++------------ 2 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 srcpkgs/cmake/patches/musl-test.patch diff --git a/srcpkgs/cmake/patches/musl-test.patch b/srcpkgs/cmake/patches/musl-test.patch new file mode 100644 index 00000000000..4da8c2f9cfc --- /dev/null +++ b/srcpkgs/cmake/patches/musl-test.patch @@ -0,0 +1,15 @@ +--- Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake.orig 2020-12-05 13:27:21.098078774 +0700 ++++ Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake 2020-12-05 13:29:19.931553018 +0700 +@@ -33,9 +33,9 @@ + [[librunpath_parent_unresolved\.so]] + [[librunpath_unresolved\.so]] + ) +-check_contents(deps/udeps1.txt "^${_check}$") +-check_contents(deps/udeps2.txt "^${_check}$") +-check_contents(deps/udeps3.txt "^${_check}$") ++check_contents(deps/udeps1.txt "^(libc.so;)?${_check}$") ++check_contents(deps/udeps2.txt "^(libc.so;)?${_check}$") ++check_contents(deps/udeps3.txt "^(libc.so;)?${_check}$") + set(_check + "^libconflict\\.so:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict/libconflict\\.so;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict2/libconflict\\.so\n$" + ) diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index 24dc0785af9..75fecef23af 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,26 +1,21 @@ # Template file for 'cmake' pkgname=cmake -version=3.19.0 +version=3.19.1 revision=1 build_style=cmake -configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake - -DCMAKE_BUILD_TYPE=None - -DCMAKE_USE_SYSTEM_LIBARCHIVE=1 - -DCMAKE_USE_SYSTEM_CURL=1 -DCMAKE_USE_SYSTEM_ZLIB=1 - -DCMAKE_USE_SYSTEM_EXPAT=1 -DCMAKE_USE_SYSTEM_BZIP2=1 - -DCMAKE_USE_SYSTEM_LIBUV=1 -DCMAKE_USE_SYSTEM_LIBRHASH=1 - -DCMAKE_USE_SYSTEM_LIBLZMA=1 -DKWSYS_LFS_WORKS=1" +configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None + -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1" make_check_target=test hostmakedepends="cmake-bootstrap gcc-fortran" makedepends="expat-devel libarchive-devel libcurl-devel libuv-devel - ncurses-devel rhash-devel" + ncurses-devel rhash-devel jsoncpp-devel" checkdepends="pax pkg-config" short_desc="Cross-platform, open-source build system" maintainer="Nathan Owens " -license="LGPL-2.1-or-later, BSD-3-Clause" +license="BSD-3-Clause, ICU" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz" -checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493 +checksum=1d266ea3a76ef650cdcf16c782a317cb4a7aa461617ee941e389cb48738a3aba pre_check() { # use ctest of this build instead of requirig cmake to test cmake... @@ -31,7 +26,9 @@ pre_check() { post_install() { rm -rf ${DESTDIR}/usr/share/doc/cmake + sed -n -e '/Copyright/,/authorization[.]/p' \ + Source/CursesDialog/form/fld_arg.c >fld.LICENSE + vlicense fld.LICENSE vlicense Copyright.txt vlicense Utilities/KWIML/Copyright.txt KWIML-Copyright.txt - vlicense Utilities/cmzlib/Copyright.txt cmzlib-Copyright.txt } From 0a6e63768577276fe3a7151cbe74aa065bcbc30b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 5 Dec 2020 12:15:25 +0700 Subject: [PATCH 3/3] cmake-gui: update to 3.19.1 --- srcpkgs/cmake-gui/patches/musl-test.patch | 15 ++++++++++++ srcpkgs/cmake-gui/template | 29 ++++++++--------------- 2 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 srcpkgs/cmake-gui/patches/musl-test.patch diff --git a/srcpkgs/cmake-gui/patches/musl-test.patch b/srcpkgs/cmake-gui/patches/musl-test.patch new file mode 100644 index 00000000000..4da8c2f9cfc --- /dev/null +++ b/srcpkgs/cmake-gui/patches/musl-test.patch @@ -0,0 +1,15 @@ +--- Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake.orig 2020-12-05 13:27:21.098078774 +0700 ++++ Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake 2020-12-05 13:29:19.931553018 +0700 +@@ -33,9 +33,9 @@ + [[librunpath_parent_unresolved\.so]] + [[librunpath_unresolved\.so]] + ) +-check_contents(deps/udeps1.txt "^${_check}$") +-check_contents(deps/udeps2.txt "^${_check}$") +-check_contents(deps/udeps3.txt "^${_check}$") ++check_contents(deps/udeps1.txt "^(libc.so;)?${_check}$") ++check_contents(deps/udeps2.txt "^(libc.so;)?${_check}$") ++check_contents(deps/udeps3.txt "^(libc.so;)?${_check}$") + set(_check + "^libconflict\\.so:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict/libconflict\\.so;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict2/libconflict\\.so\n$" + ) diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template index 6d4ad27031b..602467b9493 100644 --- a/srcpkgs/cmake-gui/template +++ b/srcpkgs/cmake-gui/template @@ -1,16 +1,11 @@ # Template file for 'cmake-gui' pkgname=cmake-gui -version=3.19.0 +version=3.19.1 revision=1 wrksrc="cmake-${version}" build_style=cmake -configure_args=" - -DBUILD_QtDialog=ON - -DCMAKE_USE_SYSTEM_LIBARCHIVE=ON - -DCMAKE_USE_SYSTEM_CURL=ON - -DCMAKE_USE_SYSTEM_JSONCPP=ON - -DCMAKE_USE_SYSTEM_LIBUV=ON - -DCMAKE_USE_SYSTEM_LIBRHASH=ON" +configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None + -DBUILD_QtDialog=ON -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1" hostmakedepends="qt5-devel" makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel ncurses-devel qt5-devel rhash-devel" @@ -18,26 +13,22 @@ depends="desktop-file-utils shared-mime-info" checkdepends="pax pkg-config" short_desc="Cross-platform, open-source build system - Qt GUI" maintainer="Nathan Owens " -license="LGPL-2.1-or-later, GPL-3.0-or-later, BSD-3-Clause" +license="BSD-3-Clause" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz" -checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493 +checksum=1d266ea3a76ef650cdcf16c782a317cb4a7aa461617ee941e389cb48738a3aba do_install() { # We are only interested in cmake-gui. vbin build/bin/cmake-gui for res in 32 64 128 ; do - vmkdir usr/share/icons/hicolor/${res}x${res}/apps - vcopy Source/QtDialog/CMakeSetup${res}.png usr/share/icons/hicolor/${res}x${res}/apps/CMakeSetup.png + vinstall Source/QtDialog/CMakeSetup${res}.png 0644 \ + usr/share/icons/hicolor/${res}x${res}/apps/ done - vmkdir usr/share/mime - vmkdir usr/share/applications - vcopy Source/QtDialog/cmakecache.xml usr/share/mime - vcopy Source/QtDialog/cmake-gui.desktop usr/share/applications + vinstall Source/QtDialog/cmakecache.xml 0644 usr/share/mime + vinstall Source/QtDialog/cmake-gui.desktop 0644 usr/share/applications - for i in Licenses/*.txt Copyright.txt ; do - vlicense $i - done + vlicense Copyright.txt }