[arch-commits] Commit in kaddressbook/repos/kde-unstable-x86_64 (3 files)

[Antonio Rojas]

    Date: Saturday, November 14, 2020 @ 09:27:37
  Author: arojas
Revision: 401009

archrelease: copy kde-unstable to kde-unstable-x86_64

Added:
  kaddressbook/repos/kde-unstable-x86_64/PKGBUILD
    (from rev 401008, kaddressbook/kde-unstable/PKGBUILD)
  kaddressbook/repos/kde-unstable-x86_64/kaddressbook-KDEInstallDirs.patch
    (from rev 401008, kaddressbook/kde-unstable/kaddressbook-KDEInstallDirs.patch)
Deleted:
  kaddressbook/repos/kde-unstable-x86_64/PKGBUILD

-----------------------------------+
 PKGBUILD                          |   62 +++++++++++++++++++-----------------
 kaddressbook-KDEInstallDirs.patch |   31 ++++++++++++++++++
 2 files changed, 65 insertions(+), 28 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-14 09:27:24 UTC (rev 401008)
+++ PKGBUILD	2020-11-14 09:27:37 UTC (rev 401009)
@@ -1,28 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=kaddressbook
-pkgver=20.11.80
-pkgrel=1
-pkgdesc="KDE contact manager"
-arch=(x86_64)
-url="https://kontact.kde.org"
-license=(GPL2)
-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})
-sha256sums=('bc29ba157ad083e4de1569c4e2a31db49fdb9e88758e60a2f6a85451f6d25530'
-            'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
-
-build() {
-  cmake -B build -S $pkgname-$pkgver \
-    -DBUILD_TESTING=OFF
-  cmake --build build
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --install build
-}

Copied: kaddressbook/repos/kde-unstable-x86_64/PKGBUILD (from rev 401008, kaddressbook/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-11-14 09:27:37 UTC (rev 401009)
@@ -0,0 +1,34 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=kaddressbook
+pkgver=20.11.80
+pkgrel=2
+pkgdesc="KDE contact manager"
+arch=(x86_64)
+url="https://kontact.kde.org"
+license=(GPL2)
+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}
+         kaddressbook-KDEInstallDirs.patch)
+sha256sums=('bc29ba157ad083e4de1569c4e2a31db49fdb9e88758e60a2f6a85451f6d25530'
+            '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
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+}

Copied: kaddressbook/repos/kde-unstable-x86_64/kaddressbook-KDEInstallDirs.patch (from rev 401008, kaddressbook/kde-unstable/kaddressbook-KDEInstallDirs.patch)
===================================================================
--- kaddressbook-KDEInstallDirs.patch	                        (rev 0)
+++ kaddressbook-KDEInstallDirs.patch	2020-11-14 09:27:37 UTC (rev 401009)
@@ -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)
+