| author | Antonio Rojas
<arojas@archlinux.org> 2024-06-18 14:37:16 UTC |
| committer | Antonio Rojas
<arojas@archlinux.org> 2024-06-18 14:37:16 UTC |
| parent | 4206ada7ed407c2e6271a773e77b0bbde4be8ef8 |
| .SRCINFO | +107 | -9 |
| PKGBUILD | +9 | -13 |
| appstream-1.0.patch | +0 | -115 |
diff --git a/.SRCINFO b/.SRCINFO index c5196a8..3d4bc08 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = plasma-workspace pkgdesc = KDE Plasma Workspace - pkgver = 6.0.5.1 - pkgrel = 2 + pkgver = 6.1.0 + pkgrel = 1 url = https://kde.org/plasma-desktop/ arch = x86_64 groups = plasma @@ -77,6 +77,7 @@ pkgbase = plasma-workspace depends = libice depends = libkexiv2 depends = libksysguard + depends = libplasma depends = libqalculate depends = libsm depends = libx11 @@ -90,10 +91,9 @@ pkgbase = plasma-workspace depends = milou depends = ocean-sound-theme depends = phonon-qt6 - depends = plasma-integration - depends = libplasma depends = plasma5support depends = prison + depends = qcoro-qt6 depends = qt6-5compat depends = qt6-base depends = qt6-declarative @@ -124,15 +124,113 @@ pkgbase = plasma-workspace optdepends = xdg-desktop-portal-gtk: sync font settings to Flatpak apps conflicts = plasma-wayland-session replaces = plasma-wayland-session - source = https://download.kde.org/stable/plasma/6.0.5/plasma-workspace-6.0.5.1.tar.xz - source = https://download.kde.org/stable/plasma/6.0.5/plasma-workspace-6.0.5.1.tar.xz.sig - source = https://invent.kde.org/plasma/plasma-workspace/-/commit/0857d18d.patch + source = https://download.kde.org/stable/plasma/6.1.0/plasma-workspace-6.1.0.tar.xz + source = https://download.kde.org/stable/plasma/6.1.0/plasma-workspace-6.1.0.tar.xz.sig validpgpkeys = E0A3EB202F8E57528E13E72FD7574483BB57B18D validpgpkeys = 0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D validpgpkeys = D07BD8662C56CB291B316EB2F5675605C74E02CF validpgpkeys = 1FA881591C26B276D7A5518EEAAF29B42A678C20 - sha256sums = 8907f9fded5fc6e5d95355f8346328de18d7c8850dabd9109d75458d5aeed813 + sha256sums = f4f542e6f201f46080ee6fb966d9f895811a8dcd7d4f18a4c6c48ce0c35a127c sha256sums = SKIP - sha256sums = ae4406bbb6c3068f499f521fb1a4df15362d08ccefc92c5519ba5c5735407ad2 pkgname = plasma-workspace + depends = accountsservice + depends = appstream-qt + depends = fontconfig + depends = freetype2 + depends = gcc-libs + depends = glibc + depends = icu + depends = plasma-activities + depends = plasma-activities-stats + depends = kactivitymanagerd + depends = karchive + depends = kauth + depends = kbookmarks + depends = kcmutils + depends = kcolorscheme + depends = kcompletion + depends = kconfig + depends = kconfigwidgets + depends = kcoreaddons + depends = kcrash + depends = kde-cli-tools + depends = kdeclarative + depends = kded + depends = kdbusaddons + depends = kglobalaccel + depends = kguiaddons + depends = kholidays + depends = ki18n + depends = kiconthemes + depends = kidletime + depends = kio + depends = kio-extras + depends = kio-fuse + depends = kirigami + depends = kirigami-addons + depends = kitemmodels + depends = kjobwidgets + depends = knewstuff + depends = knotifications + depends = knotifyconfig + depends = kpackage + depends = kparts + depends = kpipewire + depends = krunner + depends = kquickcharts + depends = kscreenlocker + depends = kservice + depends = kstatusnotifieritem + depends = ksvg + depends = ksystemstats + depends = ktexteditor + depends = ktextwidgets + depends = kuserfeedback + depends = kwallet + depends = kwayland + depends = kwidgetsaddons + depends = kwin + depends = kwindowsystem + depends = kxmlgui + depends = layer-shell-qt + depends = libcanberra + depends = libice + depends = libkexiv2 + depends = libksysguard + depends = libplasma + depends = libqalculate + depends = libsm + depends = libx11 + depends = libxau + depends = libxcb + depends = libxcrypt + depends = libxcursor + depends = libxfixes + depends = libxft + depends = libxtst + depends = milou + depends = ocean-sound-theme + depends = phonon-qt6 + depends = plasma5support + depends = prison + depends = qcoro-qt6 + depends = qt6-5compat + depends = qt6-base + depends = qt6-declarative + depends = qt6-svg + depends = qt6-tools + depends = qt6-virtualkeyboard + depends = qt6-wayland + depends = sh + depends = solid + depends = systemd-libs + depends = wayland + depends = xcb-util + depends = xcb-util-image + depends = xorg-xmessage + depends = xorg-xrdb + depends = xorg-xsetroot + depends = xorg-xwayland + depends = zlib + depends = plasma-integration diff --git a/PKGBUILD b/PKGBUILD index 53334b4..aa1a818 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,9 +4,9 @@ # Contributor: Alexey D. <lq07829icatm at rambler.ru> pkgname=plasma-workspace -pkgver=6.0.5.1 +pkgver=6.1.0 _dirver=$(echo $pkgver | cut -d. -f1-3) -pkgrel=2 +pkgrel=1 pkgdesc='KDE Plasma Workspace' arch=(x86_64) url='https://kde.org/plasma-desktop/' @@ -75,6 +75,7 @@ depends=(accountsservice libice libkexiv2 libksysguard + libplasma libqalculate libsm libx11 @@ -88,10 +89,9 @@ depends=(accountsservice milou ocean-sound-theme phonon-qt6 - plasma-integration - libplasma plasma5support prison + qcoro-qt6 qt6-5compat qt6-base qt6-declarative @@ -130,20 +130,14 @@ optdepends=('appmenu-gtk-module: global menu support for GTK2 and some GTK3 appl conflicts=(plasma-wayland-session) replaces=(plasma-wayland-session) groups=(plasma) -source=(https://download.kde.org/stable/plasma/$_dirver/$pkgname-$pkgver.tar.xz{,.sig} - https://invent.kde.org/plasma/plasma-workspace/-/commit/0857d18d.patch) -sha256sums=('8907f9fded5fc6e5d95355f8346328de18d7c8850dabd9109d75458d5aeed813' - 'SKIP' - 'ae4406bbb6c3068f499f521fb1a4df15362d08ccefc92c5519ba5c5735407ad2') +source=(https://download.kde.org/stable/plasma/$_dirver/$pkgname-$pkgver.tar.xz{,.sig}) +sha256sums=('f4f542e6f201f46080ee6fb966d9f895811a8dcd7d4f18a4c6c48ce0c35a127c' + 'SKIP') validpgpkeys=('E0A3EB202F8E57528E13E72FD7574483BB57B18D' # Jonathan Esk-Riddell <jr@jriddell.org> '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah <bshah@kde.org> 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson <davidedmundson@kde.org> '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart@gmail.com> -prepare() { - patch -d $pkgname-$pkgver -p1 < 0857d18d.patch # Fix session restore on X -} - build() { cmake -B build -S $pkgname-$pkgver \ -DCMAKE_INSTALL_LIBEXECDIR=lib \ @@ -153,5 +147,7 @@ build() { } package() { + depends+=(plasma-integration) # Declare runtime dependency here to avoid dependency cycles at build time + DESTDIR="$pkgdir" cmake --install build } diff --git a/appstream-1.0.patch b/appstream-1.0.patch deleted file mode 100644 index bbcc69d..0000000 --- a/appstream-1.0.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7b8102a86..bb5bed60c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -183,12 +183,12 @@ if(FONTCONFIG_FOUND) - find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS PrintSupport) - endif() - --find_package(AppStreamQt 0.10.6) --set_package_properties(AppStreamQt PROPERTIES DESCRIPTION "Access metadata for listing available software" -+find_package(AppStreamQt5 1.0) -+set_package_properties(AppStreamQt5 PROPERTIES DESCRIPTION "Access metadata for listing available software" - URL "https://www.freedesktop.org/wiki/Distributions/AppStream/" - TYPE OPTIONAL) - --if(${AppStreamQt_FOUND}) -+if(${AppStreamQt5_FOUND}) - set(HAVE_APPSTREAMQT true) - endif() - -diff --git a/applets/kicker/plugin/actionlist.cpp b/applets/kicker/plugin/actionlist.cpp -index 61fc23487..787afdc06 100644 ---- a/applets/kicker/plugin/actionlist.cpp -+++ b/applets/kicker/plugin/actionlist.cpp -@@ -32,7 +32,7 @@ - #include "containmentinterface.h" - - #ifdef HAVE_APPSTREAMQT --#include <AppStreamQt/pool.h> -+#include <AppStreamQt5/pool.h> - #endif - - namespace KAStats = KActivities::Stats; -@@ -447,7 +447,7 @@ bool handleAppstreamActions(const QString &actionId, const KService::Ptr &servic - } - - const auto components = -- appstreamPool->componentsByLaunchable(AppStream::Launchable::KindDesktopId, service->desktopEntryName() + QLatin1String(".desktop")); -+ appstreamPool->componentsByLaunchable(AppStream::Launchable::KindDesktopId, service->desktopEntryName() + QLatin1String(".desktop")).toList(); - if (components.empty()) { - return false; - } -diff --git a/runners/CMakeLists.txt b/runners/CMakeLists.txt -index ec22f27d7..4216518e9 100644 ---- a/runners/CMakeLists.txt -+++ b/runners/CMakeLists.txt -@@ -14,7 +14,7 @@ add_subdirectory(shell) - add_subdirectory(webshortcuts) - add_subdirectory(windowedwidgets) - --if(AppStreamQt_FOUND) -+if(AppStreamQt5_FOUND) - add_subdirectory(appstream) - endif() - -diff --git a/runners/appstream/CMakeLists.txt b/runners/appstream/CMakeLists.txt -index 7dc43cdad..15c486a3e 100644 ---- a/runners/appstream/CMakeLists.txt -+++ b/runners/appstream/CMakeLists.txt -@@ -11,4 +11,4 @@ ecm_qt_declare_logging_category(krunner_appstream_SRCS - DEFAULT_SEVERITY Warning) - - kcoreaddons_add_plugin(krunner_appstream SOURCES ${krunner_appstream_SRCS} INSTALL_NAMESPACE "kf5/krunner") --target_link_libraries(krunner_appstream PUBLIC Qt::Gui KF5::Runner KF5::I18n KF5::Service AppStreamQt) -+target_link_libraries(krunner_appstream PUBLIC Qt::Gui KF5::Runner KF5::I18n KF5::Service AppStreamQt5) -diff --git a/runners/appstream/appstreamrunner.cpp b/runners/appstream/appstreamrunner.cpp -index b0dcb381e..be37a9459 100644 ---- a/runners/appstream/appstreamrunner.cpp -+++ b/runners/appstream/appstreamrunner.cpp -@@ -6,7 +6,7 @@ - - #include "appstreamrunner.h" - --#include <AppStreamQt/icon.h> -+#include <AppStreamQt5/icon.h> - - #include <QDebug> - #include <QDesktopServices> -@@ -148,19 +148,18 @@ void InstallerRunner::run(const Plasma::RunnerContext & /*context*/, const Plasm - QList<AppStream::Component> InstallerRunner::findComponentsByString(const QString &query) - { - QMutexLocker locker(&m_appstreamMutex); -- QString error; - static bool warnedOnce = false; -- static bool opened = m_db.load(&error); -+ static bool opened = m_db.load(); - if (!opened) { - if (warnedOnce) { -- qCDebug(RUNNER_APPSTREAM) << "Had errors when loading AppStream metadata pool" << error; -+ qCDebug(RUNNER_APPSTREAM) << "Had errors when loading AppStream metadata pool" << m_db.lastError(); - } else { -- qCWarning(RUNNER_APPSTREAM) << "Had errors when loading AppStream metadata pool" << error; -+ qCWarning(RUNNER_APPSTREAM) << "Had errors when loading AppStream metadata pool" << m_db.lastError(); - warnedOnce = true; - } - } - -- return m_db.search(query); -+ return m_db.search(query).toList(); - } - - #include "appstreamrunner.moc" -diff --git a/runners/appstream/appstreamrunner.h b/runners/appstream/appstreamrunner.h -index 18197ab08..b585f55c3 100644 ---- a/runners/appstream/appstreamrunner.h -+++ b/runners/appstream/appstreamrunner.h -@@ -6,7 +6,7 @@ - - #pragma once - --#include <AppStreamQt/pool.h> -+#include <AppStreamQt5/pool.h> - #include <KRunner/AbstractRunner> - #include <QMutex> -