Date: Sun, 25 Jan 2026 16:07:03 +0000 From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e8b5b5dee81f - main - net/liferea: unbreak after 66d6d48a3884 Message-ID: <69763fa7.34aa8.7a15332c@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=e8b5b5dee81f96b5980bf320fc5f9918bf474145 commit e8b5b5dee81f96b5980bf320fc5f9918bf474145 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> AuthorDate: 2026-01-25 16:04:23 +0000 Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org> CommitDate: 2026-01-25 16:04:23 +0000 net/liferea: unbreak after 66d6d48a3884 The code assumed that with pygobject > 3.52 we'd also have glib > 2.86 - but at the time of this commit, we have only glib 2.84.4. On the downside, this needs to be revisited once glib is updated. --- net/liferea/Makefile | 6 ++++ .../files/patch-src_plugins_plugins__engine.c | 39 ++++++++++++++++++++++ net/liferea/pkg-plist | 1 + 3 files changed, 46 insertions(+) diff --git a/net/liferea/Makefile b/net/liferea/Makefile index 5d26c53b73f2..d854f51534f1 100644 --- a/net/liferea/Makefile +++ b/net/liferea/Makefile @@ -1,5 +1,6 @@ PORTNAME= liferea DISTVERSION= 1.16.7 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= https://github.com/lwindolf/liferea/releases/download/v${DISTVERSION}/ @@ -40,4 +41,9 @@ MAKE_ENV+= WEBKIT_DISABLE_COMPOSITING_MODE=1 INSTALL_TARGET= install-strip +# stop-gap hack to accomodate glib < 2.86 and pygobject > 3.52 +post-install: + ${MKDIR} -p "${STAGEDIR}/${LOCALBASE}/lib/girepository-1.0/" + ${LN} -sf "../${PORTNAME}/girepository-1.0/Liferea-3.0.typelib" "${STAGEDIR}/${LOCALBASE}/lib/girepository-1.0/Liferea-3.0.typelib" + .include <bsd.port.mk> diff --git a/net/liferea/files/patch-src_plugins_plugins__engine.c b/net/liferea/files/patch-src_plugins_plugins__engine.c new file mode 100644 index 000000000000..c1cd9c10ded0 --- /dev/null +++ b/net/liferea/files/patch-src_plugins_plugins__engine.c @@ -0,0 +1,39 @@ +commit f07f07bcd1a0b996657bcae067d5fae5a5b03686 +Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> + + use gi_repository_new() on old glib + + According to the documentation[1], the gi_repository_dup_default() + method was introduced in GLib 2.86 - and gi_repository_new() looks + like the closest replacement. + Use a compile time check to catch this in for old GLib versions + only. + + [1]: https://docs.gtk.org/girepository/type_func.Repository.dup_default.html + +diff --git src/plugins/plugins_engine.c src/plugins/plugins_engine.c +index 9a5a1358..e39665be 100644 +--- src/plugins/plugins_engine.c ++++ src/plugins/plugins_engine.c +@@ -111,13 +111,20 @@ liferea_plugins_engine_init (LifereaPluginsEngine *plugins) + g_error_free (error); + error = NULL; + } +-#else ++#elif GLIB_CHECK_VERSION(2, 86, 0) + if (!gi_repository_require_private (gi_repository_dup_default (), + typelib_dir, "Liferea", "3.0", 0, &error)) { + g_warning ("Could not load Liferea repository: %s", error->message); + g_error_free (error); + error = NULL; + } ++#else ++ if (!gi_repository_require_private (gi_repository_new (), ++ typelib_dir, "Liferea", "3.0", 0, &error)) { ++ g_warning ("Could not load Liferea repository: %s", error->message); ++ g_error_free (error); ++ error = NULL; ++ } + #endif + + g_autofree gchar *userdata = g_build_filename (g_get_user_data_dir (), "liferea", "plugins", NULL); diff --git a/net/liferea/pkg-plist b/net/liferea/pkg-plist index b0adc392b1a7..7326f03f364e 100644 --- a/net/liferea/pkg-plist +++ b/net/liferea/pkg-plist @@ -1,5 +1,6 @@ bin/liferea bin/liferea-add-feed +lib/girepository-1.0/Liferea-3.0.typelib lib/liferea/girepository-1.0/Liferea-3.0.typelib lib/liferea/plugins/add-bookmark-site.plugin lib/liferea/plugins/add-bookmark-site.pyhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69763fa7.34aa8.7a15332c>