diff --git a/media-gfx/digikam/digikam-7.0.0~beta3.recipe b/media-gfx/digikam/digikam-7.0.0.recipe similarity index 96% rename from media-gfx/digikam/digikam-7.0.0~beta3.recipe rename to media-gfx/digikam/digikam-7.0.0.recipe index 5a266919e..8951a6370 100644 --- a/media-gfx/digikam/digikam-7.0.0~beta3.recipe +++ b/media-gfx/digikam/digikam-7.0.0.recipe @@ -6,11 +6,11 @@ photos and RAW files." HOMEPAGE="https://digikam.org/" COPYRIGHT="2010-2020 KDE Organisation" LICENSE="GNU LGPL v2" -REVISION="2" -SOURCE_URI="https://download.kde.org/unstable/digikam/digikam-${portVersion/\~beta/-beta}.tar.xz" -CHECKSUM_SHA256="97b2f768674afaaca6feb6e661d5c8fc6b88b08f4d4bbab8a6bcc94c19914893" -SOURCE_DIR="digikam-${portVersion/\~beta/-beta}" -PATCHES="digikam-${portVersion/\~beta/-beta}.patchset" +REVISION="1" +SOURCE_URI="https://download.kde.org/stable/digikam/$portVersion/digikam-$portVersion.tar.xz" +CHECKSUM_SHA256="dc0718e30031e692d7f05367b44e797fed61f12d27063641b6a5cf4d8b26e911" +SOURCE_DIR="digikam-$portVersion" +PATCHES="digikam-$portVersion.patchset" ADDITIONAL_FILES=" digikam.rdef.in showfoto.rdef.in @@ -241,7 +241,7 @@ INSTALL() local APP_SIGNATURE="application/x-vnd.qt5-digikam" local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="`echo "$portVersion" | cut -d. -f3 | cut -d~ -f1`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" local LONG_INFO="$SUMMARY" sed \ -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ diff --git a/media-gfx/digikam/patches/digikam-7.0.0-beta3.patchset b/media-gfx/digikam/patches/digikam-7.0.0.patchset similarity index 79% rename from media-gfx/digikam/patches/digikam-7.0.0-beta3.patchset rename to media-gfx/digikam/patches/digikam-7.0.0.patchset index b32170587..e30e648d8 100644 --- a/media-gfx/digikam/patches/digikam-7.0.0-beta3.patchset +++ b/media-gfx/digikam/patches/digikam-7.0.0.patchset @@ -1,6 +1,6 @@ -From f42c7d6f8a0a7e6a27274426819b7618b99432d9 Mon Sep 17 00:00:00 2001 +From e96351bed55dcd5f0833b7000aac616a20a1a5c5 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 7 Jun 2020 19:56:00 +1000 +Date: Wed, 29 Jul 2020 14:26:47 +1000 Subject: Fix build for Haiku @@ -33,66 +33,18 @@ index 4b79915..4e1336c 100644 #include #include #include -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 -+++ 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__ +diff --git a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp +index e8b2e1b..ea823d6 100644 +--- a/core/libs/dimg/filters/curves/curveswidget.cpp ++++ b/core/libs/dimg/filters/curves/curveswidget.cpp +@@ -32,6 +32,7 @@ -@@ -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 adb289f..1ac95b9 100644 ---- a/core/libs/threadimageio/thumb/thumbnailbasic.cpp -+++ b/core/libs/threadimageio/thumb/thumbnailbasic.cpp -@@ -47,7 +47,7 @@ extern "C" - #include - #include - --#ifndef Q_OS_WIN32 -+#if !defined(_WIN32) && !defined(__HAIKU__) - # include - # include - #endif -diff --git a/core/utilities/import/backend/gpcamera.cpp b/core/utilities/import/backend/gpcamera.cpp -index 8d6f452..161492b 100644 ---- a/core/utilities/import/backend/gpcamera.cpp -+++ b/core/utilities/import/backend/gpcamera.cpp -@@ -65,6 +65,10 @@ extern "C" - - //#define GPHOTO2_DEBUG 1 - -+#ifdef Q_OS_HAIKU -+#define HAVE_GPHOTO25 1 -+#endif -+ - #ifdef HAVE_GPHOTO2 - - // LibGphoto2 includes --- -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 - - + #include + #include ++#include + #include + #include + #include 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 @@ -117,40 +69,41 @@ index c8915d9..11d3996 100644 #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 @@ +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 ++++ 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__ - #include - #include -+#include - #include - #include - #include -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 -+#include - - // KDE includes +@@ -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 48621ac..b6ddaaf 100644 +--- a/core/libs/threadimageio/thumb/thumbnailbasic.cpp ++++ b/core/libs/threadimageio/thumb/thumbnailbasic.cpp +@@ -47,7 +47,7 @@ extern "C" + #include + #include +-#ifndef Q_OS_WIN32 ++#if !defined(_WIN32) && !defined(__HAIKU__) + # include + # include + #endif diff --git a/core/tests/video/qtavcodecs.cpp b/core/tests/video/qtavcodecs.cpp index ac98478..72bf95b 100644 --- a/core/tests/video/qtavcodecs.cpp @@ -163,6 +116,46 @@ index ac98478..72bf95b 100644 // QtAv includes +diff --git a/core/utilities/import/backend/gpcamera.cpp b/core/utilities/import/backend/gpcamera.cpp +index 874e7bb..cff1f55 100644 +--- a/core/utilities/import/backend/gpcamera.cpp ++++ b/core/utilities/import/backend/gpcamera.cpp +@@ -66,6 +66,10 @@ extern "C" + + //#define GPHOTO2_DEBUG 1 + ++#ifdef Q_OS_HAIKU ++#define HAVE_GPHOTO25 1 ++#endif ++ + #ifdef HAVE_GPHOTO2 + + // LibGphoto2 includes -- -2.26.0 +2.27.0 + + +From 80832f6839a0ba7810aff88368bcbb0e4a22ee52 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Wed, 29 Jul 2020 17:04:12 +1000 +Subject: Fix build for gcc8 + + +diff --git a/core/libs/rawengine/libraw/src/write/file_write.cpp b/core/libs/rawengine/libraw/src/write/file_write.cpp +index de2e0ff..e4866af 100644 +--- a/core/libs/rawengine/libraw/src/write/file_write.cpp ++++ b/core/libs/rawengine/libraw/src/write/file_write.cpp +@@ -120,8 +120,8 @@ void LibRaw::tiff_head(struct tiff_hdr *th, int full) + tiff_set(th, &th->nexif, 37386, 5, 1, TOFF(th->rat[8])); + if (gpsdata[1]) + { +- uchar latref[2] = { uchar(gpsdata[29]),0 }, +- lonref[2] = { uchar(gpsdata[30]),0 }; ++ uchar latref[2] = { (uchar)(gpsdata[29]),0 }, ++ lonref[2] = { (uchar)(gpsdata[30]),0 }; + tiff_set(th, &th->ntag, 34853, 4, 1, TOFF(th->ngps)); + tiff_set(th, &th->ngps, 0, 1, 4, 0x202); + tiff_set(th, &th->ngps, 1, 2, 2, TOFF(latref)); +-- +2.27.0