libre/kio: updated to 5.42.0

2 files changed, 62 insertions, 16 deletions

diff --git a/libre/kio/PKGBUILD b/libre/kio/PKGBUILD
index 3ad573372..4bf8b88a2 100644
--- a/libre/kio/PKGBUILD
+++ b/libre/kio/PKGBUILD
@@ -1,30 +1,30 @@
+# $Id$
 # Maintainer: Andreas Grapentin <andreas@grapentin.org>
 # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
+# Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kio
-
-pkgver=5.41.0
+pkgver=5.42.0
 pkgrel=1.parabola1
-arch=(i686 x86_64 armv7h)
-
-pkgdesc="Resource and network access abstraction, without non-privacy search engines"
-url="https://community.kde.org/Frameworks"
+pkgdesc='Resource and network access abstraction, without non-privacy search engines'
+arch=(x86_64 i686 armv7h)
+url='https://community.kde.org/Frameworks'
 license=(LGPL)
-
-makedepends=(extra-cmake-modules=$pkgver kdoctools python doxygen qt5-tools)
 depends=(solid kjobwidgets kbookmarks libxslt kwallet desktop-file-utils)
-optdepends=('kio-extras: extra protocols support (sftp, fish and more)'
+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}
+        kdebug-352776.patch::"https://cgit.kde.org/kio.git/patch/?id=248941a0"
         "duckduckgo_html.desktop"
         "duckduckgo_lite.desktop")
-sha256sums=('90c4c27959efec70849fd03e6cf9708d09c0101a15f3c14ab731ec0997bb649e'
+sha256sums=('ec1d0ef9523661614f347e3c99efe98813d0fab92e8fdb4a995685d013524694'
             'SKIP'
+            '27231fbc2018caba19724a03b9ece21215bfb8d37d8cfe4e3b09095b4630f250'
             '31910ab7393e67609f15e04a57f6406f63e6dae58b01bce0787741bc5958f292'
             '40466a9dad7075f2525e9e024720da7d7b49a22892b6fca8b81cc0e6408d2f7d')
 validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure@kde.org>
@@ -33,9 +33,10 @@ prepare() {
   mkdir -p build
 
   cd $pkgname-$pkgver
+  patch -p1 -i ../kdebug-352776.patch # Fix file chooser layout with Qt 5.10
 
   # Removing non-privacy search providers
-  rm -v src/urifilters/ikws/searchproviders/{7digital,acronym,amazon{,_mp3},amg,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,google_shopping,imdb,jamendo,jeeves,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop
+  rm -v src/urifilters/ikws/searchproviders/{7digital,acronym,amazon{,_mp3},amg,backports,baidu,bing,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,google_shopping,imdb,jamendo,jeeves,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop
 
   # Adding DuckDuckGo HTML
   cp -v "$srcdir/duckduckgo_html.desktop" src/urifilters/ikws/searchproviders
@@ -45,12 +46,11 @@ prepare() {
 
 build() {
   cd build
-
   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
@@ -58,6 +58,5 @@ build() {
 
 package() {
   cd build
-
   make DESTDIR="$pkgdir" install
 }
diff --git a/libre/kio/PKGBUILD?h=packages%2Fkio b/libre/kio/PKGBUILD?h=packages%2Fkio
new file mode 100644
index 000000000..31a79ced8
--- /dev/null
+++ b/libre/kio/PKGBUILD?h=packages%2Fkio
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars@archlinux.org>
+# Maintainer: Antonio Rojas <arojas@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kio
+pkgver=5.42.0
+pkgrel=1
+pkgdesc='Resource and network access abstraction'
+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)
+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}
+        kdebug-352776.patch::"https://cgit.kde.org/kio.git/patch/?id=248941a0")
+sha256sums=('ec1d0ef9523661614f347e3c99efe98813d0fab92e8fdb4a995685d013524694'
+            'SKIP'
+            '27231fbc2018caba19724a03b9ece21215bfb8d37d8cfe4e3b09095b4630f250')
+validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure@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 \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_INSTALL_LIBEXECDIR=lib \
+    -DBUILD_TESTING=OFF \
+    -DBUILD_QCH=ON
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}