Attachment 257253 Details for Bug 284585 – Switch webkit2-gtk from 40 to 41

[patch] Switch webkit2-gtk from 40 to 41

0001-www-vimb-Switch-webkit2-gtk-from-40-to-41.patch (text/plain), 3.36 KB, created by mew14930xvi on 2025-02-05 10:03:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mew14930xvi

Created: 2025-02-05 10:03:46 UTC

Size: 3.36 KB

patch

obsolete

>From c45081d4ce453640b2880e70c44e01d2143743df Mon Sep 17 00:00:00 2001
>From: mew14930xvi <mew14930xvi@inbox.lv>
>Date: Wed, 5 Feb 2025 18:56:37 +0900
>Subject: [PATCH] www/vimb: Switch webkit2-gtk from 40 to 41
>
>---
> www/vimb/Makefile              | 12 +++++++-----
> www/vimb/files/patch-Makefile  | 11 +++++------
> www/vimb/files/patch-config.mk | 23 -----------------------
> 3 files changed, 12 insertions(+), 34 deletions(-)
> delete mode 100644 www/vimb/files/patch-config.mk
>
>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))
>-- 
>2.48.1
>

Flags:

mew14930xvi: maintainer-approval+

Actions: View | Diff

Attachments on bug 284585: 257253