[arch-commits] Commit in kaddressbook/kde-unstable (2 files)

[Antonio Rojas]

    Date: Saturday, November 14, 2020 @ 09:27:24
  Author: arojas
Revision: 401008

Fix pri install dir

Added:
  kaddressbook/kde-unstable/kaddressbook-KDEInstallDirs.patch
Modified:
  kaddressbook/kde-unstable/PKGBUILD

-----------------------------------+
 PKGBUILD                          |   12 +++++++++---
 kaddressbook-KDEInstallDirs.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-14 09:12:02 UTC (rev 401007)
+++ PKGBUILD	2020-11-14 09:27:24 UTC (rev 401008)
@@ -3,7 +3,7 @@
 
 pkgname=kaddressbook
 pkgver=20.11.80
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE contact manager"
 arch=(x86_64)
 url="https://kontact.kde.org"
@@ -11,12 +11,18 @@
 depends=(kontactinterface kdepim-runtime kuserfeedback)
 makedepends=(extra-cmake-modules kdoctools boost)
 groups=(kde-applications kdepim)
-source=("https://download.kde.org/unstable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+source=("https://download.kde.org/unstable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+         kaddressbook-KDEInstallDirs.patch)
 sha256sums=('bc29ba157ad083e4de1569c4e2a31db49fdb9e88758e60a2f6a85451f6d25530'
-            'SKIP')
+            'SKIP'
+            '044a91073a377371c21c931fe6de9c4a755155ea7ae69a9280d12889b2920376')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 -i ../kaddressbook-KDEInstallDirs.patch
+}
+
 build() {
   cmake -B build -S $pkgname-$pkgver \
     -DBUILD_TESTING=OFF

Added: kaddressbook-KDEInstallDirs.patch
===================================================================
--- kaddressbook-KDEInstallDirs.patch	                        (rev 0)
+++ kaddressbook-KDEInstallDirs.patch	2020-11-14 09:27:24 UTC (rev 401008)
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 415512d7..99bfd039 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,6 +9,12 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+ include(ECMInstallIcons)
+ 
+ 
++include(KDEInstallDirs)
++include(KDECMakeSettings)
++include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
++include(ECMAddAppIcon)
++include(ECMQtDeclareLoggingCategory)
++
+ include(ECMSetupVersion)
+ include(ECMAddTests)
+ 
+@@ -20,13 +26,6 @@ include(CheckFunctionExists)
+ include(ECMGeneratePriFile)
+ 
+ 
+-include(KDEInstallDirs)
+-include(KDECMakeSettings)
+-include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+-include(ECMAddAppIcon)
+-include(ECMQtDeclareLoggingCategory)
+-
+-
+ # Do NOT add quote
+ set(KDEPIM_DEV_VERSION beta)
+