KDE_development, bump to 25.12.0 (#13454)

This commit is contained in:
Schrijvers Luc
2025-12-22 08:01:26 +01:00
committed by GitHub
parent 9c6fa88ff6
commit db85910f08
10 changed files with 33 additions and 43 deletions

View File

@@ -17,7 +17,7 @@ COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kcachegrind-$portVersion.tar.xz"
CHECKSUM_SHA256="4253d8643a5e1c9261be470ac61c8f5eb2ce721036115ae204ac3aab6b38a0a4"
CHECKSUM_SHA256="76696fdedd0add62691191bcc51ede39cd42ee31a1724de43f38a4cbb5bdfc08"
SOURCE_DIR="kcachegrind-$portVersion"
PATCHES="kcachegrind-$portVersion.patchset"
ADDITIONAL_FILES="kcachegrind.rdef.in"
@@ -34,6 +34,7 @@ fi
PROVIDES="
kcachegrind$secondaryArchSuffix = $portVersion
app:KCachegrind = $portVersion
cmd:dprof2calltree$commandSuffix = $portVersion
cmd:hotshot2calltree$commandSuffix = $portVersion
cmd:kcachegrind$commandSuffix = $portVersion
@@ -93,7 +94,6 @@ BUILD_REQUIRES="
devel:libKF6CoreAddons$secondaryArchSuffix
devel:libKF6Crash$secondaryArchSuffix
devel:libKF6DbusAddons$secondaryArchSuffix
devel:libKF6DocTools$secondaryArchSuffix
devel:libKF6GuiAddons$secondaryArchSuffix
devel:libKF6I18n$secondaryArchSuffix
devel:libKF6IconThemes$secondaryArchSuffix
@@ -123,9 +123,6 @@ BUILD_PREREQUIRES="
PATCH()
{
# disable docs generation
sed -e '/add_subdirectory( doc )/ s/^#*/#/' -i CMakeLists.txt
sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
# remove dbus service
sed -e '/KDBusService service(KDBusService::Multiple);/d' -i kcachegrind/main.cpp
}
@@ -135,7 +132,7 @@ BUILD()
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DCMAKE_INSTALL_BINDIR=$commandBinDir \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
-DCMAKE_SKIP_RPATH=YES
make -C build $jobArgs
}
@@ -147,6 +144,10 @@ INSTALL()
# cleanup
rm -rf $dataDir/{applications,icons,metainfo}
mkdir -p $appsDir
mv $commandBinDir/kcachegrind $appsDir/KCachegrind
ln -s $appsDir/KCachegrind $commandBinDir/kcachegrind
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
local MINOR="`echo "$portVersion" | cut -d. -f3`"
@@ -160,6 +161,6 @@ INSTALL()
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
$portDir/additional-files/kcachegrind.rdef.in > kcachegrind.rdef
addResourcesToBinaries kcachegrind.rdef $commandBinDir/kcachegrind
addAppDeskbarSymlink $commandBinDir/kcachegrind KCachegrind
addResourcesToBinaries kcachegrind.rdef $appsDir/KCachegrind
addAppDeskbarSymlink $appsDir/KCachegrind
}

View File

@@ -7,8 +7,7 @@ COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU LGPL v2.1"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kdebugsettings-$portVersion.tar.xz"
CHECKSUM_SHA256="bedd634252ff85621c2246b26d61ab1a05ed9ab18bebbf8d658f4638af5f695e"
PATCHES="kdebugsettings-$portVersion.patchset"
CHECKSUM_SHA256="d197c6b152493511b232543d3ae8c74ece37b5bdb38dd6d7ca389a2709d0c9c9"
ADDITIONAL_FILES="kdebugsettings.rdef.in"
ARCHITECTURES="all !x86_gcc2"
@@ -19,7 +18,7 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
kdebugsettings$secondaryArchSuffix = $portVersion
cmd:kdebugsettings = $portVersion
# cmd:kdebugsettings = $portVersion
lib:libkdebugsettings$secondaryArchSuffix = $libVersionCompat
lib:libkdebugsettingscore$secondaryArchSuffix = $libVersionCompat
"
@@ -85,7 +84,7 @@ BUILD()
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DCMAKE_INSTALL_BINDIR=$preferencesDir \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DCMAKE_SKIP_RPATH=YES \
-DBUILD_TESTING=ON \
-Wno-dev

View File

@@ -1,22 +0,0 @@
From f671d51b839bd6d515025dc776355abd27d77bcd Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sun, 17 Aug 2025 20:06:15 +0200
Subject: Reset Qt version
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54f0f49..51217e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ set(RELEASE_SERVICE_VERSION
)
project(kdebugsettings VERSION ${RELEASE_SERVICE_VERSION})
-set(QT_REQUIRED_VERSION "6.8.0")
+set(QT_REQUIRED_VERSION "6.7.0")
set(KF_MIN_VERSION "6.14.0")
set(ECM_VERSION ${KF_MIN_VERSION})
--
2.50.1

View File

@@ -19,15 +19,24 @@ COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kompare-$portVersion.tar.xz"
CHECKSUM_SHA256="2b2f67eb9a31093b1d1e295724f0f0b0cd13275cacdfb864590d5fcce8b4c872"
CHECKSUM_SHA256="848f5c19e5d054781844323cf6fe5bb3ea7e055832d847f8d09bf13729941f48"
ADDITIONAL_FILES="kompare.rdef.in"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
commandBinDir=$binDir
commandSuffix=$secondaryArchSuffix
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
commandBinDir=$prefix/bin
fi
PROVIDES="
kompare$secondaryArchSuffix = $portVersion
app:Kompare$commandSuffix = $portVersion
app:Kompare = $portVersion
cmd:kompare$commandSuffix = $portVersion
lib:libkomparedialogpages$secondaryArchSuffix = 6
lib:libkompareinterface$secondaryArchSuffix = 6
"
@@ -69,7 +78,6 @@ BUILD_REQUIRES="
devel:libKF6Codecs$secondaryArchSuffix
devel:libKF6ConfigCore$secondaryArchSuffix
devel:libKF6CoreAddons$secondaryArchSuffix
devel:libKF6DocTools$secondaryArchSuffix
devel:libKF6GuiAddons$secondaryArchSuffix
devel:libKF6I18n$secondaryArchSuffix
devel:libKF6IconThemes$secondaryArchSuffix
@@ -92,6 +100,7 @@ BUILD_PREREQUIRES="
PATCH()
{
# disable docs generation
sed -e 's|DocTools||' -i CMakeLists.txt
sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
}
@@ -101,8 +110,9 @@ BUILD()
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DCMAKE_INSTALL_BINDIR=$appsDir \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
-DCMAKE_SKIP_RPATH=YES \
-DBUILD_TESTING=OFF \
-Wno-dev
make -C build $jobArgs
}
@@ -114,7 +124,9 @@ INSTALL()
# cleanup
rm -rf $dataDir/{applications,icons,kio,metainfo} $developDir
mkdir -p $prefix/bin
mv $appsDir/kompare $appsDir/Kompare
ln -s $appsDir/Kompare $prefix/bin/kompare
local APP_SIGNATURE="application/x-vnd.kde-kompare"
local MAJOR="`echo "$portVersion" | cut -d. -f1`"

View File

@@ -7,7 +7,7 @@ COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/massif-visualizer-$portVersion.tar.xz"
CHECKSUM_SHA256="6f282cbcf5b3c3be3d0f062c8d69f458a4294c804720cdc45576fb14e4bf1380"
CHECKSUM_SHA256="f0674df1b77e4b0c8f78c06d2eec7c3ab7ef4ac44fd733d5c101561a816f6068"
SOURCE_DIR="massif-visualizer-$portVersion"
ADDITIONAL_FILES="massif_visualizer.rdef.in"

View File

@@ -6,9 +6,9 @@ standard format to document or design the structure of your programs."
HOMEPAGE="https://umbrello.kde.org"
COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/umbrello-$portVersion.tar.xz"
CHECKSUM_SHA256="755cfa7a8ada1517614a175a40293a982dce4c3eb4739ca397a4124713b4fc6d"
CHECKSUM_SHA256="1b6264dea2c92ae4420c38567d47a0b9f0c6163ea7eff66f8354f9d1982793f7"
PATCHES="umbrello-$portVersion.patchset"
ADDITIONAL_FILES="umbrello.rdef.in"

View File

@@ -61,7 +61,7 @@ COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kate-$portVersion.tar.xz"
CHECKSUM_SHA256="7fed779b76da86f687c9509c1c22b419b2a97d57c41e693d880664b6c20a2f37"
CHECKSUM_SHA256="ea4142c40eeb392aed53354855a00e3c816c457dfe255b407c5d30c869377f56"
PATCHES="kate-$portVersion.patchset"
ADDITIONAL_FILES="kate.rdef.in"