From 16a72922da127d573e2b4440c2764da1870c898c Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 18 Apr 2020 15:10:40 +1000 Subject: [PATCH] Digikam: bump version --- ....3.0.recipe => digikam-7.0.0~beta2.recipe} | 48 +++++++++++++------ ....patchset => digikam-7.0.0-beta2.patchset} | 38 +++++++-------- 2 files changed, 53 insertions(+), 33 deletions(-) rename media-gfx/digikam/{digikam-6.3.0.recipe => digikam-7.0.0~beta2.recipe} (86%) rename media-gfx/digikam/patches/{digikam-6.3.0.patchset => digikam-7.0.0-beta2.patchset} (87%) diff --git a/media-gfx/digikam/digikam-6.3.0.recipe b/media-gfx/digikam/digikam-7.0.0~beta2.recipe similarity index 86% rename from media-gfx/digikam/digikam-6.3.0.recipe rename to media-gfx/digikam/digikam-7.0.0~beta2.recipe index 3e28d92fc..b451635d1 100644 --- a/media-gfx/digikam/digikam-6.3.0.recipe +++ b/media-gfx/digikam/digikam-7.0.0~beta2.recipe @@ -4,12 +4,13 @@ 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-2019 KDE Organisation" +COPYRIGHT="2010-2020 KDE Organisation" LICENSE="GNU LGPL v2" -REVISION="2" -SOURCE_URI="https://download.kde.org/stable/digikam/$portVersion/digikam-$portVersion.tar.xz" -CHECKSUM_SHA256="94dc05e3f9c08b83419010d1689c7b0398d4eced4fef42375249c974622874ba" -PATCHES="digikam-$portVersion.patchset" +REVISION="1" +SOURCE_URI="https://download.kde.org/unstable/digikam/digikam-${portVersion/\~beta/-beta}.tar.xz" +CHECKSUM_SHA256="62420d3ef7cd5af0075c8f69f2d078927952c2e279b0aa642025389d13aeb59d" +SOURCE_DIR="digikam-${portVersion/\~beta/-beta}" +PATCHES="digikam-${portVersion/\~beta/-beta}.patchset" ADDITIONAL_FILES=" digikam.rdef.in showfoto.rdef.in @@ -22,6 +23,9 @@ PROVIDES=" digikam$secondaryArchSuffix = $portVersion app:digiKam$secondaryArchSuffix = $portVersion app:showFoto$secondaryArchSuffix = $portVersion + lib:libdigikamcore$secondaryArchSuffix = $portVersion + lib:libdigikamdatabase$secondaryArchSuffix = $portVersion + lib:libdigikamgui$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -52,7 +56,6 @@ REQUIRES=" lib:libKF5DBusAddons$secondaryArchSuffix lib:libKF5DocTools$secondaryArchSuffix lib:libKF5Emoticons$secondaryArchSuffix -# lib:libKF5FileMetadata$secondaryArchSuffix lib:libKF5GuiAddons$secondaryArchSuffix lib:libKF5I18n$secondaryArchSuffix lib:libKF5IconThemes$secondaryArchSuffix @@ -134,7 +137,6 @@ BUILD_REQUIRES=" devel:libKF5DesignerPlugin$secondaryArchSuffix devel:libKF5DocTools$secondaryArchSuffix devel:libKF5Emoticons$secondaryArchSuffix -# devel:libKF5FileMetadata$secondaryArchSuffix devel:libKF5GuiAddons$secondaryArchSuffix devel:libKF5I18n$secondaryArchSuffix devel:libKF5IconThemes$secondaryArchSuffix @@ -165,13 +167,25 @@ BUILD_REQUIRES=" devel:libpng16$secondaryArchSuffix devel:libqtav$secondaryArchSuffix devel:libqtavwidgets$secondaryArchSuffix - devel:libQt5Core$secondaryArchSuffix >= 5.12 + devel:libQt5Core$secondaryArchSuffix >= 5.14 devel:libQt5WebKitWidgets$secondaryArchSuffix devel:libtiff$secondaryArchSuffix devel:libxml2$secondaryArchSuffix devel:libxslt$secondaryArchSuffix devel:libz$secondaryArchSuffix " + +PROVIDES_devel=" + digikam${secondaryArchSuffix}_devel = $portVersion compat >= 7 + devel:libdigikamcore$secondaryArchSuffix = $portVersion compat >= 7 + devel:libdigikamdatabase$secondaryArchSuffix = $portVersion compat >= 7 + devel:libdigikamgui$secondaryArchSuffix = $portVersion compat >= 7 + " +REQUIRES_devel=" + haiku$secondaryArchSuffix + digikam$secondaryArchSuffix == $portVersion base + " + BUILD_PREREQUIRES=" cmd:bison cmd:cmake @@ -190,14 +204,15 @@ BUILD() cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=$prefix \ + -DCMAKE_INSTALL_PREFIX=$appsDir/digiKam \ + -DCMAKE_INSTALL_DATAROOTDIR=$dataDir \ + -DCMAKE_INSTALL_LIBDIR=$libDir \ + -DCMAKE_INSTALL_INCLUDEDIR=$includeDir \ -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 \ -DENABLE_DBUS=OFF \ -DENABLE_MEDIAPLAYER=ON \ -DENABLE_APPSTYLES=ON \ @@ -213,13 +228,18 @@ INSTALL() 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 + rm -rf $appsDir/digiKam/bin + + prepareInstalledDevelLibs libdigikamcore libdigikamdatabase libdigikamgui + + packageEntries devel \ + $developDir \ + $libDir/cmake \ 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`" + local MINOR="`echo "$portVersion" | cut -d. -f3 | cut -d~ -f1`" local LONG_INFO="$SUMMARY" sed \ -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ diff --git a/media-gfx/digikam/patches/digikam-6.3.0.patchset b/media-gfx/digikam/patches/digikam-7.0.0-beta2.patchset similarity index 87% rename from media-gfx/digikam/patches/digikam-6.3.0.patchset rename to media-gfx/digikam/patches/digikam-7.0.0-beta2.patchset index 31523548f..e2f7adede 100644 --- a/media-gfx/digikam/patches/digikam-6.3.0.patchset +++ b/media-gfx/digikam/patches/digikam-7.0.0-beta2.patchset @@ -1,11 +1,11 @@ -From 098076ae99cf6c47a13ccc93c7eb17d2ec96faf4 Mon Sep 17 00:00:00 2001 +From 27354329755ef142fbe1f7fcace1d7180f09654b Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 13 Oct 2019 12:16:05 +1000 +Date: Fri, 17 Apr 2020 21:00:03 +1000 Subject: Fix build for Haiku diff --git a/core/app/DigikamTarget.cmake b/core/app/DigikamTarget.cmake -index ddbcdd3..19aa261 100644 +index 6a2a2e1..1b929af 100644 --- a/core/app/DigikamTarget.cmake +++ b/core/app/DigikamTarget.cmake @@ -48,6 +48,10 @@ target_link_libraries(digikam @@ -20,10 +20,10 @@ index ddbcdd3..19aa261 100644 target_link_libraries(digikam PUBLIC Qt5::DBus) endif() diff --git a/core/app/main/main.cpp b/core/app/main/main.cpp -index c6e0900..9533484 100644 +index 00e3826..7fe641a 100644 --- a/core/app/main/main.cpp +++ b/core/app/main/main.cpp -@@ -79,6 +79,12 @@ using namespace Magick; +@@ -90,6 +90,12 @@ using namespace Magick; # include #endif @@ -36,7 +36,7 @@ index c6e0900..9533484 100644 using namespace Digikam; int main(int argc, char* argv[]) -@@ -332,5 +338,9 @@ int main(int argc, char* argv[]) +@@ -376,5 +382,9 @@ int main(int argc, char* argv[]) # endif #endif @@ -61,10 +61,10 @@ index 4b79915..4e1336c 100644 #include #include diff --git a/core/libs/CMakeLists.txt b/core/libs/CMakeLists.txt -index b69d8c7..dc799b1 100644 +index ba014f0..09b63db 100644 --- a/core/libs/CMakeLists.txt +++ b/core/libs/CMakeLists.txt -@@ -35,8 +35,8 @@ else() +@@ -36,8 +36,8 @@ else() endif() # Check processor endianness @@ -74,9 +74,9 @@ index b69d8c7..dc799b1 100644 +#TEST_BIG_ENDIAN(IS_BIG_ENDIAN) if(NOT IS_BIG_ENDIAN) - add_definitions(-DqDNGLittleEndian=1) + add_definitions(-DqDNGLittleEndian) diff --git a/core/libs/pgfutils/libpgf/PGFplatform.h b/core/libs/pgfutils/libpgf/PGFplatform.h -index 84c2995..8558c19 100644 +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) { @@ -98,7 +98,7 @@ index 84c2995..8558c19 100644 #define __POSIX__ #endif diff --git a/core/libs/threadimageio/thumb/thumbnailbasic.cpp b/core/libs/threadimageio/thumb/thumbnailbasic.cpp -index 86bd884..a28b3e5 100644 +index d15b278..19201b7 100644 --- a/core/libs/threadimageio/thumb/thumbnailbasic.cpp +++ b/core/libs/threadimageio/thumb/thumbnailbasic.cpp @@ -45,7 +45,7 @@ extern "C" @@ -111,10 +111,10 @@ index 86bd884..a28b3e5 100644 # include #endif diff --git a/core/libs/widgets/mainview/dxmlguiwindow.cpp b/core/libs/widgets/mainview/dxmlguiwindow.cpp -index 557b2c9..c83cb76 100644 +index c59ef56..8f1ddbd 100644 --- a/core/libs/widgets/mainview/dxmlguiwindow.cpp +++ b/core/libs/widgets/mainview/dxmlguiwindow.cpp -@@ -65,6 +65,12 @@ +@@ -67,6 +67,12 @@ # include #endif @@ -127,7 +127,7 @@ index 557b2c9..c83cb76 100644 // Local includes #include "digikam_debug.h" -@@ -187,7 +193,10 @@ DXmlGuiWindow::DXmlGuiWindow(QWidget* const parent, Qt::WindowFlags f) +@@ -189,7 +195,10 @@ DXmlGuiWindow::DXmlGuiWindow(QWidget* const parent, Qt::WindowFlags f) DXmlGuiWindow::~DXmlGuiWindow() { @@ -140,10 +140,10 @@ index 557b2c9..c83cb76 100644 void DXmlGuiWindow::setConfigGroupName(const QString& name) diff --git a/core/showfoto/main/main.cpp b/core/showfoto/main/main.cpp -index 68bec41..bf201ca 100644 +index 25c834b..2cacddc 100644 --- a/core/showfoto/main/main.cpp +++ b/core/showfoto/main/main.cpp -@@ -63,6 +63,12 @@ using namespace Magick; +@@ -72,6 +72,12 @@ using namespace Magick; # include #endif @@ -156,7 +156,7 @@ index 68bec41..bf201ca 100644 using namespace Digikam; int main(int argc, char* argv[]) -@@ -167,5 +173,9 @@ int main(int argc, char* argv[]) +@@ -187,5 +193,9 @@ int main(int argc, char* argv[]) # endif #endif @@ -167,7 +167,7 @@ index 68bec41..bf201ca 100644 return ret; } diff --git a/core/utilities/import/backend/gpcamera.cpp b/core/utilities/import/backend/gpcamera.cpp -index a6b53b1..e7adafc 100644 +index 316dd3e..378874d 100644 --- a/core/utilities/import/backend/gpcamera.cpp +++ b/core/utilities/import/backend/gpcamera.cpp @@ -61,6 +61,10 @@ extern "C" @@ -182,5 +182,5 @@ index a6b53b1..e7adafc 100644 // LibGphoto2 includes -- -2.23.0 +2.26.0