From nobody Wed Nov 06 08:06:29 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 4XjyTb2btCz5cHF2; Wed, 06 Nov 2024 08:06:43 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: from mail-vk1-f172.google.com (mail-vk1-f172.google.com [209.85.221.172]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjyTZ38d7z4Rf9; Wed, 6 Nov 2024 08:06:42 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-vk1-f172.google.com with SMTP id 71dfb90a1353d-513de426bf5so353332e0c.3; Wed, 06 Nov 2024 00:06:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730880401; x=1731485201; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ljlCpkhBwRaka0Bu+oTB9hcy3j/jED7uhfR7ydA5cJM=; b=lfZh1+i2QqmgUUgcOQwZA8niXzUQZNuJop1nD7+6V1kpa2ModARFAfJIPWiKjHAhyn WSWE1AqeogDcekMaHcQsatWSisRdDZz5WIj1jq80KD8+YOswFnhhSQdM5+Us3uOMvb1r 3DtGOe5IFI5D/XfJHE+IPexaE6bfOXM+nhG/dhOUWqzaCuNF4p886YU58nRsu4utLNRc zNfgbejMx7gUTtv1TnLOMt8x7zgiaZwQIxRg6wUAK5hFDlr0iexSw5+5dFRKtMj6NTe2 sHaXjdmz1EpnjlmTVi46NIkXhbNhdbJQSvYerrC/w+HIL5PVtVZwXKt1HLTyosfOUO3j XMFA== X-Forwarded-Encrypted: i=1; AJvYcCUYMZsrzOMEtCYugMwk3V6UyfCh5rmoD1lQEXEbTxvdocQfCcvGPo//Tfn4q7A3P7v9Mw/KjnYJrVAXw8IUA4+q4EDuOBM=@freebsd.org, AJvYcCVcLMP9DyLrWeBDgvPraUIwACBT3TVBBFOQLse9XUZYcyTcT2IYT3vQthzUyddhmeNeZ2OWiKmKyfCReDxBmuhDm6dKX0Fuxw==@freebsd.org X-Gm-Message-State: AOJu0YwhYyxI1mnd2z3uVfkwo0lOGNqy3LZ06KeWwGWp+smjEtp+iYE3 hyi+M9o6DdHTPgus82RWw09hILv2vrfuZ9rnZc7+WsRX+dq8hTOjPYmSmq95dOwsHPZGqI6UxlU 8DCnr+CUjp4+14ra1vaySIxfJvBj2jw== X-Google-Smtp-Source: AGHT+IHZBDjFwDbjpjeSN66USMFhPLDWg3qGgGlOjBSfc5fJd/AVIIzgyuilpHV0fUVIdYHLhm0HIJFCnSVRzGvo084= X-Received: by 2002:a05:6122:a18:b0:50d:3ec1:1531 with SMTP id 71dfb90a1353d-510150e1e84mr36767048e0c.8.1730880400624; Wed, 06 Nov 2024 00:06:40 -0800 (PST) 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 References: <202411060024.4A60OppA091460@gitrepo.freebsd.org> In-Reply-To: <202411060024.4A60OppA091460@gitrepo.freebsd.org> From: Antoine Brodin Date: Wed, 6 Nov 2024 09:06:29 +0100 Message-ID: Subject: Re: git: 96de6ae007dd - main - graphics/xpdf4: add Qt5/Qt6 flavors To: "Sergey A. Osokin" Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4XjyTZ38d7z4Rf9 X-Spamd-Bar: ---- On Wed, Nov 6, 2024 at 1:24=E2=80=AFAM Sergey A. Osokin 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 > AuthorDate: 2024-11-06 00:23:35 +0000 > Commit: Sergey A. Osokin > 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