From nobody Sat Nov 05 23:57:10 2022 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 4N4ZD722lSz4gp6V; Sat, 5 Nov 2022 23:57:11 +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 4N4ZD71Xylz45Hx; Sat, 5 Nov 2022 23:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667692631; 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=9ItL14skj+cgNZMpJajFVkPSYWD9qI81O1tYS+t3EaY=; b=tiDEikLUX1mpe+6yJsfZk0y1uJ7gbfKS0BBmHJQ1YtYMB9eFJ+0orF24W8VyAYj+f1PzKb NbOQPPk+lWO3i7zpSCHKYAM89F73fdHAfabXGwZXq4yUnC2ZwXDWlPVgOaMZg2KBM1WZ/S QboM9YtLjrZ1l+IVbzlz19FCwbQBBbQYxPSk3xHWqfg6yUNoJY6gUb7ANZNfyYqFA/wLO4 3O9ZRh+CKCctWpHZBUxgCYnP1/WpQ4QaqGnG5sDUQmZmpyuYK9QNVhrQmAUmjU3fBQrwdT AfYpiSd85urLTKTIpNkxmKmk+JGKGJgFRe5212uO6XIuMF9NOU4MULFsU5MZhA== 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 4N4ZD70Sdrz111g; Sat, 5 Nov 2022 23:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A5NvAdS053849; Sat, 5 Nov 2022 23:57:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A5NvA6v053848; Sat, 5 Nov 2022 23:57:10 GMT (envelope-from git) Date: Sat, 5 Nov 2022 23:57:10 GMT Message-Id: <202211052357.2A5NvA6v053848@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 68acc1609371 - main - graphics/yacreader: add -qt6 flavor 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68acc1609371e9b5c8a374c24927823f1f60cbb1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667692631; 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=9ItL14skj+cgNZMpJajFVkPSYWD9qI81O1tYS+t3EaY=; b=Mha84gcWcalYuSfAWZ1OQ1k7y0VbBRNA/vkxas+xVYGv/4dUC3eLUEnEgZ3jVHhb2mWUqA zBi9h+VT8oGFyh9KLismqnhrD6XvTNMmQ5zKDGi/2kJBpaRWZZppfEN/KRqS3k9DRSTauG YYTRJ03etFVHFj27osulw0ZZa2cOkxlvxRbimstd9SUwMW0ZMAWni1ckwsFSZ7PvXANWyN 0URYhQxRzH9J0Al7RLYNss6ApuD9BWjUghxQ6lzd9WrimHb9/brzT51nPWHC0KM7wgjoFd khkFB+ywNj99QPAr0SrQbF2HK2JduoXqg6Tj6NlyyjlgihuH+NagafXNdk/dNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667692631; a=rsa-sha256; cv=none; b=kIW1wcnbPB6OSZk60WskPwdIU5l+NMdoJrsqgVlHykr7aoW50QtJVIWcwK59JabAXJF5D4 hLz/z67x63ile/RO639FfgTq5a8fc094KujDdOq8rsmGLAIGZAzzqYgPp8Hm3+3dEJAFwR b4gZ9zzglE7pxLgf4iT8mFBw8R5c/GFE5APq8yj8nA0G7yxcr9pflDMdcONpK2Ki1EXCnK 4fIPTmRd1Og8jwuDEaPLsHQ+2rrBdx6jEh5VO0C0Hrje6Ucn0p93YmjOJPU5P4AZfJjGqP sw6cIH/HgR0MR9zzF6dHg9G1zid8RHw6cHv3P8Qrt0UHrHTrczqhIOqs9umWvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=68acc1609371e9b5c8a374c24927823f1f60cbb1 commit 68acc1609371e9b5c8a374c24927823f1f60cbb1 Author: Jan Beich AuthorDate: 2022-11-04 21:41:09 +0000 Commit: Jan Beich CommitDate: 2022-11-05 23:56:25 +0000 graphics/yacreader: add -qt6 flavor PDF isn't supported yet: poppler is broken and pdfium isn't packaged. --- graphics/yacreader/Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/graphics/yacreader/Makefile b/graphics/yacreader/Makefile index 0b71b4f500f2..e50f5760778c 100644 --- a/graphics/yacreader/Makefile +++ b/graphics/yacreader/Makefile @@ -14,12 +14,24 @@ LICENSE_FILE= ${WRKSRC}/COPYING.txt LIB_DEPENDS= libunarr.so:archivers/unarr +FLAVORS= qt5 qt6 + USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake qt:5 USE_GITHUB= yes USE_QT= qmake:build buildtools:build core concurrent:build declarative \ gui linguisttools:build multimedia network quickcontrols2 \ sql sql-sqlite3:run svg testlib:build widgets +.if ${FLAVOR:U} == qt6 +PKGNAMESUFFIX= -${FLAVOR} +USES:= ${USES:S/qt:5/qt:6/} +USE_QT= 5compat base declarative multimedia svg tools:build +OPTIONS_EXCLUDE=POPPLER # https://github.com/YACReader/yacreader/issues/352 +CONFLICTS_INSTALL= ${PORTNAME} +.else +CONFLICTS_INSTALL= ${PORTNAME}-qt6 +.endif + OPTIONS_DEFINE= OPENGL POPPLER OPTIONS_DEFAULT=OPENGL POPPLER @@ -27,7 +39,7 @@ OPENGL_USES= gl OPENGL_USE= GL=gl OPENGL_QMAKE_OFF= CONFIG+=no_opengl -POPPLER_LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 +POPPLER_LIB_DEPENDS= libpoppler-${FLAVOR}.so:graphics/poppler-${FLAVOR} POPPLER_QMAKE_OFF= CONFIG+=no_pdf .include