git » ktorrent.git » commit afbaf2b

Fix build with Qt 5.11 (FS#59158), rebuild without CMAKE_BUILD_TYPE

author Antonio Rojas
2018-06-27 14:35:10 UTC
committer Antonio Rojas
2018-06-27 14:35:10 UTC
parent a29ac052ed392477fe138aede07f8e1a6636db05

Fix build with Qt 5.11 (FS#59158), rebuild without CMAKE_BUILD_TYPE

PKGBUILD +21 -11

diff --git a/PKGBUILD b/PKGBUILD
index d1ea906..7f85d78 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=ktorrent
 pkgver=5.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A powerful BitTorrent client for KDE"
 arch=(x86_64)
 url='https://www.kde.org/applications/internet/ktorrent/'
@@ -13,25 +13,35 @@ depends=(libktorrent kcmutils knotifyconfig kross)
 makedepends=(extra-cmake-modules kdoctools boost plasma-workspace kdnssd taglib kde-syndication kplotting kdewebkit)
 optdepends=('plasma-workspace: shutdown plugin' 'kdnssd: zeroconf plugin' 'taglib: mediaplayer plugin'
             'kde-syndication: syndication plugin' 'kdewebkit: search plugin, syndication plugin' 'kplotting: statistics plugin')
-source=("http://download.kde.org/stable/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig})
+source=("http://download.kde.org/stable/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig}
+        ktorrent-qt5.11.patch::"https://cgit.kde.org/ktorrent.git/patch/?id=16691987"
+        ktorrent-qt5.11b.patch::"https://cgit.kde.org/ktorrent.git/patch/?id=c66233cd"
+        ktorrent-qt5.11c.patch::"https://cgit.kde.org/ktorrent.git/patch/?id=672c5076")
 sha256sums=('3c57882f78006dcec3c5fb243479e995cc541e51e6acded5bf98a09900c486a3'
-            'SKIP')
+            'SKIP'
+            '653d4665807e007ab1d64217e4ca3ec1c94eca912e09b5b7616fa0fdc76a5423'
+            'ea4372920e7741d6accde2a9127761c801eb2548d3e262e0da799742e542a61e'
+            '9e63246e5a975f22dfd9cc2aae41153c676a1420daffd1de0a2e6c6a39d2fb82')
 validpgpkeys=(1EE5A3205904BAA2B88C0A9D24FD31940095C0E1) # Andrius Štikonas <andrius@stikonas.eu>
 
 prepare() {
   mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../ktorrent-qt5.11.patch # Fix build with Qt 5.11
+  patch -p1 -i ../ktorrent-qt5.11b.patch
+  patch -p1 -i ../ktorrent-qt5.11c.patch
 }
 
 build() {
-	cd build
-	cmake ../$pkgname-$pkgver \
-	  -DCMAKE_BUILD_TYPE=Release \
-	  -DCMAKE_INSTALL_PREFIX=/usr \
-          -DKDE_INSTALL_LIBDIR=lib
-	make
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib
+  make
 }
 
 package() {
-	cd build
-	make DESTDIR="$pkgdir" install
+  cd build
+  make DESTDIR="$pkgdir" install
 }