diff options
Diffstat (limited to 'user/kio-extras')
| -rw-r--r-- | user/kio-extras/APKBUILD | 9 | ||||
| -rw-r--r-- | user/kio-extras/D17205-nfs-tirpc.patch | 143 |
2 files changed, 3 insertions, 149 deletions
diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD index 8fdc83304..6961d83f8 100644 --- a/user/kio-extras/APKBUILD +++ b/user/kio-extras/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kio-extras -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="KIO plugins for various data tasks" url="https://www.kde.org/" @@ -17,9 +17,7 @@ depends_dev="qt5-qtbase-dev qt5-qtsvg-dev karchive-dev kconfig-dev kio-dev kactivities-stats-dev" makedepends="$depends_dev cmake extra-cmake-modules shared-mime-info" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/kio-extras-$pkgver.tar.xz - D17205-nfs-tirpc.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/kio-extras-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -44,5 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="289d4336e563ee38be20f40c146172111ebeb3893edd15c76ad42435b8b1b0967864d8764519cd5c0aaa2580c56b76283076a3598917876b5e22acdf75ba9da7 kio-extras-19.12.3.tar.xz -dbc58b5d8a7783d5697a24fe6232f0aa3d6222cf15eeb8ce94f0ea99c81dce067ab1ef20261f77107cc9f75ecae506458a828a5ad3437b589ca00b93ad52b1e2 D17205-nfs-tirpc.patch" +sha512sums="50c895f678ca4b8b7b60e1b7dd4821fc5e665159a0b48cf5d1fbccef8ef83ef129e08cb0792cf2d4b243ccff021269ed47b9bfa4c4f8628cfa424a06071e16a1 kio-extras-20.04.2.tar.xz" diff --git a/user/kio-extras/D17205-nfs-tirpc.patch b/user/kio-extras/D17205-nfs-tirpc.patch deleted file mode 100644 index b12c0a2c5..000000000 --- a/user/kio-extras/D17205-nfs-tirpc.patch +++ /dev/null @@ -1,143 +0,0 @@ -Subject: Build kio_nfs against standalone libtirpc -From: asturmlechner -Date: Wed 28 Nov 07:41:00 UTC 2018 - -Summary - -Since glibc-2.26, cmake skipped over nfs when standalone tirpc -was installed in tirpc subdir (as done by Debian, Fedora, Arch, Gentoo...) - -Use FindTIRPC and make kio_nfs optional that way -FindTIRPC taken from https://phabricator.kde.org/D12761 - -Test Plan - -Built with libtirpc successfully. - -https://phabricator.kde.org/D17205 - -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -132,6 +132,11 @@ - set_package_properties(KF5KHtml PROPERTIES TYPE OPTIONAL - PURPOSE "Needed to build the man kioslave" - ) -+ -+ find_package(TIRPC) -+ set_package_properties(TIRPC PROPERTIES TYPE OPTIONAL -+ PURPOSE "Needed to build the NFS kioslave" -+ ) - else() - # FIXME: on windows we ignore support until trash gets integrated - endif() -@@ -174,9 +179,7 @@ - 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) -+ if(TIRPC_FOUND) - add_subdirectory( nfs ) - endif() - endif() -diff --git a/cmake/FindTIRPC.cmake b/cmake/FindTIRPC.cmake -new file mode 100644 ---- /dev/null -+++ b/cmake/FindTIRPC.cmake -@@ -0,0 +1,60 @@ -+# - Try to find TI-RPC -+# -+# The following variables will be available once found : -+# -+# TIRPC_INCLUDE_DIRS - The TI-RPC headers location -+# TIRPC_LIBRARIES - Link these to use TI-RPC -+# TIRPC_VERSION - The TIRPC version -+# -+#============================================================================= -+# Copyright (c) 2017 Christophe Giboudeaux <christophe@krop.fr> -+# -+# -+# Redistribution and use in source and binary forms, with or without -+# modification, are permitted provided that the following conditions -+# are met: -+# -+# 1. Redistributions of source code must retain the copyright -+# notice, this list of conditions and the following disclaimer. -+# 2. Redistributions in binary form must reproduce the copyright -+# notice, this list of conditions and the following disclaimer in the -+# documentation and/or other materials provided with the distribution. -+# 3. The name of the author may not be used to endorse or promote products -+# derived from this software without specific prior written permission. -+# -+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+#============================================================================= -+ -+find_package(PkgConfig QUIET) -+pkg_check_modules(PC_TIRPC libtirpc) -+ -+find_path(TIRPC_INCLUDE_DIRS -+ NAMES netconfig.h -+ PATH_SUFFIXES tirpc -+ HINTS ${PC_TIRPC_INCLUDE_DIRS} -+) -+ -+find_library(TIRPC_LIBRARIES -+ NAMES tirpc -+ HINTS ${PC_TIRPC_LIBRARY_DIRS} -+) -+ -+set(TIRPC_VERSION ${PC_TIRPC_VERSION}) -+ -+include(FindPackageHandleStandardArgs) -+ -+find_package_handle_standard_args(TIRPC -+ REQUIRED_VARS TIRPC_LIBRARIES TIRPC_INCLUDE_DIRS -+ VERSION_VAR TIRPC_VERSION -+) -+ -+mark_as_advanced(TIRPC_INCLUDE_DIRS TIRPC_LIBRARIES) -diff --git a/nfs/CMakeLists.txt b/nfs/CMakeLists.txt ---- a/nfs/CMakeLists.txt -+++ b/nfs/CMakeLists.txt -@@ -1,10 +1,12 @@ - ## Check for XDR functions --include(CheckFunctionExists) -+include(CheckSymbolExists) - --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) --CHECK_FUNCTION_EXISTS(xdr_u_longlong_t HAVE_XDR_U_LONGLONG_T) -+set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${TIRPC_LIBRARIES}) -+set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${TIRPC_INCLUDE_DIRS}) -+check_symbol_exists(xdr_u_int64_t "rpc/xdr.h" HAVE_XDR_U_INT64_T) -+check_symbol_exists(xdr_uint64_t "rpc/xdr.h" HAVE_XDR_UINT64_T) -+check_symbol_exists(xdr_u_hyper "rpc/xdr.h" HAVE_XDR_U_HYPER) -+check_symbol_exists(xdr_u_longlong_t "rpc/xdr.h" HAVE_XDR_U_LONGLONG_T) - - if (NOT HAVE_XDR_U_INT64_T AND NOT HAVE_XDR_UINT64_T AND NOT HAVE_XDR_U_HYPER AND NOT HAVE_XDR_U_LONGLONG_T) - message(FATAL_ERROR "Could not find 64-bit XDR datatype functions!") -@@ -24,9 +26,10 @@ - endif (HAVE_XDR_U_LONGLONG_T) - - add_definitions(-DTRANSLATION_DOMAIN=\"kio5_nfs\") -+include_directories(${TIRPC_INCLUDE_DIRS}) - - 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_LIBRARIES}) - set_target_properties(kio_nfs PROPERTIES OUTPUT_NAME "nfs") - - install(TARGETS kio_nfs DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kio) - |