[arch-commits] Commit in kio-extras/repos/extra-x86_64 (5 files)
Antonio Rojas
arojas at archlinux.org
Thu Dec 12 13:44:03 UTC 2019
Date: Thursday, December 12, 2019 @ 13:44:02
Author: arojas
Revision: 371024
archrelease: copy trunk to extra-x86_64
Added:
kio-extras/repos/extra-x86_64/PKGBUILD
(from rev 371023, kio-extras/trunk/PKGBUILD)
kio-extras/repos/extra-x86_64/kio-extras-rpc.patch
(from rev 371023, kio-extras/trunk/kio-extras-rpc.patch)
Deleted:
kio-extras/repos/extra-x86_64/PKGBUILD
kio-extras/repos/extra-x86_64/kio-extras-libssh-0.9.patch
kio-extras/repos/extra-x86_64/kio-extras-rpc.patch
-----------------------------+
PKGBUILD | 90 ++++++++++++++++++++----------------------
kio-extras-libssh-0.9.patch | 14 ------
kio-extras-rpc.patch | 90 +++++++++++++++++++++---------------------
3 files changed, 89 insertions(+), 105 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-12-12 13:43:53 UTC (rev 371023)
+++ PKGBUILD 2019-12-12 13:44:02 UTC (rev 371024)
@@ -1,46 +0,0 @@
-# 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=19.08.3
-pkgrel=1
-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 syntax-highlighting)
-makedepends=(extra-cmake-modules kdoctools gperf taglib khtml libappimage)
-optdepends=('qt5-imageformats: thumbnails for additional image formats'
- 'kimageformats: thumbnails for additional image formats' 'taglib: audio file thumbnails'
- 'khtml: man kioslave' 'phonon-qt5: audio file previews' 'libappimage: AppImage thumbnails')
-groups=(kde-applications kdenetwork)
-source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
- kio-extras-rpc.patch kio-extras-libssh-0.9.patch)
-sha256sums=('e38e872f78ff24fe512ec7ff9ed4f6b6a8e1fef6111fdb0222c133bed0a8861f'
- 'SKIP'
- '94d9fd44daddb07fcd18d4c49c379838bdc5e4f0bdd9e03519814295eb6b7895'
- '6e97c66d2b5adfdeaa34864ec54c2ac1728710af735c8acdd4f1c5e0c446efc2')
-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
- patch -p1 -i ../kio-extras-libssh-0.9.patch # fix build with libssh 0.9
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DLIBAPPIMAGE_LIBRARIES=libappimage.so \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: kio-extras/repos/extra-x86_64/PKGBUILD (from rev 371023, kio-extras/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-12-12 13:44:02 UTC (rev 371024)
@@ -0,0 +1,44 @@
+# 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=19.12.0
+pkgrel=1
+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-stats phonon-qt5 syntax-highlighting)
+makedepends=(extra-cmake-modules kdoctools gperf taglib libappimage)
+optdepends=('qt5-imageformats: thumbnails for additional image formats'
+ 'kimageformats: thumbnails for additional image formats' 'taglib: audio file thumbnails'
+ 'phonon-qt5: audio file previews' 'libappimage: AppImage thumbnails')
+groups=(kde-applications kdenetwork)
+source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+ kio-extras-rpc.patch)
+sha256sums=('7943c14a5a095a8d8d3ee868be085ddc59d6a0ec172637c3551e148fadc9ac6c'
+ '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 \
+ -DLIBAPPIMAGE_LIBRARIES=libappimage.so \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Deleted: kio-extras-libssh-0.9.patch
===================================================================
--- kio-extras-libssh-0.9.patch 2019-12-12 13:43:53 UTC (rev 371023)
+++ kio-extras-libssh-0.9.patch 2019-12-12 13:44:02 UTC (rev 371024)
@@ -1,14 +0,0 @@
-diff --git a/sftp/CMakeLists.txt b/sftp/CMakeLists.txt
-index 5e8d2cb1..aa88f054 100644
---- a/sftp/CMakeLists.txt
-+++ b/sftp/CMakeLists.txt
-@@ -9,6 +9,9 @@ target_link_libraries(kio_sftp
- KF5::I18n
- Qt5::Network
- ${LIBSSH_LIBRARIES})
-+if(TARGET ssh_shared) # libssh 0.9
-+ target_link_libraries(kio_sftp ssh_shared)
-+endif()
- set_target_properties(kio_sftp PROPERTIES OUTPUT_NAME "sftp")
-
- install(TARGETS kio_sftp DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kio)
Deleted: kio-extras-rpc.patch
===================================================================
--- kio-extras-rpc.patch 2019-12-12 13:43:53 UTC (rev 371023)
+++ kio-extras-rpc.patch 2019-12-12 13:44:02 UTC (rev 371024)
@@ -1,45 +0,0 @@
-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)
Copied: kio-extras/repos/extra-x86_64/kio-extras-rpc.patch (from rev 371023, kio-extras/trunk/kio-extras-rpc.patch)
===================================================================
--- kio-extras-rpc.patch (rev 0)
+++ kio-extras-rpc.patch 2019-12-12 13:44:02 UTC (rev 371024)
@@ -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)
More information about the arch-commits
mailing list