haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

extra_cmake_modules, bump version to 6.16.0 (#12571)

Browse Source
This commit is contained in:
Schrijvers Luc
2025-07-12 08:12:14 +02:00
committed by GitHub
parent 50227c60c9
commit 0f814163e8
2 changed files with 71 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
kde-frameworks/extra-cmake-modules/extra_cmake_modules-6.13.0.recipe → kde-frameworks/extra-cmake-modules/extra_cmake_modules-6.16.0.recipe
View File

@@ -5,11 +5,11 @@ common software, ones that can be used directly in CMakeLists.txt files to \
perform common tasks and toolchain files that must be specified on the \
commandline by the user."
HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
COPYRIGHT="2010-2024 KDE Organisation"
COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="BSD (2-clause)"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/extra-cmake-modules-$portVersion.tar.xz"
CHECKSUM_SHA256="7006017c00c817ff4c056995146d271791d1487a398d39ea6cac1cd59a8bf402"
CHECKSUM_SHA256="e881c19e335beb82326e02d000766e7ee8324d7ce8583df0f5bfd4c26998fbfe"
SOURCE_DIR="extra-cmake-modules-$portVersion"
PATCHES="extra_cmake_modules-$portVersion.patchset"
@@ -25,6 +25,9 @@ if [ "$targetArchitecture" = "x86_gcc2" ]; then
"
fi
pythonVersion="3.10"
pythonPackage=python${pythonVersion//.}
ARCHITECTURES_doc="any"
PROVIDES_doc="
extra_cmake_modules_doc = $portVersion
@@ -47,23 +50,27 @@ BUILD_PREREQUIRES="
cmd:msgfmt$secondaryArchSuffix
cmd:msgmerge$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
cmd:python3
sphinx_python310
cmd:python$pythonVersion
sphinx_$pythonPackage
"
BUILD()
{
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
-DSHARE_INSTALL_DIR=$dataDir/cmake/Modules \
-DDOC_INSTALL_DIR=$docDir \
-DDOC_INSTALL_DIR=$documentationDir/packages/qt6_base \
-DMAN_INSTALL_DIR=$manDir \
-DBUILD_TESTING=OFF
make -Cbuild $jobArgs
-DBUILD_TESTING=OFF \
-Wno-dev
make -C build $jobArgs
}
INSTALL()
{
make -Cbuild install
make -C build install
mv $documentationDir/packages/qt6_base/html $docDir
packageEntries doc \
$documentationDir

58
kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-6.13.0.patchset → kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-6.16.0.patchset
View File

@@ -1,4 +1,4 @@
From 5894427093d71f6298ddc4df8478ffb2e0b4bdce Mon Sep 17 00:00:00 2001
From 7d5a7af49e38ea5cd1ca4f74b704a270f2bbaf24 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Mon, 16 Dec 2019 16:01:30 +0300
Subject: don't default to using debug build type on Haiku...
@@ -22,7 +22,7 @@ index ad96879..624f457 100644
2.48.1
From 985400e08548bd5456d31b85750cf3377b86da20 Mon Sep 17 00:00:00 2001
From 29e6fe10e09ff1310275368f58f44534888ba7f7 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 8 May 2022 21:16:49 +1000
Subject: Add Haiku platform check
@@ -47,7 +47,7 @@ index 7e354dd..357f4b6 100644
2.48.1
From c098504fbf380b35409c3b5e7816a6faf6c0c0ed Mon Sep 17 00:00:00 2001
From 662c18b57ff63879fc1a2c430bf0e526c99495d8 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 28 Feb 2024 11:48:23 +0100
Subject: demote_unsupported_platform_error_to_a_warning
@@ -69,3 +69,55 @@ index 357f4b6..45152c8 100644
--
2.48.1
From 79dad224585107aa44356f82adb24a77f38b9e25 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Tue, 20 May 2025 16:21:06 +0200
Subject: Fix hardcoded paths, we don't use /usr/*
diff --git a/kde-modules/prefix.sh.cmake b/kde-modules/prefix.sh.cmake
index 43b41e9..7658826 100644
--- a/kde-modules/prefix.sh.cmake
+++ b/kde-modules/prefix.sh.cmake
@@ -3,14 +3,14 @@ export PATH=@KDE_INSTALL_FULL_BINDIR@:$PATH
# LD_LIBRARY_PATH only needed if you are building without rpath
# export LD_LIBRARY_PATH=@KDE_INSTALL_FULL_LIBDIR@:$LD_LIBRARY_PATH
-export XDG_DATA_DIRS=@KDE_INSTALL_FULL_DATADIR@:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}
-export XDG_CONFIG_DIRS=@KDE_INSTALL_FULL_CONFDIR@:${XDG_CONFIG_DIRS:-/etc/xdg}
+export XDG_DATA_DIRS=@KDE_INSTALL_FULL_DATADIR@:${XDG_DATA_DIRS:-/boot/system/non-packaged/data:/boot/system/data}
+export XDG_CONFIG_DIRS=@KDE_INSTALL_FULL_CONFDIR@:${XDG_CONFIG_DIRS:-/boot/system/settings/xdg}
export QT_PLUGIN_PATH=@KDE_INSTALL_FULL_QTPLUGINDIR@:$QT_PLUGIN_PATH
export QML2_IMPORT_PATH=@KDE_INSTALL_FULL_QMLDIR@:$QML2_IMPORT_PATH
export QT_QUICK_CONTROLS_STYLE_PATH=@KDE_INSTALL_FULL_QMLDIR@/QtQuick/Controls.2/:$QT_QUICK_CONTROLS_STYLE_PATH
-export MANPATH=@KDE_INSTALL_FULL_DATADIR@/man:${MANPATH:-/usr/local/share/man:/usr/share/man}
+export MANPATH=@KDE_INSTALL_FULL_DATADIR@/man:${MANPATH:-/boot/home/config/non-packaged/documentation/man:/boot/system/documentation/man}
-export SASL_PATH=@KDE_INSTALL_FULL_LIBDIR@/sasl2:${SASL_PATH:-/usr/@CMAKE_INSTALL_LIBDIR@/sasl2}
+export SASL_PATH=@KDE_INSTALL_FULL_LIBDIR@/sasl2:${SASL_PATH:-${CMAKE_INSTALL_LIBDIR}/sasl2}
diff --git a/kde-modules/prefix.sh.fish.cmake b/kde-modules/prefix.sh.fish.cmake
index d59c1b8..e6aa25f 100644
--- a/kde-modules/prefix.sh.fish.cmake
+++ b/kde-modules/prefix.sh.fish.cmake
@@ -7,12 +7,12 @@ set PATH "@KDE_INSTALL_FULL_BINDIR@:$PATH"
# set -x LD_LIBRARY_PATH "@KDE_INSTALL_FULL_LIBDIR@:$LD_LIBRARY_PATH"
if test -z "$XDG_DATA_DIRS"
- set -x --path XDG_DATA_DIRS /usr/local/share/ /usr/share/
+ set -x --path XDG_DATA_DIRS /boot/system/non-packaged/data:/boot/system/data
end
set -x --path XDG_DATA_DIRS "@KDE_INSTALL_FULL_DATADIR@" $XDG_DATA_DIRS
if test -z "$XDG_CONFIG_DIRS"
- set -x --path XDG_CONFIG_DIRS /etc/xdg
+ set -x --path XDG_CONFIG_DIRS /boot/system/settings/xdg
end
set -x --path XDG_CONFIG_DIRS "@KDE_INSTALL_FULL_CONFDIR@" $XDG_CONFIG_DIRS
--
2.48.1