diff --git a/graphics/photoqt/Makefile b/graphics/photoqt/Makefile index 0a0842f13e56..04dd84dc2e03 100644 --- a/graphics/photoqt/Makefile +++ b/graphics/photoqt/Makefile @@ -1,43 +1,47 @@ PORTNAME= photoqt DISTVERSIONPREFIX= v -DISTVERSION= 1.6 -PORTREVISION= 10 +DISTVERSION= 3.4 CATEGORIES= graphics MAINTAINER= melanhit@gmail.com COMMENT= Simple, powerful and good looking QT5 image viewer 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 EXIV2_CMAKE_BOOL= EXIV2 EXIV2_DESC= Metadata editing EXIV2_LIB_DEPENDS= libexiv2.so:graphics/exiv2 RAW_CMAKE_BOOL= RAW RAW_DESC= Raw image support RAW_LIB_DEPENDS= libraw.so:graphics/libraw 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 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 ++ + #include + #include + #include 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 --#include -+#include - #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 --#include -+#include - #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