Skip to content

Commit

Permalink
KF6 frameworks, bump to 6.9.0 Part3 (#11454)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Begasus
Begasus authored Dec 16, 2024
1 parent bc79bc5 commit 118246d
Show file tree
Hide file tree
Showing 16 changed files with 293 additions and 618 deletions.
14 changes: 7 additions & 7 deletions kde-frameworks/kauth/kauth6-6.7.0.recipe → kde-frameworks/kauth/kauth6-6.9.0.recipe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kauth-${portVersion}.tar.xz"
CHECKSUM_SHA256="173654eee2891acd41538d31ace8b9d7ae60863bc7faef1cacec7e21c7eb1223"
CHECKSUM_SHA256="84cf15729bd248aa9d78c1bfecf68161782d521ac14a9b6a5bdacc29cbe3dec6"
SOURCE_DIR="kauth-$portVersion"

ARCHITECTURES="all !x86_gcc2"
Expand Down Expand Up @@ -39,9 +39,9 @@ REQUIRES_devel="

BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix >= $portVersion
extra_cmake_modules$secondaryArchSuffix
qt6_tools${secondaryArchSuffix}_devel
devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion
devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion
devel:libQt6Core$secondaryArchSuffix
"
BUILD_PREREQUIRES="
Expand All @@ -57,19 +57,19 @@ TEST_REQUIRES="
lib:libdbus_1$secondaryArchSuffix
"

defineDebugInfoPackage kauth6$secondaryArchSuffix \
$libDir/libKF6AuthCore.so.$libVersion
#defineDebugInfoPackage kauth6$secondaryArchSuffix \
# $libDir/libKF6AuthCore.so.$libVersion

BUILD()
{
cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DCMAKE_SKIP_RPATH=YES \
-DBUILD_QCH=ON \
-DBUILD_TESTING=OFF \
-Wno-dev
Expand Down
40 changes: 12 additions & 28 deletions ...works/kbookmarks/kbookmarks6-6.7.0.recipe → ...works/kbookmarks/kbookmarks6-6.9.0.recipe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kbookmarks-${portVersion}.tar.xz"
CHECKSUM_SHA256="bd41a39df76515ee34e7df07b2600e1e5b67b1812cc959ec51585f2ebcc56573"
CHECKSUM_SHA256="932234bedbf5a5887f23c610010c8c70b36b5dce4f4c4c5d76f47a92ce8e577a"
SOURCE_DIR="kbookmarks-$portVersion"

ARCHITECTURES="all !x86_gcc2"
Expand All @@ -26,19 +26,11 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libKF6Codecs$secondaryArchSuffix
lib:libKF6ColorScheme$secondaryArchSuffix
lib:libKF6ConfigCore$secondaryArchSuffix
lib:libKF6ConfigGui$secondaryArchSuffix
lib:libKF6ConfigWidgets$secondaryArchSuffix
lib:libKF6CoreAddons$secondaryArchSuffix
lib:libKF6IconThemes$secondaryArchSuffix
lib:libKF6WidgetsAddons$secondaryArchSuffix
lib:libQt6Core$secondaryArchSuffix
lib:libQt6DBus$secondaryArchSuffix
lib:libQt6Gui$secondaryArchSuffix
lib:libQt6Widgets$secondaryArchSuffix
lib:libQt6Xml$secondaryArchSuffix
lib:libQt6Qml$secondaryArchSuffix
"

PROVIDES_devel="
Expand All @@ -48,26 +40,18 @@ PROVIDES_devel="
"
REQUIRES_devel="
kbookmarks6$secondaryArchSuffix == $portVersion base
devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion
"

BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix >= $portVersion
extra_cmake_modules$secondaryArchSuffix
qt6_tools${secondaryArchSuffix}_devel
devel:libKF6Codecs$secondaryArchSuffix == $portVersion
devel:libKF6ColorScheme$secondaryArchSuffix == $portVersion
devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion
devel:libKF6ConfigGui$secondaryArchSuffix == $portVersion
devel:libKF6ConfigWidgets$secondaryArchSuffix == $portVersion
devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion
devel:libKF6IconThemes$secondaryArchSuffix == $portVersion
devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion
devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion
devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion
devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion
devel:libQt6Core$secondaryArchSuffix
devel:libQt6DBus$secondaryArchSuffix
devel:libQt6Gui$secondaryArchSuffix
devel:libQt6Qml$secondaryArchSuffix
devel:libQt6Widgets$secondaryArchSuffix
devel:libQt6Xml$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
Expand All @@ -82,20 +66,20 @@ TEST_REQUIRES="
qthaikuplugins
"

defineDebugInfoPackage kbookmarks6$secondaryArchSuffix \
$libDir/libKF6Bookmarks.so.$libVersion \
$libDir/libKF6BookmarksWidgets.so.$libVersion
#defineDebugInfoPackage kbookmarks6$secondaryArchSuffix \
# $libDir/libKF6Bookmarks.so.$libVersion \
# $libDir/libKF6BookmarksWidgets.so.$libVersion

BUILD()
{
cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DCMAKE_SKIP_RPATH=YES \
-DBUILD_QCH=ON \
-DBUILD_TESTING=OFF \
-Wno-dev
Expand Down
32 changes: 22 additions & 10 deletions kde-frameworks/kded/kded6-6.7.0.recipe → kde-frameworks/kded/kded6-6.9.0.recipe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@ COPYRIGHT="2010-2024 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kded-${portVersion}.tar.xz"
CHECKSUM_SHA256="22aa1b6543b40e094346138516131c0f7eb78a70e87296938457fd1386680a2f"
CHECKSUM_SHA256="39d74343db901b8419244738ef4c6d9e8b1a3331278d55f57811b016adb02a9f"
SOURCE_DIR="kded-$portVersion"

ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"

libVersion="$portVersion"

PROVIDES="
kded6$secondaryArchSuffix = $portVersion
cmd:kded6$secondaryArchSuffix = $portVersion
Expand Down Expand Up @@ -58,26 +60,29 @@ REQUIRES_devel="

BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix >= $portVersion
devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion
devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion
devel:libKF6Crash$secondaryArchSuffix == $portVersion
devel:libKF6DBusAddons$secondaryArchSuffix == $portVersion
devel:libKF6Service$secondaryArchSuffix == $portVersion
extra_cmake_modules$secondaryArchSuffix
qt6_tools${secondaryArchSuffix}_devel
devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion
devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion
devel:libKF6Crash$secondaryArchSuffix == $libVersion
devel:libKF6DBusAddons$secondaryArchSuffix == $libVersion
devel:libKF6Service$secondaryArchSuffix == $libVersion
devel:libQt6Core$secondaryArchSuffix
devel:libQt6Qml$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:dot
cmd:doxygen
cmd:g++$secondaryArchSuffix
cmd:make
cmd:msgfmt$secondaryArchSuffix
cmd:msgmerge$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
"

defineDebugInfoPackage kded6$secondaryArchSuffix \
$binDir/kded6
#defineDebugInfoPackage kded6$secondaryArchSuffix \
# $binDir/kded6

BUILD()
{
Expand All @@ -87,8 +92,8 @@ BUILD()
-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DCMAKE_SKIP_RPATH=YES \
-DBUILD_QCH=ON \
-DBUILD_TESTING=OFF \
-Wno-dev
Expand All @@ -105,3 +110,10 @@ INSTALL()
packageEntries devel \
$libDir/cmake
}

TEST()
{
# no test cases
export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
ctest --test-dir build --output-on-failure
}
38 changes: 8 additions & 30 deletions ...s/kglobalaccel/kglobalaccel6-6.7.0.recipe → ...s/kglobalaccel/kglobalaccel6-6.9.0.recipe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kglobalaccel-${portVersion}.tar.xz"
CHECKSUM_SHA256="2a35b9e06c6601d602b3a45e278c49e11e4627939cfacffb1fdee0826a6f6e0b"
CHECKSUM_SHA256="061a506f5ccefe62c5d92a6ed109b4f01e14a4c8bd5d42b622c8c8447f75e1fd"
SOURCE_DIR="kglobalaccel-$portVersion"

ARCHITECTURES="all !x86_gcc2"
Expand All @@ -18,26 +18,16 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}"

PROVIDES="
kglobalaccel6$secondaryArchSuffix = $portVersion
cmd:kglobalaccel6$secondaryArchSuffix = $portVersion
lib:libKF6GlobalAccel$secondaryArchSuffix = $libVersionCompat
lib:libKF6GlobalAccelPrivate$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libKF6ConfigCore$secondaryArchSuffix
lib:libKF6CoreAddons$secondaryArchSuffix
lib:libKF6Crash$secondaryArchSuffix
lib:libKF6DBusAddons$secondaryArchSuffix
lib:libKF6I18n$secondaryArchSuffix
lib:libKF6Service$secondaryArchSuffix
lib:libKF6WindowSystem$secondaryArchSuffix
lib:libQt6Concurrent$secondaryArchSuffix
lib:libQt6Core$secondaryArchSuffix
lib:libQt6DBus$secondaryArchSuffix
lib:libQt6Test$secondaryArchSuffix
lib:libQt6Gui$secondaryArchSuffix
lib:libQt6Widgets$secondaryArchSuffix
lib:libQt6Xml$secondaryArchSuffix
"

PROVIDES_devel="
Expand All @@ -50,22 +40,9 @@ REQUIRES_devel="

BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix >= $portVersion
extra_cmake_modules$secondaryArchSuffix
qt6_tools${secondaryArchSuffix}_devel
devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion
devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion
devel:libKF6Crash$secondaryArchSuffix == $portVersion
devel:libKF6DBusAddons$secondaryArchSuffix == $portVersion
devel:libKF6I18n$secondaryArchSuffix == $portVersion
devel:libKF6Service$secondaryArchSuffix == $portVersion
devel:libKF6WindowSystem$secondaryArchSuffix == $portVersion
devel:libQt6Concurrent$secondaryArchSuffix
devel:libQt6Core$secondaryArchSuffix
devel:libQt6DBus$secondaryArchSuffix
devel:libQt6Qml$secondaryArchSuffix
devel:libQt6Test$secondaryArchSuffix
devel:libQt6Widgets$secondaryArchSuffix
devel:libQt6Xml$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
Expand All @@ -80,21 +57,22 @@ TEST_REQUIRES="
qthaikuplugins$secondaryArchSuffix
"

defineDebugInfoPackage kglobalaccel6$secondaryArchSuffix \
$libDir/libKF6GlobalAccel.so.$libVersion
#defineDebugInfoPackage kglobalaccel6$secondaryArchSuffix \
# $libDir/libKF6GlobalAccel.so.$libVersion

BUILD()
{
cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DCMAKE_SKIP_RPATH=YES \
-DBUILD_QCH=ON \
-DBUILD_TESTING=OFF \
-DWITH_X11=OFF \
-Wno-dev
make -C build $jobArgs
}
Expand Down
Loading

0 comments on commit 118246d

Please sign in to comment.