From nobody Thu Feb 06 10:58:18 2025 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 4YpYx65bSDz5mFQx; Thu, 06 Feb 2025 10:58:18 +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 4YpYx63kNtz3p0T; Thu, 06 Feb 2025 10:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738839498; 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=E8lrVTxJpn9bzRLinm6U7zzdjhmiRUecJijMriXhJNo=; b=oeVitmENwbsbOkpHn0JBzzPNKuqRTyky0qYneHDutC2F2cHmPOScDFNRrnXeu+aVwVFz9I C1MF3qy+n5onvpCL3UHVc9JGB/IGXbtCnGV2F21fxiveT64D8IQImEnck605KUXx7Jd3tL 0A0TbrMhigOoFCdZ+OLjsm0M6z7tDdzsuA1Pt/KeBxhpGcadEfpbQJgYUDClzgyyEq9xn7 kDe0Za8m4L1GQAf/SCGRsS0sQfoaW1mvqjeFrPYQvtABMzQm2EDEKG5IUO/V75vU3CcaNv wl0vXJe0rTd6EZepc6V7XUMXm9KE5J7a3ecPnF/JQZ5bke+Q+oYgWpImI3d0gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738839498; 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=E8lrVTxJpn9bzRLinm6U7zzdjhmiRUecJijMriXhJNo=; b=xcL7Zw6nZSb3xk7Vx6YirgtmHWNrGl2thi7+6tgXMPmkUTIiyTJ5JUz0dED7iDVhw7Ydwp eO493CYJQDKchpRsEzVb3Xlfqm5wPkG0HF0uyQZFr792lb6IP9QEKK+SyAURSO0Ld1xJl3 yTlgFZgLTNIGac8sBsPDkIr/EvD1x9M9PsmldG6AB/0qMqv0RJ/QG1/U62vQU6PTS8nsOm ea6NQkKh+b0dXY/aD6ThsXPl62xUTvmn1TB2JJDkrFSb/S6OFNYOLlD5AXYxYzD4KhxAsf nj3BX0EJYkXJRn+IFficeaj2pHMzlTbRZXhrWMTLQnwrosb7ym36nDKkQiFTdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738839498; a=rsa-sha256; cv=none; b=Rzb7eAY/ZxiNT2fLxLQJjjb0vesusKznKXWDyGT5Ucq6YNsDjWM2JUxx/OThZryr+FHXvi WAqNNlerfLNYt4rdkZY4cH1T1SWMYTMfuHmMgAOZal5uUNwhN04wye3YJ4mrryJWQ+Dnwk gWTfDVUJ9PnIsvT6E8kmR3PXAurDk+Fkm5KxCyIgRqKdMPl7IyIYyoZtQwFfGBjOxvGe24 ajyJBMo8bJrN5wsKCf0fMmKVpAez8a0BXCcU0kUHeVzPhKqsskipAQeX7PIfWZyK7ED12L yPlgSL7CXj6LoGMLj9NgFRWESCkha2iNZeo/Th46G3LwPL+fS3mNKOflrjfTuA== 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 4YpYx63KlVzbc4; Thu, 06 Feb 2025 10:58:18 +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 516AwIkY075858; Thu, 6 Feb 2025 10:58:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 516AwIg5075855; Thu, 6 Feb 2025 10:58:18 GMT (envelope-from git) Date: Thu, 6 Feb 2025 10:58:18 GMT Message-Id: <202502061058.516AwIg5075855@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: dbb11cfc892d - main - www/vimb: Switch webkit2-gtk from 40 to 41 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dbb11cfc892db2046e29afebabbea9b5e799b6b1 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=dbb11cfc892db2046e29afebabbea9b5e799b6b1 commit dbb11cfc892db2046e29afebabbea9b5e799b6b1 Author: mew14930xvi AuthorDate: 2025-02-06 10:56:53 +0000 Commit: Nuno Teixeira CommitDate: 2025-02-06 10:57:51 +0000 www/vimb: Switch webkit2-gtk from 40 to 41 PR: 284585 --- www/vimb/Makefile | 12 +++++++----- www/vimb/files/patch-Makefile | 11 +++++------ www/vimb/files/patch-config.mk | 23 ----------------------- 3 files changed, 12 insertions(+), 34 deletions(-) diff --git a/www/vimb/Makefile b/www/vimb/Makefile index 5fc211c630c4..68440b389036 100644 --- a/www/vimb/Makefile +++ b/www/vimb/Makefile @@ -1,6 +1,6 @@ PORTNAME= vimb DISTVERSION= 3.7.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MAINTAINER= mew14930xvi@inbox.lv @@ -10,16 +10,15 @@ WWW= https://fanglingsu.github.io/vimb/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ - libwebkit2gtk-4.0.so:www/webkit2-gtk@40 +LIB_DEPENDS= libsoup-3.0.so:devel/libsoup3 \ + libwebkit2gtk-4.1.so:www/webkit2-gtk@41 USES= compiler:c11 desktop-file-utils gmake gnome pkgconfig USE_GITHUB= yes GH_ACCOUNT= fanglingsu USE_GNOME= glib20 gtk30 -MAKE_ARGS= V=1 \ - version="${DISTVERSION}" +MAKE_ARGS= V=1 LDFLAGS+= -Wl,--as-needed PLIST_FILES= bin/vimb \ @@ -32,6 +31,9 @@ OPTIONS_DEFINE= GSTREAMER GSTREAMER_USES= gstreamer GSTREAMER_USE= GSTREAMER=good,libav +post-patch: + ${ECHO_CMD} "#define VERSION \"${DISTVERSION}\"" > ${WRKSRC}/version.h + 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 index fe10629eb72a..1b0a681a3bfc 100644 --- a/www/vimb/files/patch-Makefile +++ b/www/vimb/files/patch-Makefile @@ -1,15 +1,14 @@ ---- Makefile.orig 2024-12-23 06:28:27 UTC +--- Makefile.orig 2025-01-26 14:39:03 UTC +++ Makefile -@@ -3,10 +3,9 @@ all: version.h src.subdir-all +@@ -3,11 +3,6 @@ all: version.h src.subdir-all all: version.h src.subdir-all -version.h: Makefile $(wildcard .git/index) -+version.h: - @echo "create $@" +- @echo "create $@" - $(Q)v="$$(git describe --tags 2>/dev/null)"; \ - echo "#define VERSION \"$${v:-$(version)}\"" > $@ -+ echo "#define VERSION \"$(version)\"" > $@ - +- options: @echo "vimb build options:" + @echo "LIBS = $(LIBS)" diff --git a/www/vimb/files/patch-config.mk b/www/vimb/files/patch-config.mk deleted file mode 100644 index 57ec376c8c17..000000000000 --- a/www/vimb/files/patch-config.mk +++ /dev/null @@ -1,23 +0,0 @@ ---- 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))