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 }