From eac146a6575d5bc3554a17f1f6abe2a1d037e12f Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 8 Feb 2025 06:53:59 +0100 Subject: [PATCH] kaccounts_integration, bump KF6 version (#11739) --- ...pe => kaccounts_integration_kf6-24.12.2.recipe} | 14 +++++++------- ...hset => kaccounts_integration-24.12.2.patchset} | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) rename kde-apps/kaccounts_integration/{kaccounts_integration24-24.12.0.recipe => kaccounts_integration_kf6-24.12.2.recipe} (88%) rename kde-apps/kaccounts_integration/patches/{kaccounts_integration-24.12.0.patchset => kaccounts_integration-24.12.2.patchset} (95%) diff --git a/kde-apps/kaccounts_integration/kaccounts_integration24-24.12.0.recipe b/kde-apps/kaccounts_integration/kaccounts_integration_kf6-24.12.2.recipe similarity index 88% rename from kde-apps/kaccounts_integration/kaccounts_integration24-24.12.0.recipe rename to kde-apps/kaccounts_integration/kaccounts_integration_kf6-24.12.2.recipe index d1a13422a..805236779 100644 --- a/kde-apps/kaccounts_integration/kaccounts_integration24-24.12.0.recipe +++ b/kde-apps/kaccounts_integration/kaccounts_integration_kf6-24.12.2.recipe @@ -6,7 +6,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2.1" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kaccounts-integration-$portVersion.tar.xz" -CHECKSUM_SHA256="04e8a00bdd4539027497edcabc4d7c21932ab00f43a51b1184365735f8d3b433" +CHECKSUM_SHA256="d456f36884580e5447fed3f23f85e7d3fae0264cf85093e1eaa621eab65881d8" SOURCE_DIR="kaccounts-integration-$portVersion" PATCHES="kaccounts_integration-$portVersion.patchset" @@ -17,7 +17,7 @@ libVersion="$portVersion" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" - kaccounts_integration24$secondaryArchSuffix = $portVersion + kaccounts_integration_kf6$secondaryArchSuffix = $portVersion lib:libkaccounts6$secondaryArchSuffix = $libVersionCompat " REQUIRES=" @@ -33,13 +33,16 @@ REQUIRES=" lib:libQt6Gui$secondaryArchSuffix lib:libQt6Xml$secondaryArchSuffix " +REPLACES=" + kaccounts_integration_kf6$secondaryArchSuffix + " PROVIDES_devel=" - kaccounts_integration24${secondaryArchSuffix}_devel = $portVersion + kaccounts_integration_kf6${secondaryArchSuffix}_devel = $portVersion devel:libkaccounts6$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" - kaccounts_integration24$secondaryArchSuffix == $portVersion base + kaccounts_integration_kf6$secondaryArchSuffix == $portVersion base devel:libaccounts_qt6$secondaryArchSuffix devel:libsignon_qt6$secondaryArchSuffix " @@ -83,9 +86,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -#defineDebugInfoPackage kaccounts_integration24$secondaryArchSuffix \ -# $libDir/libkaccounts6.so.$libVersion - BUILD() { cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ diff --git a/kde-apps/kaccounts_integration/patches/kaccounts_integration-24.12.0.patchset b/kde-apps/kaccounts_integration/patches/kaccounts_integration-24.12.2.patchset similarity index 95% rename from kde-apps/kaccounts_integration/patches/kaccounts_integration-24.12.0.patchset rename to kde-apps/kaccounts_integration/patches/kaccounts_integration-24.12.2.patchset index 42024bbc0..37422f291 100644 --- a/kde-apps/kaccounts_integration/patches/kaccounts_integration-24.12.0.patchset +++ b/kde-apps/kaccounts_integration/patches/kaccounts_integration-24.12.2.patchset @@ -1,4 +1,4 @@ -From 3a969250f73889e32f8011069b8045c85485edef Mon Sep 17 00:00:00 2001 +From 2d8dc578b689f208e16f9f583fb6166f88501cb1 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 9 Sep 2024 16:07:36 +0200 Subject: Disable KDirNotify