| author | Antonio Rojas
<arojas@archlinux.org> 2023-11-12 12:29:41 UTC |
| committer | Antonio Rojas
<arojas@archlinux.org> 2023-11-12 12:29:41 UTC |
| parent | d39732aa65da40938c831f257ccf0e1b1ecd5528 |
| .SRCINFO | +4 | -2 |
| PKGBUILD | +10 | -4 |
| appstream-1.0.patch | +115 | -0 |
diff --git a/.SRCINFO b/.SRCINFO index 39ad582..c5a2ab9 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = plasma-workspace pkgdesc = KDE Plasma Workspace pkgver = 5.27.9.1 - pkgrel = 2 + pkgrel = 3 url = https://kde.org/plasma-desktop/ arch = x86_64 groups = plasma @@ -19,7 +19,7 @@ pkgbase = plasma-workspace depends = ktexteditor5 depends = libqalculate depends = kde-cli-tools - depends = appstream-qt + depends = appstream-qt5 depends = xorg-xrdb depends = xorg-xsetroot depends = kactivitymanagerd @@ -42,6 +42,7 @@ pkgbase = plasma-workspace source = https://download.kde.org/stable/plasma/5.27.9/plasma-workspace-5.27.9.1.tar.xz source = https://download.kde.org/stable/plasma/5.27.9/plasma-workspace-5.27.9.1.tar.xz.sig source = kde.pam + source = appstream-1.0.patch validpgpkeys = E0A3EB202F8E57528E13E72FD7574483BB57B18D validpgpkeys = 0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D validpgpkeys = D07BD8662C56CB291B316EB2F5675605C74E02CF @@ -49,6 +50,7 @@ pkgbase = plasma-workspace sha256sums = 8d00b691cfbb4d7218f97d0c68a677f41cba6eaf18e8fe29976c92d3718201b8 sha256sums = SKIP sha256sums = 00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739 + sha256sums = e3068a5709711dc54809b0280a59ec3ab6bc3b7ad0f0d93246e40d1daa1dc45e pkgname = plasma-workspace optdepends = plasma-workspace-wallpapers: additional wallpapers diff --git a/PKGBUILD b/PKGBUILD index 1aff421..c9ce9f4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,26 +7,32 @@ pkgbase=plasma-workspace pkgname=(plasma-workspace plasma-wayland-session) pkgver=5.27.9.1 _dirver=$(echo $pkgver | cut -d. -f1-3) -pkgrel=2 +pkgrel=3 pkgdesc='KDE Plasma Workspace' arch=(x86_64) url='https://kde.org/plasma-desktop/' license=(LGPL) -depends=(knotifyconfig5 ksystemstats ktexteditor5 libqalculate kde-cli-tools appstream-qt +depends=(knotifyconfig5 ksystemstats ktexteditor5 libqalculate kde-cli-tools appstream-qt5 xorg-xrdb xorg-xsetroot kactivitymanagerd kholidays5 xorg-xmessage milou prison5 kwin plasma-integration kpeople5 kactivities-stats5 kquickcharts5 kuserfeedback5 kpipewire accountsservice kio-extras kio-fuse qt5-tools oxygen-sounds) makedepends=(extra-cmake-modules kdoctools5 gpsd baloo5 networkmanager-qt5 plasma-wayland-protocols wayland-protocols kunitconversion5) groups=(plasma) -source=(https://download.kde.org/stable/plasma/$_dirver/$pkgbase-$pkgver.tar.xz{,.sig} kde.pam) +source=(https://download.kde.org/stable/plasma/$_dirver/$pkgbase-$pkgver.tar.xz{,.sig} kde.pam + appstream-1.0.patch) sha256sums=('8d00b691cfbb4d7218f97d0c68a677f41cba6eaf18e8fe29976c92d3718201b8' 'SKIP' - '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739') + '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739' + 'e3068a5709711dc54809b0280a59ec3ab6bc3b7ad0f0d93246e40d1daa1dc45e') 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 $pkgbase-$pkgver -p1 < appstream-1.0.patch # Support appstream 1.0 +} + build() { cmake -B build -S $pkgbase-$pkgver \ -DCMAKE_INSTALL_LIBEXECDIR=lib \ diff --git a/appstream-1.0.patch b/appstream-1.0.patch new file mode 100644 index 0000000..bbcc69d --- /dev/null +++ b/appstream-1.0.patch @@ -0,0 +1,115 @@ +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> +