git » kio-extras.git » commit 69910fc

diff --git a/PKGBUILD b/PKGBUILD
index ae95cd2..e2039f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kio-extras
-pkgver=18.12.1
+pkgver=18.12.2
 pkgrel=1
 pkgdesc="Additional components to increase the functionality of KIO"
 arch=(x86_64)
@@ -16,10 +16,12 @@ optdepends=('qt5-imageformats: thumbnails for additional image formats'
             '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'
+        kio-extras-rpc.patch
+        kio-extras-libappimage.patch)
+sha256sums=('16f76a1130fbfe01d3b72f15b1a5be763c9341e424b253b9025f6c6aa3beab45'
             'SKIP'
-            '94d9fd44daddb07fcd18d4c49c379838bdc5e4f0bdd9e03519814295eb6b7895')
+            '94d9fd44daddb07fcd18d4c49c379838bdc5e4f0bdd9e03519814295eb6b7895'
+            'ccac5c5856b6fdc2a671273a85e23499295ad55c2725b7a87fb1399241a5539e')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org>
 
@@ -28,6 +30,7 @@ prepare() {
 
   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() {
@@ -35,6 +38,7 @@ build() {
   cmake ../$pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
+    -DLIBAPPIMAGE_LIBRARIES=libappimage.so \
     -DBUILD_TESTING=OFF
   make
 }
diff --git a/kio-extras-libappimage.patch b/kio-extras-libappimage.patch
new file mode 100644
index 0000000..2064b33
--- /dev/null
+++ b/kio-extras-libappimage.patch
@@ -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})
+