git: 9b77fbd3f34d - main - graphics/luminance-qt5: unbreak build with boost-1.85

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Thu, 03 Oct 2024 10:27:28 UTC
The branch main has been updated by fluffy:

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

commit 9b77fbd3f34d490c0e8a329dd5a74ac31dbf3850
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2024-10-02 23:35:37 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2024-10-03 10:24:55 +0000

    graphics/luminance-qt5: unbreak build with boost-1.85
    
    With hat:       office
    Sponsored by:   Future Crew, LLC
---
 graphics/luminance-qt5/Makefile                    |  7 ++--
 graphics/luminance-qt5/files/patch-CMakeLists.txt  | 37 +++++++++++++++++++---
 .../files/patch-src_Common_init__fftw.h            | 11 +++++++
 .../files/patch-src_Libpfs_maninp_projection.cpp   | 12 -------
 .../files/patch-src_Libpfs_manip_projection.cpp    | 12 +++++++
 .../files/patch-src_Libpfs_manip_resize.hxx        | 12 +++++++
 6 files changed, 72 insertions(+), 19 deletions(-)

diff --git a/graphics/luminance-qt5/Makefile b/graphics/luminance-qt5/Makefile
index 6a79cfa0728d..f1843eccbdd4 100644
--- a/graphics/luminance-qt5/Makefile
+++ b/graphics/luminance-qt5/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	luminance-hdr
 DISTVERSION=	2.6.1.1
-PORTREVISION=	26
+PORTREVISION=	27
 CATEGORIES=	graphics
 MASTER_SITES=	SF/qtpfsgui/luminance/${DISTVERSION}
 
@@ -24,11 +24,14 @@ LIB_DEPENDS=	libImath.so:math/Imath \
 
 CFLAGS+=	-I${LOCALBASE}/include/Imath
 
-USES=		cmake desktop-file-utils eigen:3 jpeg pkgconfig qt:5 tar:bzip2
+USES=		cmake compiler:c++14-lang desktop-file-utils \
+		eigen:3 jpeg pkgconfig qt:5 tar:bzip2
 USE_QT=		concurrent core declarative gui location network \
 		printsupport sql svg widgets xml \
 		buildtools:build linguisttools:build qmake:build
 
+USE_CXXSTD=	c++14
+
 OPTIONS_DEFINE=		CFITSIO DOCS HELPBROWSER
 OPTIONS_DEFAULT=	CFITSIO
 OPTIONS_DEFAULT_aarch64=	HELPBROWSER
diff --git a/graphics/luminance-qt5/files/patch-CMakeLists.txt b/graphics/luminance-qt5/files/patch-CMakeLists.txt
index a9fa150e07f3..7726e547ed62 100644
--- a/graphics/luminance-qt5/files/patch-CMakeLists.txt
+++ b/graphics/luminance-qt5/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
 --- CMakeLists.txt.orig	2021-01-11 09:41:28 UTC
 +++ CMakeLists.txt
-@@ -64,6 +64,7 @@ find_package(Qt5Core             REQUIRED)
+@@ -64,6 +64,7 @@ find_package(Qt5Gui              REQUIRED)
  find_package(Qt5Concurrent       REQUIRED)
  find_package(Qt5Widgets          REQUIRED)
  find_package(Qt5Gui              REQUIRED)
@@ -8,12 +8,39 @@
  # QtWebEngine is preferred web engine because QtWebKit is deprecated since Qt 5.5:
  # https://wiki.qt.io/New-Features-in-Qt-5.5#Deprecated_Functionality. Unfortunately,
  # some Qt distributions still provide QtWebKit instead of QtWebEngine. So first we
-@@ -75,6 +76,8 @@ else()
-     find_package(Qt5WebKit           REQUIRED)
+@@ -76,6 +77,8 @@ endif()
      find_package(Qt5WebKitWidgets    REQUIRED)
      add_definitions(-DUSE_DEPRECATED_QTWEBKIT)
-+endif()
-+    add_definitions(-DWITH_HELPBROWSER)
  endif()
++    add_definitions(-DWITH_HELPBROWSER)
++endif()
  find_package(Qt5Xml              REQUIRED)
  find_package(Qt5Sql              REQUIRED)
+ find_package(Qt5Svg              REQUIRED)
+@@ -345,7 +348,6 @@ IF(APPLE)
+     FILE(COPY
+          ${CMAKE_SOURCE_DIR}/AUTHORS
+          ${CMAKE_SOURCE_DIR}/README.md
+-         ${CMAKE_SOURCE_DIR}/LICENSE
+          ${CMAKE_SOURCE_DIR}/Changelog
+          DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents
+     )
+@@ -416,9 +418,8 @@ ELSEIF(UNIX)
+     INSTALL(FILES
+     ${CMAKE_SOURCE_DIR}/AUTHORS
+     ${CMAKE_SOURCE_DIR}/README.md
+-    ${CMAKE_SOURCE_DIR}/LICENSE
+     ${CMAKE_SOURCE_DIR}/Changelog
+-    DESTINATION share/luminance-hdr/doc) #info files
++    DESTINATION share/doc/luminance-hdr) #info files
+     INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/help DESTINATION share/luminance-hdr) # help directory
+     INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/hdrhtml DESTINATION share/luminance-hdr) # hdrhtml directory
+ # Microsoft Windows
+@@ -508,7 +509,6 @@ ELSEIF(WIN32)
+         INSTALL(FILES ${CMAKE_SOURCE_DIR}/program-icons/luminance-hdr.png DESTINATION ./icons/hicolor/48x48/apps) # icon
+         INSTALL(FILES ${CMAKE_SOURCE_DIR}/AUTHORS
+                       ${CMAKE_SOURCE_DIR}/README.md
+-                      ${CMAKE_SOURCE_DIR}/LICENSE
+                       ${CMAKE_SOURCE_DIR}/Changelog
+                       DESTINATION ./) #info files
+         INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/icons DESTINATION ./) # icons directory
diff --git a/graphics/luminance-qt5/files/patch-src_Common_init__fftw.h b/graphics/luminance-qt5/files/patch-src_Common_init__fftw.h
new file mode 100644
index 000000000000..e58b85c7b1b4
--- /dev/null
+++ b/graphics/luminance-qt5/files/patch-src_Common_init__fftw.h
@@ -0,0 +1,11 @@
+--- src/Common/init_fftw.h.orig	2021-01-11 09:41:28 UTC
++++ src/Common/init_fftw.h
+@@ -22,7 +22,7 @@
+ #ifndef INIT_FFTW_H
+ #define INIT_FFTW_H
+ 
+-#include <boost/thread/mutex.hpp>
++#include <mutex>
+ 
+ class FFTW_MUTEX {
+    public:
diff --git a/graphics/luminance-qt5/files/patch-src_Libpfs_maninp_projection.cpp b/graphics/luminance-qt5/files/patch-src_Libpfs_maninp_projection.cpp
deleted file mode 100644
index 5f85799aa2f1..000000000000
--- a/graphics/luminance-qt5/files/patch-src_Libpfs_maninp_projection.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-Include cstdio for stderr, to fix the build with gcc 4.9
-
---- src/Libpfs/manip/projection.cpp.orig	2015-10-29 16:26:58.000000000 +0100
-+++ src/Libpfs/manip/projection.cpp	2015-10-29 16:27:41.000000000 +0100
-@@ -26,6 +26,7 @@
- 
- #include <cmath>
- #include <cstring>
-+#include <cstdio>
- // #include <stdio.h>
- // #include <stdlib.h>
- 
diff --git a/graphics/luminance-qt5/files/patch-src_Libpfs_manip_projection.cpp b/graphics/luminance-qt5/files/patch-src_Libpfs_manip_projection.cpp
new file mode 100644
index 000000000000..19b83928077a
--- /dev/null
+++ b/graphics/luminance-qt5/files/patch-src_Libpfs_manip_projection.cpp
@@ -0,0 +1,12 @@
+Include cstdio for stderr, to fix the build with gcc 4.9
+
+--- src/Libpfs/manip/projection.cpp.orig	2021-01-11 09:41:28 UTC
++++ src/Libpfs/manip/projection.cpp
+@@ -28,6 +28,7 @@
+ 
+ #include <cmath>
+ #include <cstring>
++#include <cstdio>
+ // #include <stdio.h>
+ // #include <stdlib.h>
+ 
diff --git a/graphics/luminance-qt5/files/patch-src_Libpfs_manip_resize.hxx b/graphics/luminance-qt5/files/patch-src_Libpfs_manip_resize.hxx
new file mode 100644
index 000000000000..2b00bd54e315
--- /dev/null
+++ b/graphics/luminance-qt5/files/patch-src_Libpfs_manip_resize.hxx
@@ -0,0 +1,12 @@
+Fix build with boost 1.85.
+
+--- src/Libpfs/manip/resize.hxx.orig	2024-05-30 18:37:03.836910306 +0000
++++ src/Libpfs/manip/resize.hxx
+@@ -23,6 +23,7 @@
+ #define PFS_RESIZE_HXX
+ 
+ #include <boost/math/constants/constants.hpp>
++#include <boost/numeric/conversion/bounds.hpp>
+ #include "copy.h"
+ #include "resize.h"
+ #include "../../sleef.c"