From bb686723b4cca38dc8e9eb1d02ff9b5e5c5b42a6 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Thu, 12 Sep 2024 15:02:30 +0200 Subject: [PATCH] kaccounts_integration, new recipes (#11109) --- .../kaccounts_integration-23.08.5.recipe | 114 +++++++++++++++++ .../kaccounts_integration24-24.08.0.recipe | 120 ++++++++++++++++++ .../kaccounts_integration-24.08.0.patchset | 44 +++++++ 3 files changed, 278 insertions(+) create mode 100644 kde-apps/kaccounts_integration/kaccounts_integration-23.08.5.recipe create mode 100644 kde-apps/kaccounts_integration/kaccounts_integration24-24.08.0.recipe create mode 100644 kde-apps/kaccounts_integration/patches/kaccounts_integration-24.08.0.patchset diff --git a/kde-apps/kaccounts_integration/kaccounts_integration-23.08.5.recipe b/kde-apps/kaccounts_integration/kaccounts_integration-23.08.5.recipe new file mode 100644 index 000000000..d4cfdc087 --- /dev/null +++ b/kde-apps/kaccounts_integration/kaccounts_integration-23.08.5.recipe @@ -0,0 +1,114 @@ +SUMMARY="Online account management system and its Plasma integration components" +DESCRIPTION="Small system to administer web accounts for the sites and services across the KDE \ +desktop." +HOMEPAGE="https://invent.kde.org/network/kaccounts-integration" +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="c02ee25495c387dfc9c7581babd4756e04d7c3dae68bffd1652cf418e1d129b9" +SOURCE_DIR="kaccounts-integration-$portVersion" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="?x86" + +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + +PROVIDES=" + kaccounts_integration$secondaryArchSuffix = $portVersion + lib:libkaccounts$secondaryArchSuffix = $libVersionCompat + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libaccounts_qt5$secondaryArchSuffix + lib:libsignon_qt5$secondaryArchSuffix + # KF5 + lib:libKF5CoreAddons$secondaryArchSuffix + lib:libKF5I18n$secondaryArchSuffix + # Qt5 + lib:libQt5Core$secondaryArchSuffix + lib:libQt5Gui$secondaryArchSuffix + lib:libQt5Xml$secondaryArchSuffix + " + +PROVIDES_devel=" + kaccounts_integration${secondaryArchSuffix}_devel = $portVersion + devel:libkaccounts$secondaryArchSuffix = $libVersionCompat + " +REQUIRES_devel=" + kaccounts_integration$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libaccounts_qt5$secondaryArchSuffix + devel:libQCoro5Core$secondaryArchSuffix + devel:libsignon_qt5$secondaryArchSuffix + # KF5 + extra_cmake_modules$secondaryArchSuffix + devel:libKF5Auth$secondaryArchSuffix + devel:libKF5Bookmarks$secondaryArchSuffix + devel:libKF5Codecs$secondaryArchSuffix + devel:libKF5Completion$secondaryArchSuffix + devel:libKF5ConfigCore$secondaryArchSuffix + devel:libKF5ConfigWidgets$secondaryArchSuffix + devel:libKF5CoreAddons$secondaryArchSuffix + devel:libKF5DbusAddons$secondaryArchSuffix + devel:libKF5Declarative$secondaryArchSuffix + devel:libKF5I18n$secondaryArchSuffix + devel:libKF5ItemViews$secondaryArchSuffix + devel:libKF5JobWidgets$secondaryArchSuffix + devel:libKF5KCMUtils$secondaryArchSuffix + devel:libKF5KIOCore$secondaryArchSuffix + devel:libKF5Package$secondaryArchSuffix + devel:libKF5Service$secondaryArchSuffix + devel:libKF5Solid$secondaryArchSuffix + devel:libKF5Wallet$secondaryArchSuffix + devel:libKF5WidgetsAddons$secondaryArchSuffix + devel:libKF5WindowSystem$secondaryArchSuffix + devel:libKF5XmlGui$secondaryArchSuffix + # Qt5 + devel:libQt5Core$secondaryArchSuffix + devel:libQt5Gui$secondaryArchSuffix + devel:libQt5Xml$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:g++$secondaryArchSuffix + cmd:make + cmd:msgfmt + cmd:msgmerge + cmd:pkg_config$secondaryArchSuffix + cmd:python3 + cmd:qdbuscpp2xml$secondaryArchSuffix >= 5 + cmd:xsltproc + " + +BUILD() +{ + cmake -Bbuild -S. $cmakeDirArgs \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=YES \ + -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \ + -DKDE_INSTALL_QMLDIR=$dataDir/Qt5/qml \ + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake + make -C build $jobArgs +} + +INSTALL() +{ + make -C build install + + prepareInstalledDevelLib \ + libkaccounts + + packageEntries devel \ + $developDir \ + $libDir/cmake +} + +TEST() +{ + make check +} diff --git a/kde-apps/kaccounts_integration/kaccounts_integration24-24.08.0.recipe b/kde-apps/kaccounts_integration/kaccounts_integration24-24.08.0.recipe new file mode 100644 index 000000000..f3deb237d --- /dev/null +++ b/kde-apps/kaccounts_integration/kaccounts_integration24-24.08.0.recipe @@ -0,0 +1,120 @@ +SUMMARY="Online account management system and its Plasma integration components" +DESCRIPTION="Small system to administer web accounts for the sites and services across the KDE \ +desktop." +HOMEPAGE="https://invent.kde.org/network/kaccounts-integration" +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="fb21d2435b2aaa9960fed9660a9cd56b7702080c4e99f9a207e6c1ba8d52b3f4" +SOURCE_DIR="kaccounts-integration-$portVersion" +PATCHES="kaccounts_integration-$portVersion.patchset" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="?x86" + +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + +PROVIDES=" + kaccounts_integration24$secondaryArchSuffix = $portVersion + lib:libkaccounts6$secondaryArchSuffix = $libVersionCompat + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libaccounts_qt6$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libsignon_qt6$secondaryArchSuffix + # KF6 + lib:libKF6CoreAddons$secondaryArchSuffix + lib:libKF6I18n$secondaryArchSuffix + # Qt6 + lib:libQt6Core$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix + lib:libQt6Xml$secondaryArchSuffix + " + +PROVIDES_devel=" + kaccounts_integration24${secondaryArchSuffix}_devel = $portVersion + devel:libkaccounts6$secondaryArchSuffix = $libVersionCompat + " +REQUIRES_devel=" + kaccounts_integration24$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libaccounts_qt6$secondaryArchSuffix + devel:libKirigami$secondaryArchSuffix + devel:libQCoro6Core$secondaryArchSuffix + devel:libsignon_qt6$secondaryArchSuffix + # KF6 + extra_cmake_modules$secondaryArchSuffix + devel:libKF6AuthCore$secondaryArchSuffix + devel:libKF6Bookmarks$secondaryArchSuffix + devel:libKF6Codecs$secondaryArchSuffix + devel:libKF6ColorScheme$secondaryArchSuffix + devel:libKF6Completion$secondaryArchSuffix + devel:libKF6ConfigCore$secondaryArchSuffix + devel:libKF6ConfigWidgets$secondaryArchSuffix + devel:libKF6CoreAddons$secondaryArchSuffix + devel:libKF6DbusAddons$secondaryArchSuffix +# devel:libKF6Declarative$secondaryArchSuffix + devel:libKF6I18n$secondaryArchSuffix + devel:libKF6ItemViews$secondaryArchSuffix + devel:libKF6JobWidgets$secondaryArchSuffix + devel:libKF6KCMUtils$secondaryArchSuffix + devel:libKF6KIOCore$secondaryArchSuffix + devel:libKF6Package$secondaryArchSuffix + devel:libKF6Service$secondaryArchSuffix + devel:libKF6Solid$secondaryArchSuffix + devel:libKF6Wallet$secondaryArchSuffix + devel:libKF6WidgetsAddons$secondaryArchSuffix + devel:libKF6WindowSystem$secondaryArchSuffix + devel:libKF6XmlGui$secondaryArchSuffix + # Qt6 + devel:libQt6Core$secondaryArchSuffix + devel:libQt6Gui$secondaryArchSuffix + devel:libQt6Qml$secondaryArchSuffix + devel:libQt6Xml$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:g++$secondaryArchSuffix + cmd:make + cmd:msgfmt + cmd:msgmerge + cmd:pkg_config$secondaryArchSuffix +# cmd:python3 +# cmd:qdbuscpp2xml$secondaryArchSuffix >= 5 +# cmd:xsltproc + " + +BUILD() +{ + cmake -Bbuild -S. $cmakeDirArgs \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=YES \ + -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ + -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DBUILD_TESTING=OFF + make -C build $jobArgs +} + +INSTALL() +{ + make -C build install + + prepareInstalledDevelLib \ + libkaccounts6 + + packageEntries devel \ + $developDir \ + $libDir/cmake +} + +TEST() +{ + make check +} diff --git a/kde-apps/kaccounts_integration/patches/kaccounts_integration-24.08.0.patchset b/kde-apps/kaccounts_integration/patches/kaccounts_integration-24.08.0.patchset new file mode 100644 index 000000000..b09ddbdd2 --- /dev/null +++ b/kde-apps/kaccounts_integration/patches/kaccounts_integration-24.08.0.patchset @@ -0,0 +1,44 @@ +From a8c61d38b7dabcf9e8a73e21fefba016d757e448 Mon Sep 17 00:00:00 2001 +From: Schrijvers Luc +Date: Mon, 9 Sep 2024 16:07:36 +0200 +Subject: Disable KDirNotify + + +diff --git a/src/plugins/kio-webdav/kioservices.cpp b/src/plugins/kio-webdav/kioservices.cpp +index 9881963..9c35303 100644 +--- a/src/plugins/kio-webdav/kioservices.cpp ++++ b/src/plugins/kio-webdav/kioservices.cpp +@@ -17,7 +17,9 @@ + + #include + #include +-#include ++#ifndef __HAIKU__ ++ #include ++#endif + #include + #include + #include +@@ -214,7 +216,9 @@ QCoro::Task KIOServices::createNetAttach(const Accounts::AccountId account + wallet->writeMap(walletUrl + QStringLiteral("webdav"), info); + wallet->sync(); + ++#ifndef __HAIKU__ + org::kde::KDirNotify::emitFilesAdded(QUrl(QStringLiteral("remote:/"))); ++#endif + } + + QCoro::Task KIOServices::getRealm(const QUrl &url) +@@ -267,7 +271,9 @@ QCoro::Task KIOServices::removeNetAttach(const QString &id) + qDebug() << url.userName() << url.host() << url; + + QFile::remove(path); ++#ifndef __HAIKU__ + org::kde::KDirNotify::emitFilesRemoved(QList() << QUrl(QStringLiteral("remote:/") + id)); ++#endif + + QString walletUrl(QStringLiteral("webdav")); + walletUrl.append(QStringLiteral("-")); +-- +2.45.2 +