From nobody Wed Nov 06 14:01:56 2024 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 4Xk6MT3QQHz5cd30; Wed, 06 Nov 2024 14:01:57 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xk6MT19jlz481c; Wed, 6 Nov 2024 14:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730901717; 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=bfYdIjdlB9noeymlT5uYp2jtdhDy9ya87JRBPrLdqyg=; b=ek/tM2MdvHuqSFMBvd43FUf2W+Il1AQZ8zoJL0CiWfc1GCEGn+50m4xMvcq5E6AIitypi8 YZKta19VQJX9LWKGHQ3sRT7khHYUy7d/rtfXzRZrdvvDWSG1zvNuEXIXrO04PNM+F8qU+4 Z0P4bFMWs8WR+0RC/luRI5SBU4Am5ftckGOGqzUfiJ1hh12YaLbyG8jk9KJj8qIjVpVazI eL07WyIso+o6Dwau6dZ6LeactRGe8nSFje63CogsCmxdUgjt/p3LpB54CPKRk2IZXfp1+0 TfSnVJoTUkLcK/XzeEffBFyOWNiAP//sFobdCn6I9xN439d6nzttHupEj2WuwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730901717; 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=bfYdIjdlB9noeymlT5uYp2jtdhDy9ya87JRBPrLdqyg=; b=LTYZrKxbGMN1pVawfEW+EKXa/rC/G3QWfSAqYbZNqQyzBazr2/SxaLsnT78u1VCHHP/2BM yN//XCli//lbVxJ6ipQs3MwRX/WAKEUkj0Gx3vH026yxhZ5UaQOm3wJcABqptLcD/p7uWh CveU+knjNUeWRhTqbf3CrmojMq7awM8/RAABvwCmgVAfH3sgi4v0BGpE5yxd6uxkROLdl9 Yw8CpLY5mlNmLgzhkRzmiGcf8PgeuUqWdMtdO8dIqBIVY7tHhJ4lQ5hx7mt1adXMQzUmlI cBeGQIIZbcgp3jYompSunll0UUhyMWq1dz8pzfEZl+VME9nz3yh92Lk2ztdVtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730901717; a=rsa-sha256; cv=none; b=nx+38Ob8pJ803oyqShiCzSqQbRCy2pYSkgMeVG/I6EU7L+GG1c04SspSzlvLqdCCZOxIhg MjKddFkefpFBxxokhUDSg3JsIwyuXxLuEq0kJzqrsALykmQrGUOIOcMerJ1dtLkUDZ8ee6 z1knxUX6YeBc+e7x9cynBDS06vMJQ8k5ATHkDmJxSUYYY94Vu7R5qC/ov+dSi9M3OVwGsL WKY29STmiH1bf2jpLj045tfcC3NDerbVXkvX+94NPhal9k0PHJLakzN1MKhy60mQFJolar voTW6aDeCvbNJcmfRhmH5dAgHmW/WYJc7VwLZ9Gw7Fo3QKwHihb2kQtT8ILzOA== 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 4Xk6MT0Txkz14HB; Wed, 6 Nov 2024 14:01:57 +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 4A6E1uqU007656; Wed, 6 Nov 2024 14:01:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6E1uNn007653; Wed, 6 Nov 2024 14:01:56 GMT (envelope-from git) Date: Wed, 6 Nov 2024 14:01:56 GMT Message-Id: <202411061401.4A6E1uNn007653@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 617fba3d9759 - main - graphics/xpdf: revert back recent commit 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 617fba3d97599b007f54c5a4f8564c71d6ae52b6 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=617fba3d97599b007f54c5a4f8564c71d6ae52b6 commit 617fba3d97599b007f54c5a4f8564c71d6ae52b6 Author: Sergey A. Osokin AuthorDate: 2024-11-06 14:00:43 +0000 Commit: Sergey A. Osokin CommitDate: 2024-11-06 14:00:43 +0000 graphics/xpdf: revert back recent commit I'll submit a review for these changes. Bump PORTREVISION. Fixes: 96de6ae007dd2d770f685d8997523c9ea2def06d --- graphics/xpdf4/Makefile | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/graphics/xpdf4/Makefile b/graphics/xpdf4/Makefile index c41d6d9d7e3c..59c26202b9ac 100644 --- a/graphics/xpdf4/Makefile +++ b/graphics/xpdf4/Makefile @@ -1,6 +1,6 @@ PORTNAME= xpdf PORTVERSION= 4.05 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= graphics print MASTER_SITES= https://dl.xpdfreader.com/ @@ -21,13 +21,6 @@ CONFLICTS_INSTALL+= xpdf3 xpdf CONFLICTS_INSTALL+= xpdf3 xpdf4 .endif -FLAVORS= qt5 qt6 -FLAVOR?= ${FLAVORS:[1]} -qt5_PKGNAMESUFFIX= -qt6_PKGNAMESUFFIX= -qt6 -qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 -qt6_CONFLICTS_INSTALL= ${PORTNAME} - USES= compiler:c++11-lang cmake cpe localbase:ldflags LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ @@ -41,7 +34,9 @@ CMAKE_ARGS+= -DOPI_SUPPORT:BOOL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt4:BOOL=ON \ -DCMAKE_INSTALL_PREFIX=${PREFIX} \ -DCMAKE_INSTALL_BINDIR=${PREFIX}/libexec/xpdf \ -DCMAKE_INSTALL_MANDIR=${PREFIX}/share/xpdf/man \ - -DNO_TEXT_SELECT:BOOL=OFF + -DNO_TEXT_SELECT:BOOL=OFF \ + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=FALSE \ + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets:BOOL=ON CPE_VENDOR= xpdfreader PLIST_SUB= DESKTOPDIR="${DESKTOPDIR}" @@ -57,20 +52,10 @@ TYPE1_RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/d050000l.pfb:print/gsfon LIBPAPER_CMAKE_BOOL= USE_LIBPAPER LIBPAPER_LIB_DEPENDS= libpaper.so:print/libpaper -GUI_DESC= GUI interface -GUI_USES= desktop-file-utils - -.if ${FLAVOR} == qt5 -USES+= qt:5 -GUI_USE= QT=buildtools:build,qmake:build,concurrent,core,gui,network,printsupport,svg,widgets -CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=FALSE \ - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets:BOOL=ON -.else -USES+= qt:6 -GUI_USE= QT=base,tools:build -CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=ON \ - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets:BOOL=FALSE -.endif +GUI_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=1 +GUI_DESC= QT5 interface +GUI_USES= qt:5 desktop-file-utils +GUI_USE= QT=buildtools:build,qmake:build,concurrent,core,gui,widgets,printsupport,svg,network,printsupport PRINT_CMAKE_ON= -DXPDFWIDGET_PRINTING:BOOL=ON -DCUPS:BOOL=ON PRINT_CMAKE_OFF= -DXPDFWIDGET_PRINTING:BOOL=OFF -DCUPS:BOOL=OFF