<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1fc59c144fd0cb85bd0b1575e8876dab981d2a7c">https://github.com/macports/macports-ports/commit/1fc59c144fd0cb85bd0b1575e8876dab981d2a7c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1fc59c144fd photoqt: new port in graphics
</span>1fc59c144fd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1fc59c144fd0cb85bd0b1575e8876dab981d2a7c
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Tue Nov 28 13:19:15 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> photoqt: new port in graphics
</span>---
graphics/photoqt/Portfile | 127 +++++++++++++++++++++++
graphics/photoqt/files/patch-exiv2.diff | 20 ++++
graphics/photoqt/files/patch-include-magick.diff | 45 ++++++++
3 files changed, 192 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/photoqt/Portfile b/graphics/photoqt/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f3bcbd24ab7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/photoqt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,127 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name photoqt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup luspi photoqt 3.4 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories graphics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description PhotoQt Image Viewer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description PhotoQt is a simple yet powerful and good looking image viewer, based on Qt/QML, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ published as open-source and completely free.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://photoqt.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:exiv2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:shared-mime-info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "${name}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts photoqt-qt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platforms {darwin > 10}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 884155ef964f60ac886e8e7b20001878cc23888e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bd26133640f523a34e71f4a5335cb5ff96f3bfd22ffd403e1de4f26bf043de90 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4189447
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ImageMagick \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:kde-extra-cmake-modules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libarchive \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libraw \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/poppler.pc:poppler \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:poppler-qt5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pugixml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:vips \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:webp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We have to use ImageMagick here: https://github.com/luspi/photoqt/issues/19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCHROMECAST=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDEVIL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DFREEIMAGE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGRAPHICSMAGICK=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DIMAGEMAGICK=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_WEBP=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBARCHIVE=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBVIPS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPOPPLER=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPUGIXML=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DQTPDF=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DRAW=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DRESVG=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVIDEO_MPV=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVIDEO_QT=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qtlocation broken on aarch64: https://trac.macports.org/ticket/68508
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtmultimedia qtsvg qttools qttranslations sqlite-plugin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLOCATION=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtlocation qtmultimedia qtsvg qttools qttranslations sqlite-plugin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Without this the build cannot find QtPlatformHeaders:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${qt_includes_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport photoqt-qt4 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This is the last version to support Qt4.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: restore Qt4 support into 1.x.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup luspi photoqt-legacy 1.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts photoqt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platforms {darwin < 11}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 e43351a7d1c1bc5fa96c1b4e759134d594c68c4f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 63c8a41a9dc77ab24d3990ee0d8fff0ea3cd8e9430177378ecd7078121618326 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 704647
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-exiv2.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-include-magick.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@PREFIX@,${prefix}," ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:GraphicsMagick \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:phonon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGM=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPHONON=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # filehandling.cpp: error: invalid conversion from 'QPushButton*' to 'CustomPushButton*' [-fpermissive]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -fpermissive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXIV2=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/photoqt/files/patch-exiv2.diff b/graphics/photoqt/files/patch-exiv2.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b28e59a0343
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/photoqt/files/patch-exiv2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- widgets/detailswidget.cpp.orig 2013-08-12 04:07:23.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ widgets/detailswidget.cpp 2023-08-23 11:09:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,6 +17,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "detailswidget.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <exiv2/exiv2.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This class provides a widget for displaying meta (Exif) information
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Details::Details(QWidget *parent, QMap<QString, QVariant> set, bool v): QWidget(parent) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -492,7 +494,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } catch(const Exiv2::AnyError&) { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } catch(const Exiv2::Error &e) { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/photoqt/files/patch-include-magick.diff b/graphics/photoqt/files/patch-include-magick.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..143c949539f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/photoqt/files/patch-include-magick.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- graphics/imagereader.h.orig 2013-08-12 04:07:23.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ graphics/imagereader.h 2023-08-23 10:23:58.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,7 +10,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QFileInfo>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef GM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <GraphicsMagick/Magick++/Image.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <Magick++.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class ImageReader : public QObject {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2013-08-12 04:07:23.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-08-23 11:19:01.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -88,8 +88,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(PHONON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_DEFINITIONS(-DPHONON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TARGET_LINK_LIBRARIES(photoqt "phonon")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(QT_PHONON_INCLUDE_DIR /usr/include/phonon)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(QT_PHONON_INCLUDE_DIR @PREFIX@/include/phonon)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message("** Phonon enabled")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(NOT PHONON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -98,7 +99,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(GM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INCLUDE_DIRECTORIES("/usr/include/GraphicsMagick/")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INCLUDE_DIRECTORIES("@PREFIX@/include/GraphicsMagick/")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET_LINK_LIBRARIES(photoqt "GraphicsMagick++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_DEFINITIONS(-DGM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,8 +118,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Set the install prefix to /usr/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(PRODUCT_INSTALL_PREFIX /usr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Set the install prefix to @PREFIX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(PRODUCT_INSTALL_PREFIX @PREFIX@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Install executeable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL(
</span></pre><pre style='margin:0'>
</pre>