wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-30 17:33:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

extra-cmake-modules: update to 6.0.0.

Browse source
This commit is contained in:
Đoàn Trần Công Danh 2024-02-29 11:47:41 +07:00
parent feef21a4cc
commit 30c426f1d1
4 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
srcpkgs/extra-cmake-modules/patches/cross.patch
View file

@ -1,6 +1,6 @@
--- a/modules/ECMQueryQt.cmake 2023-11-08 15:40:41.000000000 +0100 --- a/modules/ECMQueryQt.cmake
+++ - 2023-11-10 11:16:37.362553722 +0100 +++ b/modules/ECMQueryQt.cmake
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@ if (QT_MAJOR_VERSION STREQUAL "5")
endif() endif()
elseif(QT_MAJOR_VERSION STREQUAL "6") elseif(QT_MAJOR_VERSION STREQUAL "6")
# QUIET to accommodate the TRY option # QUIET to accommodate the TRY option

18
srcpkgs/extra-cmake-modules/patches/libexecdir.patch
View file

@ -1,7 +1,5 @@
Index: extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs5.cmake --- a/kde-modules/KDEInstallDirs5.cmake
=================================================================== +++ b/kde-modules/KDEInstallDirs5.cmake
--- extra-cmake-modules-5.100.0.orig/kde-modules/KDEInstallDirs5.cmake
+++ extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs5.cmake
@@ -43,7 +43,7 @@ deprecated variable name in square brack @@ -43,7 +43,7 @@ deprecated variable name in square brack
``EXECROOTDIR/lib/<multiarch-tuple`` on Debian) [``LIB_INSTALL_DIR``] ``EXECROOTDIR/lib/<multiarch-tuple`` on Debian) [``LIB_INSTALL_DIR``]
``LIBEXECDIR`` ``LIBEXECDIR``
@ -11,10 +9,8 @@ Index: extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs5.cmake
``CMAKEPACKAGEDIR`` ``CMAKEPACKAGEDIR``
CMake packages, including config files (``LIBDIR/cmake``) CMake packages, including config files (``LIBDIR/cmake``)
[``CMAKECONFIG_INSTALL_PREFIX``] [``CMAKECONFIG_INSTALL_PREFIX``]
Index: extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs6.cmake --- a/kde-modules/KDEInstallDirs6.cmake
=================================================================== +++ b/kde-modules/KDEInstallDirs6.cmake
--- extra-cmake-modules-5.100.0.orig/kde-modules/KDEInstallDirs6.cmake
+++ extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs6.cmake
@@ -46,7 +46,7 @@ where ``<dir>`` is one of (default value @@ -46,7 +46,7 @@ where ``<dir>`` is one of (default value
``EXECROOTDIR/lib/<multiarch-tuple`` on Debian) ``EXECROOTDIR/lib/<multiarch-tuple`` on Debian)
``LIBEXECDIR`` ``LIBEXECDIR``
@ -24,10 +20,8 @@ Index: extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs6.cmake
``CMAKEPACKAGEDIR`` ``CMAKEPACKAGEDIR``
CMake packages, including config files (``LIBDIR/cmake``) CMake packages, including config files (``LIBDIR/cmake``)
``QTPLUGINDIR`` ``QTPLUGINDIR``
Index: extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirsCommon.cmake --- a/kde-modules/KDEInstallDirsCommon.cmake
=================================================================== +++ b/kde-modules/KDEInstallDirsCommon.cmake
--- extra-cmake-modules-5.100.0.orig/kde-modules/KDEInstallDirsCommon.cmake
+++ extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirsCommon.cmake
@@ -248,7 +248,7 @@ if(WIN32) @@ -248,7 +248,7 @@ if(WIN32)
"executables for internal use by programs and libraries" "executables for internal use by programs and libraries"
LIBEXEC_INSTALL_DIR) LIBEXEC_INSTALL_DIR)

10
srcpkgs/extra-cmake-modules/patches/musl.patch
View file

@ -13,19 +13,15 @@ Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com>
kde-modules/KDECompilerSettings.cmake | 3 +++ kde-modules/KDECompilerSettings.cmake | 3 +++
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake
index dfa29f7..f50911c 100644
--- a/kde-modules/KDECompilerSettings.cmake --- a/kde-modules/KDECompilerSettings.cmake
+++ b/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake
@@ -140,6 +140,9 @@ if (UNIX) @@ -316,6 +316,9 @@ if (UNIX)
# implementation recognize it? # implementation recognize it?
_kde_add_platform_definitions(-D_LARGEFILE64_SOURCE) _kde_add_platform_definitions(-D_LARGEFILE64_SOURCE)
+ # Non-glibc platforms need this since we specify -std=iso9899:1990 + # Non-glibc platforms need this since we specify -std=iso9899:1990
+ _kde_add_platform_definitions(-D_XOPEN_SOURCE=600) + _kde_add_platform_definitions(-D_XOPEN_SOURCE=600)
+ +
include(CheckCXXSourceCompiles) include(CheckCXXSourceCompiles)
# By default (in glibc, at least), on 32bit platforms off_t is 32 bits, # By default (in glibc, at least), on 32bit platforms off_t is 32 bits,
--
2.10.0

8
srcpkgs/extra-cmake-modules/template
View file

@ -1,6 +1,6 @@
# Template file for 'extra-cmake-modules' # Template file for 'extra-cmake-modules'
pkgname=extra-cmake-modules pkgname=extra-cmake-modules
version=5.115.0 version=6.0.0
revision=1 revision=1
build_style=cmake build_style=cmake
configure_args="-DBUILD_HTML_DOCS=ON" configure_args="-DBUILD_HTML_DOCS=ON"
@ -12,13 +12,13 @@ maintainer="John <me@johnnynator.dev>"
license="BSD-3-Clause" license="BSD-3-Clause"
homepage="https://invent.kde.org/frameworks/extra-cmake-modules" homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=ee3e35f6a257526b8995a086dd190528a8ef4b3854b1e457b8122701b0ce45ee checksum=23992bf19db717156b7d6dd13118caa79fd57f090beb062e8308db3c09f70d0c
python_version=3 python_version=3
do_check() { do_check() {
cd build cd build
# expects to be in frameworks/extra-cmake-modules instead of extra-cmake-modules # expects to be in frameworks/extra-cmake-modules
ctest -E 'KDEFetchTranslations' ctest ${makejobs} -E 'KDEFetchTranslations'
} }
post_install() { post_install() {