diff --git a/graphics/birdfont/Makefile b/graphics/birdfont/Makefile index 5baf75c3735a..e8c3f95f9492 100644 --- a/graphics/birdfont/Makefile +++ b/graphics/birdfont/Makefile @@ -1,53 +1,53 @@ PORTNAME= birdfont DISTVERSION= 2.33.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics x11-fonts MASTER_SITES= https://birdfont.org/releases/ MAINTAINER= eduardo@FreeBSD.org COMMENT= Font editor for creating fonts in TTF, EOT, SVG and BIRDFONT format WWW= https://birdfont.org/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/GPLv3.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}doit>0:devel/py-doit@${PY_FLAVOR} LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ 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 \ shebangfix sqlite:3 tar:xz vala:build USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 USE_LDCONFIG= yes SHEBANG_FILES= configure install.py HAS_CONFIGURE= yes CONFIGURE_ARGS= --cc="${CC}" \ --cflags="${CFLAGS}" \ --dest="${STAGEDIR}" \ --ldflags="${LDFLAGS}" \ --prefix="${PREFIX}" LDFLAGS_powerpc= -lm _STRIPPABLE= bin/birdfont bin/birdfont-autotrace bin/birdfont-export \ bin/birdfont-import lib/libbirdfont.so.36.0 \ lib/libbirdgems.so.0.0 do-build: (cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PYTHON_CMD} build.py) do-install: (cd ${WRKSRC} && ./install.py \ --dest="${STAGEDIR}" \ --nogzip=1 \ --manpages-directory="/share/man/man1") @(cd ${STAGEDIR}${PREFIX} && \ ${STRIP_CMD} ${_STRIPPABLE}) .include 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 \