git: 94c534c90435 - main - graphics/photoqt: update 1.6 → 3.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 08 Dec 2023 07:46:25 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=94c534c90435826eb4478f4e22d8fdcf6a06b757
commit 94c534c90435826eb4478f4e22d8fdcf6a06b757
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-12-08 07:43:06 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-12-08 07:46:23 +0000
graphics/photoqt: update 1.6 → 3.4
PR: 270493
Approved by: melanhit@gmail.com (maintainer's timeout; 8 months 8 days)
---
graphics/photoqt/Makefile | 26 +++++++++++++---------
graphics/photoqt/distinfo | 8 ++++---
...cplusplus_imageprovider_loader_loadimage__raw.h | 16 -------------
graphics/photoqt/files/patch-cplusplus_main.cpp | 13 +++++++++++
...-cplusplus_scripts_getanddostuff_manipulation.h | 12 ----------
.../files/patch-cplusplus_scripts_getmetadata.h | 12 ----------
graphics/photoqt/pkg-plist | 14 ++++++------
7 files changed, 40 insertions(+), 61 deletions(-)
diff --git a/graphics/photoqt/Makefile b/graphics/photoqt/Makefile
index 0a0842f13e56..04dd84dc2e03 100644
--- a/graphics/photoqt/Makefile
+++ b/graphics/photoqt/Makefile
@@ -1,7 +1,6 @@
PORTNAME= photoqt
DISTVERSIONPREFIX= v
-DISTVERSION= 1.6
-PORTREVISION= 10
+DISTVERSION= 3.4
CATEGORIES= graphics
MAINTAINER= melanhit@gmail.com
@@ -11,15 +10,25 @@ WWW= https://photoqt.org/
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
+LIB_DEPENDS= libfreeimage.so:graphics/freeimage \
+ libIL.so:graphics/devil \
+ libmpv.so:multimedia/mpv \
+ libpoppler.so:graphics/poppler \
+ libpoppler-qt5.so:graphics/poppler-qt5 \
+ libpugixml.so:textproc/pugixml
+
USES= cmake compiler:c++11-lib desktop-file-utils \
- localbase:ldflags qt:5
-USE_QT= core declarative graphicaleffects gui multimedia network \
- quickcontrols sql svg widgets xml \
- buildtools:build linguisttools:build qmake:build
+ kde:5 libarchive localbase:ldflags magick:7 qt:5
+USE_QT= concurrent core dbus declarative graphicaleffects gui multimedia \
+ printsupport network quickcontrols sql svg widgets xml \
+ buildtools:build concurrent:build linguisttools:build qmake:build
+USE_KDE= ecm:build
USE_GITHUB= yes
GH_ACCOUNT= luspi
+CMAKE_OFF= CHROMECAST # requires the chromecast Python module
+
OPTIONS_DEFINE= EXIV2 RAW GM
OPTIONS_DEFAULT=EXIV2
@@ -35,9 +44,4 @@ GM_CMAKE_BOOL= GM
GM_DESC= GraphicsMagick image processing
GM_LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick
-post-patch:
- ${REINPLACE_CMD} -e 's,Exiv2::Image::AutoPtr,Exiv2::Image::UniquePtr,g' \
- ${WRKSRC}/cplusplus/scripts/getanddostuff/manipulation.cpp \
- ${WRKSRC}/cplusplus/scripts/getmetadata.cpp
-
.include <bsd.port.mk>
diff --git a/graphics/photoqt/distinfo b/graphics/photoqt/distinfo
index 0fef876f655f..dd727f0f963f 100644
--- a/graphics/photoqt/distinfo
+++ b/graphics/photoqt/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1525630998
-SHA256 (luspi-photoqt-v1.6_GH0.tar.gz) = 34f30ee07d535a227db325219a59f81e9f21a6918510e225a3e7310f6fde569d
-SIZE (luspi-photoqt-v1.6_GH0.tar.gz) = 1119296
+TIMESTAMP = 1702019963
+SHA256 (luspi-photoqt-v3.4_GH0.tar.gz) = bd26133640f523a34e71f4a5335cb5ff96f3bfd22ffd403e1de4f26bf043de90
+SIZE (luspi-photoqt-v3.4_GH0.tar.gz) = 4189447
+SHA256 (0ad4563f6cca77322ad2fe8d0310e807db4ba15f.patch) = bdaab47ea70d248f13631f4eef17682e1fbd17db5769ea33d8a2b5a0e303ce30
+SIZE (0ad4563f6cca77322ad2fe8d0310e807db4ba15f.patch) = 525
diff --git a/graphics/photoqt/files/patch-cplusplus_imageprovider_loader_loadimage__raw.h b/graphics/photoqt/files/patch-cplusplus_imageprovider_loader_loadimage__raw.h
deleted file mode 100644
index 7cdd88ff11c6..000000000000
--- a/graphics/photoqt/files/patch-cplusplus_imageprovider_loader_loadimage__raw.h
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix build with libraw >= 0.21.0
-
---- cplusplus/imageprovider/loader/loadimage_raw.h.orig 2023-03-02 16:52:09 UTC
-+++ cplusplus/imageprovider/loader/loadimage_raw.h
-@@ -56,7 +56,11 @@ class LoadImageRaw { (public)
- // Since we don't care about manipulating RAW images but only want to display
- // them, we can optimise for speed
- raw.imgdata.params.user_qual = 2;
-+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
-+ raw.imgdata.rawparams.use_rawspeed = 1;
-+#else
- raw.imgdata.params.use_rawspeed = 1;
-+#endif
- raw.imgdata.params.use_camera_wb = 1;
-
- // Open the RAW image
diff --git a/graphics/photoqt/files/patch-cplusplus_main.cpp b/graphics/photoqt/files/patch-cplusplus_main.cpp
new file mode 100644
index 000000000000..c955dd621965
--- /dev/null
+++ b/graphics/photoqt/files/patch-cplusplus_main.cpp
@@ -0,0 +1,13 @@
+- fix for https://github.com/luspi/photoqt/issues/20
+
+--- cplusplus/main.cpp.orig 2023-12-08 05:19:26 UTC
++++ cplusplus/main.cpp
+@@ -20,6 +20,8 @@
+ ** **
+ **************************************************************************/
+
++#include <clocale>
++
+ #include <QQmlApplicationEngine>
+ #include <QQmlContext>
+ #include <QLoggingCategory>
diff --git a/graphics/photoqt/files/patch-cplusplus_scripts_getanddostuff_manipulation.h b/graphics/photoqt/files/patch-cplusplus_scripts_getanddostuff_manipulation.h
deleted file mode 100644
index 0d5f1d33ac5e..000000000000
--- a/graphics/photoqt/files/patch-cplusplus_scripts_getanddostuff_manipulation.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- cplusplus/scripts/getanddostuff/manipulation.h.orig 2019-07-07 08:24:57 UTC
-+++ cplusplus/scripts/getanddostuff/manipulation.h
-@@ -37,8 +37,7 @@
- #include "../../logger.h"
-
- #ifdef EXIV2
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- #endif
-
- class GetAndDoStuffManipulation : public QObject {
diff --git a/graphics/photoqt/files/patch-cplusplus_scripts_getmetadata.h b/graphics/photoqt/files/patch-cplusplus_scripts_getmetadata.h
deleted file mode 100644
index 5e808ab72b7d..000000000000
--- a/graphics/photoqt/files/patch-cplusplus_scripts_getmetadata.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- cplusplus/scripts/getmetadata.h.orig 2019-07-07 08:22:25 UTC
-+++ cplusplus/scripts/getmetadata.h
-@@ -34,8 +34,7 @@
- #include "../logger.h"
-
- #ifdef EXIV2
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- #endif
-
- class GetMetaData : public QObject {
diff --git a/graphics/photoqt/pkg-plist b/graphics/photoqt/pkg-plist
index aa1b7df6197c..0612c506a1bf 100644
--- a/graphics/photoqt/pkg-plist
+++ b/graphics/photoqt/pkg-plist
@@ -1,8 +1,8 @@
bin/photoqt
-share/appdata/photoqt.appdata.xml
-share/applications/photoqt.desktop
-share/icons/hicolor/128x128/apps/photoqt.png
-share/icons/hicolor/16x16/apps/photoqt.png
-share/icons/hicolor/32x32/apps/photoqt.png
-share/icons/hicolor/48x48/apps/photoqt.png
-share/icons/hicolor/64x64/apps/photoqt.png
+share/applications/org.photoqt.PhotoQt.desktop
+share/icons/hicolor/128x128/apps/org.photoqt.PhotoQt.png
+share/icons/hicolor/16x16/apps/org.photoqt.PhotoQt.png
+share/icons/hicolor/32x32/apps/org.photoqt.PhotoQt.png
+share/icons/hicolor/48x48/apps/org.photoqt.PhotoQt.png
+share/icons/hicolor/64x64/apps/org.photoqt.PhotoQt.png
+share/metainfo/org.photoqt.PhotoQt.metainfo.xml