diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -870,6 +870,7 @@ libFeedReader.so:feed_reader_login_row_getInfo libFeedReader.so:feed_reader_login_row_get_type libFeedReader.so:feed_reader_login_row_new +libFeedReader.so:feed_reader_main libFeedReader.so:feed_reader_main_window_getInterfaceState libFeedReader.so:feed_reader_main_window_getSimpleHeader libFeedReader.so:feed_reader_main_window_get_default @@ -1248,9 +1249,75 @@ libFeedReader.so:image libFeedReader.so:init_multibyte libFeedReader.so:is_zeile_empty +libFeedReader.so:ivy_color_get_type +libFeedReader.so:ivy_critical_handler_get_type +libFeedReader.so:ivy_extractor_construct +libFeedReader.so:ivy_extractor_create_stacktrace +libFeedReader.so:ivy_extractor_get_type +libFeedReader.so:ivy_extractor_new +libFeedReader.so:ivy_extractor_ref +libFeedReader.so:ivy_extractor_unref +libFeedReader.so:ivy_frame_construct +libFeedReader.so:ivy_frame_get_address +libFeedReader.so:ivy_frame_get_file_path +libFeedReader.so:ivy_frame_get_file_short_path +libFeedReader.so:ivy_frame_get_function +libFeedReader.so:ivy_frame_get_line +libFeedReader.so:ivy_frame_get_line_number +libFeedReader.so:ivy_frame_get_type +libFeedReader.so:ivy_frame_new +libFeedReader.so:ivy_frame_ref +libFeedReader.so:ivy_frame_unref +libFeedReader.so:ivy_param_spec_extractor +libFeedReader.so:ivy_param_spec_frame +libFeedReader.so:ivy_param_spec_printer +libFeedReader.so:ivy_param_spec_stacktrace +libFeedReader.so:ivy_printer_construct +libFeedReader.so:ivy_printer_get_type +libFeedReader.so:ivy_printer_new +libFeedReader.so:ivy_printer_print +libFeedReader.so:ivy_printer_ref +libFeedReader.so:ivy_printer_unref +libFeedReader.so:ivy_stacktrace_construct +libFeedReader.so:ivy_stacktrace_get_critical_handling +libFeedReader.so:ivy_stacktrace_get_default_error_background +libFeedReader.so:ivy_stacktrace_get_default_highlight_color +libFeedReader.so:ivy_stacktrace_get_enabled +libFeedReader.so:ivy_stacktrace_get_error_background +libFeedReader.so:ivy_stacktrace_get_frames +libFeedReader.so:ivy_stacktrace_get_hide_installed_libraries +libFeedReader.so:ivy_stacktrace_get_highlight_color +libFeedReader.so:ivy_stacktrace_get_is_custom +libFeedReader.so:ivy_stacktrace_get_type +libFeedReader.so:ivy_stacktrace_new +libFeedReader.so:ivy_stacktrace_print +libFeedReader.so:ivy_stacktrace_ref +libFeedReader.so:ivy_stacktrace_register_handlers +libFeedReader.so:ivy_stacktrace_set_critical_handling +libFeedReader.so:ivy_stacktrace_set_default_error_background +libFeedReader.so:ivy_stacktrace_set_default_highlight_color +libFeedReader.so:ivy_stacktrace_set_enabled +libFeedReader.so:ivy_stacktrace_set_error_background +libFeedReader.so:ivy_stacktrace_set_hide_installed_libraries +libFeedReader.so:ivy_stacktrace_set_highlight_color +libFeedReader.so:ivy_stacktrace_unref +libFeedReader.so:ivy_style_get_type +libFeedReader.so:ivy_value_get_extractor +libFeedReader.so:ivy_value_get_frame +libFeedReader.so:ivy_value_get_printer +libFeedReader.so:ivy_value_get_stacktrace +libFeedReader.so:ivy_value_set_extractor +libFeedReader.so:ivy_value_set_frame +libFeedReader.so:ivy_value_set_printer +libFeedReader.so:ivy_value_set_stacktrace +libFeedReader.so:ivy_value_take_extractor +libFeedReader.so:ivy_value_take_frame +libFeedReader.so:ivy_value_take_printer +libFeedReader.so:ivy_value_take_stacktrace libFeedReader.so:latin1 libFeedReader.so:ligature_entity libFeedReader.so:line_break +libFeedReader.so:main libFeedReader.so:microsoft_character libFeedReader.so:microsoft_entities libFeedReader.so:neuer_paragraph diff --git a/files/Safely-parse-response-unread.patch b/files/Safely-parse-response-unread.patch deleted file mode 100644 --- a/files/Safely-parse-response-unread.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 098bee1120dd5ee13830a04999901c6b3d415541 Mon Sep 17 00:00:00 2001 -From: Allan Reyes -Date: Fri, 18 May 2018 00:33:30 -0700 -Subject: [PATCH] Safely parse response.unread; fixes #691 - ---- - plugins/backend/ttrss/ttrssAPI.vala | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/plugins/backend/ttrss/ttrssAPI.vala b/plugins/backend/ttrss/ttrssAPI.vala -index 582687f9..1a99d934 100644 ---- a/plugins/backend/ttrss/ttrssAPI.vala -+++ b/plugins/backend/ttrss/ttrssAPI.vala -@@ -191,7 +191,15 @@ public class FeedReader.ttrssAPI : GLib.Object { - if(error == ConnectionError.SUCCESS) - { - var response = message.get_response_object(); -- unread = int.parse(response.get_string_member("unread")); -+ int64 parsed = 0; -+ bool res = int64.try_parse(response.get_string_member("unread"), out parsed); -+ if(res) { -+ unread = (int) parsed; -+ } -+ else -+ { -+ Logger.warning("Could not parse unread articles"); -+ } - } - Logger.info("There are %i unread articles".printf(unread)); - diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : feedreader -version : '2.2' -release : 25 +version : 2.2.1 +release : 26 source : - - git|https://github.com/jangernert/FeedReader.git : v2.2 + - https://github.com/jangernert/FeedReader/archive/2.2.1.tar.gz : 4dca0fe4622cebeb7cc7d3138d404e2b35877036da7588dd6867ac90a5763cf7 license : GPL-3.0-or-later summary : Modern desktop application designed to complement existing web-based RSS accounts component : network.news @@ -27,7 +27,6 @@ rundeps : - gnome-keyring setup : | - %patch -p1 < $pkgfiles/Safely-parse-response-unread.patch %meson_configure build : | %ninja_build diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ feedreader - Joey Riches - josephriches@gmail.com + Pierre-Yves + pyu@riseup.net GPL-3.0-or-later network.news @@ -19,7 +19,7 @@ network.news - /usr/bin + /usr/bin/feedreader /usr/lib64/feedreader/plugins/bazqux.plugin /usr/lib64/feedreader/plugins/feedbin.plugin /usr/lib64/feedreader/plugins/feedhq.plugin @@ -54,10 +54,11 @@ /usr/lib64/feedreader/pluginsShare/telegram.plugin /usr/lib64/feedreader/pluginsShare/twitter.plugin /usr/lib64/feedreader/pluginsShare/wallabag.plugin - /usr/lib64/lib*.so + /usr/lib64/libFeedReader.so /usr/share/appdata/org.gnome.FeedReader.appdata.xml /usr/share/applications/org.gnome.FeedReader.desktop - /usr/share/feedreader + /usr/share/feedreader/GrabberConfig + /usr/share/feedreader/org.gnome.FeedReader-autostart.desktop /usr/share/glib-2.0/schemas/org.gnome.feedreader.bazqux.gschema.xml /usr/share/glib-2.0/schemas/org.gnome.feedreader.feedbin.gschema.xml /usr/share/glib-2.0/schemas/org.gnome.feedreader.feedhq.gschema.xml @@ -84,16 +85,87 @@ /usr/share/icons/hicolor/48x48/apps/org.gnome.FeedReader.svg /usr/share/icons/hicolor/64x64/apps/org.gnome.FeedReader.svg /usr/share/icons/hicolor/scalable/apps/org.gnome.FeedReader-symbolic.svg - /usr/share/locale + /usr/share/locale/af/LC_MESSAGES/feedreader.mo + /usr/share/locale/am/LC_MESSAGES/feedreader.mo + /usr/share/locale/ar/LC_MESSAGES/feedreader.mo + /usr/share/locale/ast/LC_MESSAGES/feedreader.mo + /usr/share/locale/az/LC_MESSAGES/feedreader.mo + /usr/share/locale/be/LC_MESSAGES/feedreader.mo + /usr/share/locale/bg/LC_MESSAGES/feedreader.mo + /usr/share/locale/bn/LC_MESSAGES/feedreader.mo + /usr/share/locale/bs/LC_MESSAGES/feedreader.mo + /usr/share/locale/ca/LC_MESSAGES/feedreader.mo + /usr/share/locale/ckb/LC_MESSAGES/feedreader.mo + /usr/share/locale/cs/LC_MESSAGES/feedreader.mo + /usr/share/locale/da/LC_MESSAGES/feedreader.mo + /usr/share/locale/de/LC_MESSAGES/feedreader.mo + /usr/share/locale/el/LC_MESSAGES/feedreader.mo + /usr/share/locale/en_AU/LC_MESSAGES/feedreader.mo + /usr/share/locale/en_CA/LC_MESSAGES/feedreader.mo + /usr/share/locale/en_GB/LC_MESSAGES/feedreader.mo + /usr/share/locale/eo/LC_MESSAGES/feedreader.mo + /usr/share/locale/es/LC_MESSAGES/feedreader.mo + /usr/share/locale/et/LC_MESSAGES/feedreader.mo + /usr/share/locale/eu/LC_MESSAGES/feedreader.mo + /usr/share/locale/fa/LC_MESSAGES/feedreader.mo + /usr/share/locale/fi/LC_MESSAGES/feedreader.mo + /usr/share/locale/fr/LC_MESSAGES/feedreader.mo + /usr/share/locale/fr_CA/LC_MESSAGES/feedreader.mo + /usr/share/locale/gl/LC_MESSAGES/feedreader.mo + /usr/share/locale/he/LC_MESSAGES/feedreader.mo + /usr/share/locale/hi/LC_MESSAGES/feedreader.mo + /usr/share/locale/hr/LC_MESSAGES/feedreader.mo + /usr/share/locale/hu/LC_MESSAGES/feedreader.mo + /usr/share/locale/hy/LC_MESSAGES/feedreader.mo + /usr/share/locale/id/LC_MESSAGES/feedreader.mo + /usr/share/locale/it/LC_MESSAGES/feedreader.mo + /usr/share/locale/ja/LC_MESSAGES/feedreader.mo + /usr/share/locale/ka/LC_MESSAGES/feedreader.mo + /usr/share/locale/ko/LC_MESSAGES/feedreader.mo + /usr/share/locale/ky/LC_MESSAGES/feedreader.mo + /usr/share/locale/lb/LC_MESSAGES/feedreader.mo + /usr/share/locale/lo/LC_MESSAGES/feedreader.mo + /usr/share/locale/lt/LC_MESSAGES/feedreader.mo + /usr/share/locale/lv/LC_MESSAGES/feedreader.mo + /usr/share/locale/ml/LC_MESSAGES/feedreader.mo + /usr/share/locale/mr/LC_MESSAGES/feedreader.mo + /usr/share/locale/ms/LC_MESSAGES/feedreader.mo + /usr/share/locale/nb/LC_MESSAGES/feedreader.mo + /usr/share/locale/nl/LC_MESSAGES/feedreader.mo + /usr/share/locale/nn/LC_MESSAGES/feedreader.mo + /usr/share/locale/pl/LC_MESSAGES/feedreader.mo + /usr/share/locale/pt/LC_MESSAGES/feedreader.mo + /usr/share/locale/pt_BR/LC_MESSAGES/feedreader.mo + /usr/share/locale/ro/LC_MESSAGES/feedreader.mo + /usr/share/locale/ro_RO/LC_MESSAGES/feedreader.mo + /usr/share/locale/ru/LC_MESSAGES/feedreader.mo + /usr/share/locale/rue/LC_MESSAGES/feedreader.mo + /usr/share/locale/si/LC_MESSAGES/feedreader.mo + /usr/share/locale/sk/LC_MESSAGES/feedreader.mo + /usr/share/locale/sl/LC_MESSAGES/feedreader.mo + /usr/share/locale/sma/LC_MESSAGES/feedreader.mo + /usr/share/locale/sq/LC_MESSAGES/feedreader.mo + /usr/share/locale/sr/LC_MESSAGES/feedreader.mo + /usr/share/locale/sv/LC_MESSAGES/feedreader.mo + /usr/share/locale/sw/LC_MESSAGES/feedreader.mo + /usr/share/locale/ta/LC_MESSAGES/feedreader.mo + /usr/share/locale/te/LC_MESSAGES/feedreader.mo + /usr/share/locale/th/LC_MESSAGES/feedreader.mo + /usr/share/locale/tr/LC_MESSAGES/feedreader.mo + /usr/share/locale/uk/LC_MESSAGES/feedreader.mo + /usr/share/locale/vi/LC_MESSAGES/feedreader.mo + /usr/share/locale/zh_CN/LC_MESSAGES/feedreader.mo + /usr/share/locale/zh_HK/LC_MESSAGES/feedreader.mo + /usr/share/locale/zh_TW/LC_MESSAGES/feedreader.mo - - 2018-06-07 - 2.2 + + 2018-08-26 + 2.2.1 Packaging update - Joey Riches - josephriches@gmail.com + Pierre-Yves + pyu@riseup.net \ No newline at end of file