summaryrefslogtreecommitdiff
path: root/user/spectacle
diff options
context:
space:
mode:
Diffstat (limited to 'user/spectacle')
-rw-r--r--user/spectacle/APKBUILD16
-rw-r--r--user/spectacle/kconfig.patch40
-rw-r--r--user/spectacle/qt5.9.patch23
3 files changed, 6 insertions, 73 deletions
diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD
index 653b3487f..3ee051c24 100644
--- a/user/spectacle/APKBUILD
+++ b/user/spectacle/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=spectacle
-pkgver=19.08.0
+pkgver=22.04.2
pkgrel=0
pkgdesc="Application for capturing desktop screenshots"
url="https://www.kde.org/applications/graphics/spectacle/"
@@ -12,12 +12,10 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
kcoreaddons-dev kwidgetsaddons-dev kdbusaddons-dev knotifications-dev
kconfig-dev ki18n-dev kio-dev kxmlgui-dev kwindowsystem-dev python3
kdoctools-dev kdeclarative-dev xcb-util-image-dev xcb-util-cursor-dev
- libxcb-dev xcb-util-renderutil-dev knewstuff-dev libkipi-dev"
+ libxcb-dev xcb-util-renderutil-dev knewstuff-dev libkipi-dev
+ kwayland-dev purpose-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/spectacle-$pkgver.tar.xz
- qt5.9.patch
- kconfig.patch
- "
+source="https://download.kde.org/stable/release-service/$pkgver/src/spectacle-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -31,7 +29,7 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DBUILD_TESTING=OFF \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -43,6 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="3581db1a0135e0942c3ddddeb8b8bf7d913e0bb45576a5a3982d24793bfab75f9ae66dc40db5708cdcadd950bd977a7c85ad44e20d8c8b50c2cf0e219cb89a97 spectacle-19.08.0.tar.xz
-781e1611026a45232fa117b90a1520bed380e512ae2e0690785a960f897342284ce0c553d8fb22caf10fd34c3823ee7dacb770815c871808345c1bb05126b74f qt5.9.patch
-9119ea6e7662f92a6daa37f16fbc634668cc179b872bc07173227b44821a2ebfbe15f083e3203a4abebd5380fffbb647e506c56466b743a8dd29e798cebd84e3 kconfig.patch"
+sha512sums="9fc2dd1792988c74ee7c7f5b6a32373dc9129e6a3beafaad82c58f3a512d9c61f8669fef53e3c682b0b4316d8eebf85833382da52ea39c3afe7df7e5efbb6ce3 spectacle-22.04.2.tar.xz"
diff --git a/user/spectacle/kconfig.patch b/user/spectacle/kconfig.patch
deleted file mode 100644
index 2d1860f2e..000000000
--- a/user/spectacle/kconfig.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From cab0844fef8bc6e7491978307245aadf65d64409 Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Thu, 15 Aug 2019 09:05:28 -0500
-Subject: [PATCH] Define QT_NO_FOREACH only if KConfig > 5.56.0
-
-Spectacle cannot be compiled with KConfig <= 5.56.0 otherwise, because
-KConfig uses Q_FOREACH in its public headers.
-
-Tested on: KConfig 5.54.0 / Qt 5.9.7
----
- CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 78eae41..79eb869 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -40,7 +40,7 @@ include(FeatureSummary)
- include(ECMQtDeclareLoggingCategory)
- include(ECMAddTests)
-
--add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOREACH)
-+add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_ASCII)
-
- find_package(
- Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
-@@ -67,6 +67,10 @@ find_package(
- XmlGui
- )
-
-+if(${KF5Config_VERSION} STRGREATER "5.56.0")
-+ add_definitions(-DQT_NO_FOREACH)
-+endif()
-+
- # optional components
-
- find_package(KF5Kipi)
---
-2.22.0
-
diff --git a/user/spectacle/qt5.9.patch b/user/spectacle/qt5.9.patch
deleted file mode 100644
index aa830f86b..000000000
--- a/user/spectacle/qt5.9.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- spectacle-19.04.0/CMakeLists.txt.old 2019-04-12 00:06:23.000000000 +0000
-+++ spectacle-19.04.0/CMakeLists.txt 2019-04-18 22:57:10.598054362 +0000
-@@ -11,7 +11,7 @@
- # Spectacle project
- project(Spectacle VERSION ${SPECTACLE_VERSION})
-
--set(QT_MIN_VERSION "5.10.0")
-+set(QT_MIN_VERSION "5.9.0")
- set(KF5_MIN_VERSION "5.53.0")
- set(PLASMA_MIN_VERSION "5.12.0")
-
---- spectacle-19.04.0/src/SpectacleCore.cpp.old 2019-04-11 07:37:14.000000000 +0000
-+++ spectacle-19.04.0/src/SpectacleCore.cpp 2019-04-18 22:57:46.694193923 +0000
-@@ -165,8 +165,7 @@
- break;
- case Actions::StartNewInstance:
- QProcess newInstance;
-- newInstance.setProgram(QStringLiteral("spectacle"));
-- newInstance.startDetached();
-+ newInstance.startDetached(QStringLiteral("spectacle"));
- break;
- }
- }