From nobody Wed Jan 22 10:17:33 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YdKl21HyBz5lGQW; Wed, 22 Jan 2025 10:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YdKl20mwtz4NF9; Wed, 22 Jan 2025 10:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737541054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XF/xsy1SVqlONn8SbJ6XhQdvhR0HKy6UsH+sLledra8=; b=DyRuag3MLR0kO3hGr1HzCApSSw39b64Ykszu7ZT89+R4ZuluwK8aC7VvQDyEHFkq5R2Tmo dHluT4oRmnsp93NFUrJfAElG3xXFb+9XIu+2yhBu8HRHQLpPgxplP3E2yx/7xQQA3SQczI qLZCmc/AAMGe+oqfcGDssMMHagDinTwO7uQw9IRx0LQ+rtJgcWtLUuLzHhcyKmH+SJO+6V T84WMQvu+pNLqj78YKpdREzRRtaLRPKRgL6onIXB9D+AFAJDNBOUGkNG06p0NWeZb3VTYb +esNB1lINQyCNVjgFgaoWCqc7Sovumj+dwU3dXYcpzqMH6Y29uuejChCcg24mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737541054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XF/xsy1SVqlONn8SbJ6XhQdvhR0HKy6UsH+sLledra8=; b=Cil88nIn6EvQ3l3kVhGQJ4jsGTZ86AgRiy8WIhJod+40mhcijHQmRSOpbXBcN45y8Qz5fU ybRe7NAuihOeUNQgc5VkA/EEYfJpD1GIKCsdiiMgYSjsNLUWph3G2G67eD7yV8NvFkB0XZ vq9MM/01rxfxXP1gJff4BUVhieU2hpGlOa8c9z2ykxSJUXpw7dcAKjsPDhsCLPglw3yNRn w+kLsTkj+27AgjMivdJiaqqFpsAFoTZLdfzymxyALtbNaJmrQbub3PqRyXr7eXP/bpU+kS 2K94l+vr3v749vLp/lJ34DmwhlcdlNfGzzm5TxiBPAFwsBQQb9LZTpHKqXqbcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737541054; a=rsa-sha256; cv=none; b=MkbnmEm0derGz+ypz8wYyJKFsFosU4ylelwQdrlPT5N7dkvwoWt1PJ2oe2GOreNWnAaMsh 6V/wzjvJZcuUT2w0atJrlWS4Oj+AEmO28H08w3FPRkV52Dn2KPOmAWdbMavX3VQENx2LaC wdJKuK0ZbachzK85SW2aXEeOKxaETzxMmpZTGtX2QZR0Q6kv8LOu+ENpI1crFGY7DV8tiW pgjZHM3asX7ZUichRdedDfWO1JIr22QFcpQzjrA7SPYK/ybrdofdcT13/MylS13pHobtM+ dLHpKuiX9+xsAiE5YJAShVZ3/q7rM+Rmiogq4ZopNXzj6CrBnS3BXT2cNoDAgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YdKl20Gtmzphn; Wed, 22 Jan 2025 10:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50MAHXrJ016026; Wed, 22 Jan 2025 10:17:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50MAHXHi016024; Wed, 22 Jan 2025 10:17:33 GMT (envelope-from git) Date: Wed, 22 Jan 2025 10:17:33 GMT Message-Id: <202501221017.50MAHXHi016024@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 1a1d3b86d1b5 - main - graphics/birdfont: Build with www/webkit2-gtk@41 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a1d3b86d1b5a70979c7678d4759002af70a5389 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=1a1d3b86d1b5a70979c7678d4759002af70a5389 commit 1a1d3b86d1b5a70979c7678d4759002af70a5389 Author: Nuno Teixeira AuthorDate: 2025-01-22 10:14:50 +0000 Commit: Nuno Teixeira 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 \