From nobody Mon May 16 22:01:52 2022 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 DA2C91AEF819; Mon, 16 May 2022 22:01:52 +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 4L2Crw5lMcz3KJH; Mon, 16 May 2022 22:01:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652738512; 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=HIQ9JPWT3Fm8oOOVl9umE2a51TYfRKQ9ztuMsnTX56A=; b=vmiYnVWi0RQO44rXNdhNN1y95Ufsy8XvAXIbk6C33vtyfpULVAtrEYYg7QNSdOAancL8wV W5vHEVfho1/JziFTC404HmV05vvDXcVBSrWh0nCNiMox6yZpiWsLFAJCzdbRnUKef8SqSC GDy/4hy5T9tdh4W58nR8Htp0LCiGDPTksiEO3XL5KJ1QNltNd7TSHruNdrgzrfE+sWfh9N 3DEVL4Gf3bqntbjzIp80d+j9KNekNl1ZaatzcWzV9rjjNa0lRIvmJENfM4Po4aSKUyGuR+ Oy0DcylpN9sHWpZaddYxpGgWDb6WAU1iaIM2HDjUrF8r1qaw4NXcmAL/VaINXw== 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 9B59C1E8; Mon, 16 May 2022 22:01:52 +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 24GM1qjN045334; Mon, 16 May 2022 22:01:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GM1qMV045333; Mon, 16 May 2022 22:01:52 GMT (envelope-from git) Date: Mon, 16 May 2022 22:01:52 GMT Message-Id: <202205162201.24GM1qMV045333@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 16efa5a804e5 - main - x11/xscreensaver: remove XFT option 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16efa5a804e5bdc8e319809155f4122960a5f3ee Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652738512; 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=HIQ9JPWT3Fm8oOOVl9umE2a51TYfRKQ9ztuMsnTX56A=; b=EqZtZvlaF2yiBK6Y+aOECL23TzX5u5A+5LWggKMQhJ6v3xnSu8ljSLYmggYgJ3l5TLJWlj VELXQ4mWG2oeULm7o5Qvagoob0v0X5rGYzmsI0ywqgDVdDcjjm3w5ArCCGNBOPgRPQbysz 22fmzxhgiIb2bDkpxUiju3Z/cKmCvhiW2SkgrqeRLACsHdvfdq59aGHwRwTeIkDiNSArU0 6TdqOk3wAHw706ED/mg7mlGr6arl+NloRptksy7TBeSZopJ1BoWSba7J6quzoLUKtf6pHa c9/7HURtgpyURKUhkzQpIpYhrC5QY7oYHcdCUt6Zdp5KdsXqqN/6fg1lmUtL7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652738512; a=rsa-sha256; cv=none; b=iJ6NW9bwk/2voOdGHHdLukYYflMLmp3hw70nYVs9Tzrrqnb+M7tSodtTHpchKNn5xm0Bgi 6lUv1gFqd48u/o4DuSrXQJrj+SkXXbh0hn+CKPq4IEhDkyzelddBefJgzjrZEpIwAp8j6N dp8SLXOStxR/g6qWMVnU6vw4ObjmfvywAEWimBZcfxlzd9PggbS8kw6O39msM0H6OFNSgu uEKfruweglA8m4YLaMhpbdmWCTUobNgH/oUsP7U5qZTYSjwNitAN8XN7ZmxDI8C//VJoun axKHj/2reysNiy32sNiddKemEqnoZEF+J/4U6uE67mwlZMJMCYyUW1OX58x49w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=16efa5a804e5bdc8e319809155f4122960a5f3ee commit 16efa5a804e5bdc8e319809155f4122960a5f3ee Author: Adriaan de Groot AuthorDate: 2022-05-16 21:55:28 +0000 Commit: Adriaan de Groot CommitDate: 2022-05-16 22:01:50 +0000 x11/xscreensaver: remove XFT option Xft isn't optional: it is mandatory, and xscreensaver configure complains if it isn't there (but completes with a successful exit code, which is a bit strange). Without XFT, the build eventually fails like so: dialog.c:695:52: error: use of undeclared identifier 'FcChar32' if (XftCharExists (ws->dpy, ws->label_font, (FcChar32) *uc)) PR: 263869 Reported by: riggs Approved by: build-fix blanket --- x11/xscreensaver/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 1dfc19010e84..b5b815c743d7 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -2,6 +2,7 @@ PORTNAME= xscreensaver PORTVERSION= 6.02 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://www.jwz.org/xscreensaver/ @@ -22,7 +23,7 @@ USES= autoreconf cpe gettext gl gmake gnome jpeg localbase:ldflags perl5 \ USE_GL= gl glu USE_GNOME= cairo gdkpixbuf2 gtk20 intltool libglade2 libxml2 USE_PERL5= run -USE_XORG= ice sm x11 xext xi xinerama xmu xrandr xrender xt xxf86vm +USE_XORG= ice sm x11 xext xft xi xinerama xmu xrandr xrender xt xxf86vm CPE_VENDOR= xscreensaver_project GNU_CONFIGURE= yes @@ -41,15 +42,16 @@ CONFIGURE_ARGS= --enable-locking \ --with-xdbe-ext \ --with-xf86gamma-ext \ --with-xf86vmode-ext \ + --with-xft \ --with-xinerama-ext \ --with-xshm-ext \ --without-kerberos MAKE_ARGS+= install_prefix=${STAGEDIR} MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= FIREF NLS NSFW PAM SETUID_HACKS XAOS1 XDALI XEARTH XFT \ +OPTIONS_DEFINE= FIREF NLS NSFW PAM SETUID_HACKS XAOS1 XDALI XEARTH \ XMOUN XPLANET XSNOW -OPTIONS_DEFAULT= PAM XFT +OPTIONS_DEFAULT= PAM OPTIONS_SUB= yes PAM_CONFIGURE_WITH= passwd-helper=${PREFIX}/bin/pam_helper @@ -72,9 +74,6 @@ XAOS1_RUN_DEPENDS= xaos:graphics/xaos XDALI_DESC= Add extra port x11-clocks/xdaliclock XDALI_RUN_DEPENDS= xdaliclock:x11-clocks/xdaliclock -XFT_CONFIGURE_WITH= xft -XFT_USE= XORG=xft - XEARTH_DESC= Add extra port astro/xearth XEARTH_RUN_DEPENDS= xearth:astro/xearth