[arch-commits] Commit in kio-extras/repos (3 files)

[Antonio Rojas]

    Date: Sunday, August 19, 2018 @ 08:58:41
  Author: arojas
Revision: 332630

archrelease: copy trunk to staging-x86_64

Added:
  kio-extras/repos/staging-x86_64/
  kio-extras/repos/staging-x86_64/PKGBUILD
    (from rev 332629, kio-extras/trunk/PKGBUILD)
  kio-extras/repos/staging-x86_64/kio-extras-rpc.patch
    (from rev 332629, kio-extras/trunk/kio-extras-rpc.patch)

----------------------+
 PKGBUILD             |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 kio-extras-rpc.patch |   45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+)

Copied: kio-extras/repos/staging-x86_64/PKGBUILD (from rev 332629, kio-extras/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2018-08-19 08:58:41 UTC (rev 332630)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kio-extras
+pkgver=18.08.0
+pkgrel=2
+pkgdesc="Additional components to increase the functionality of KIO"
+arch=(x86_64)
+url='https://www.kde.org/applications/internet/'
+license=(LGPL)
+depends=(kio kdnssd libssh smbclient exiv2 openexr libmtp kpty kactivities)
+makedepends=(extra-cmake-modules kdoctools qt5-webengine gperf taglib khtml)
+optdepends=('qt5-webengine: HTML thumbnailer' 'qt5-imageformats: thumbnails for additional image formats'
+            'kimageformats: thumbnails for additional image formats' 'taglib: audio file thumbnails'
+            'khtml: man kioslave')
+groups=(kde-applications kdenetwork)
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+        kio-extras-rpc.patch)
+sha256sums=('764cb0e970da6df0e775d8eb793930005e893e8a2093fdb4a54ef36fc4ffaacc'
+            'SKIP'
+            '94d9fd44daddb07fcd18d4c49c379838bdc5e4f0bdd9e03519814295eb6b7895')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../kio-extras-rpc.patch # fix build of kio-nfs with glibc 2.27
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}
+

Copied: kio-extras/repos/staging-x86_64/kio-extras-rpc.patch (from rev 332629, kio-extras/trunk/kio-extras-rpc.patch)
===================================================================
--- staging-x86_64/kio-extras-rpc.patch	                        (rev 0)
+++ staging-x86_64/kio-extras-rpc.patch	2018-08-19 08:58:41 UTC (rev 332630)
@@ -0,0 +1,45 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 97528179..bf82cfac 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -170,9 +170,9 @@ if(NOT WIN32)
+    if(Gperf_FOUND AND KF5KHtml_FOUND)
+      add_subdirectory( man )
+    endif()
+-   check_include_files(rpc/rpc.h HAVE_RPC_RPC_H)
+-   add_feature_info("NFS kioslave" HAVE_RPC_RPC_H "The RPC library is needed to build the NFS kioslave")
+-   if(HAVE_RPC_RPC_H)
++   find_path(RPC_H_DIR rpc/rpc.h PATH_SUFFIXES tirpc)
++   add_feature_info("NFS kioslave" RPC_H_DIR "The RPC library is needed to build the NFS kioslave")
++   if(RPC_H_DIR)
+      add_subdirectory( nfs )
+    endif()
+ endif()
+diff --git a/nfs/CMakeLists.txt b/nfs/CMakeLists.txt
+index 3dce1c1e..461620c7 100644
+--- a/nfs/CMakeLists.txt
++++ b/nfs/CMakeLists.txt
+@@ -1,6 +1,11 @@
+ ## Check for XDR functions
+ include(CheckFunctionExists)
+ 
++if (${RPC_H_DIR} MATCHES tirpc)
++ find_library(TIRPC_LIB tirpc)
++endif()
++set(CMAKE_REQUIRED_LIBRARIES ${TIRPC_LIB})
++
+ CHECK_FUNCTION_EXISTS(xdr_u_int64_t HAVE_XDR_U_INT64_T)
+ CHECK_FUNCTION_EXISTS(xdr_uint64_t HAVE_XDR_UINT64_T)
+ CHECK_FUNCTION_EXISTS(xdr_u_hyper HAVE_XDR_U_HYPER)
+@@ -24,9 +29,10 @@ if (HAVE_XDR_U_LONGLONG_T)
+ endif (HAVE_XDR_U_LONGLONG_T)
+ 
+ add_definitions(-DTRANSLATION_DOMAIN=\"kio5_nfs\")
++include_directories(${RPC_H_DIR})
+ 
+ add_library(kio_nfs MODULE kio_nfs.cpp nfsv2.cpp nfsv3.cpp rpc_nfs3_prot_xdr.c rpc_nfs2_prot_xdr.c)
+-target_link_libraries(kio_nfs KF5::KIOCore KF5::I18n Qt5::Network)
++target_link_libraries(kio_nfs KF5::KIOCore KF5::I18n Qt5::Network ${TIRPC_LIB})
+ set_target_properties(kio_nfs PROPERTIES OUTPUT_NAME "nfs")
+ 
+ install(TARGETS kio_nfs DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kio)