Skip to content

Commit

Permalink
KF6 frameworks, bump to 6.9.0 Part2 (#11452)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Begasus
Begasus authored Dec 16, 2024
1 parent 34e486f commit bc79bc5
Show file tree
Hide file tree
Showing 13 changed files with 101 additions and 199 deletions.
20 changes: 10 additions & 10 deletions ...rks/kcompletion/kcompletion6-6.7.0.recipe → ...rks/kcompletion/kcompletion6-6.9.0.recipe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
LICENSE="BSD (2-clause)"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kcompletion-${portVersion}.tar.xz"
CHECKSUM_SHA256="7ed5a96ab0d2ab17bb521ecaaf44d6ec6b7c9a3d6e09403360ba49b24d94560f"
CHECKSUM_SHA256="dcce4153fa13a2c7b86f5fb2641377feda587e4af478a3937fb9bc7275db891c"
SOURCE_DIR="kcompletion-$portVersion"

ARCHITECTURES="all !x86_gcc2"
Expand All @@ -32,7 +32,7 @@ REQUIRES="
haiku$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libKF6Codecs$secondaryArchSuffix
lib:libKF6ConfigGui$secondaryArchSuffix
lib:libKF6ConfigCore$secondaryArchSuffix
lib:libKF6WidgetsAddons$secondaryArchSuffix
lib:libQt6Core$secondaryArchSuffix
lib:libQt6Gui$secondaryArchSuffix
Expand All @@ -49,11 +49,11 @@ REQUIRES_devel="

BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix >= $portVersion
extra_cmake_modules$secondaryArchSuffix
qt6_tools${secondaryArchSuffix}_devel
devel:libKF6Codecs$secondaryArchSuffix == $portVersion
devel:libKF6ConfigGui$secondaryArchSuffix == $portVersion
devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion
devel:libKF6Codecs$secondaryArchSuffix == $libVersion
devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion
devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion
devel:libQt6Core$secondaryArchSuffix
devel:libQt6Gui$secondaryArchSuffix
devel:libQt6Qml$secondaryArchSuffix
Expand All @@ -72,19 +72,19 @@ TEST_REQUIRES="
qthaikuplugins$secondaryArchSuffix
"

defineDebugInfoPackage kcompletion6$secondaryArchSuffix \
$libDir/libKF6Completion.so.$libVersion
#defineDebugInfoPackage kcompletion6$secondaryArchSuffix \
# $libDir/libKF6Completion.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
34 changes: 17 additions & 17 deletions ...onfigwidgets/kconfigwidgets6-6.7.0.recipe → ...onfigwidgets/kconfigwidgets6-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%.*}/kconfigwidgets-${portVersion}.tar.xz"
CHECKSUM_SHA256="c079c67c578930baafae241bb4f252c63fdd125e44f1fb952e39bae3c9859cd1"
CHECKSUM_SHA256="c9568cbdd9169a496a26293383cc4f7c79e94871f76a9146fb167c3c759b04ca"
SOURCE_DIR="kconfigwidgets-$portVersion"

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

PROVIDES="
kconfigwidgets6$secondaryArchSuffix = $portVersion
cmd:preparetips6$secondaryArchSuffix = $portVersion
lib:libKF6ConfigWidgets$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
Expand All @@ -40,21 +39,23 @@ PROVIDES_devel="
"
REQUIRES_devel="
kconfigwidgets6$secondaryArchSuffix == $portVersion base
devel:libKF6Codecs$secondaryArchSuffix == $portVersion
devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion
devel:libKF6ColorScheme$secondaryArchSuffix == $libVersion
devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion
devel:libKF6Codecs$secondaryArchSuffix == $libVersion
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:libKF6CoreAddons$secondaryArchSuffix == $portVersion
devel:libKF6GuiAddons$secondaryArchSuffix == $portVersion
devel:libKF6I18n$secondaryArchSuffix == $portVersion
devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion
devel:libKF6Codecs$secondaryArchSuffix == $libVersion
devel:libKF6ColorScheme$secondaryArchSuffix == $libVersion
devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion
devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion
devel:libKF6GuiAddons$secondaryArchSuffix == $libVersion
devel:libKF6I18n$secondaryArchSuffix == $libVersion
devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion
devel:libQt6Core$secondaryArchSuffix
devel:libQt6Qml$secondaryArchSuffix
"
Expand All @@ -73,20 +74,19 @@ TEST_REQUIRES="
qthaikuplugins$secondaryArchSuffix
"

defineDebugInfoPackage kconfigwidgets6$secondaryArchSuffix \
$libDir/libKF6ConfigWidgets.so.$libVersion
#defineDebugInfoPackage kconfigwidgets6$secondaryArchSuffix \
# $libDir/libKF6ConfigWidgets.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 \
-DHAVE_DBUS=OFF \
-DCMAKE_SKIP_RPATH=YES \
-DBUILD_QCH=ON \
-DBUILD_TESTING=OFF \
-Wno-dev
Expand Down
18 changes: 8 additions & 10 deletions kde-frameworks/kcrash/kcrash6-6.7.0.recipe → kde-frameworks/kcrash/kcrash6-6.9.0.recipe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ COPYRIGHT="2010-2024 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kcrash-${portVersion}.tar.xz"
CHECKSUM_SHA256="1dc2c65d8ef62ef98457f8ab423b7686de3e713766c06e64d6322aa9db26eea4"
CHECKSUM_SHA256="a9734e48ad425bb426294f2de6badef3b485ff5b9bb273ba51fe2cac7aa7a456"
SOURCE_DIR="kcrash-$portVersion"
PATCHES="kcrash-$portVersion.patchset"

ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
Expand Down Expand Up @@ -40,10 +39,10 @@ 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:libKF6WindowSystem$secondaryArchSuffix == $portVersion
devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion
devel:libKF6WindowSystem$secondaryArchSuffix == $libVersion
devel:libQt6Core$secondaryArchSuffix
devel:libQt6Gui$secondaryArchSuffix
devel:libQt6Widgets$secondaryArchSuffix
Expand All @@ -61,20 +60,19 @@ TEST_REQUIRES="
qthaikuplugins$secondaryArchSuffix
"

defineDebugInfoPackage kcrash6$secondaryArchSuffix \
$libDir/libKF6Crash.so.$libVersion
#defineDebugInfoPackage kcrash6$secondaryArchSuffix \
# $libDir/libKF6Crash.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 \
-DWITH_X11=OFF \
-DCMAKE_SKIP_RPATH=YES \
-DBUILD_QCH=ON \
-DBUILD_TESTING=OFF \
-Wno-dev
Expand Down
24 changes: 0 additions & 24 deletions kde-frameworks/kcrash/patches/kcrash-6.7.0.patchset
View file

This file was deleted.

14 changes: 7 additions & 7 deletions ...rks/kdbusaddons/kdbusaddons6-6.7.0.recipe → ...rks/kdbusaddons/kdbusaddons6-6.9.0.recipe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kdbusaddons-${portVersion}.tar.xz"
CHECKSUM_SHA256="e87d08f6d0037d8fa33f1e7d16a4e3aa17d7d0b12c6aa96f76323f78344e151b"
CHECKSUM_SHA256="30a0b18f702830ee3e9ae94f0d953b0bf835f3d9c836cb22366de48065a3a74c"
SOURCE_DIR="kdbusaddons-$portVersion"

ARCHITECTURES="all !x86_gcc2"
Expand Down Expand Up @@ -37,7 +37,7 @@ REQUIRES_devel="

BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix >= $portVersion
extra_cmake_modules$secondaryArchSuffix
qt6_tools${secondaryArchSuffix}_devel
devel:libQt6Core$secondaryArchSuffix
devel:libQt6DBus$secondaryArchSuffix
Expand All @@ -51,20 +51,20 @@ BUILD_PREREQUIRES="
cmd:pkg_config$secondaryArchSuffix
"

defineDebugInfoPackage kdbusaddons6$secondaryArchSuffix \
$libDir/libKF6DBusAddons.so.$libVersion
#defineDebugInfoPackage kdbusaddons6$secondaryArchSuffix \
# $binDir/kquitapp6 \
# $libDir/libKF6DBusAddons.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 \
-DWITH_X11=OFF \
-DCMAKE_SKIP_RPATH=YES \
-DBUILD_QCH=ON \
-DBUILD_TESTING=OFF \
-Wno-dev
Expand Down
18 changes: 10 additions & 8 deletions ...meworks/kdoctools/kdoctools6-6.7.0.recipe → ...meworks/kdoctools/kdoctools6-6.9.0.recipe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kdoctools-${portVersion}.tar.xz"
CHECKSUM_SHA256="9fe539dffed01836940fa4f06f953ac4ed0cd4fb5f0232fe5b66c22364c1692f"
CHECKSUM_SHA256="6cc43f7db6df703cde1c6fbb24debcfb11c3df8f176be101577e21582d0209ca"
SOURCE_DIR="kdoctools-$portVersion"

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

PROVIDES="
kdoctools6$secondaryArchSuffix = $portVersion
cmd:checkxml6$secondaryArchSuffix = $portVersion
cmd:checkXML6$secondaryArchSuffix = $portVersion
cmd:meinproc6$secondaryArchSuffix = $portVersion
lib:libKF6DocTools$secondaryArchSuffix = $libVersionCompat
"
Expand All @@ -42,10 +42,10 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
docbook_xml_dtd
docbook_xsl_stylesheets >= 1.79.2
extra_cmake_modules$secondaryArchSuffix >= $portVersion
extra_cmake_modules$secondaryArchSuffix
qt6_tools${secondaryArchSuffix}_devel
uri
devel:libKF6archive$secondaryArchSuffix == $portVersion
devel:libKF6archive$secondaryArchSuffix == $libVersion
# devel:libKF6i18n$secondaryArchSuffix == $portVersion # breaks the build
devel:libQt6Core$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
Expand All @@ -69,21 +69,23 @@ PATCH()
sed -e 's/add/#add/g' -i $sourceDir/docs/CMakeLists.txt
}

defineDebugInfoPackage kdoctools6$secondaryArchSuffix \
$libDir/libKF6DocTools.so.$libVersion
#defineDebugInfoPackage kdoctools6$secondaryArchSuffix \
# $binDir/checkXML6 \
# $binDir/meinproc6 \
# $libDir/libKF6DocTools.so.$libVersion

BUILD()
{
cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DCMAKE_INSTALL_DATAROOTDIR=data \
-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 \
-DDocBookXSL_DIR=/system/data/xml/docbook/xsl-stylesheets-1.79.2 \
-DCMAKE_SKIP_RPATH=YES \
-DBUILD_QCH=ON \
-DBUILD_TESTING=OFF \
-Wno-dev
Expand Down
33 changes: 14 additions & 19 deletions ...rks/kiconthemes/kiconthemes6-6.7.0.recipe → ...rks/kiconthemes/kiconthemes6-6.9.0.recipe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kiconthemes-${portVersion}.tar.xz"
CHECKSUM_SHA256="be25bff1f5f65edd45b24ff9beda44b04c0e22d193e72458c96a5c591b70b968"
CHECKSUM_SHA256="e24d4b4f8bd09d6edd61e7dfb2033017352452eae879c1260200a81d48bc996e"
SOURCE_DIR="kiconthemes-$portVersion"

ARCHITECTURES="all !x86_gcc2"
Expand All @@ -35,11 +35,8 @@ REQUIRES="
lib:libGL$secondaryArchSuffix
lib:libKF6Archive$secondaryArchSuffix
lib:libKF6BreezeIcons$secondaryArchSuffix
lib:libKF6Codecs$secondaryArchSuffix
lib:libKF6ColorScheme$secondaryArchSuffix
lib:libKF6ConfigCore$secondaryArchSuffix
lib:libKF6ConfigWidgets$secondaryArchSuffix
lib:libKF6CoreAddons$secondaryArchSuffix
lib:libKF6I18n$secondaryArchSuffix
lib:libKF6WidgetsAddons$secondaryArchSuffix
lib:libQt6Core$secondaryArchSuffix
Expand All @@ -60,17 +57,14 @@ REQUIRES_devel="

BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix >= $portVersion
extra_cmake_modules$secondaryArchSuffix
qt6_tools${secondaryArchSuffix}_devel
devel:libKF6Archive$secondaryArchSuffix == $portVersion
devel:libKF6BreezeIcons$secondaryArchSuffix == $portVersion
devel:libKF6Codecs$secondaryArchSuffix == $portVersion
devel:libKF6ColorScheme$secondaryArchSuffix == $portVersion
devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion
devel:libKF6ConfigWidgets$secondaryArchSuffix == $portVersion
devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion
devel:libKF6I18n$secondaryArchSuffix == $portVersion
devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion
devel:libKF6Archive$secondaryArchSuffix == $libVersion
devel:libKF6BreezeIcons$secondaryArchSuffix == $libVersion
devel:libKF6ColorScheme$secondaryArchSuffix == $libVersion
devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion
devel:libKF6I18n$secondaryArchSuffix == $libVersion
devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion
devel:libQt6Core$secondaryArchSuffix
devel:libQt6Gui$secondaryArchSuffix
devel:libQt6Qml$secondaryArchSuffix
Expand All @@ -93,20 +87,21 @@ TEST_REQUIRES="
qthaikuplugins$secondaryArchSuffix
"

defineDebugInfoPackage kiconthemes6$secondaryArchSuffix \
$libDir/libKF6IconThemes.so.$libVersion \
$libDir/libKF6IconWidgets.so.$libVersion
#defineDebugInfoPackage kiconthemes6$secondaryArchSuffix \
# $binDir/kiconfinder6 \
# $libDir/libKF6IconThemes.so.$libVersion \
# $libDir/libKF6IconWidgets.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
Loading

0 comments on commit bc79bc5

Please sign in to comment.