git: 1a1d3b86d1b5 - main - graphics/birdfont: Build with www/webkit2-gtk@41

From: Nuno Teixeira <eduardo_at_FreeBSD.org>
Date: Wed, 22 Jan 2025 10:17:33 UTC
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1a1d3b86d1b5a70979c7678d4759002af70a5389

commit 1a1d3b86d1b5a70979c7678d4759002af70a5389
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2025-01-22 10:14:50 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2025-01-22 10:17:23 +0000

    graphics/birdfont: Build with www/webkit2-gtk@41
    
    Build with www/webkit2-gtk@41 as recomended upstream
---
 graphics/birdfont/Makefile              |  6 +++---
 graphics/birdfont/files/patch-configure | 13 -------------
 graphics/birdfont/files/patch-dodo.py   | 31 -------------------------------
 3 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/graphics/birdfont/Makefile b/graphics/birdfont/Makefile
index 5baf75c3735a..e8c3f95f9492 100644
--- a/graphics/birdfont/Makefile
+++ b/graphics/birdfont/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	birdfont
 DISTVERSION=	2.33.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics x11-fonts
 MASTER_SITES=	https://birdfont.org/releases/
 
@@ -17,8 +17,8 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libgee-0.8.so:devel/libgee \
 		libharfbuzz.so:print/harfbuzz \
 		libnotify.so:devel/libnotify \
-		libsoup-2.4.so:devel/libsoup \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
+		libsoup-3.0.so:devel/libsoup3 \
+		libwebkit2gtk-4.1.so:www/webkit2-gtk@41 \
 		libxmlbird.so:textproc/libxmlbird
 
 USES=		gettext-tools gnome pkgconfig python:build shared-mime-info \
diff --git a/graphics/birdfont/files/patch-configure b/graphics/birdfont/files/patch-configure
deleted file mode 100644
index 75070126c3a0..000000000000
--- a/graphics/birdfont/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-Lowering dep to webkit2gtk-4.0
-
---- configure.orig	2024-02-17 20:04:34 UTC
-+++ configure
-@@ -78,7 +78,7 @@ def configure(libbgee, valac, pkg_config):
- 			'gio-2.0', 
- 			'glib-2.0', 
- 			'gtk+-3.0',
--			'webkit2gtk-4.1', 
-+			'webkit2gtk-4.0', 
- 			'libsoup-2.4',
- 			'libnotify',
- 			'sqlite3',
diff --git a/graphics/birdfont/files/patch-dodo.py b/graphics/birdfont/files/patch-dodo.py
deleted file mode 100644
index b25ceb6f475c..000000000000
--- a/graphics/birdfont/files/patch-dodo.py
+++ /dev/null
@@ -1,31 +0,0 @@
-Lowering dep to webkit2gtk-4.0
-
---- dodo.py.orig	2024-02-17 20:49:47 UTC
-+++ dodo.py
-@@ -73,7 +73,7 @@ def make_birdfont(target_binary, deps):
- 		--pkg gio-2.0  \
- 		--pkg cairo \
- 		--pkg gdk-pixbuf-2.0 \
--		--pkg webkit2gtk-4.1 \
-+		--pkg webkit2gtk-4.0 \
- 		--pkg libnotify \
- 		--pkg xmlbird \
- 		--pkg libbirdfont \
-@@ -90,7 +90,7 @@ def make_birdfont(target_binary, deps):
- 		$({pkg-config} --cflags glib-2.0) \
- 		$({pkg-config} --cflags gdk-pixbuf-2.0) \
- 		$({pkg-config} --cflags xmlbird) \
--		$({pkg-config} --cflags webkit2gtk-4.1) \
-+		$({pkg-config} --cflags webkit2gtk-4.0) \
- 		$({pkg-config} --cflags libnotify) \
-         -o OBJECT_FILE""".format(**config.SETTINGS)
-         
-@@ -104,7 +104,7 @@ def make_birdfont(target_binary, deps):
- 		$({pkg-config} --libs cairo-gobject) \
- 		$({pkg-config} --libs glib-2.0) \
- 		$({pkg-config} --libs gdk-pixbuf-2.0) \
--		$({pkg-config} --libs webkit2gtk-4.1) \
-+		$({pkg-config} --libs webkit2gtk-4.0) \
- 		$({pkg-config} --libs xmlbird) \
- 		$({pkg-config} --libs libnotify) \
- 		-L./build -L./build/bin -l birdgems \