diff --git a/net/liferea/Makefile b/net/liferea/Makefile index 3e08c8dd5cac..5dbfaf1e4a2f 100644 --- a/net/liferea/Makefile +++ b/net/liferea/Makefile @@ -1,48 +1,40 @@ PORTNAME= liferea -DISTVERSION= 1.16.14 +DISTVERSION= 2.0 CATEGORIES= net gnome MASTER_SITES= https://github.com/lwindolf/liferea/releases/download/v${DISTVERSION}/ MAINTAINER= cmt@FreeBSD.org COMMENT= Simple RSS/RDF feed reader WWW= https://lzone.de/liferea/ LICENSE= GPLv2 LGPL3 LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LIB BUILD_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas LIB_DEPENDS= libfribidi.so:converters/fribidi \ libharfbuzz.so:print/harfbuzz \ libsoup-3.0.so:devel/libsoup3 \ - libwebkit2gtk-4.1.so:www/webkit2-gtk@41 \ + libwebkitgtk-6.0.so:www/webkit2-gtk@60 \ libpeas-2.so:devel/libpeas \ libjson-glib-1.0.so:devel/json-glib RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \ ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} USES= compiler:c++11-lang cpe desktop-file-utils gettext \ - gmake gnome libtool localbase \ - pathfix pkgconfig python sqlite tar:bzip2 -USE_GNOME= cairo dconf:run gtk30 gdkpixbuf intltool introspection \ - libxslt libxml2 + gmake gnome libtool localbase meson \ + pathfix pkgconfig python sqlite tar:xz +USE_GNOME= cairo dconf:run glib20 gtk40 gdkpixbuf intltool introspection \ + libadwaita libxslt libxml2 pango GLIB_SCHEMAS= net.sf.liferea.gschema.xml -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-introspection - # Introspection starts the program, but it may hang or crash-abort # without an X server because the Webkit compositor tries to initialize # a graphics backend 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 diff --git a/net/liferea/distinfo b/net/liferea/distinfo index 8f62d5e1b6cb..61058c59879a 100644 --- a/net/liferea/distinfo +++ b/net/liferea/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1786572077 -SHA256 (liferea-1.16.14.tar.bz2) = ff3bb1e364cd478e77fd709ea7dfc126039b117c13e4bab474055bb9c113d4e8 -SIZE (liferea-1.16.14.tar.bz2) = 1784265 +TIMESTAMP = 1787158183 +SHA256 (liferea-2.0.tar.xz) = 94322f51d1bca03a3fbc2b763ea310dfe9c717a085ed7d7d84e269c34a6fa13e +SIZE (liferea-2.0.tar.xz) = 1454368 diff --git a/net/liferea/files/patch-263663385df5a98301b053c6f0d1cc4b22e2f89e b/net/liferea/files/patch-263663385df5a98301b053c6f0d1cc4b22e2f89e new file mode 100644 index 000000000000..025542595dc4 --- /dev/null +++ b/net/liferea/files/patch-263663385df5a98301b053c6f0d1cc4b22e2f89e @@ -0,0 +1,18 @@ +commit 263663385df5a98301b053c6f0d1cc4b22e2f89e +Author: Lars Windolf +Date: Wed Aug 19 22:48:49 2026 +0200 + + Fix missing OPML install + +diff --git meson.build meson.build +index 20827dfa..83394637 100644 +--- meson.build ++++ meson.build +@@ -95,6 +95,7 @@ endforeach + + install_subdir('plugins', install_dir: libdir) + install_subdir('css', install_dir: datadir) ++install_subdir('opml', install_dir: datadir) + install_subdir('resources/help', install_dir: datadir) + + dbus_service_file = configure_file( diff --git a/net/liferea/files/patch-meson.build b/net/liferea/files/patch-meson.build new file mode 100644 index 000000000000..93f22c406535 --- /dev/null +++ b/net/liferea/files/patch-meson.build @@ -0,0 +1,20 @@ +commit 0823bf205e9daf50e070ab11fabf7796ba2b8e9b +Author: Christoph Moench-Tegeder + + lower adwaita dependency to 1.8.5 + + we don't have 1.9 in FreeBSD ports yet + +diff --git meson.build meson.build +index 032aaf23..beb4b001 100644 +--- meson.build ++++ meson.build +@@ -41,7 +41,7 @@ liferea_deps = [ + dependency('glib-2.0', version: '>= 2.74.0'), + dependency('gsettings-desktop-schemas'), + dependency('gtk4', version: '>= 4.12.0'), +- dependency('libadwaita-1', version: '>=1.9'), ++ dependency('libadwaita-1', version: '>=1.8.5'), + dependency('json-glib-1.0', version: '>= 1.6'), + dependency('libxml-2.0', version: '>= 2.6.12'), + dependency('libxslt', version: '>= 1.1.19'), diff --git a/net/liferea/files/patch-src_Makefile.in b/net/liferea/files/patch-src_Makefile.in deleted file mode 100644 index 88e1318367f5..000000000000 --- a/net/liferea/files/patch-src_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- src/Makefile.in.orig 2026-04-26 13:20:43.007761000 +0200 -+++ src/Makefile.in 2026-04-26 13:21:19.183756000 +0200 -@@ -476,6 +476,7 @@ - $(top_srcdir)/js/htmlview.js \ - $(top_srcdir)/js/gopher-renderer.js \ - $(top_srcdir)/js/helpers/render.js \ -+ $(top_srcdir)/js/user.js \ - $(top_srcdir)/js/vendor/Readability.js \ - $(top_srcdir)/js/vendor/purify.min.js \ - $(top_srcdir)/js/vendor/handlebars.min.js \ diff --git a/net/liferea/files/patch-src_plugins_plugins__engine.c b/net/liferea/files/patch-src_plugins_plugins__engine.c deleted file mode 100644 index c1cd9c10ded0..000000000000 --- a/net/liferea/files/patch-src_plugins_plugins__engine.c +++ /dev/null @@ -1,39 +0,0 @@ -commit f07f07bcd1a0b996657bcae067d5fae5a5b03686 -Author: Christoph Moench-Tegeder - - 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 7326f03f364e..b85cf8fb7bec 100644 --- a/net/liferea/pkg-plist +++ b/net/liferea/pkg-plist @@ -1,198 +1,170 @@ 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/README.md lib/liferea/plugins/add-bookmark-site.plugin lib/liferea/plugins/add-bookmark-site.py lib/liferea/plugins/add-bookmark-site.ui lib/liferea/plugins/bold-unread.plugin lib/liferea/plugins/bold-unread.py lib/liferea/plugins/download-manager.plugin lib/liferea/plugins/download-manager.py lib/liferea/plugins/download-manager.ui lib/liferea/plugins/getfocus.plugin lib/liferea/plugins/getfocus.py lib/liferea/plugins/getfocus.ui lib/liferea/plugins/gnome-keyring.plugin lib/liferea/plugins/gnome-keyring.py -lib/liferea/plugins/headerbar.plugin -lib/liferea/plugins/headerbar.py lib/liferea/plugins/libnotify.plugin lib/liferea/plugins/libnotify.py -lib/liferea/plugins/trayicon.plugin -lib/liferea/plugins/trayicon.py -lib/liferea/web-extension/liblifereawebextension.a -lib/liferea/web-extension/liblifereawebextension.so +lib/liferea/plugins/pc.py +lib/liferea/plugins/python-console.plugin +lib/liferea/plugins/python-console.py share/applications/net.sourceforge.liferea.desktop share/dbus-1/services/net.sourceforge.liferea.service -share/GConf/gsettings/liferea.convert share/icons/hicolor/16x16/apps/net.sourceforge.liferea.png share/icons/hicolor/22x22/apps/net.sourceforge.liferea.png share/icons/hicolor/24x24/apps/net.sourceforge.liferea.png share/icons/hicolor/32x32/apps/net.sourceforge.liferea.png share/icons/hicolor/48x48/apps/net.sourceforge.liferea.png share/icons/hicolor/scalable/apps/net.sourceforge.liferea-symbolic.svg share/icons/hicolor/scalable/apps/net.sourceforge.liferea.svg -%%DATADIR%%/about.ui -%%DATADIR%%/auth.ui %%DATADIR%%/css/liferea.css %%DATADIR%%/css/user.css -%%DATADIR%%/doc/html/about_de.html -%%DATADIR%%/doc/html/about_en.html -%%DATADIR%%/doc/html/about_it.html -%%DATADIR%%/doc/html/about_ru.html -%%DATADIR%%/doc/html/concepts_de.html -%%DATADIR%%/doc/html/concepts_en.html -%%DATADIR%%/doc/html/concepts_it.html -%%DATADIR%%/doc/html/concepts_ru.html -%%DATADIR%%/doc/html/folders_de.html -%%DATADIR%%/doc/html/folders_en.html -%%DATADIR%%/doc/html/folders_it.html -%%DATADIR%%/doc/html/folders_ru.html -%%DATADIR%%/doc/html/headlines_de.html -%%DATADIR%%/doc/html/headlines_en.html -%%DATADIR%%/doc/html/headlines_it.html -%%DATADIR%%/doc/html/headlines_ru.html -%%DATADIR%%/doc/html/help_feed_default.png -%%DATADIR%%/doc/html/help_feed_error.png -%%DATADIR%%/doc/html/help_feed_prop_adv_1.6.0.png -%%DATADIR%%/doc/html/help_feed_prop_cache_1.6.0.png -%%DATADIR%%/doc/html/help_feed_prop_downl_1.6.0.png -%%DATADIR%%/doc/html/help_feed_prop_general_1.6.0.png -%%DATADIR%%/doc/html/help_feed_prop_source_1.6.0.png -%%DATADIR%%/doc/html/help_folder.png -%%DATADIR%%/doc/html/help_item_flag.png -%%DATADIR%%/doc/html/help_item_unread.png -%%DATADIR%%/doc/html/help_opml.png -%%DATADIR%%/doc/html/help_prefs_browser_1.14.0.png -%%DATADIR%%/doc/html/help_prefs_desktop_1.14.0.png -%%DATADIR%%/doc/html/help_prefs_feeds_1.14.0.png -%%DATADIR%%/doc/html/help_prefs_folders_1.14.0.png -%%DATADIR%%/doc/html/help_prefs_headlines_1.14.0.png -%%DATADIR%%/doc/html/help_prefs_proxy_1.14.0.png -%%DATADIR%%/doc/html/help_search_1.6.0.png -%%DATADIR%%/doc/html/help_subscribe_1.6.0.png -%%DATADIR%%/doc/html/help_subscribe_adv_1.6.0.png -%%DATADIR%%/doc/html/help_vfolder_1.6.0.png -%%DATADIR%%/doc/html/newsbin_de.html -%%DATADIR%%/doc/html/newsbin_en.html -%%DATADIR%%/doc/html/newsbin_it.html -%%DATADIR%%/doc/html/newsbin_ru.html -%%DATADIR%%/doc/html/onlineservices_de.html -%%DATADIR%%/doc/html/onlineservices_en.html -%%DATADIR%%/doc/html/onlineservices_it.html -%%DATADIR%%/doc/html/onlineservices_ru.html -%%DATADIR%%/doc/html/preferences_de.html -%%DATADIR%%/doc/html/preferences_en.html -%%DATADIR%%/doc/html/preferences_it.html -%%DATADIR%%/doc/html/preferences_ru.html -%%DATADIR%%/doc/html/searching_de.html -%%DATADIR%%/doc/html/searching_en.html -%%DATADIR%%/doc/html/searching_it.html -%%DATADIR%%/doc/html/searching_ru.html -%%DATADIR%%/doc/html/subscriptions_de.html -%%DATADIR%%/doc/html/subscriptions_en.html -%%DATADIR%%/doc/html/subscriptions_it.html -%%DATADIR%%/doc/html/subscriptions_ru.html -%%DATADIR%%/doc/html/topics_de.html -%%DATADIR%%/doc/html/topics_en.html -%%DATADIR%%/doc/html/topics_it.html -%%DATADIR%%/doc/html/topics_ru.html -%%DATADIR%%/doc/html/updating_de.html -%%DATADIR%%/doc/html/updating_en.html -%%DATADIR%%/doc/html/updating_it.html -%%DATADIR%%/doc/html/updating_ru.html -%%DATADIR%%/dtd/html.ent %%DATADIR%%/gir-1.0/Liferea-3.0.gir -%%DATADIR%%/google_source.ui -%%DATADIR%%/liferea_menu.ui -%%DATADIR%%/liferea_toolbar.ui -%%DATADIR%%/liferea.css -%%DATADIR%%/mainwindow.ui -%%DATADIR%%/mark_read_dialog.ui -%%DATADIR%%/new_folder.ui -%%DATADIR%%/new_newsbin.ui -%%DATADIR%%/node_source.ui -%%DATADIR%%/opml_source.ui +%%DATADIR%%/help/about_de.html +%%DATADIR%%/help/about_en.html +%%DATADIR%%/help/about_it.html +%%DATADIR%%/help/about_ru.html +%%DATADIR%%/help/concepts_de.html +%%DATADIR%%/help/concepts_en.html +%%DATADIR%%/help/concepts_it.html +%%DATADIR%%/help/concepts_ru.html +%%DATADIR%%/help/folders_de.html +%%DATADIR%%/help/folders_en.html +%%DATADIR%%/help/folders_it.html +%%DATADIR%%/help/folders_ru.html +%%DATADIR%%/help/headlines_de.html +%%DATADIR%%/help/headlines_en.html +%%DATADIR%%/help/headlines_it.html +%%DATADIR%%/help/headlines_ru.html +%%DATADIR%%/help/help_feed_default.png +%%DATADIR%%/help/help_feed_error.png +%%DATADIR%%/help/help_feed_prop_adv_1.6.0.png +%%DATADIR%%/help/help_feed_prop_cache_1.6.0.png +%%DATADIR%%/help/help_feed_prop_downl_1.6.0.png +%%DATADIR%%/help/help_feed_prop_general_1.6.0.png +%%DATADIR%%/help/help_feed_prop_source_1.6.0.png +%%DATADIR%%/help/help_folder.png +%%DATADIR%%/help/help_item_flag.png +%%DATADIR%%/help/help_item_unread.png +%%DATADIR%%/help/help_opml.png +%%DATADIR%%/help/help_prefs_browser_1.14.0.png +%%DATADIR%%/help/help_prefs_desktop_1.14.0.png +%%DATADIR%%/help/help_prefs_feeds_1.14.0.png +%%DATADIR%%/help/help_prefs_folders_1.14.0.png +%%DATADIR%%/help/help_prefs_headlines_1.14.0.png +%%DATADIR%%/help/help_prefs_privacy_1.14.0.png +%%DATADIR%%/help/help_prefs_proxy_1.14.0.png +%%DATADIR%%/help/help_search_1.6.0.png +%%DATADIR%%/help/help_subscribe_1.6.0.png +%%DATADIR%%/help/help_subscribe_adv_1.6.0.png +%%DATADIR%%/help/help_vfolder_1.6.0.png +%%DATADIR%%/help/newsbin_de.html +%%DATADIR%%/help/newsbin_en.html +%%DATADIR%%/help/newsbin_it.html +%%DATADIR%%/help/newsbin_ru.html +%%DATADIR%%/help/onlineservices_de.html +%%DATADIR%%/help/onlineservices_en.html +%%DATADIR%%/help/onlineservices_it.html +%%DATADIR%%/help/onlineservices_ru.html +%%DATADIR%%/help/preferences_de.html +%%DATADIR%%/help/preferences_en.html +%%DATADIR%%/help/preferences_it.html +%%DATADIR%%/help/preferences_ru.html +%%DATADIR%%/help/reference.css +%%DATADIR%%/help/searching_de.html +%%DATADIR%%/help/searching_en.html +%%DATADIR%%/help/searching_it.html +%%DATADIR%%/help/searching_ru.html +%%DATADIR%%/help/subscriptions_de.html +%%DATADIR%%/help/subscriptions_en.html +%%DATADIR%%/help/subscriptions_it.html +%%DATADIR%%/help/subscriptions_ru.html +%%DATADIR%%/help/topics_de.html +%%DATADIR%%/help/topics_en.html +%%DATADIR%%/help/topics_it.html +%%DATADIR%%/help/topics_ru.html +%%DATADIR%%/help/updating_de.html +%%DATADIR%%/help/updating_en.html +%%DATADIR%%/help/updating_it.html +%%DATADIR%%/help/updating_ru.html %%DATADIR%%/opml/feedlist_bg.opml %%DATADIR%%/opml/feedlist_ca.opml %%DATADIR%%/opml/feedlist_de.opml %%DATADIR%%/opml/feedlist_en.opml %%DATADIR%%/opml/feedlist_es.opml %%DATADIR%%/opml/feedlist_eu.opml %%DATADIR%%/opml/feedlist_fa.opml %%DATADIR%%/opml/feedlist_fr.opml %%DATADIR%%/opml/feedlist_gl.opml %%DATADIR%%/opml/feedlist_he.opml %%DATADIR%%/opml/feedlist_hu.opml %%DATADIR%%/opml/feedlist_id.opml %%DATADIR%%/opml/feedlist_it.opml %%DATADIR%%/opml/feedlist_nl.opml %%DATADIR%%/opml/feedlist_no.opml %%DATADIR%%/opml/feedlist_pl.opml -%%DATADIR%%/opml/feedlist_pt_BR.opml %%DATADIR%%/opml/feedlist_pt.opml +%%DATADIR%%/opml/feedlist_pt_BR.opml %%DATADIR%%/opml/feedlist_sk.opml %%DATADIR%%/opml/feedlist_sv.opml %%DATADIR%%/pixmaps/default.svg %%DATADIR%%/pixmaps/emblem-important.svg %%DATADIR%%/pixmaps/emblem-web.svg %%DATADIR%%/pixmaps/fl_opml.png %%DATADIR%%/pixmaps/folder-saved-search.png %%DATADIR%%/pixmaps/folder.png %%DATADIR%%/pixmaps/newsbin.png %%DATADIR%%/pixmaps/unread.png -%%DATADIR%%/plugins.ui -%%DATADIR%%/prefs.ui -%%DATADIR%%/properties.ui -%%DATADIR%%/reedah_source.ui -%%DATADIR%%/rename_node.ui -%%DATADIR%%/shortcuts.ui -%%DATADIR%%/search_folder.ui -%%DATADIR%%/search.ui -%%DATADIR%%/simple_search.ui -%%DATADIR%%/simple_subscription.ui -%%DATADIR%%/theoldreader_source.ui -%%DATADIR%%/ttrss_source.ui -%%DATADIR%%/update_monitor.ui share/locale/ar/LC_MESSAGES/liferea.mo share/locale/ast/LC_MESSAGES/liferea.mo share/locale/be@latin/LC_MESSAGES/liferea.mo share/locale/bg/LC_MESSAGES/liferea.mo share/locale/ca/LC_MESSAGES/liferea.mo share/locale/cs/LC_MESSAGES/liferea.mo share/locale/da/LC_MESSAGES/liferea.mo share/locale/de/LC_MESSAGES/liferea.mo share/locale/el/LC_MESSAGES/liferea.mo share/locale/en_GB/LC_MESSAGES/liferea.mo share/locale/es/LC_MESSAGES/liferea.mo share/locale/eu/LC_MESSAGES/liferea.mo share/locale/fi/LC_MESSAGES/liferea.mo share/locale/fr/LC_MESSAGES/liferea.mo share/locale/gl/LC_MESSAGES/liferea.mo share/locale/he/LC_MESSAGES/liferea.mo share/locale/hu/LC_MESSAGES/liferea.mo share/locale/id/LC_MESSAGES/liferea.mo share/locale/it/LC_MESSAGES/liferea.mo share/locale/ja/LC_MESSAGES/liferea.mo +share/locale/ka/LC_MESSAGES/liferea.mo share/locale/ko/LC_MESSAGES/liferea.mo share/locale/lt/LC_MESSAGES/liferea.mo share/locale/lv/LC_MESSAGES/liferea.mo share/locale/mk/LC_MESSAGES/liferea.mo share/locale/nl/LC_MESSAGES/liferea.mo share/locale/pl/LC_MESSAGES/liferea.mo share/locale/pt_BR/LC_MESSAGES/liferea.mo share/locale/pt/LC_MESSAGES/liferea.mo share/locale/ro/LC_MESSAGES/liferea.mo share/locale/ru/LC_MESSAGES/liferea.mo share/locale/sk/LC_MESSAGES/liferea.mo share/locale/sq/LC_MESSAGES/liferea.mo share/locale/sv/LC_MESSAGES/liferea.mo +share/locale/te/LC_MESSAGES/liferea.mo share/locale/tr/LC_MESSAGES/liferea.mo share/locale/uk/LC_MESSAGES/liferea.mo share/locale/vi/LC_MESSAGES/liferea.mo share/locale/zh_CN/LC_MESSAGES/liferea.mo share/locale/zh_TW/LC_MESSAGES/liferea.mo -share/man/it/man1/liferea.1.gz share/man/man1/liferea.1.gz share/metainfo/net.sourceforge.liferea.appdata.xml