From nobody Tue Jul 09 07:08:54 2024 X-Original-To: dev-commits-ports-all@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 4WJBtH0VNvz5Q0NJ; Tue, 09 Jul 2024 07:08:55 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WJBtH043dz4fm2; Tue, 9 Jul 2024 07:08:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720508935; 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=9ilDO6LVOV8shO4GsTKkHlc9rJ3GXWn32pdFz0LqGYE=; b=VDKFkDceSw7uFKxpfFKE2C997EJKPC5FAyuMIWWNZso/mAEIQ5rF4tXbhMjJKzxj1S+kBY 1U+4LkLALVbylQEyijmu48YwV9psMPt9n4Cu/R/LRw19H/U5kS70JaPAphfi/cx/GToBaM clgSbfAHdSR0N/LUwZ4nNv3CsNnHQdCupd88VchyW6++4VfqiNJUlJeM0B6MWr5w8F7fFq P1Vpezgp90q0EiPyxndGtmiyb3ke9hL06Pdeue9aBSqMTKvswspg5EoJV0MRrUfE4C+/id ONBHp2B8iazaNKwoSKAeGpGf14I+3dEAht7N2oHIlxH3zX9ZWmIbM6D9GpZsUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720508935; a=rsa-sha256; cv=none; b=DQRfDO4zhn9/TQvaKir1CBqkj/Lzrh5PwwEX2eefpqowQVIiJ2WjVl+ABPYI5R1uJKK7vC f+6s/zC2wfb6Vk2miAvi/tpzw5hdgs7w1jMmEJml3FxxVj8vDeFRIyhomi6OTh1K8nL6lI piBcmnATuV584g+KX5vV7ILqRjbQbaVEnb4EcBxyk6V+PQp9j4WdSLENIjAVE5AnB/95y6 3vo/NmqZEzaJebf5VeGJ7nsQEA67wLfcIVaMRaMVtZMhRcXggM+ulDYnNkOA6pHfmvjmiA oroFmW+1V+ovKSGdxJuX4OwLHaQFbI6wWdSMmf8FW5If/XlntMs4/RhtUPVPww== 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=1720508935; 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=9ilDO6LVOV8shO4GsTKkHlc9rJ3GXWn32pdFz0LqGYE=; b=B5VHFmm2Zy0HBf1U7o/6linCYAoLP5J+WevyKzwvMqShtZ8Hsz5gvaMyWjCUambnHQkOR6 e64cY3Xnvr1wWhMFVRj5vc40GenCqazrlxe96p9nOZXYp0qFwJdlbDveodVCFHtUbtu0aa vu6pqYgoR8XnqtSIMOFAfKtfikpAtV/78ZItGyIeKddvxhXh5WDmpo3tRNVb2+Fax76LPY g63hldmqdiTt2Sj71XqmvleRU47YBBRBNJ8GK5Ok/gOT5TyNzZwSkrS9UUcn3im9Z6xI7y CbZ0LEPPgaYdnKHoiY9aOAMWU/sKNfXv05KTGQ8zPOOn9c25RmLb9oaSBu3cIw== 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 4WJBtG6pFhzPYK; Tue, 9 Jul 2024 07:08:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46978sGG000217; Tue, 9 Jul 2024 07:08:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46978sPa000214; Tue, 9 Jul 2024 07:08:54 GMT (envelope-from git) Date: Tue, 9 Jul 2024 07:08:54 GMT Message-Id: <202407090708.46978sPa000214@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: bd58b57d8141 - main - print/qpdfview: add flavors set maintainership List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd58b57d81415582daf4aa71c19f7b12ef6a0c5c Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=bd58b57d81415582daf4aa71c19f7b12ef6a0c5c commit bd58b57d81415582daf4aa71c19f7b12ef6a0c5c Author: mew14930xvi AuthorDate: 2024-07-07 17:16:16 +0000 Commit: Fernando Apesteguía CommitDate: 2024-07-09 07:08:32 +0000 print/qpdfview: add flavors set maintainership Add qt5 and qt6 flavors. While here, submitter takes maintainership. Already maintainer of several ports. PR: 279882 Reported by: mew14930xvi@inbox.lv --- print/qpdfview/Makefile | 52 ++++++++++++++++-------- print/qpdfview/files/patch-qpdfview.pri | 8 ---- print/qpdfview/files/patch-sources_djvumodel.cpp | 10 ----- print/qpdfview/files/patch-sources_model.h | 10 ----- 4 files changed, 36 insertions(+), 44 deletions(-) diff --git a/print/qpdfview/Makefile b/print/qpdfview/Makefile index f6ea9e280c60..1a3709d35688 100644 --- a/print/qpdfview/Makefile +++ b/print/qpdfview/Makefile @@ -1,30 +1,42 @@ PORTNAME= qpdfview DISTVERSION= 0.5.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= print MASTER_SITES= https://launchpad.net/${PORTNAME}/trunk/${DISTVERSION}/+download/ -DISTNAME= ${PORTNAME}-0.5 +DISTNAME= ${PORTNAME}-${DISTVERSION:S/.0$//} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mew14930xvi@inbox.lv COMMENT= Tabbed DjVu/PDF/PS document viewer WWW= https://launchpad.net/qpdfview LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 +LIB_DEPENDS= libpoppler-${FLAVOR}.so:graphics/poppler-${FLAVOR} -USES= compiler:c++17-lang desktop-file-utils gl pkgconfig qmake qt:5 -USE_GL= gl +FLAVORS= qt6 qt5 +FLAVOR?= qt6 + +USES= desktop-file-utils gl pkgconfig qmake USE_LDCONFIG= yes -USE_QT= concurrent core dbus gui imageformats linguisttools \ - printsupport sql sql-sqlite3 svg widgets xml buildtools:build -QMAKE_SOURCE_PATH= ${PORTNAME}.pro +.if ${FLAVOR} == "qt5" +PKGNAMESUFFIX= -qt5 +USES+= compiler:c++17-lang qt:5 +USE_GL= gl +USE_QT= concurrent core dbus gui linguisttools printsupport \ + sql svg widgets xml buildtools:build +CONFLICTS_INSTALL= ${PORTNAME} +.else +USES+= compiler:c++11-lang qt:6 +USE_GL= opengl +USE_QT= base svg tools:build +CONFLICTS_INSTALL= ${PORTNAME}-qt5 +.endif -DATADIR= ${PREFIX}/share/${PORTNAME} +QMAKE_SOURCE_PATH= ${PORTNAME}.pro -OPTIONS_DEFINE= CUPS DJVU PS +OPTIONS_DEFINE= CUPS DJVU PS SYNCTEX OPTIONS_DEFAULT= CUPS DJVU PS OPTIONS_SUB= yes @@ -34,14 +46,22 @@ CUPS_QMAKE_OFF= "CONFIG+=without_cups" DJVU_LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre DJVU_QMAKE_OFF= "CONFIG+=without_djvu" -PS_LIB_DEPENDS= libspectre.so:print/libspectre -PS_QMAKE_OFF= "CONFIG+=without_ps" +PS_LIB_DEPENDS= libspectre.so:print/libspectre +PS_QMAKE_OFF= "CONFIG+=without_ps" -.include +SYNCTEX_DESC= SyncTeX support +SYNCTEX_LIB_DEPENDS= libsynctex.so:devel/tex-synctex +SYNCTEX_QMAKE_OFF= "CONFIG+=without_synctex" -pre-configure: - ${REINPLACE_CMD} -e 's#/usr#${PREFIX}#g' \ +post-patch: +.if ${FLAVOR} == "qt5" + ${REINPLACE_CMD} -e '/CONFIG/s/c\+\+11/c++17/' \ ${WRKSRC}/${PORTNAME}.pri +.endif + ${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \ + ${WRKSRC}/${PORTNAME}.pri + +pre-configure: cd ${WRKSRC} && ${LRELEASE} ${PORTNAME}.pro .include diff --git a/print/qpdfview/files/patch-qpdfview.pri b/print/qpdfview/files/patch-qpdfview.pri deleted file mode 100644 index 266e872da9ac..000000000000 --- a/print/qpdfview/files/patch-qpdfview.pri +++ /dev/null @@ -1,8 +0,0 @@ ---- qpdfview.pri.orig 2024-01-02 16:01:53 UTC -+++ qpdfview.pri -@@ -12,4 +12,4 @@ os2:include(qpdfview_os2.pri) - win32:include(qpdfview_win32.pri) - os2:include(qpdfview_os2.pri) - --CONFIG += c++11 -+CONFIG += c++17 diff --git a/print/qpdfview/files/patch-sources_djvumodel.cpp b/print/qpdfview/files/patch-sources_djvumodel.cpp deleted file mode 100644 index 6a3b2a1bfb95..000000000000 --- a/print/qpdfview/files/patch-sources_djvumodel.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- sources/djvumodel.cpp.orig 2020-05-21 10:55:32 UTC -+++ sources/djvumodel.cpp -@@ -29,6 +29,7 @@ along with qpdfview. If not, see - - #include -+#include - #include - - #if defined(Q_OS_WIN) && defined(DJVU_STATIC) diff --git a/print/qpdfview/files/patch-sources_model.h b/print/qpdfview/files/patch-sources_model.h deleted file mode 100644 index bd0d0b752480..000000000000 --- a/print/qpdfview/files/patch-sources_model.h +++ /dev/null @@ -1,10 +0,0 @@ ---- sources/model.h.orig 2020-05-21 10:55:32 UTC -+++ sources/model.h -@@ -27,6 +27,7 @@ along with qpdfview. If not, see - #include - #include -+#include - - class QAbstractItemModel; - class QColor;