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

[Antonio Rojas via arch-commits]

    Date: Friday, February 12, 2021 @ 07:54:35
  Author: arojas
Revision: 856827

Fix build with Qt 5.15, fix taskbar item on Wayland, modernize PKGBUILD

Modified:
  trojita/trunk/PKGBUILD

----------+
 PKGBUILD |   29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2021-02-12 07:10:14 UTC (rev 856826)
+++ PKGBUILD    2021-02-12 07:54:35 UTC (rev 856827)
@@ -4,39 +4,40 @@
 
 pkgname=trojita
 pkgver=0.7
-pkgrel=3
+pkgrel=4
 pkgdesc="A Qt IMAP email client"
 arch=(x86_64)
 url="https://trojita.flaska.net";
 license=(GPL)
 makedepends=(cmake qt5-tools pinentry)
-depends=(hicolor-icon-theme qt5-webkit qtkeychain qt5-svg qgpgme mimetic)
+depends=(hicolor-icon-theme qt5-webkit qtkeychain-qt5 qt5-svg qgpgme mimetic)
 
source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz{,.asc}
         trojita-gpgme.patch
-        
trojita-fix-crash.patch::"https://cgit.kde.org/trojita.git/patch/?id=cf2364b8";)
+        
trojita-fix-crash.patch::"https://invent.kde.org/pim/trojita/-/commit/cf2364b8.patch";
+        
trojita-qt5.15.patch::"https://invent.kde.org/pim/trojita/-/commit/2869c385.patch";
+        
trojita-desktop.patch::"https://invent.kde.org/pim/trojita/-/commit/d080f785.patch";)
 sha256sums=('e08da881721cafa00ecd772eaef6b99fd37d068cb703eeb532de0ed1ea0136d9'
             'SKIP'
             '9f99bd2d91cd3b345e2bf52c0d9929ea81147f6578b774c5d2b4f2e86aade2a8'
-            '6078b569d152f48289669d7bd41dd6c350a21908df5b3c456d304f0534ce2a53')
+            '3b97c6b60a986ca1ec5f505589600f6ed88a0ddd45960815a64c5f63b7e70d98'
+            '7d0a506f16bd0bd112decfb25927fd19d77e53c71ac94e1e06ffddb16381d62e'
+            'f7a72c2fa4c8e2bd592a705781a32f6148198f7b43f603e2e0e704b92b38f2c5')
 validpgpkeys=('61AB87D6F66CE2FCD2D2E1F56A65DFA844722517')
 
 prepare() {
-  mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../trojita-gpgme.patch # suport gmgpe's gpgme++
-  patch -p1 -i ../trojita-fix-crash.patch # Fix crash when opening attachments
+  patch -d $pkgname-$pkgver -p1 < trojita-gpgme.patch # suport gmgpe's gpgme++
+  patch -d $pkgname-$pkgver -p1 < trojita-fix-crash.patch # Fix crash when 
opening attachments
+  patch -d $pkgname-$pkgver -p1 < trojita-qt5.15.patch # Fix build with Qt 5.15
+  patch -d $pkgname-$pkgver -p1 < trojita-desktop.patch # Fix taskbar item on 
Wayland
 }
 
 build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
+  cmake -B build -S $pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DWITH_TESTS=OFF
-  make
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }