digiKam: add recipe for 6.2.0 version

2026-04-23 12:10:06 +02:00 · 2019-08-24 22:32:17 +10:00
parent c009173b10
commit 80b4a12a66
5 changed files with 363 additions and 124 deletions
--- a/media-gfx/digikam/additional-files/digikam.rdef.in
+++ b/media-gfx/digikam/additional-files/digikam.rdef.in
@@ -19,3 +19,29 @@ resource file_types message {
 	"types" = "image"
 };

+resource vector_icon {
+	$"6E63696606040033054F04FF19040066031789BA0374B8D6090207B4FCC2B1B4"
+	$"FCC2B1B4FBC2DBB4F6C32EB4F6C304B4F6CACAC2B1D0E9BB15D0E9CA4CD0E9D0"
+	$"6CC32ED06CCACAD06CC304D065C2B1D067C2DBD023CA11C2B1CFEECA21CFEEBB"
+	$"40CFEEB4FCC2B1B53ECA11B4FCC2B10204C2B1B4F6CA4CB4F6BB15B4F6B4F6C2"
+	$"B1B4F6BB16B4F6CA4CC2B1D06CBB15D06CCA4CD06CD06CC2B1D06CCA4CD06CBB"
+	$"160206C2B1B4F6CA4CB4F6BB15B4F6B4F6C2B1B4F6BB15B4F6C2BFB4F8C2DBB4"
+	$"F7C2CDB524BB67C2B1B573BB31B573CA30B573D06AC2DBD03DBB67D06AC2CDD0"
+	$"6CC2B1D06CC2BFD06CBB150206BB83C358BBA8BF83BB81C338BB7FC2F7BB80C3"
+	$"17BB7FBF06C2B1BBD3BEB8BBD3C6A9BBD3C9E2C2F7C9E2BF06C9E1C30EC9DEC3"
+	$"3CC9E0C325C9AABF72C2B1BC79C683BC7ABED4BC7B0204C0EDB9DDBCF8B9DDC4"
+	$"E1B9DDC7FCC0EDC7FCBCF9C7FCC4E1C0EDC7FDC4E1C7FDBCF8C7FDB9DDC0EDB9"
+	$"DDC4E1B9DDBCF90204C151CA0CBE3ECA0CC464CA0CC6CFC48EC6CFC7A1C6CFC1"
+	$"7BC151BF10C464BF10BE3EBF10BBD3C48EBBD3C17BBBD3C7A10204C151C98EBE"
+	$"3EC98EC464C98EC6CFC410C6CFC724C6CFC0FDC151BE92C464BE92BE3EBE92BB"
+	$"D3C410BBD3C0FDBBD3C7240204C1E8BF4241BF42C3AABF42C50BC266C50BC0A4"
+	$"C50BC427C1E8C589C3AAC58941C589BEC4C266BEC4C427BEC4C0A40204C1E8BE"
+	$"C541BEC5C3AABEC5C50BC1E8C50B41C50BC3AAC1E8C50BC3AAC50B41C50BBEC4"
+	$"C1E8BEC4C3AABEC441090A000100023F7A490000000000003F8AB8C25B6DC366"
+	$"C40A010101023F7A490000000000003F6E07C25B6DC24C450A020102023F7A49"
+	$"0000000000003F6E07C25B6DC24C450A0001030240727D000000000000406FBB"
+	$"C8198BC821CD0A0301040240727D000000000000406FBBC6D0B5C6DDD60A0001"
+	$"050240266C00000000000040244AC4D917C7E82E0A0401060240266C00000000"
+	$"000040244AC574C4C7998E0A0001070240266C000000000000409C11C4D917C8"
+	$"64810A05010802404DF2000000000000404C37C6E7FFC6F27D"
+};
--- a/media-gfx/digikam/additional-files/showfoto.rdef.in
+++ b/media-gfx/digikam/additional-files/showfoto.rdef.in
@@ -0,0 +1,47 @@
+
+resource app_flags B_MULTIPLE_LAUNCH;
+
+resource app_version {
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = @MINOR@,
+
+	variety = B_APPV_FINAL,
+	internal = 0,
+
+	short_info = "showFoto",
+	long_info = "@LONG_INFO@"
+};
+
+resource app_signature "@APP_SIGNATURE@";
+
+resource file_types message {
+	"types" = "image"
+};
+
+resource vector_icon {
+	$"6E63696606040033054F04FF1904006603FFA80003E7E48F090207B4FCC2B1B4"
+	$"FCC2B1B4FBC2DBB4F6C32EB4F6C304B4F6CACAC2B1D0E9BB15D0E9CA4CD0E9D0"
+	$"6CC32ED06CCACAD06CC304D065C2B1D067C2DBD023CA11C2B1CFEECA21CFEEBB"
+	$"40CFEEB4FCC2B1B53ECA11B4FCC2B10204C2B1B4F6CA4CB4F6BB15B4F6B4F6C2"
+	$"B1B4F6BB16B4F6CA4CC2B1D06CBB15D06CCA4CD06CD06CC2B1D06CCA4CD06CBB"
+	$"160206C2B1B4F6CA4CB4F6BB15B4F6B4F6C2B1B4F6BB15B4F6C2BFB4F8C2DBB4"
+	$"F7C2CDB524BB67C2B1B573BB31B573CA30B573D06AC2DBD03DBB67D06AC2CDD0"
+	$"6CC2B1D06CC2BFD06CBB150206BB83C358BBA8BF83BB81C338BB7FC2F7BB80C3"
+	$"17BB7FBF06C2B1BBD3BEB8BBD3C6A9BBD3C9E2C2F7C9E2BF06C9E1C30EC9DEC3"
+	$"3CC9E0C325C9AABF72C2B1BC79C683BC7ABED4BC7B0204C0EDB9DDBCF8B9DDC4"
+	$"E1B9DDC7FCC0EDC7FCBCF9C7FCC4E1C0EDC7FDC4E1C7FDBCF8C7FDB9DDC0EDB9"
+	$"DDC4E1B9DDBCF90204C151CA0CBE3ECA0CC464CA0CC6CFC48EC6CFC7A1C6CFC1"
+	$"7BC151BF10C464BF10BE3EBF10BBD3C48EBBD3C17BBBD3C7A10204C151C98EBE"
+	$"3EC98EC464C98EC6CFC410C6CFC724C6CFC0FDC151BE92C464BE92BE3EBE92BB"
+	$"D3C410BBD3C0FDBBD3C7240204C1E8BF4241BF42C3AABF42C50BC266C50BC0A4"
+	$"C50BC427C1E8C589C3AAC58941C589BEC4C266BEC4C427BEC4C0A40204C1E8BE"
+	$"C541BEC5C3AABEC5C50BC1E8C50B41C50BC3AAC1E8C50BC3AAC50B41C50BBEC4"
+	$"C1E8BEC4C3AABEC441090A000100023F7A490000000000003F8AB8C25B6DC366"
+	$"C40A010101023F7A490000000000003F6E07C25B6DC24C450A020102023F7A49"
+	$"0000000000003F6E07C25B6DC24C450A0001030240727D000000000000406FBB"
+	$"C8198BC821CD0A0301040240727D000000000000406FBBC6D0B5C6DDD60A0001"
+	$"050240266C00000000000040244AC4D917C7E82E0A0401060240266C00000000"
+	$"000040244AC574C4C7998E0A0001070240266C000000000000409C11C4D917C8"
+	$"64810A05010802404DF2000000000000404C37C6E7FFC6F27D"
+};
--- a/media-gfx/digikam/digikam-6.2.0.recipe
+++ b/media-gfx/digikam/digikam-6.2.0.recipe
@@ -4,23 +4,39 @@ application that runs on Linux, Windows, and MacOS. The application provides \
 a comprehensive set of tools for importing, managing, editing, and sharing \
 photos and RAW files."
 HOMEPAGE="https://digikam.org/"
-COPYRIGHT="2010-2018 KDE Organisation"
+COPYRIGHT="2010-2019 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
-SOURCE_URI="https://github.com/KDE/digikam/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="8757f92da30f26b6c9eb51e6b6bb81edbe257fce72f540cc04917b32de4655ea"
-PATCHES="digikam-5.9.0.patchset"
-ADDITIONAL_FILES="digikam.rdef.in"
+SOURCE_URI="https://download.kde.org/stable/digikam/$portVersion/digikam-$portVersion.tar.xz"
+CHECKSUM_SHA256="28762ea0f03a82e3b2473c0682a358c9b83f5013aec827dd5ab6556a1f29baeb"
+PATCHES="digikam-$portVersion.patchset"
+ADDITIONAL_FILES="
+	digikam.rdef.in
+	showfoto.rdef.in
+	"

-ARCHITECTURES="x86 ?x86_64"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	digikam$secondaryArchSuffix = $portVersion
 	app:digiKam$secondaryArchSuffix = $portVersion
+	app:showFoto$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libavcodec$secondaryArchSuffix
+	lib:libavformat$secondaryArchSuffix
+	lib:libavutil$secondaryArchSuffix
+	lib:libexiv2$secondaryArchSuffix
+	lib:libexpat$secondaryArchSuffix
+	lib:libglib_2.0${secondaryArchSuffix}
+	lib:libgomp$secondaryArchSuffix
+	lib:libgphoto2$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libjasper$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
 	lib:libkdeinit5_kded5$secondaryArchSuffix
 	lib:libkdeinit5_klauncher$secondaryArchSuffix
 	lib:libKF5Archive$secondaryArchSuffix
@@ -36,6 +52,7 @@ REQUIRES="
 	lib:libKF5DBusAddons$secondaryArchSuffix
 	lib:libKF5DocTools$secondaryArchSuffix
 	lib:libKF5Emoticons$secondaryArchSuffix
+#	lib:libKF5FileMetadata$secondaryArchSuffix
 	lib:libKF5GuiAddons$secondaryArchSuffix
 	lib:libKF5I18n$secondaryArchSuffix
 	lib:libKF5IconThemes$secondaryArchSuffix
@@ -44,33 +61,61 @@ REQUIRES="
 	lib:libKF5JobWidgets$secondaryArchSuffix
 	lib:libKF5KIOCore$secondaryArchSuffix
 	lib:libKF5KIOFileWidgets$secondaryArchSuffix
-	lib:libKF5KIOWidgets$secondaryArchSuffix
+	lib:libKF5KIOWidgets$secondaryArchSuffix	
 	lib:libKF5Notifications$secondaryArchSuffix
+	lib:libKF5NotifyConfig$secondaryArchSuffix
 	lib:libKF5Parts$secondaryArchSuffix
+	lib:libKF5Sane$secondaryArchSuffix
 	lib:libKF5Service$secondaryArchSuffix
 	lib:libKF5Solid$secondaryArchSuffix
 	lib:libKF5SonnetUi$secondaryArchSuffix
 	lib:libKF5TextWidgets$secondaryArchSuffix
+	lib:libKF5ThreadWeaver$secondaryArchSuffix
 	lib:libKF5UnitConversion$secondaryArchSuffix
 	lib:libKF5WidgetsAddons$secondaryArchSuffix
 	lib:libKF5WindowSystem$secondaryArchSuffix
 	lib:libKF5XmlGui$secondaryArchSuffix
+	lib:liblcms2$secondaryArchSuffix
+	lib:liblensfun$secondaryArchSuffix
+#	lib:libMagick++_7.Q16HDRI$secondaryArchSuffix
+	lib:libopencv_core$secondaryArchSuffix
+	lib:libopencv_imgcodecs$secondaryArchSuffix
+	lib:libopencv_imgproc$secondaryArchSuffix
+	lib:libopencv_objdetect$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libqtav$secondaryArchSuffix
+	lib:libqtavwidgets$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5DBus$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5Network$secondaryArchSuffix
 	lib:libQt5PrintSupport$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libQt5WebKit$secondaryArchSuffix
+	lib:libQt5WebKitWidgets$secondaryArchSuffix
 	lib:libQt5Xml$secondaryArchSuffix
+	lib:libtiff$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libxslt$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules >= 5.39
+	extra_cmake_modules >= 5.55
+	devel:eigen$secondaryArchSuffix
+	devel:libavcodec$secondaryArchSuffix
+	devel:libavformat$secondaryArchSuffix
+	devel:libavutil$secondaryArchSuffix
 	devel:libboost_system$secondaryArchSuffix
 	devel:libexiv2$secondaryArchSuffix
 	devel:libexpat$secondaryArchSuffix
+	devel:libglib_2.0$secondaryArchSuffix
+	devel:libgomp$secondaryArchSuffix
+	devel:libgphoto2$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
+	devel:libjasper$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libkdeinit5_kded5$secondaryArchSuffix
 	devel:libkdeinit5_klauncher$secondaryArchSuffix
@@ -88,6 +133,7 @@ BUILD_REQUIRES="
 	devel:libKF5DesignerPlugin$secondaryArchSuffix
 	devel:libKF5DocTools$secondaryArchSuffix
 	devel:libKF5Emoticons$secondaryArchSuffix
+#	devel:libKF5FileMetadata$secondaryArchSuffix
 	devel:libKF5GuiAddons$secondaryArchSuffix
 	devel:libKF5I18n$secondaryArchSuffix
 	devel:libKF5IconThemes$secondaryArchSuffix
@@ -98,27 +144,41 @@ BUILD_REQUIRES="
 	devel:libKF5KIOFileWidgets$secondaryArchSuffix
 	devel:libKF5KIOWidgets$secondaryArchSuffix
 	devel:libKF5Notifications$secondaryArchSuffix
+	devel:libKF5NotifyConfig$secondaryArchSuffix
 	devel:libKF5Parts$secondaryArchSuffix
+	devel:libKF5Sane$secondaryArchSuffix
 	devel:libKF5Service$secondaryArchSuffix
 	devel:libKF5Solid$secondaryArchSuffix
 	devel:libKF5SonnetUi$secondaryArchSuffix
 	devel:libKF5TextWidgets$secondaryArchSuffix
+	devel:libKF5ThreadWeaver$secondaryArchSuffix
 	devel:libKF5UnitConversion$secondaryArchSuffix
 	devel:libKF5WidgetsAddons$secondaryArchSuffix
 	devel:libKF5WindowSystem$secondaryArchSuffix
 	devel:libKF5XmlGui$secondaryArchSuffix
 	devel:liblcms2$secondaryArchSuffix
 	devel:liblensfun$secondaryArchSuffix
+#	devel:libMagick++_7.Q16HDRI$secondaryArchSuffix
 	devel:libopencv_core$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix >= 5.7
-	devel:libQt5WebKitWidgets$secondaryArchSuffix	
+	devel:libpng16$secondaryArchSuffix
+	devel:libqtav$secondaryArchSuffix
+	devel:libqtavwidgets$secondaryArchSuffix
+	devel:libQt5Core$secondaryArchSuffix >= 5.12
+	devel:libQt5WebKitWidgets$secondaryArchSuffix
 	devel:libtiff$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	devel:libxslt$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:bison
 	cmd:cmake
+	cmd:flex
 	cmd:g++$secondaryArchSuffix
+	cmd:lrelease$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config
+	cmd:qdbuscpp2xml$secondaryArchSuffix
 	"

 BUILD()
@@ -127,13 +187,19 @@ BUILD()
 	cd build

 	cmake .. \
+		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=$prefix \
 		-DINCLUDE_INSTALL_DIR=$includeDir \
 		-DSHARE_INSTALL_PREFIX=$dataDir \
+		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt5 \
 		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DCMAKE_INSTALL_PREFIX=$appsDir/digiKam \
-		-DCMAKE_INSTALL_DATAROOTDIR=$dataDir
+		-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
+		-DENABLE_DBUS=OFF \
+		-DENABLE_MEDIAPLAYER=ON \
+		-DENABLE_APPSTYLES=ON \
+		-Wno-dev

 	make $jobArgs
 }
@@ -142,9 +208,11 @@ INSTALL()
 {
 	cd build
 	make install
-	mv $appsDir/digiKam/bin/* $appsDir/digiKam
-	mv $appsDir/digiKam/digikam $appsDir/digiKam/digiKam

+	mv $appsDir/digiKam/bin/digikam $appsDir/digiKam/digiKam
+	mv $appsDir/digiKam/bin/showfoto $appsDir/digiKam/showFoto
+	rm -rf $appsDir/digiKam/{bin,lib/cmake}
+	rm -rf $developDir

 	local APP_SIGNATURE="application/x-vnd.qt5-digikam"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
@@ -158,12 +226,18 @@ INSTALL()
 		-e "s|@MINOR@|$MINOR|" \
 		-e "s|@LONG_INFO@|$LONG_INFO|" \
 		$portDir/additional-files/digikam.rdef.in > digikam.rdef
-
 	addResourcesToBinaries digikam.rdef $appsDir/digiKam/digiKam
+
+	local APP_SIGNATURE="application/x-vnd.qt5-showfoto"
+	sed \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		-e "s|@LONG_INFO@|$LONG_INFO|" \
+		$portDir/additional-files/showfoto.rdef.in > showfoto.rdef
+	addResourcesToBinaries showfoto.rdef $appsDir/digiKam/showFoto
+
+	addAppDeskbarSymlink $appsDir/digiKam/showFoto
 	addAppDeskbarSymlink $appsDir/digiKam/digiKam
 }
-
-TEST()
-{
-	make test
-}
--- a/media-gfx/digikam/patches/digikam-5.9.0.patchset
+++ b/media-gfx/digikam/patches/digikam-5.9.0.patchset
@@ -1,104 +0,0 @@
-From 935d721d50313c1e9b012f097d28d5a97cae47ac Mon Sep 17 00:00:00 2001
-From: Sergei Reznikov <diver@gelios.net>
-Date: Tue, 27 Mar 2018 13:02:02 +0300
-Subject: Haiku fixes
-
-
-diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
-index 2c0ff3b..2a1d87f 100644
--- a/app/CMakeLists.txt
-+++ b/app/CMakeLists.txt
-@@ -255,6 +255,10 @@ if(APPLE)
-     target_link_libraries(digikamcore PUBLIC /System/Library/Frameworks/AppKit.framework)
- endif()
- 
-+if(HAIKU)
-+    target_link_libraries(digikamcore PUBLIC network iconv intl)
-+endif()
-+
- if(WIN32)
-   target_link_libraries(digikamcore PUBLIC wsock32 ws2_32)
- endif()
-diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
-index bbffb87..3fc2e22 100644
--- a/libs/CMakeLists.txt
-+++ b/libs/CMakeLists.txt
-@@ -35,12 +35,12 @@ else()
- endif()
- 
- # Check processor endianness
-include(TestBigEndian)
-TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
-+#include(TestBigEndian)
-+#TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
- 
-if(NOT IS_BIG_ENDIAN)
-    add_definitions(-DqDNGLittleEndian=1)
-endif()
-+#if(NOT IS_BIG_ENDIAN)
-+#    add_definitions(-DqDNGLittleEndian=1)
-+#endif()
- 
- # Thread safe support under Mac and Linux using pthread library
- 
-diff --git a/libs/pgfutils/PGFplatform.h b/libs/pgfutils/PGFplatform.h
-index ee803c3..ca32fcf 100644
--- a/libs/pgfutils/PGFplatform.h
-+++ b/libs/pgfutils/PGFplatform.h
-@@ -320,7 +320,7 @@ inline OSError SetFPos(HANDLE hFile, int posMode, INT64 posOff) {
- //-------------------------------------------------------------------------------
- // LINUX
- //-------------------------------------------------------------------------------
-#if defined(__linux__) || defined(__GLIBC__)
-+#if defined(__linux__) || defined(__GLIBC__) || defined(__HAIKU__)
- #define __POSIX__
- #endif // __linux__ or __GLIBC__
- 
-@@ -336,7 +336,7 @@ inline OSError SetFPos(HANDLE hFile, int posMode, INT64 posOff) {
- //-------------------------------------------------------------------------------
- // *BSD
- //-------------------------------------------------------------------------------
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
-+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__HAIKU__)
- #ifndef __POSIX__
- #define __POSIX__
- #endif
-@@ -349,7 +349,7 @@ inline OSError SetFPos(HANDLE hFile, int posMode, INT64 posOff) {
- #define lseek64 lseek
- #endif
- 
-#endif // __NetBSD__ or __OpenBSD__ or __FreeBSD__
-+#endif // __NetBSD__ or __OpenBSD__ or __FreeBSD__ or __HAIKU__
- 
- 
- //-------------------------------------------------------------------------------
-diff --git a/libs/threadimageio/thumbnailbasic.cpp b/libs/threadimageio/thumbnailbasic.cpp
-index 524e06e..83fbc7b 100644
--- a/libs/threadimageio/thumbnailbasic.cpp
-+++ b/libs/threadimageio/thumbnailbasic.cpp
-@@ -44,7 +44,7 @@ extern "C"
- #include <sys/stat.h>
- #include <sys/types.h>
- 
-#ifndef _WIN32
-+#if !defined(_WIN32) && !defined(__HAIKU__)
- #include <sys/ipc.h>
- #include <sys/shm.h>
- #endif
-diff --git a/utilities/mediaserver/upnpsdk/Neptune/Source/System/Bsd/NptBsdNetwork.cpp b/utilities/mediaserver/upnpsdk/Neptune/Source/System/Bsd/NptBsdNetwork.cpp
-index 4b79915..2303781 100644
--- a/utilities/mediaserver/upnpsdk/Neptune/Source/System/Bsd/NptBsdNetwork.cpp
-+++ b/utilities/mediaserver/upnpsdk/Neptune/Source/System/Bsd/NptBsdNetwork.cpp
-@@ -12,6 +12,9 @@
- +---------------------------------------------------------------------*/
- #include <sys/types.h>
- #include <sys/socket.h>
-+#ifdef __HAIKU__
-+#include <sys/sockio.h>
-+#endif
- #include <sys/select.h>
- #include <sys/time.h>
- #include <sys/ioctl.h>
-- 
-2.16.2
-
--- a/media-gfx/digikam/patches/digikam-6.2.0.patchset
+++ b/media-gfx/digikam/patches/digikam-6.2.0.patchset
@@ -0,0 +1,196 @@
+From 77a52a8165dec511a58f4c8b1d391de75449f552 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sun, 11 Aug 2019 12:54:43 +1000
+Subject: Fix build for Haiku
+
+
+diff --git a/core/app/DigikamTarget.cmake b/core/app/DigikamTarget.cmake
+index 1a5cb3b..1d2f661 100644
+--- a/core/app/DigikamTarget.cmake
+++ b/core/app/DigikamTarget.cmake
+@@ -43,6 +43,10 @@ target_link_libraries(digikam
+                       KF5::I18n
+ )
+ 
+if(HAIKU)
+    target_link_libraries(digikamcore PUBLIC network iconv intl)
+endif()
+
+ if(ENABLE_DBUS)
+     target_link_libraries(digikam PUBLIC Qt5::DBus)
+ endif()
+diff --git a/core/app/main/main.cpp b/core/app/main/main.cpp
+index cf43cb9..3715e43 100644
+--- a/core/app/main/main.cpp
+++ b/core/app/main/main.cpp
+@@ -77,6 +77,12 @@ using namespace Magick;
+ #   include <objbase.h>
+ #endif
+ 
+#ifdef Q_OS_HAIKU
+#	include <unistd.h>
+#	include <sys/types.h>
+#	include <signal.h>
+#endif
+
+ using namespace Digikam;
+ 
+ int main(int argc, char* argv[])
+@@ -329,5 +335,9 @@ int main(int argc, char* argv[])
+ #   endif
+ #endif
+ 
+#ifdef Q_OS_HAIKU
+	kill(::getpid(), SIGKILL);
+#endif
+
+     return ret;
+ }
+diff --git a/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/System/Bsd/NptBsdNetwork.cpp b/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/System/Bsd/NptBsdNetwork.cpp
+index 4b79915..4e1336c 100644
+--- a/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/System/Bsd/NptBsdNetwork.cpp
+++ b/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/System/Bsd/NptBsdNetwork.cpp
+@@ -13,6 +13,9 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/select.h>
+#ifdef __HAIKU__
+#include <sys/sockio.h>
+#endif
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+ #include <netinet/in.h>
+diff --git a/core/libs/CMakeLists.txt b/core/libs/CMakeLists.txt
+index b69d8c7..dc799b1 100644
+--- a/core/libs/CMakeLists.txt
+++ b/core/libs/CMakeLists.txt
+@@ -35,8 +35,8 @@ else()
+ endif()
+ 
+ # Check processor endianness
+-include(TestBigEndian)
+-TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
+#include(TestBigEndian)
+#TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
+ 
+ if(NOT IS_BIG_ENDIAN)
+     add_definitions(-DqDNGLittleEndian=1)
+diff --git a/core/libs/pgfutils/libpgf/PGFplatform.h b/core/libs/pgfutils/libpgf/PGFplatform.h
+index 84c2995..8558c19 100644
+--- a/core/libs/pgfutils/libpgf/PGFplatform.h
+++ b/core/libs/pgfutils/libpgf/PGFplatform.h
+@@ -320,7 +320,7 @@ inline OSError SetFPos(HANDLE hFile, int posMode, INT64 posOff) {
+ //-------------------------------------------------------------------------------
+ // LINUX
+ //-------------------------------------------------------------------------------
+-#if defined(__linux__) || defined(__GLIBC__)
+#if defined(__linux__) || defined(__GLIBC__) || defined(__HAIKU__)
+ #define __POSIX__
+ #endif // __linux__ or __GLIBC__
+ 
+@@ -336,7 +336,7 @@ inline OSError SetFPos(HANDLE hFile, int posMode, INT64 posOff) {
+ //-------------------------------------------------------------------------------
+ // *BSD
+ //-------------------------------------------------------------------------------
+-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__HAIKU__)
+ #ifndef __POSIX__ 
+ #define __POSIX__ 
+ #endif 
+diff --git a/core/libs/threadimageio/thumb/thumbnailbasic.cpp b/core/libs/threadimageio/thumb/thumbnailbasic.cpp
+index c5f2760..7b7ac44 100644
+--- a/core/libs/threadimageio/thumb/thumbnailbasic.cpp
+++ b/core/libs/threadimageio/thumb/thumbnailbasic.cpp
+@@ -44,7 +44,7 @@ extern "C"
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ 
+-#ifndef Q_OS_WIN32
+#if !defined(_WIN32) && !defined(__HAIKU__)
+ #   include <sys/ipc.h>
+ #   include <sys/shm.h>
+ #endif
+diff --git a/core/showfoto/main/main.cpp b/core/showfoto/main/main.cpp
+index 68bec41..bf201ca 100644
+--- a/core/showfoto/main/main.cpp
+++ b/core/showfoto/main/main.cpp
+@@ -63,6 +63,12 @@ using namespace Magick;
+ #   include <objbase.h>
+ #endif
+ 
+#ifdef Q_OS_HAIKU
+#	include <unistd.h>
+#	include <sys/types.h>
+#	include <signal.h>
+#endif
+
+ using namespace Digikam;
+ 
+ int main(int argc, char* argv[])
+@@ -167,5 +173,9 @@ int main(int argc, char* argv[])
+ #   endif
+ #endif
+ 
+#ifdef Q_OS_HAIKU
+	kill(::getpid(), SIGKILL);
+#endif
+
+     return ret;
+ }
+diff --git a/core/utilities/import/backend/gpcamera.cpp b/core/utilities/import/backend/gpcamera.cpp
+index a6b53b1..e7adafc 100644
+--- a/core/utilities/import/backend/gpcamera.cpp
+++ b/core/utilities/import/backend/gpcamera.cpp
+@@ -61,6 +61,10 @@ extern "C"
+ 
+ //#define GPHOTO2_DEBUG 1
+ 
+#ifdef Q_OS_HAIKU
+#define HAVE_GPHOTO25 1
+#endif
+
+ #ifdef HAVE_GPHOTO2
+ 
+ // LibGphoto2 includes
+-- 
+2.21.0
+
+
+From 795ebe7e169ee4dc3946c6a114cb32df812c895d Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sun, 11 Aug 2019 16:04:29 +1000
+Subject: Hack for crash on exit
+
+
+diff --git a/core/libs/widgets/mainview/dxmlguiwindow.cpp b/core/libs/widgets/mainview/dxmlguiwindow.cpp
+index 557b2c9..c83cb76 100644
+--- a/core/libs/widgets/mainview/dxmlguiwindow.cpp
+++ b/core/libs/widgets/mainview/dxmlguiwindow.cpp
+@@ -65,6 +65,12 @@
+ #   include <knotifyconfigwidget.h>
+ #endif
+ 
+#ifdef Q_OS_HAIKU
+#	include <unistd.h>
+#	include <sys/types.h>
+#	include <signal.h>
+#endif
+
+ // Local includes
+ 
+ #include "digikam_debug.h"
+@@ -187,7 +193,10 @@ DXmlGuiWindow::DXmlGuiWindow(QWidget* const parent, Qt::WindowFlags f)
+ 
+ DXmlGuiWindow::~DXmlGuiWindow()
+ {
+-    delete d;
+#ifdef Q_OS_HAIKU
+	kill(::getpid(), SIGKILL);
+#endif
+    delete d;    
+ }
+ 
+ void DXmlGuiWindow::setConfigGroupName(const QString& name)
+-- 
+2.21.0
+