diff --git a/media-gfx/digikam/digikam-6.2.0.recipe b/media-gfx/digikam/digikam-6.3.0.recipe similarity index 96% rename from media-gfx/digikam/digikam-6.2.0.recipe rename to media-gfx/digikam/digikam-6.3.0.recipe index bf9c10309..a34c41ff5 100644 --- a/media-gfx/digikam/digikam-6.2.0.recipe +++ b/media-gfx/digikam/digikam-6.3.0.recipe @@ -6,9 +6,9 @@ photos and RAW files." HOMEPAGE="https://digikam.org/" COPYRIGHT="2010-2019 KDE Organisation" LICENSE="GNU LGPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.kde.org/stable/digikam/$portVersion/digikam-$portVersion.tar.xz" -CHECKSUM_SHA256="28762ea0f03a82e3b2473c0682a358c9b83f5013aec827dd5ab6556a1f29baeb" +CHECKSUM_SHA256="94dc05e3f9c08b83419010d1689c7b0398d4eced4fef42375249c974622874ba" PATCHES="digikam-$portVersion.patchset" ADDITIONAL_FILES=" digikam.rdef.in @@ -77,7 +77,8 @@ REQUIRES=" lib:libKF5XmlGui$secondaryArchSuffix lib:liblcms2$secondaryArchSuffix lib:liblensfun$secondaryArchSuffix -# lib:libMagick++_7.Q16HDRI$secondaryArchSuffix + lib:liblqr_1$secondaryArchSuffix + lib:libMagick++_7.Q16HDRI$secondaryArchSuffix lib:libopencv_core$secondaryArchSuffix lib:libopencv_imgcodecs$secondaryArchSuffix lib:libopencv_imgproc$secondaryArchSuffix @@ -158,7 +159,8 @@ BUILD_REQUIRES=" devel:libKF5XmlGui$secondaryArchSuffix devel:liblcms2$secondaryArchSuffix devel:liblensfun$secondaryArchSuffix -# devel:libMagick++_7.Q16HDRI$secondaryArchSuffix + devel:liblqr_1$secondaryArchSuffix + devel:libMagick++_7.Q16HDRI$secondaryArchSuffix devel:libopencv_core$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libqtav$secondaryArchSuffix diff --git a/media-gfx/digikam/patches/digikam-6.2.0.patchset b/media-gfx/digikam/patches/digikam-6.3.0.patchset similarity index 89% rename from media-gfx/digikam/patches/digikam-6.2.0.patchset rename to media-gfx/digikam/patches/digikam-6.3.0.patchset index 0a9609d3f..31523548f 100644 --- a/media-gfx/digikam/patches/digikam-6.2.0.patchset +++ b/media-gfx/digikam/patches/digikam-6.3.0.patchset @@ -1,15 +1,15 @@ -From 77a52a8165dec511a58f4c8b1d391de75449f552 Mon Sep 17 00:00:00 2001 +From 098076ae99cf6c47a13ccc93c7eb17d2ec96faf4 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 11 Aug 2019 12:54:43 +1000 +Date: Sun, 13 Oct 2019 12:16:05 +1000 Subject: Fix build for Haiku diff --git a/core/app/DigikamTarget.cmake b/core/app/DigikamTarget.cmake -index 1a5cb3b..1d2f661 100644 +index ddbcdd3..19aa261 100644 --- a/core/app/DigikamTarget.cmake +++ b/core/app/DigikamTarget.cmake -@@ -43,6 +43,10 @@ target_link_libraries(digikam - KF5::I18n +@@ -48,6 +48,10 @@ target_link_libraries(digikam + KF5::Service ) +if(HAIKU) @@ -20,10 +20,10 @@ index 1a5cb3b..1d2f661 100644 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 +index c6e0900..9533484 100644 --- a/core/app/main/main.cpp +++ b/core/app/main/main.cpp -@@ -77,6 +77,12 @@ using namespace Magick; +@@ -79,6 +79,12 @@ using namespace Magick; # include #endif @@ -36,7 +36,7 @@ index cf43cb9..3715e43 100644 using namespace Digikam; int main(int argc, char* argv[]) -@@ -329,5 +335,9 @@ int main(int argc, char* argv[]) +@@ -332,5 +338,9 @@ int main(int argc, char* argv[]) # endif #endif @@ -98,10 +98,10 @@ index 84c2995..8558c19 100644 #define __POSIX__ #endif diff --git a/core/libs/threadimageio/thumb/thumbnailbasic.cpp b/core/libs/threadimageio/thumb/thumbnailbasic.cpp -index c5f2760..7b7ac44 100644 +index 86bd884..a28b3e5 100644 --- a/core/libs/threadimageio/thumb/thumbnailbasic.cpp +++ b/core/libs/threadimageio/thumb/thumbnailbasic.cpp -@@ -44,7 +44,7 @@ extern "C" +@@ -45,7 +45,7 @@ extern "C" #include #include @@ -110,6 +110,35 @@ index c5f2760..7b7ac44 100644 # include # include #endif +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 + #endif + ++#ifdef Q_OS_HAIKU ++# include ++# include ++# include ++#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) diff --git a/core/showfoto/main/main.cpp b/core/showfoto/main/main.cpp index 68bec41..bf201ca 100644 --- a/core/showfoto/main/main.cpp @@ -153,44 +182,5 @@ index a6b53b1..e7adafc 100644 // 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 - #endif - -+#ifdef Q_OS_HAIKU -+# include -+# include -+# include -+#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 +2.23.0