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

[Antonio Rojas]

    Date: Friday, January 12, 2018 @ 11:49:51
  Author: arojas
Revision: 314630

Fix file chooser layout with Qt 5.10 (FS#56736)

Modified:
  kio/trunk/PKGBUILD

----------+
 PKGBUILD |   30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-12 11:19:10 UTC (rev 314629)
+++ PKGBUILD	2018-01-12 11:49:51 UTC (rev 314630)
@@ -1,35 +1,41 @@
 # $Id$
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=kio
 pkgver=5.41.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Resource and network access abstraction'
-arch=('x86_64')
+arch=(x86_64)
 url='https://community.kde.org/Frameworks'
-license=('LGPL')
-depends=('solid' 'kjobwidgets' 'kbookmarks' 'libxslt' 'kwallet' 'desktop-file-utils')
-makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'doxygen' 'qt5-tools')
+license=(LGPL)
+depends=(solid kjobwidgets kbookmarks libxslt kwallet desktop-file-utils)
+makedepends=(extra-cmake-modules kdoctools python doxygen qt5-tools)
 optdepends=('kio-extras: extra protocols support (sftp, fish and more)' 'kdoctools: for the help kioslave'
             'knetattach: to add new kio-remote entries')
-groups=('kf5')
-source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
+groups=(kf5)
+source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig}
+        kdebug-352776.patch::"https://cgit.kde.org/kio.git/patch/?id=248941a0")
 sha256sums=('90c4c27959efec70849fd03e6cf9708d09c0101a15f3c14ab731ec0997bb649e'
-            'SKIP')
+            'SKIP'
+            '27231fbc2018caba19724a03b9ece21215bfb8d37d8cfe4e3b09095b4630f250')
 validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
 
 prepare() {
   mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../kdebug-352776.patch # Fix file chooser layout with Qt 5.10
 }
 
 build() {
   cd build
-  cmake ../${pkgname}-${pkgver} \
+  cmake ../$pkgname-$pkgver \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKDE_INSTALL_LIBDIR=lib \
-    -DKDE_INSTALL_LIBEXECDIR=lib \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_INSTALL_LIBEXECDIR=lib \
     -DBUILD_TESTING=OFF \
     -DBUILD_QCH=ON
   make
@@ -37,5 +43,5 @@
 
 package() {
   cd build
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 }