Date: Wed, 6 Nov 2024 09:06:29 +0100 From: Antoine Brodin <antoine@freebsd.org> To: "Sergey A. Osokin" <osa@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 96de6ae007dd - main - graphics/xpdf4: add Qt5/Qt6 flavors Message-ID: <CAALwa8ntCPXoSyFveDwzPO6M9H6hUYieL%2BofhzOQ0xKnATvPHw@mail.gmail.com> In-Reply-To: <202411060024.4A60OppA091460@gitrepo.freebsd.org> References: <202411060024.4A60OppA091460@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Nov 6, 2024 at 1:24=E2=80=AFAM Sergey A. Osokin <osa@freebsd.org> w= rote: > > The branch main has been updated by osa: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D96de6ae007dd2d770f685d89= 97523c9ea2def06d > > commit 96de6ae007dd2d770f685d8997523c9ea2def06d > Author: Sergey A. Osokin <osa@FreeBSD.org> > AuthorDate: 2024-11-06 00:23:35 +0000 > Commit: Sergey A. Osokin <osa@FreeBSD.org> > CommitDate: 2024-11-06 00:24:46 +0000 > > graphics/xpdf4: add Qt5/Qt6 flavors > > Bump PORTREVISION. > > Approved by: cy (maintainer) > --- > graphics/xpdf4/Makefile | 30 +++++++++++++++++++++++------- > 1 file changed, 23 insertions(+), 7 deletions(-) > > diff --git a/graphics/xpdf4/Makefile b/graphics/xpdf4/Makefile > index a6f999c9babe..c41d6d9d7e3c 100644 > --- a/graphics/xpdf4/Makefile > +++ b/graphics/xpdf4/Makefile > @@ -1,5 +1,6 @@ > PORTNAME=3D xpdf > PORTVERSION=3D 4.05 > +PORTREVISION=3D 1 > PORTEPOCH=3D 1 > CATEGORIES=3D graphics print > MASTER_SITES=3D https://dl.xpdfreader.com/ > @@ -20,6 +21,13 @@ CONFLICTS_INSTALL+=3D xpdf3 xpdf > CONFLICTS_INSTALL+=3D xpdf3 xpdf4 > .endif > > +FLAVORS=3D qt5 qt6 > +FLAVOR?=3D ${FLAVORS:[1]} > +qt5_PKGNAMESUFFIX=3D > +qt6_PKGNAMESUFFIX=3D -qt6 > +qt5_CONFLICTS_INSTALL=3D ${PORTNAME}-qt6 > +qt6_CONFLICTS_INSTALL=3D ${PORTNAME} Hello, There is a PKGBASE (and PKGNAME) collision with graphics/xpdf Antoine > USES=3D compiler:c++11-lang cmake cpe localbase:ldflags > LIB_DEPENDS=3D libfreetype.so:print/freetype2 \ > libpng.so:graphics/png \ > @@ -33,9 +41,7 @@ CMAKE_ARGS+=3D -DOPI_SUPPORT:BOOL=3DON -DCMAKE_DISABLE= _FIND_PACKAGE_Qt4:BOOL=3DON \ > -DCMAKE_INSTALL_PREFIX=3D${PREFIX} \ > -DCMAKE_INSTALL_BINDIR=3D${PREFIX}/libexec/xpdf \ > -DCMAKE_INSTALL_MANDIR=3D${PREFIX}/share/xpdf/man \ > - -DNO_TEXT_SELECT:BOOL=3DOFF \ > - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=3DFALSE \ > - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets:BOOL=3DON > + -DNO_TEXT_SELECT:BOOL=3DOFF > CPE_VENDOR=3D xpdfreader > > PLIST_SUB=3D DESKTOPDIR=3D"${DESKTOPDIR}" > @@ -51,10 +57,20 @@ TYPE1_RUN_DEPENDS=3D ${LOCALBASE}/share/ghostscript/= fonts/d050000l.pfb:print/gsfon > LIBPAPER_CMAKE_BOOL=3D USE_LIBPAPER > LIBPAPER_LIB_DEPENDS=3D libpaper.so:print/libpaper > > -GUI_CMAKE_OFF=3D -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=3D1 > -GUI_DESC=3D QT5 interface > -GUI_USES=3D qt:5 desktop-file-utils > -GUI_USE=3D QT=3Dbuildtools:build,qmake:build,concurrent,co= re,gui,widgets,printsupport,svg,network,printsupport > +GUI_DESC=3D GUI interface > +GUI_USES=3D desktop-file-utils > + > +.if ${FLAVOR} =3D=3D qt5 > +USES+=3D qt:5 > +GUI_USE=3D QT=3Dbuildtools:build,qmake:build,concurrent,core,gui,n= etwork,printsupport,svg,widgets > +CMAKE_ARGS+=3D -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=3DFALSE \ > + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets:BOOL=3DON > +.else > +USES+=3D qt:6 > +GUI_USE=3D QT=3Dbase,tools:build > +CMAKE_ARGS+=3D -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=3DON \ > + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets:BOOL=3DFALSE > +.endif > > PRINT_CMAKE_ON=3D -DXPDFWIDGET_PRINTING:BOOL=3DON -DCUPS:= BOOL=3DON > PRINT_CMAKE_OFF=3D -DXPDFWIDGET_PRINTING:BOOL=3DOFF -DCUPS:BOOL=3D= OFF
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAALwa8ntCPXoSyFveDwzPO6M9H6hUYieL%2BofhzOQ0xKnATvPHw>