From nobody Fri Dec 27 18:35: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 4YKZ1Y6VNHz5j8xs; Fri, 27 Dec 2024 18:35:29 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKZ1Y5rPsz4KS7; Fri, 27 Dec 2024 18:35:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735324529; 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=+dORPSY5w7ai96FZpbHWxYzK8HtzH9eQkckBeyygEjQ=; b=GVvdyxiDYFGM+gkIvoIMiN8Dj1/GFSvWki4koc0lWQpstMQ9CWM/yEqM8hG7gmrsrDLOv3 +EHjXk5/b/lEkKCZMvyBuuSphBk5hs/gp8SYMjEzWjioAF4n6pK5HII+9noEDUIrxp+C1F Nv9R1AYWtAXVa5WFYpus9UyMiTkoRjlfekA5S8yGk0OCf9SuBl1lhK/Gd7SYCCTieIi3Q9 d0WWcGaRltsMVeWXES4qu80PFwNG1BxymfWgg1Rg2/l0BcRcSx2gIsTQZXgk9RH5cT2kvO shwMja856FGfaxMFnahMFxGcv8jrjAFAVheDj+MwcXkppeCZev15ihWBBEXJDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735324529; 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=+dORPSY5w7ai96FZpbHWxYzK8HtzH9eQkckBeyygEjQ=; b=Dt3gESsmnOqnuToLXL5hYnoIhRx6A7U3C2cWcRKqYLcf6xC/g4+PAlZLQaW7DOz2OBtOsz fijHY03GdvmWRLTbCgL/CFgqzPH1dgHx5UsYrY3qiH7Ub7iNufNJdYVrgbtuJu+hO8AGCv E9yUqiHskW0koAksNzl8CZ7isyBS78xeOI5zEChplrkI3w6BGhU6ZzzCpjxjLcWqqXr6wc LzpTo1AjBm+iR+p1KCIc3wA0QXGYXmNDVnS1+7u45559/Im7rBJxPw5zrEMFt3/OxvTBvJ p4LUVS0Is/FCyC7NcrHj7muXB3V8ZzrNItfAOAOVX8v3OGyFv3N608wSExbEvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735324529; a=rsa-sha256; cv=none; b=WDoaU8c0F3wc9GmDBHqywdlp7T7F/wRKUrquKh2aQyoOpTNNmzmqgVFSmdZY+qOfCHciGu pSfki9CVQ0X1khVzBCGK4O8D/emoqRw1bX2GaKgH/1B9Ry27m+CJfIdf+VPaICnD1x1UjB vMKPk1qDhNMOFIcdb6ZNm9lY6kcgMnFm2dZZ4+rmzI2HcHemIWhll0G1o7AdySuMkBRxVn QDp1GCCM8l7IQTV29NJwOTlqriWUVGKyaHJhPPCYgDwN0k320ZUqFDTRVvtbp9smAyUUcJ azP64UDzF7/xzSZNXUZ+aEhwrw1L7kZocnJZ/uSf/hA5QkQ3JPuCr7hbshchDQ== 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 4YKZ1Y5R1zzr4n; Fri, 27 Dec 2024 18:35:29 +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 4BRIZTgD007274; Fri, 27 Dec 2024 18:35:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRIZT8S007271; Fri, 27 Dec 2024 18:35:29 GMT (envelope-from git) Date: Fri, 27 Dec 2024 18:35:29 GMT Message-Id: <202412271835.4BRIZT8S007271@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Zsolt Udvari Subject: git: 043f51cb65ad - main - www/vimb: Simplify generate version.h 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: uzsolt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 043f51cb65ad079bc4c551a84689df0488d1a44c Auto-Submitted: auto-generated The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=043f51cb65ad079bc4c551a84689df0488d1a44c commit 043f51cb65ad079bc4c551a84689df0488d1a44c Author: mew14930xvi AuthorDate: 2024-12-27 18:31:05 +0000 Commit: Zsolt Udvari CommitDate: 2024-12-27 18:31:05 +0000 www/vimb: Simplify generate version.h Sometimes build fails because of "slow" git-generating of version.h. If it isn't enough should add MAKE_JOBS_UNSAFE=yes. Remove cairo from USE_GNOME. Switch to patch file (instead of post-patch target). PR: 283504 Approved by: submitter is maintainer --- www/vimb/Makefile | 7 +------ www/vimb/files/patch-Makefile | 15 +++++++++++++++ www/vimb/files/patch-config.mk | 23 +++++++++++++++++++++++ 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/www/vimb/Makefile b/www/vimb/Makefile index effc2642eeb9..c2ee02cb70bf 100644 --- a/www/vimb/Makefile +++ b/www/vimb/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ USES= compiler:c11 desktop-file-utils gmake gnome pkgconfig USE_GITHUB= yes GH_ACCOUNT= fanglingsu -USE_GNOME= cairo glib20 gtk30 +USE_GNOME= glib20 gtk30 MAKE_ARGS= V=1 \ version="${DISTVERSION}" @@ -32,11 +32,6 @@ OPTIONS_DEFINE= GSTREAMER GSTREAMER_USES= gstreamer GSTREAMER_USE= GSTREAMER=good,libav -post-patch: - @${REINPLACE_CMD} -e 's|gtk-4.1|gtk-4.0|' ${WRKSRC}/config.mk -# .git/index needs to exist to generate version.h... - ${MKDIR} ${WRKSRC}/.git/index - post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vimb \ ${STAGEDIR}${PREFIX}/lib/vimb/webext_main.so diff --git a/www/vimb/files/patch-Makefile b/www/vimb/files/patch-Makefile new file mode 100644 index 000000000000..fe10629eb72a --- /dev/null +++ b/www/vimb/files/patch-Makefile @@ -0,0 +1,15 @@ +--- Makefile.orig 2024-12-23 06:28:27 UTC ++++ Makefile +@@ -3,10 +3,9 @@ all: version.h src.subdir-all + + all: version.h src.subdir-all + +-version.h: Makefile $(wildcard .git/index) ++version.h: + @echo "create $@" +- $(Q)v="$$(git describe --tags 2>/dev/null)"; \ +- echo "#define VERSION \"$${v:-$(version)}\"" > $@ ++ echo "#define VERSION \"$(version)\"" > $@ + + options: + @echo "vimb build options:" diff --git a/www/vimb/files/patch-config.mk b/www/vimb/files/patch-config.mk new file mode 100644 index 000000000000..57ec376c8c17 --- /dev/null +++ b/www/vimb/files/patch-config.mk @@ -0,0 +1,23 @@ +--- config.mk.orig 2024-12-23 06:24:27 UTC ++++ config.mk +@@ -18,7 +18,7 @@ DOCDIR = doc + DOCDIR = doc + + # used libs +-LIBS = gtk+-3.0 webkit2gtk-4.1 ++LIBS = gtk+-3.0 webkit2gtk-4.0 + + # setup general used CFLAGS + CFLAGS += -std=c99 -pipe -Wall -fPIC +@@ -35,9 +35,9 @@ EXTTARGET = webext_main.so + + # flags used to build webextension + EXTTARGET = webext_main.so +-EXTCFLAGS = ${CFLAGS} $(shell pkg-config --cflags webkit2gtk-web-extension-4.1) ++EXTCFLAGS = ${CFLAGS} $(shell pkg-config --cflags webkit2gtk-web-extension-4.0) + EXTCPPFLAGS = $(CPPFLAGS) +-EXTLDFLAGS = ${LDFLAGS} $(shell pkg-config --libs webkit2gtk-web-extension-4.1) -shared ++EXTLDFLAGS = ${LDFLAGS} $(shell pkg-config --libs webkit2gtk-web-extension-4.0) -shared + + # flags used for the main application + CFLAGS += $(shell pkg-config --cflags $(LIBS))