[arch-commits] Commit in calligra-plan/trunk (PKGBUILD)

Antonio Rojas arojas at archlinux.org
Tue Sep 1 20:22:03 UTC 2020


    Date: Tuesday, September 1, 2020 @ 20:22:03
  Author: arojas
Revision: 395109

Fix build with Qt 5.15 (FS#67797)

Modified:
  calligra-plan/trunk/PKGBUILD

----------+
 PKGBUILD |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-01 19:08:10 UTC (rev 395108)
+++ PKGBUILD	2020-09-01 20:22:03 UTC (rev 395109)
@@ -10,24 +10,24 @@
 depends=(kinit akonadi-contacts kdiagram kactivities kholidays kcalendarcore khtml qca)
 makedepends=(extra-cmake-modules kdoctools boost)
 conflicts=('calligra<3.1.0')
-source=("https://download.kde.org/stable/calligra/$pkgver/calligraplan-$pkgver.tar.xz"{,.sig})
+source=("https://download.kde.org/stable/calligra/$pkgver/calligraplan-$pkgver.tar.xz"{,.sig}
+         calligra-plan-qt-5.15.patch::"https://invent.kde.org/office/calligraplan/-/commit/f77fb06d.patch")
 sha256sums=('e10c6f4a6fbf40da422d98d5138201f7db52236181c25641402e4ae4b0add336'
-            'SKIP')
+            'SKIP'
+            '4ea0f9e0dc2a6336120d2cd7907de127a10b690254b522b5bb082d200f03bc55')
 validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD  # Boudewijn Rempt <foundation at krita.org>
               42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen <danders at get2net.dk>
 
 prepare() {
-  mkdir -p build
+  patch -d calligraplan-$pkgver -p1 -i ../calligra-plan-qt-5.15.patch # Fix build with Qt 5.15
 }
 
 build() {
-  cd build
-  cmake ../calligraplan-$pkgver \
+  cmake -B build -S calligraplan-$pkgver \
     -DBUILD_TESTING=OFF
-  make
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }



More information about the arch-commits mailing list