diff --git a/net/liferea/Makefile b/net/liferea/Makefile index 5d26c53b73f2..d854f51534f1 100644 --- a/net/liferea/Makefile +++ b/net/liferea/Makefile @@ -1,43 +1,49 @@ PORTNAME= liferea DISTVERSION= 1.16.7 +PORTREVISION= 1 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 \ 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 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/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 + + 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,197 +1,198 @@ 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.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 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%%/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_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/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/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