From nobody Fri Dec 08 07:46:25 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SmjrK5LYmz53XPH; Fri, 8 Dec 2023 07:46:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmjrK4s2Qz3RsX; Fri, 8 Dec 2023 07:46:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702021585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZYvR9oyDW2SfJ1XS9FLk8EG5lgZBibP5uec9dhCL2hg=; b=jEZ1mzTOFGp6UN4YEpoxYnEfvicjOA+qd0dFrYjlaM3JvFDmuuZxhZBnktkBm4pSpymIsH UVOgUOpPo9EiBm/WK06ecpBL9LpBk5eZe6bUE2udogc07si4pREXW9WA7ayDmqas6zxpnS PmNSQa1cE0Fj3Ntzoiq4CLA8vkhtEURmsAl9qjVIHaqZ52byKEwBSk54ccm8+6cPuFQ7NM uoR1bcZnymszDAKwugsY/caVS2+EXfgFN43rLE9EEMsp25fuON9bwGTDQPcDEgyH20sGU1 ObLaMCD+518Ecj9aPfb6Ea9277FfQhjGlK2PWB63rspQ3rbySntOWY4NKNv6uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702021585; a=rsa-sha256; cv=none; b=kWFMxy3m3VZnCLm3lS08bV1wa0+zAcyOwEi/WG4/5HLJFJrfXpA6ccQHz3J2AOe9oqdLpE fBr5CMit1cvxpU+A5349jer2eGz430O61dmlnrcHx5JMv7XGsGMPOofPur2ZDQXLja8KGb sJPBiN6RImgTXvyW1ZZw0IUVAx+nemtEWCiPGnrzN90mCD3i4BfZgbXgzf2T1XIsDsaiy7 PwNWlZq7TaUomoRy+aDwd74fKZ5pZ+LT2/JhyBaT+yuA1TXSSdDHnl9YUAKQGYUJn6mDhY iSaI8oYc4pcUi4AkgPF/l5jCSQtXicU/C+X4C6NXYDZowi5HeJ4D9ZmjGywvbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702021585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZYvR9oyDW2SfJ1XS9FLk8EG5lgZBibP5uec9dhCL2hg=; b=yUa+jFoI61pI5yiPOHgspDlZOvJ8VRbZfiRUZOAAc+lRCbhjMqU25orp+ewCS2nmTa/YW0 8M8Hu/uwEOWD5BiwR3IEcCPtez2FOx55wpbObOfkqBUL84zOJT72VYGmN3ebKOJBXFrKeg hbZkQp1yjimqbHrA1odgLee2kjPiCdY6bbD695kBqd6D/dqNU4ACgC+J8tOmDewBeTCFpa 093JBMz/rl50+PIy8uLUcO1NCa5o4sDpBThW9XuhA3UYc2P5DZ8p/QqlIF0MWaKpg5ghah Xlt9zxntTuM1KxxQSTj1it7dOdANrW1m1CMG+WZLZUGWkakBz98Q+WM+5L9rtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SmjrK3bpvz1Bc7; Fri, 8 Dec 2023 07:46:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B87kPdT079422; Fri, 8 Dec 2023 07:46:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B87kP9Z079419; Fri, 8 Dec 2023 07:46:25 GMT (envelope-from git) Date: Fri, 8 Dec 2023 07:46:25 GMT Message-Id: <202312080746.3B87kP9Z079419@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 94c534c90435 - main - graphics/photoqt: update 1.6 =?utf-8?Q?=E2=86=92?= 3.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94c534c90435826eb4478f4e22d8fdcf6a06b757 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=94c534c90435826eb4478f4e22d8fdcf6a06b757 commit 94c534c90435826eb4478f4e22d8fdcf6a06b757 Author: Yuri Victorovich AuthorDate: 2023-12-08 07:43:06 +0000 Commit: Yuri Victorovich 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 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