kio_extras: fixes for mime database

* fix build for kpty and thumbnals plugins

kde-apps/kio-extras/kio_extras-18.12.2.recipe

@@ -12,7 +12,7 @@ This package also supports the following protocols:
 HOMEPAGE="https://github.com/KDE/kio-extras/"
 COPYRIGHT="2010-2019 KDE Organisation"
 LICENSE="GNU LGPL v2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://github.com/KDE/kio-extras/archive/v$portVersion.tar.gz"
 SOURCE_DIR="kio-extras-$portVersion"
 CHECKSUM_SHA256="5a0c97d699990bfe4200d15867d37125c8dbfe6e8a61106b2b34c3668060e844"
@@ -49,9 +49,11 @@ REQUIRES="
 	lib:libKF5ItemViews$secondaryArchSuffix
 	lib:libKF5KIOCore$secondaryArchSuffix
 	lib:libKF5JobWidgets$secondaryArchSuffix
+	lib:libKF5Pty$secondaryArchSuffix
 	lib:libKF5Service$secondaryArchSuffix
 	lib:libKF5Solid$secondaryArchSuffix
 	lib:libKF5WidgetsAddons$secondaryArchSuffix
+	lib:libKF5WindowSystem$secondaryArchSuffix
 	lib:libKF5XmlGui$secondaryArchSuffix
 	lib:libmtp$secondaryArchSuffix
 	lib:libphonon4qt5$secondaryArchSuffix
@@ -92,16 +94,17 @@ BUILD_REQUIRES="
 	devel:libKF5ItemViews$secondaryArchSuffix
 	devel:libKF5JobWidgets$secondaryArchSuffix
 	devel:libKF5KIOCore$secondaryArchSuffix
+	devel:libKF5Pty$secondaryArchSuffix
 	devel:libKF5Service$secondaryArchSuffix
 	devel:libKF5Solid$secondaryArchSuffix
 	devel:libKF5WidgetsAddons$secondaryArchSuffix
+	devel:libKF5WindowSystem$secondaryArchSuffix
 	devel:libKF5XmlGui$secondaryArchSuffix
 	devel:libmtp$secondaryArchSuffix
 	devel:libphonon4qt5$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix >= 5.7
-	devel:libQt5DBus$secondaryArchSuffix >= 5.7
-	devel:libQt5Gui$secondaryArchSuffix >= 5.7
-	devel:libQt5Network$secondaryArchSuffix >= 5.7
+	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5Gui$secondaryArchSuffix
+	devel:libQt5Network$secondaryArchSuffix
 	devel:libsmbclient$secondaryArchSuffix
 	devel:libssh$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
@@ -111,7 +114,7 @@ BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
 	cmd:gperf
-	cmd:lrelease$secondaryArchSuffix >= 5
+	cmd:lrelease$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:find
@@ -124,12 +127,17 @@ TEST_REQUIRES="
 
 BUILD()
 {
+	# disable docs generation
+	sed -e '/add_subdirectory( doc )/ s/^#*/#/' -i CMakeLists.txt
+
 	mkdir -p build
 	cd build
 
 	cmake .. $cmakeDirArgs \
+		-DCMAKE_BUILD_TYPE=Release \
 		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DLIBSSH_LIBRARIES="-lssh" \
 		-DCMAKE_CXX_FLAGS="-fstack-protector"
 	make $jobArgs
 }
@@ -139,6 +147,9 @@ INSTALL()
 	cd build
 	make $jobArgs install
 
+	rm -rf $dataDir/mime/{aliases,generic-icons,globs,globs2,icons,magic}
+	rm -rf $dataDir/mime/{mime.cache,subclasses,treemagic,types,version,XMLnamespaces}
+
 	prepareInstalledDevelLibs \
 		libkioarchive \
 

kde-apps/kio-extras/patches/kio_extras-18.12.2.patchset

@@ -1,68 +1,31 @@
-From 12910f0f724adba5937e6499a77c8cdd44542256 Mon Sep 17 00:00:00 2001
-From: Sergei Reznikov <diver@gelios.net>
-Date: Sun, 18 Aug 2019 19:43:29 +0300
-Subject: disable docs generation until libxml package is fixed
+From 5ee7b8cf9f11ba8cdaa2163f905479e10bf32843 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Fri, 28 Jan 2022 10:13:34 +1000
+Subject: Fix build
 
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 75378a9..63c7333 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -136,7 +136,7 @@ else()
-     # FIXME: on windows we ignore support until trash gets integrated
- endif()
- 
--add_subdirectory( doc )
-+#add_subdirectory( doc )
- 
- add_subdirectory( about )
- if(KF5Activities_FOUND)
+diff --git a/thumbnail/thumbnail.cpp b/thumbnail/thumbnail.cpp
+index c4db1d1..42b7ca0 100644
+--- a/thumbnail/thumbnail.cpp
++++ b/thumbnail/thumbnail.cpp
+@@ -25,7 +25,7 @@
+     #include <machine/param.h>
+ #endif
+ #include <sys/types.h>
+-#ifndef Q_OS_WIN
++#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU)
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ #include <unistd.h> // nice()
+@@ -333,7 +333,7 @@ void ThumbnailProtocol::get(const QUrl &url)
+             data(imgData);
+         }
+     } else {
+-#ifndef Q_OS_WIN
++#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU)
+         QByteArray imgData;
+         QDataStream stream( &imgData, QIODevice::WriteOnly );
+         //qDebug() << "IMAGE TO SHMID";
 -- 
-2.21.0
-
-
-From dc72f7fcf47e3d7ca38ac2911fcf030a72931218 Mon Sep 17 00:00:00 2001
-From: Sergei Reznikov <diver@gelios.net>
-Date: Sun, 18 Aug 2019 19:53:57 +0300
-Subject: disable linking with KF5Pty
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 63c7333..48f0227 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -42,7 +42,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-     GuiAddons
- )
- # As this is the check used for linkage, only require it in the same location...
--if (UNIX)
-+if (UNIX AND NOT HAIKU)
-     find_package(KF5Pty ${KF5_MIN_VERSION} REQUIRED)
- endif()
- 
--- 
-2.21.0
-
-
-From 89029b7580e5b8dd1903e0e0b97238cff0bf29d3 Mon Sep 17 00:00:00 2001
-From: Sergei Reznikov <diver@gelios.net>
-Date: Sun, 18 Aug 2019 19:55:32 +0300
-Subject: disable thumbnail plugin as it requires KF5Pty which we don't have
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 48f0227..21767f2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -158,7 +158,7 @@ if (NOT WIN32)
-     # Used for getting the resource limit for closing all child process FDs. Could be completely replaced by fcloseall() if available for Unix or _fcloseall() for Windows, either conditionally on Q_OS_type or using a configure test.
-     add_subdirectory( fish )
- endif()
--add_subdirectory( thumbnail )
-+#add_subdirectory( thumbnail )
- add_subdirectory( docfilter )
- if (libssh_FOUND AND HAVE_UTIME_H)
-     # does not compile on Windows: kio_sftp.cpp(28): fatal error C1083: Cannot open include file: 'utime.h': No such file or directory
--- 
-2.21.0
+2.30.2