photivo, bump to 20240904 checkout (#13391)

fixes building with new exiv2

media-gfx/photivo/patches/photivo-0~pre20240904.patchset

@@ -1,37 +1,14 @@
-From e3c67a66bf9c8259afbddf7e55387a40803b51bb Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sat, 21 Nov 2020 23:13:49 +1000
-Subject: Fix build for Haiku
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5f9d506..e006ad3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -146,7 +146,7 @@ message( "Build Adobe profiles creator : ${WITH_ADOBE_PROFILES}\n" )
- 
- set( CMAKE_CXX_FLAGS "" )
- set( CMAKE_C_FLAGS "" )
--set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -funroll-loops -fopenmp -std=gnu++0x" )
-+set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -funroll-loops -std=gnu++0x" )
- set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -std=gnu++0x" )
- set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=gnu++0x" )
- 
--- 
-2.28.0
-
-
-From 47ef2716d446eb05899a03d654e749205033a4df Mon Sep 17 00:00:00 2001
+From 5d44caa75e5b0dbb9d36c9ffb06fa56217ead34b Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 21 Nov 2020 23:14:43 +1000
 Subject: Disable thumb worker
 
 
 diff --git a/Sources/filemgmt/ptThumbGenWorker.cpp b/Sources/filemgmt/ptThumbGenWorker.cpp
-index a774b1d..1119b15 100644
+index 9850cbc..50753cc 100644
 --- a/Sources/filemgmt/ptThumbGenWorker.cpp
 +++ b/Sources/filemgmt/ptThumbGenWorker.cpp
-@@ -149,6 +149,9 @@ TThumbPtr ptThumbGenWorker::generateThumb(const TThumbId& AThumbId) {
+@@ -150,6 +150,9 @@ TThumbPtr ptThumbGenWorker::generateThumb(const TThumbId& AThumbId) {
      const QString hFilePath = AThumbId.FilePath;
      hThumbnail.reset(new ptImage8);
  
@@ -41,7 +18,7 @@ index a774b1d..1119b15 100644
      ptDcRaw     hDcRaw;
      MagickWand* hGMImage = NewMagickWand();
      QSize       hSize;
-@@ -184,6 +187,7 @@ TThumbPtr ptThumbGenWorker::generateThumb(const TThumbId& AThumbId) {
+@@ -185,6 +188,7 @@ TThumbPtr ptThumbGenWorker::generateThumb(const TThumbId& AThumbId) {
      }
  
      DestroyMagickWand(hGMImage);
@@ -62,17 +39,17 @@ index 8f4557b..f395ae2 100644
          <file>dark/icons/go-up-48px.png</file>
          <file>dark/icons/broken-image-48px.png</file>
 -- 
-2.28.0
+2.51.0
 
 
-From ce3e470a0be95c475329f2f3913268f103b02ca8 Mon Sep 17 00:00:00 2001
+From 07e0f2b8d8e482db9c2b8a00a31cf6776519f121 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 21 Nov 2020 23:15:28 +1000
 Subject: Set username
 
 
 diff --git a/Sources/ptMain.cpp b/Sources/ptMain.cpp
-index fd40ba5..bae290a 100644
+index 2be0eb7..e85e2cb 100644
 --- a/Sources/ptMain.cpp
 +++ b/Sources/ptMain.cpp
 @@ -526,6 +526,9 @@ int photivoMain(int Argc, char *Argv[]) {
@@ -80,12 +57,12 @@ index fd40ba5..bae290a 100644
  
    //QApplication TheApplication(Argc,Argv);
 +#ifdef Q_OS_HAIKU
-+  QString     user = "Photivo_user";
++  Qstring    user = "Photivo_user";
 +#else
    QStringList environment = QProcess::systemEnvironment();
-   QString user=environment.filter(QRegExp("^USERNAME=|^USER=",Qt::CaseInsensitive)).first();
-   if(!user.isEmpty()){
-@@ -533,6 +536,7 @@ int photivoMain(int Argc, char *Argv[]) {
+   QString user = environment.filter(
+       QRegularExpression("^USERNAME=|^USER=", QRegularExpression::CaseInsensitiveOption)).first();
+@@ -534,6 +537,7 @@ int photivoMain(int Argc, char *Argv[]) {
        user="_"+user.right(user.length()-l-1);
    }
    user="photivo"+user;
@@ -94,10 +71,10 @@ index fd40ba5..bae290a 100644
  #ifdef Q_OS_MAC
    TheApplication = new MyQApplication(user, Argc,Argv);
 -- 
-2.28.0
+2.51.0
 
 
-From 287dfcfa4675c08ae9d68abe600dbcdf4b41c8e9 Mon Sep 17 00:00:00 2001
+From 81a0abecbdf6130039b5ca502929bec557976b93 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 21 Nov 2020 23:15:07 +1000
 Subject: Disable preview panel by default
@@ -117,6 +94,5 @@ index 592a76c..9e06823 100644
      {"FileMgrThumbLayoutType"               ,1    ,tlVerticalByRow                       ,0},
      {"FileMgrShowRAWs"                      ,1    ,1                                     ,0},
 -- 
-2.28.0
-
+2.51.0
 

media-gfx/photivo/photivo-0~pre20240904.recipe

@@ -15,10 +15,10 @@ HOMEPAGE="http://www.photivo.org"
 COPYRIGHT="2004-2007 Jeremy Ruston,
 		2007-2020, UnaMesa Association"
 LICENSE="GNU GPL v3"
-REVISION="5"
-srcGitRevision="b8210572f022"
+REVISION="1"
+srcGitRevision="517cc62aff5f"
 SOURCE_URI="https://bitbucket.org/Photivo/photivo/get/$srcGitRevision.tar.bz2"
-CHECKSUM_SHA256="0086c2b4f57bf58295812385edb5f9299c21266fd71c1ba8bd482da7a28e400b"
+CHECKSUM_SHA256="218bd0cf09e87802602b75920e75dd21e18e8499a550f0560bdaf7b9ad7af78c"
 SOURCE_DIR="Photivo-photivo-$srcGitRevision"
 
 PATCHES="photivo-$portVersion.patchset"
@@ -32,7 +32,7 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	photivo$secondaryArchSuffix = $portVersion
-	app:Photivo$secondaryArchSuffix = $portVersion
+	app:Photivo = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -50,10 +50,10 @@ REQUIRES="
 	lib:liblcms2$secondaryArchSuffix
 	lib:liblqr_1$secondaryArchSuffix
 	lib:libpugixml$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Network$secondaryArchSuffix
-	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libQt6Core$secondaryArchSuffix
+	lib:libQt6Gui$secondaryArchSuffix
+	lib:libQt6Network$secondaryArchSuffix
+	lib:libQt6Widgets$secondaryArchSuffix
 	lib:libraw$secondaryArchSuffix
 	lib:libtiff$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
@@ -75,10 +75,10 @@ BUILD_REQUIRES="
 	devel:liblqr_1$secondaryArchSuffix
 	devel:libopencv_core$secondaryArchSuffix
 	devel:libpugixml$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt5Gui$secondaryArchSuffix
-	devel:libQt5Network$secondaryArchSuffix
-	devel:libQt5Widgets$secondaryArchSuffix
+	devel:libQt6Core$secondaryArchSuffix
+	devel:libQt6Gui$secondaryArchSuffix
+	devel:libQt6Network$secondaryArchSuffix
+	devel:libQt6Widgets$secondaryArchSuffix
 	devel:libraw$secondaryArchSuffix
 	devel:libtiff$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
@@ -89,7 +89,6 @@ BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
 	cmd:gm$secondaryArchSuffix
-	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:which
@@ -109,7 +108,8 @@ BUILD()
 		-DCMAKE_BUILD_TYPE=Release \
 		-DWITH_X3F=OFF \
 		-DWITH_GIMP=OFF \
-		-DCMAKE_INSTALL_PREFIX=$appsDir/Photivo
+		-DCMAKE_INSTALL_PREFIX=$appsDir/Photivo \
+		-DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
 	export DISABLE_ASLR=1
 	# multi-job takes too much memory