From nobody Thu Aug 24 11:05:15 2023 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 4RWgGg3Hcdz4r13H; Thu, 24 Aug 2023 11:05:15 +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 4RWgGg2fC2z3Rp9; Thu, 24 Aug 2023 11:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692875115; 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=sRL5gluinae66cj2gnCD95rLh/0mZ+B+4L2WeykWnKw=; b=AM0Zh4xsriC2YtKlh2fc9tfqXWDJ0Wp5Nf7sNajLjExvO9f5k7039XK2eiDAgwD0oB9+Xc zMMD5XsASJm577WOhWYudnIKbCZ6WImtyhPlEpVG8LOScVDDNsqmvW72wvcm4+bH5uEN01 RLuWPiGekwUWig9kuJ4+ABpTdrdyRKMmUVVgANgEoPgdfi6ZTXrRub0/6jQ0gVRs93qwdN Mu9LY5VswghSovfOt52zuhLOBnyPtzAfmfmNyuPR7OURuV9F7iyVaFrQBGTtJ/lyWS4niZ SzNyxbho7rnArohmtPvtEDUuF429KcPsUG1qu5n3jBqpdT/ISKWKUYUfA3rEvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692875115; 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=sRL5gluinae66cj2gnCD95rLh/0mZ+B+4L2WeykWnKw=; b=nNrvMvGRgbr7ZSkhqYgI8qRW7mzePAbYcXLRrGXTz2cSNU8FWQpX2yq/OogK7FGMQnL5hF ub6JF6ajTuHZkEUfJkVwsUY5nwKAQV/nhYoHbdwQpO0oaNnvnmClxiTavoVPkKNd9XEXbv g35WTVezuczRvNUL0u34co7YqG5gLuGL8To7PuTcHpgx5GyY8369aHgy1+6KYSrKjNGGoo XtuW9BoTwagKpPLMF1ZgpI8oWRLox4m7aAeEf7/XpKNyzcSGobS6PzFlA76hCbMGt33I0g tQpKq4UZT18R5VfUpsOmzo+XcKQvFKfsuDL9t+opexbHRWz1FnIacW1NX10OLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692875115; a=rsa-sha256; cv=none; b=RdYj8v73SCDv8e6fshPEMbPlYt2Kbf9cIfVR4XUoFnqqBL5RzlKQBr+oX9iwlsMCEKFl4h 4Xhw1W+6jfHUut8j7uYCYcoJ+ElxuSARO4T2cj0WmKAm+t9dLX3Hei1ldH4UJhtHGED/cr Ig7vZAM/LEPp+Zd0uyzkB1xfPMRKtPbAC1d5FnQhFIi1ZNjcHav9YRhziDftlFQtokukF/ 9cqbkUekrkbHfyuFMwtJv7CgeAQgnMCp/68VWQ+56BS2bSmDY1GxuroGPDQPFolDcCh27+ DqTJbRkuEWr+zhTwO1zNN2JvnsYvxlEcQxoGNQ+eroUz+Nwox58/ZTnFX1Jhug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RWgGg1bnlz8fr; Thu, 24 Aug 2023 11:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OB5FNY063721; Thu, 24 Aug 2023 11:05:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OB5F5O063718; Thu, 24 Aug 2023 11:05:15 GMT (envelope-from git) Date: Thu, 24 Aug 2023 11:05:15 GMT Message-Id: <202308241105.37OB5F5O063718@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: a49bc4538d99 - main - x11-fm/polo: respect CFLAGS to unbreak the build on recent -CURRENT 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a49bc4538d99525c5e49329beaf9987bcc14feec Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=a49bc4538d99525c5e49329beaf9987bcc14feec commit a49bc4538d99525c5e49329beaf9987bcc14feec Author: Alexey Dokuchaev AuthorDate: 2023-08-24 11:03:02 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-08-24 11:03:02 +0000 x11-fm/polo: respect CFLAGS to unbreak the build on recent -CURRENT Commit c57cd4390a27 had pacified one particular warning which often breaks Vala code compilation with Clang 16, thus correct fix is not to force an older compiler, but to pass down our CFLAGS to valac(1) together with -v option to make the actual compiler call visible in the build logs. Fixes: 09e56dc8e568 --- x11-fm/polo/Makefile | 10 ---------- x11-fm/polo/files/patch-makefile | 21 ++++++++++++++++++++- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/x11-fm/polo/Makefile b/x11-fm/polo/Makefile index 024dca397f4a..b9ed97874a78 100644 --- a/x11-fm/polo/Makefile +++ b/x11-fm/polo/Makefile @@ -21,18 +21,8 @@ GH_ACCOUNT= teejee2008 USE_GNOME= cairo gdkpixbuf2 gtk30 libxml2 vte3 MAKEFILE= makefile - WRKSRC_SUBDIR= src -.include - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) -USES+= llvm:max=15 -CC= clang${LLVM_VERSION} -CPP= clang-cpp${LLVM_VERSION} -CXX= clang++${LLVM_VERSION} -.endif - post-patch: @${RM} ${WRKSRC}/share/polo/files/gtk-theme/*.orig @${RM} ${WRKSRC}/share/polo/files/install-*.sh diff --git a/x11-fm/polo/files/patch-makefile b/x11-fm/polo/files/patch-makefile index 041a1842d28f..607de7693c6b 100644 --- a/x11-fm/polo/files/patch-makefile +++ b/x11-fm/polo/files/patch-makefile @@ -2,14 +2,33 @@ +++ makefile @@ -1,7 +1,7 @@ -SHELL=/bin/bash +-CFLAGS=--std=c99 +SHELL=/bin/sh - CFLAGS=--std=c99 ++XCCFLAGS=$(foreach arg,$(CFLAGS),--Xcc=$(arg)) -prefix=/usr +prefix=$(PREFIX) bindir=$(prefix)/bin sharedir=$(prefix)/share localedir=$(sharedir)/locale +@@ -43,7 +43,7 @@ app-gtk: + + #polo-gtk + valac -X -D'GETTEXT_PACKAGE="${app_name}"' \ +- --Xcc="-lm" ${define_symbols} --Xcc="-O3" --thread \ ++ --Xcc="-lm" ${define_symbols} ${XCCFLAGS} -v --thread \ + Common/Main.vala \ + Gtk/*.vala \ + Utility/*.vala \ +@@ -60,7 +60,7 @@ app-util-gtk3: + + app-util-disk: + valac --Xcc="-lm" -X -D'GETTEXT_PACKAGE="${app_name}"' \ +- "polo-disk.vala" Console/*.vala --Xcc="-O3" -o polo-disk --pkg posix --pkg gio-unix-2.0 --pkg gee-0.8 ++ "polo-disk.vala" Console/*.vala ${XCCFLAGS} -v -o polo-disk --pkg posix --pkg gio-unix-2.0 --pkg gee-0.8 + + app-translations: + @@ -101,17 +101,15 @@ install: mkdir -p "$(DESTDIR)$(sharedir)/${app_name}" mkdir -p "$(DESTDIR)$(sharedir)/pixmaps"