[arch-commits] Commit in kio-extras/repos/extra-x86_64 (5 files)
Antonio Rojas
arojas at archlinux.org
Thu Feb 7 11:48:04 UTC 2019
Date: Thursday, February 7, 2019 @ 11:48:03
Author: arojas
Revision: 345537
archrelease: copy trunk to extra-x86_64
Added:
kio-extras/repos/extra-x86_64/PKGBUILD
(from rev 345536, kio-extras/trunk/PKGBUILD)
kio-extras/repos/extra-x86_64/kio-extras-libappimage.patch
(from rev 345536, kio-extras/trunk/kio-extras-libappimage.patch)
kio-extras/repos/extra-x86_64/kio-extras-rpc.patch
(from rev 345536, kio-extras/trunk/kio-extras-rpc.patch)
Deleted:
kio-extras/repos/extra-x86_64/PKGBUILD
kio-extras/repos/extra-x86_64/kio-extras-rpc.patch
------------------------------+
PKGBUILD | 94 +++++++++++++++++++++--------------------
kio-extras-libappimage.patch | 37 ++++++++++++++++
kio-extras-rpc.patch | 90 +++++++++++++++++++--------------------
3 files changed, 131 insertions(+), 90 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-02-07 11:47:49 UTC (rev 345536)
+++ PKGBUILD 2019-02-07 11:48:03 UTC (rev 345537)
@@ -1,45 +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=18.12.1
-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)
-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)
-sha256sums=('83ef90969b4d420677d9d2b72c0dc337dced5b265ad0b45e965f4ce61b57c59f'
- '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/extra-x86_64/PKGBUILD (from rev 345536, kio-extras/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-02-07 11:48:03 UTC (rev 345537)
@@ -0,0 +1,49 @@
+# 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.12.2
+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)
+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-libappimage.patch)
+sha256sums=('16f76a1130fbfe01d3b72f15b1a5be763c9341e424b253b9025f6c6aa3beab45'
+ 'SKIP'
+ '94d9fd44daddb07fcd18d4c49c379838bdc5e4f0bdd9e03519814295eb6b7895'
+ 'ccac5c5856b6fdc2a671273a85e23499295ad55c2725b7a87fb1399241a5539e')
+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-libappimage.patch # fix build with libappimage 0.1.8
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DLIBAPPIMAGE_LIBRARIES=libappimage.so \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: kio-extras/repos/extra-x86_64/kio-extras-libappimage.patch (from rev 345536, kio-extras/trunk/kio-extras-libappimage.patch)
===================================================================
--- kio-extras-libappimage.patch (rev 0)
+++ kio-extras-libappimage.patch 2019-02-07 11:48:03 UTC (rev 345537)
@@ -0,0 +1,37 @@
+diff --git a/thumbnail/CMakeLists.txt b/thumbnail/CMakeLists.txt
+--- a/thumbnail/CMakeLists.txt
++++ b/thumbnail/CMakeLists.txt
+@@ -7,18 +7,12 @@
+ PURPOSE "Provides support for OpenEXR formatted images in the thumbnail kioslave"
+ )
+
+-find_package(libappimage)
++find_package(libappimage CONFIG)
+ set_package_properties(libappimage PROPERTIES DESCRIPTION "Core library of the AppImage project"
+ URL "https://github.com/AppImage/libappimage"
+ TYPE OPTIONAL
+ PURPOSE "Provides support for AppImage thumbnails"
+ )
+-if (libappimage_FOUND)
+- # workaround for currently released libappimage versions (sadly no version check possible yet)
+- if (NOT LIBAPPIMAGE_INCLUDE_DIRS)
+- get_target_property(LIBAPPIMAGE_INCLUDE_DIRS libappimage INTERFACE_INCLUDE_DIRECTORIES)
+- endif()
+-endif()
+
+ include_directories(${CMAKE_BINARY_DIR})
+
+@@ -239,11 +233,10 @@
+
+ set(appimagethumbnail_SRCS appimagecreator.cpp)
+ add_library(appimagethumbnail MODULE ${appimagethumbnail_SRCS})
+-target_include_directories(appimagethumbnail PRIVATE ${LIBAPPIMAGE_INCLUDE_DIRS})
+ target_link_libraries(appimagethumbnail
+ KF5::KIOWidgets
+ Qt5::Gui
+- ${LIBAPPIMAGE_LIBRARIES}
++ libappimage
+ )
+
+ install(TARGETS appimagethumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR})
+
Deleted: kio-extras-rpc.patch
===================================================================
--- kio-extras-rpc.patch 2019-02-07 11:47:49 UTC (rev 345536)
+++ kio-extras-rpc.patch 2019-02-07 11:48:03 UTC (rev 345537)
@@ -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 345536, kio-extras/trunk/kio-extras-rpc.patch)
===================================================================
--- kio-extras-rpc.patch (rev 0)
+++ kio-extras-rpc.patch 2019-02-07 11:48:03 UTC (rev 345537)
@@ -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