git: d0326b720447 - main - graphics/photivo: the port had been slightly improved (+)

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d0326b720447a417b038304320ce915c6ded8e0e

commit d0326b720447a417b038304320ce915c6ded8e0e
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2026-10-15 04:31:52 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2026-10-15 04:31:52 +0000

    graphics/photivo: the port had been slightly improved (+)
    
    - Stretch out CMAKE_MINIMUM_REQUIRED() version range to
      accommodate for upcoming CMake 4.x and beyond
    - Drop `dos2unix' from USES in favor of PATCH_ARGS+=-l
---
 graphics/photivo/Makefile                       |  6 +++---
 graphics/photivo/files/patch-CMakeLists.txt     | 19 ++++++++++++++-----
 graphics/photivo/files/patch-Sources_ptMain.cpp | 18 +++++++++---------
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/graphics/photivo/Makefile b/graphics/photivo/Makefile
index d86bfae6c51a..2009e09c768d 100644
--- a/graphics/photivo/Makefile
+++ b/graphics/photivo/Makefile
@@ -20,12 +20,10 @@ LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
 		libGraphicsMagick.so:graphics/GraphicsMagick \
 		libfftw3.so:math/fftw3
 
-USES=		cmake compiler:c++11-lib desktop-file-utils dos2unix \
+USES=		cmake compiler:c++11-lib desktop-file-utils \
 		gettext-runtime gnome jpeg pkgconfig qt:5 zip
 USE_GNOME=	glib20
 USE_QT=		qmake:build buildtools:build core gui network widgets
-DOS2UNIX_FILES=	Sources/ptImage.cpp Sources/ptCheck.cpp Sources/filemgmt/ptFileMgrWindow.h \
-		Sources/ptImageHelper.h Sources/ptMainWindow.h Sources/ptImageHelper.cpp
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -45,3 +43,5 @@ post-patch:
 		${WRKSRC}/Sources/ptDcRaw.cpp
 
 .include <bsd.port.mk>
+
+PATCH_ARGS+=	-l
diff --git a/graphics/photivo/files/patch-CMakeLists.txt b/graphics/photivo/files/patch-CMakeLists.txt
index 8e3548faf5c7..bae4895f73e7 100644
--- a/graphics/photivo/files/patch-CMakeLists.txt
+++ b/graphics/photivo/files/patch-CMakeLists.txt
@@ -1,6 +1,15 @@
 --- CMakeLists.txt.orig	2016-03-22 03:34:54 UTC
 +++ CMakeLists.txt
-@@ -140,7 +140,7 @@ message( "Build Adobe profiles creator :
+@@ -36,7 +36,7 @@
+ #
+ ################################################################################
+ 
+-CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
++CMAKE_MINIMUM_REQUIRED( VERSION 2.8...9.9 )
+ 
+ PROJECT( photivo )
+ 
+@@ -140,7 +140,7 @@ message( "Build Adobe profiles creator : ${WITH_ADOBE_
  
  set( CMAKE_CXX_FLAGS "" )
  set( CMAKE_C_FLAGS "" )
@@ -9,12 +18,12 @@
  set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -std=gnu++0x" )
  set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=gnu++0x" )
  
-@@ -488,8 +488,6 @@ else( NOT ${CMAKE_SYSTEM_PROCESSOR} OR $
+@@ -487,8 +487,6 @@ else( NOT ${CMAKE_SYSTEM_PROCESSOR} OR ${CMAKE_SYSTEM_
+   set_target_properties( photivo PROPERTIES COMPILE_FLAGS
                           "-march=i686 -ffast-math -DAPPVERSION='${APPVERSION}' -DPREFIX=${CMAKE_INSTALL_PREFIX}" )
  endif( NOT ${CMAKE_SYSTEM_PROCESSOR} OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" )
- 
--set_target_properties( photivo PROPERTIES LINK_FLAGS "-lgomp" )
 -
+-set_target_properties( photivo PROPERTIES LINK_FLAGS "-lgomp" )
+ 
  target_link_libraries( photivo
                         ${GLIB2_LIBRARIES}
-                        ${QT_LIBRARIES}
diff --git a/graphics/photivo/files/patch-Sources_ptMain.cpp b/graphics/photivo/files/patch-Sources_ptMain.cpp
index f250b801004f..38920ab6c2f7 100644
--- a/graphics/photivo/files/patch-Sources_ptMain.cpp
+++ b/graphics/photivo/files/patch-Sources_ptMain.cpp
@@ -1,11 +1,11 @@
 --- Sources/ptMain.cpp.orig	2016-03-22 03:34:55 UTC
 +++ Sources/ptMain.cpp
-@@ -5325,7 +5325,7 @@ void ReadSidecar(const QString& Sidecar)
-     return;
-   }
- 
--  Exiv2::Image::AutoPtr hImage = Exiv2::ImageFactory::open(Sidecar.toLocal8Bit().data());
-+  Exiv2::Image::UniquePtr hImage = Exiv2::ImageFactory::open(Sidecar.toLocal8Bit().data());
- 
-   if (!hImage.get()) {
-     return;
+@@ -5325,7 +5325,7 @@ void ReadSidecar(const QString& Sidecar)
+     return;
+   }
+ 
+-  Exiv2::Image::AutoPtr hImage = Exiv2::ImageFactory::open(Sidecar.toLocal8Bit().data());
++  Exiv2::Image::UniquePtr hImage = Exiv2::ImageFactory::open(Sidecar.toLocal8Bit().data());
+ 
+   if (!hImage.get()) {
+     return;