haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

digiKam: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-06-08 17:04:54 +10:00
parent 498f5a340a
commit 2831a0ee10
4 changed files with 102 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media-gfx/digikam/additional-files/digikam.rdef.in
View File

@@ -15,6 +15,8 @@ resource app_version {
resource app_signature "@APP_SIGNATURE@";
resource("QT:QPA_FLAGS") "Q_KILL_ON_EXIT|Q_REF_TO_ARGV|Q_REF_TO_FORK";
resource file_types message {
"types" = "image"
};

2
media-gfx/digikam/additional-files/showfoto.rdef.in
View File

@@ -15,6 +15,8 @@ resource app_version {
resource app_signature "@APP_SIGNATURE@";
resource("QT:QPA_FLAGS") "Q_KILL_ON_EXIT|Q_REF_TO_ARGV|Q_REF_TO_FORK";
resource file_types message {
"types" = "image"
};

14
media-gfx/digikam/digikam-7.0.0~beta2.recipe → media-gfx/digikam/digikam-7.0.0~beta3.recipe
View File

@@ -6,9 +6,9 @@ photos and RAW files."
HOMEPAGE="https://digikam.org/"
COPYRIGHT="2010-2020 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="3"
REVISION="1"
SOURCE_URI="https://download.kde.org/unstable/digikam/digikam-${portVersion/\~beta/-beta}.tar.xz"
CHECKSUM_SHA256="62420d3ef7cd5af0075c8f69f2d078927952c2e279b0aa642025389d13aeb59d"
CHECKSUM_SHA256="97b2f768674afaaca6feb6e661d5c8fc6b88b08f4d4bbab8a6bcc94c19914893"
SOURCE_DIR="digikam-${portVersion/\~beta/-beta}"
PATCHES="digikam-${portVersion/\~beta/-beta}.patchset"
ADDITIONAL_FILES="
@@ -16,8 +16,8 @@ ADDITIONAL_FILES="
showfoto.rdef.in
"
ARCHITECTURES="x86_64"
SECONDARY_ARCHITECTURES="!x86"
ARCHITECTURES="!x86_gcc2 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
digikam$secondaryArchSuffix = $portVersion
@@ -30,6 +30,7 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix
lib:libavcodec$secondaryArchSuffix
lib:libavdevice$secondaryArchSuffix
lib:libavformat$secondaryArchSuffix
lib:libavutil$secondaryArchSuffix
lib:libexiv2$secondaryArchSuffix
@@ -106,7 +107,7 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules >= 5.55
extra_cmake_modules$secondaryArchSuffix >= 5.65
devel:eigen$secondaryArchSuffix
devel:libavcodec$secondaryArchSuffix
devel:libavformat$secondaryArchSuffix
@@ -193,7 +194,7 @@ BUILD_PREREQUIRES="
cmd:g++$secondaryArchSuffix
cmd:lrelease$secondaryArchSuffix >= 5
cmd:make
cmd:pkg_config
cmd:pkg_config$secondaryArchSuffix
cmd:qdbuscpp2xml$secondaryArchSuffix >= 5
"
@@ -216,6 +217,7 @@ BUILD()
-DENABLE_DBUS=OFF \
-DENABLE_MEDIAPLAYER=ON \
-DENABLE_APPSTYLES=ON \
-DENABLE_QWEBENGINE=OFF \
-Wno-dev
make $jobArgs

198
media-gfx/digikam/patches/digikam-7.0.0-beta2.patchset → media-gfx/digikam/patches/digikam-7.0.0-beta3.patchset
View File

@@ -1,15 +1,15 @@
From 27354329755ef142fbe1f7fcace1d7180f09654b Mon Sep 17 00:00:00 2001
From f42c7d6f8a0a7e6a27274426819b7618b99432d9 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 17 Apr 2020 21:00:03 +1000
Date: Sun, 7 Jun 2020 19:56:00 +1000
Subject: Fix build for Haiku
diff --git a/core/app/DigikamTarget.cmake b/core/app/DigikamTarget.cmake
index 6a2a2e1..1b929af 100644
index a02d7eb..43ef26e 100644
--- a/core/app/DigikamTarget.cmake
+++ b/core/app/DigikamTarget.cmake
@@ -48,6 +48,10 @@ target_link_libraries(digikam
KF5::Service
@@ -49,6 +49,10 @@ target_link_libraries(digikam
digikamgui
)
+if(HAIKU)
@@ -17,35 +17,8 @@ index 6a2a2e1..1b929af 100644
+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 00e3826..7fe641a 100644
--- a/core/app/main/main.cpp
+++ b/core/app/main/main.cpp
@@ -90,6 +90,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[])
@@ -376,5 +382,9 @@ int main(int argc, char* argv[])
# endif
#endif
+#ifdef Q_OS_HAIKU
+ kill(::getpid(), SIGKILL);
+#endif
+
return ret;
}
target_link_libraries(digikam
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
@@ -60,21 +33,6 @@ index 4b79915..4e1336c 100644
#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 ba014f0..09b63db 100644
--- a/core/libs/CMakeLists.txt
+++ b/core/libs/CMakeLists.txt
@@ -36,8 +36,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)
diff --git a/core/libs/pgfutils/libpgf/PGFplatform.h b/core/libs/pgfutils/libpgf/PGFplatform.h
index 791343a..76a8dba 100644
--- a/core/libs/pgfutils/libpgf/PGFplatform.h
@@ -98,10 +56,10 @@ index 791343a..76a8dba 100644
#define __POSIX__
#endif
diff --git a/core/libs/threadimageio/thumb/thumbnailbasic.cpp b/core/libs/threadimageio/thumb/thumbnailbasic.cpp
index d15b278..19201b7 100644
index adb289f..1ac95b9 100644
--- a/core/libs/threadimageio/thumb/thumbnailbasic.cpp
+++ b/core/libs/threadimageio/thumb/thumbnailbasic.cpp
@@ -45,7 +45,7 @@ extern "C"
@@ -47,7 +47,7 @@ extern "C"
#include <sys/stat.h>
#include <sys/types.h>
@@ -110,67 +68,11 @@ index d15b278..19201b7 100644
# include <sys/ipc.h>
# include <sys/shm.h>
#endif
diff --git a/core/libs/widgets/mainview/dxmlguiwindow.cpp b/core/libs/widgets/mainview/dxmlguiwindow.cpp
index c59ef56..8f1ddbd 100644
--- a/core/libs/widgets/mainview/dxmlguiwindow.cpp
+++ b/core/libs/widgets/mainview/dxmlguiwindow.cpp
@@ -67,6 +67,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"
@@ -189,7 +195,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 25c834b..2cacddc 100644
--- a/core/showfoto/main/main.cpp
+++ b/core/showfoto/main/main.cpp
@@ -72,6 +72,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[])
@@ -187,5 +193,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 316dd3e..378874d 100644
index 8d6f452..161492b 100644
--- a/core/utilities/import/backend/gpcamera.cpp
+++ b/core/utilities/import/backend/gpcamera.cpp
@@ -61,6 +61,10 @@ extern "C"
@@ -65,6 +65,10 @@ extern "C"
//#define GPHOTO2_DEBUG 1
@@ -184,3 +86,83 @@ index 316dd3e..378874d 100644
--
2.26.0
From a3d5f14875ce5886fb0316995ef126798e9886ab Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 8 Jun 2020 11:53:27 +1000
Subject: Use system int types
diff --git a/core/libs/dngwriter/extra/dng_sdk/dng_types.h b/core/libs/dngwriter/extra/dng_sdk/dng_types.h
index c8915d9..11d3996 100644
--- a/core/libs/dngwriter/extra/dng_sdk/dng_types.h
+++ b/core/libs/dngwriter/extra/dng_sdk/dng_types.h
@@ -33,7 +33,9 @@
/*****************************************************************************/
#ifdef qDNGUseStdInt
-
+#ifdef __HAIKU__
+#include <SupportDefs.h>
+#else
typedef int8_t int8;
typedef int16_t int16;
typedef int32_t int32;
@@ -43,7 +45,7 @@ typedef uint8_t uint8;
typedef uint16_t uint16;
typedef uint32_t uint32;
typedef uint64_t uint64;
-
+#endif
#else
typedef signed char int8;
--
2.26.0
From 83f7687f52c028cdf25e587631f4c4cc7eedcd37 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 8 Jun 2020 11:53:59 +1000
Subject: Fix build for Qt 5.15
diff --git a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp
index cccccbd..bcc62d6 100644
--- a/core/libs/dimg/filters/curves/curveswidget.cpp
+++ b/core/libs/dimg/filters/curves/curveswidget.cpp
@@ -32,6 +32,7 @@
#include <QPixmap>
#include <QPainter>
+#include <QPainterPath>
#include <QPoint>
#include <QPen>
#include <QEvent>
diff --git a/core/libs/dimg/filters/levels/histogrampainter.cpp b/core/libs/dimg/filters/levels/histogrampainter.cpp
index 241d5fc..f11ad4b 100644
--- a/core/libs/dimg/filters/levels/histogrampainter.cpp
+++ b/core/libs/dimg/filters/levels/histogrampainter.cpp
@@ -30,6 +30,7 @@
// Qt includes
#include <QPainter>
+#include <QPainterPath>
// KDE includes
diff --git a/core/tests/video/qtavcodecs.cpp b/core/tests/video/qtavcodecs.cpp
index ac98478..72bf95b 100644
--- a/core/tests/video/qtavcodecs.cpp
+++ b/core/tests/video/qtavcodecs.cpp
@@ -22,6 +22,7 @@
* ============================================================ */
#include <QDebug>
+#include <QPainterPath>
// QtAv includes
--
2.26.0