www/vimb: Switch webkit2-gtk from 40 to 41

PR:		284585
This commit is contained in:
mew14930xvi 2025-02-06 10:56:53 +00:00 committed by Nuno Teixeira
parent 0f7b8f6097
commit dbb11cfc89
3 changed files with 12 additions and 34 deletions

View file

@ -1,6 +1,6 @@
PORTNAME= vimb PORTNAME= vimb
DISTVERSION= 3.7.0 DISTVERSION= 3.7.0
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= www CATEGORIES= www
MAINTAINER= mew14930xvi@inbox.lv MAINTAINER= mew14930xvi@inbox.lv
@ -10,16 +10,15 @@ WWW= https://fanglingsu.github.io/vimb/
LICENSE= GPLv3+ LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ LIB_DEPENDS= libsoup-3.0.so:devel/libsoup3 \
libwebkit2gtk-4.0.so:www/webkit2-gtk@40 libwebkit2gtk-4.1.so:www/webkit2-gtk@41
USES= compiler:c11 desktop-file-utils gmake gnome pkgconfig USES= compiler:c11 desktop-file-utils gmake gnome pkgconfig
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= fanglingsu GH_ACCOUNT= fanglingsu
USE_GNOME= glib20 gtk30 USE_GNOME= glib20 gtk30
MAKE_ARGS= V=1 \ MAKE_ARGS= V=1
version="${DISTVERSION}"
LDFLAGS+= -Wl,--as-needed LDFLAGS+= -Wl,--as-needed
PLIST_FILES= bin/vimb \ PLIST_FILES= bin/vimb \
@ -32,6 +31,9 @@ OPTIONS_DEFINE= GSTREAMER
GSTREAMER_USES= gstreamer GSTREAMER_USES= gstreamer
GSTREAMER_USE= GSTREAMER=good,libav GSTREAMER_USE= GSTREAMER=good,libav
post-patch:
${ECHO_CMD} "#define VERSION \"${DISTVERSION}\"" > ${WRKSRC}/version.h
post-install: post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vimb \ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vimb \
${STAGEDIR}${PREFIX}/lib/vimb/webext_main.so ${STAGEDIR}${PREFIX}/lib/vimb/webext_main.so

View file

@ -1,15 +1,14 @@
--- Makefile.orig 2024-12-23 06:28:27 UTC --- Makefile.orig 2025-01-26 14:39:03 UTC
+++ Makefile +++ 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 all: version.h src.subdir-all
-version.h: Makefile $(wildcard .git/index) -version.h: Makefile $(wildcard .git/index)
+version.h: - @echo "create $@"
@echo "create $@"
- $(Q)v="$$(git describe --tags 2>/dev/null)"; \ - $(Q)v="$$(git describe --tags 2>/dev/null)"; \
- echo "#define VERSION \"$${v:-$(version)}\"" > $@ - echo "#define VERSION \"$${v:-$(version)}\"" > $@
+ echo "#define VERSION \"$(version)\"" > $@ -
options: options:
@echo "vimb build options:" @echo "vimb build options:"
@echo "LIBS = $(LIBS)"

View file

@ -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))