diff --git a/graphics/birdfont/Makefile b/graphics/birdfont/Makefile index 05d08854b038..7c822e2c4124 100644 --- a/graphics/birdfont/Makefile +++ b/graphics/birdfont/Makefile @@ -1,54 +1,52 @@ PORTNAME= birdfont -DISTVERSION= 2.32.3 -PORTREVISION= 3 +DISTVERSION= 2.33.4 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-gtk3 \ libxmlbird.so:textproc/libxmlbird -USES= compiler:c++11-lang desktop-file-utils gettext-tools gnome \ - pkgconfig python:build shared-mime-info shebangfix \ - sqlite:3 tar:xz vala:build +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} && ${SETENV} ${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/distinfo b/graphics/birdfont/distinfo index 6637493ce662..0e5a8d4b892e 100644 --- a/graphics/birdfont/distinfo +++ b/graphics/birdfont/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663958457 -SHA256 (birdfont-2.32.3.tar.xz) = 66c6300d2ee982ceb7e4fdf03d7fcf093b872d7dff22ef7b1e055efaa1728d9c -SIZE (birdfont-2.32.3.tar.xz) = 2569732 +TIMESTAMP = 1708200086 +SHA256 (birdfont-2.33.4.tar.xz) = 0f688dc24b65bb71a55ba7e36389f847359fabd753bb868f77a6ec4b9c50400e +SIZE (birdfont-2.33.4.tar.xz) = 2542704 diff --git a/graphics/birdfont/files/patch-configure b/graphics/birdfont/files/patch-configure new file mode 100644 index 000000000000..75070126c3a0 --- /dev/null +++ b/graphics/birdfont/files/patch-configure @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000000..b25ceb6f475c --- /dev/null +++ b/graphics/birdfont/files/patch-dodo.py @@ -0,0 +1,31 @@ +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 \