diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-08-15 16:05:09 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-08-15 16:05:09 +0000 |
| commit | 2ceb6f3abca081464614cf99a42ae76c396c8f26 (patch) | |
| tree | 1b8dddf72f0e88e1c0a4a3c809089b3a99423697 /user/spectacle | |
| parent | f1086867c788eec4c8cd02317f8970105289efc0 (diff) | |
| download | packages-2ceb6f3abca081464614cf99a42ae76c396c8f26.tar.gz packages-2ceb6f3abca081464614cf99a42ae76c396c8f26.tar.bz2 packages-2ceb6f3abca081464614cf99a42ae76c396c8f26.tar.xz packages-2ceb6f3abca081464614cf99a42ae76c396c8f26.zip | |
user/[KDE Applications]: Bump to 19.08.0
Diffstat (limited to 'user/spectacle')
| -rw-r--r-- | user/spectacle/APKBUILD | 12 | ||||
| -rw-r--r-- | user/spectacle/kconfig.patch | 40 |
2 files changed, 46 insertions, 6 deletions
diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD index aedc2d30d..653b3487f 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.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Application for capturing desktop screenshots" url="https://www.kde.org/applications/graphics/spectacle/" @@ -16,10 +16,10 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/spectacle-$pkgver.tar.xz qt5.9.patch + kconfig.patch " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,19 +30,19 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_TESTING=OFF \ ${CMAKE_CROSSOPTS} make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="e26b73e8523d65956f6e744ffeb15ed1f63fec2cf2f1352ff5ab0f9c208d30efeb43665592a215dcfc65e0cae201675f5a14a86c23e516b3fcb30902ef71143e spectacle-19.04.3.tar.xz -781e1611026a45232fa117b90a1520bed380e512ae2e0690785a960f897342284ce0c553d8fb22caf10fd34c3823ee7dacb770815c871808345c1bb05126b74f qt5.9.patch" +sha512sums="3581db1a0135e0942c3ddddeb8b8bf7d913e0bb45576a5a3982d24793bfab75f9ae66dc40db5708cdcadd950bd977a7c85ad44e20d8c8b50c2cf0e219cb89a97 spectacle-19.08.0.tar.xz +781e1611026a45232fa117b90a1520bed380e512ae2e0690785a960f897342284ce0c553d8fb22caf10fd34c3823ee7dacb770815c871808345c1bb05126b74f qt5.9.patch +9119ea6e7662f92a6daa37f16fbc634668cc179b872bc07173227b44821a2ebfbe15f083e3203a4abebd5380fffbb647e506c56466b743a8dd29e798cebd84e3 kconfig.patch" diff --git a/user/spectacle/kconfig.patch b/user/spectacle/kconfig.patch new file mode 100644 index 000000000..2d1860f2e --- /dev/null +++ b/user/spectacle/kconfig.patch @@ -0,0 +1,40 @@ +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 + |