Hello community, here is the log from the commit of package rssguard for openSUSE:Factory checked in at 2020-05-03 22:46:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rssguard (Old) and /work/SRC/openSUSE:Factory/.rssguard.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rssguard" Sun May 3 22:46:32 2020 rev:14 rq:799702 version:3.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rssguard/rssguard.changes 2019-09-07 11:52:53.766278672 +0200 +++ /work/SRC/openSUSE:Factory/.rssguard.new.2738/rssguard.changes 2020-05-03 22:46:32.711070539 +0200 @@ -1,0 +2,35 @@ +Thu Apr 30 15:59:59 UTC 2020 - Luigi Baldoni <aloi...@gmx.com> + +- Update to version 3.6.0 + Added: + * UK, GL translation and some other localizations. + * Executable is now separated from library, making it possible + to write external plugins for RSS Guard and distribute them + separately as dll/lib/so/dylib file. + * Fetch some M-RSS metadata when downloading RSS feeds. + * Ability to postpone updates if main window is visible. + * Switchable monochrome tray icons. + * Default system icon theme is now default for RSS Guard on + all platforms. + * QtWebEngine-based RSS Guard variant now should respect web + proxy set in settings. + Fixed/changed: + * Feeds.url attribute in MySQL storage now has <=1000 length. + * Message viewer now responds to "zoom" action via mouse wheel + + CTRL key and persistently saves the zoom level fixing the + problem with small text in HIDPI screens. + * Minimum Qt version is now 5.9.0. + * Translations synced with newest strings. + * TT-RSS: Saving of message states now works + (read/unread/important). + * Many code cleanups, refactorings and regressions fixed. + * Tray icon now shows correct number of unread messages upon + app startup. + * Many fixes for build scripts for dev builds. +- Refreshed rssguard-3.5.2-fix_no_return_nonvoid.patch as + rssguard-3.6.0-fix_no_return_nonvoid.patch +- Dropped rssguard-3.5.9-Qt59.patch (merged upstream) +- Added rssguard-3.6.0-add_library_version.patch +- Dropped Group tag + +------------------------------------------------------------------- Old: ---- rssguard-3.5.2-fix_no_return_nonvoid.patch rssguard-3.5.9-Qt59.patch rssguard-3.5.9.tar.gz New: ---- rssguard-3.6.0-add_library_version.patch rssguard-3.6.0-fix_no_return_nonvoid.patch rssguard-3.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rssguard.spec ++++++ --- /var/tmp/diff_new_pack.VESfyd/_old 2020-05-03 22:46:33.587072320 +0200 +++ /var/tmp/diff_new_pack.VESfyd/_new 2020-05-03 22:46:33.595072337 +0200 @@ -1,7 +1,7 @@ # # spec file for package rssguard # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,19 +16,19 @@ # +%define libver 3_6_0 Name: rssguard -Version: 3.5.9 +Version: 3.6.0 Release: 0 Summary: RSS/ATOM/RDF feed reader License: GPL-3.0-only AND AGPL-3.0-or-later -Group: Productivity/Networking/News/Utilities -Url: https://github.com/martinrotter/rssguard +URL: https://github.com/martinrotter/rssguard Source0: https://github.com/martinrotter/rssguard/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.changes -# PATCH-FIX-UPSTREAM rssguard-3.5.2-fix_no_return_nonvoid.patch -Patch0: rssguard-3.5.2-fix_no_return_nonvoid.patch -# PATCH-FIX-UPSTREAM rssguard-3.5.9-Qt59.patch -Patch1: rssguard-3.5.9-Qt59.patch +# PATCH-FIX-UPSTREAM rssguard-3.6.0-fix_no_return_nonvoid.patch +Patch0: rssguard-3.6.0-fix_no_return_nonvoid.patch +# PATCH-FIX-OPENSUSE rssguard-3.6.0-add_library_version.patch aloi...@gmx.com -- add version to shared library +Patch2: rssguard-3.6.0-add_library_version.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -50,16 +50,29 @@ RSS Guard is a RSS/ATOM feed aggregator developed using the Qt framework. It supports online feed synchronization. +%package -n lib%{name}-devel +Summary: Development headers for lib%{name}-%{libver} +Requires: lib%{name}-%{libver} + +%description -n lib%{name}-devel +Development headers to be used with lib%{name}-%{libver}. + +%package -n lib%{name}-%{libver} +Summary: Shared library for %{name} + +%description -n lib%{name}-%{libver} +Shared library for %{name} to be used by external plugins. + %prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%autosetup -p1 +# remove executable bit chmod -x resources/desktop/com.github.rssguard.appdata.xml +find src/librssguard -name "*.h" -exec chmod -x {} \; %build # resources_big is not compatible with LTO %define _lto_cflags %{nil} -%qmake5 PREFIX=%{_prefix} USE_WEBENGINE=true +%qmake5 PREFIX=%{_prefix} LIBDIR=%{_libdir} USE_WEBENGINE=true %make_jobs %install @@ -69,6 +82,9 @@ install -m0644 resources/desktop/com.github.%{name}.desktop.autostart -t %{buildroot}%{_datadir}/autostart %fdupes -s %{buildroot} +%post -n lib%{name}-%{libver} -p /sbin/ldconfig +%postun -n lib%{name}-%{libver} -p /sbin/ldconfig + %files %license LICENSE.md %dir %{_datadir}/applications @@ -80,4 +96,11 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/metainfo/com.github.%{name}.appdata.xml +%files -n librssguard-devel +%{_includedir}/lib%{name} +%{_libdir}/pkgconfig/%{name}.pc + +%files -n lib%{name}-%{libver} +%{_libdir}/lib%{name}-%{version}.so + %changelog ++++++ rssguard-3.6.0-add_library_version.patch ++++++ Index: rssguard-3.6.0/src/librssguard/librssguard.pro =================================================================== --- rssguard-3.6.0.orig/src/librssguard/librssguard.pro +++ rssguard-3.6.0/src/librssguard/librssguard.pro @@ -1,7 +1,10 @@ TEMPLATE = lib +include(../../pri/vars.pri) +include(../../pri/defs.pri) + unix|mac { - TARGET = rssguard + TARGET = rssguard-$$APP_VERSION } else { TARGET = librssguard @@ -10,9 +13,6 @@ else { MSG_PREFIX = "librssguard" APP_TYPE = "core library" -include(../../pri/vars.pri) -include(../../pri/defs.pri) - message($$MSG_PREFIX: Shadow copy build directory \"$$OUT_PWD\".) message($$MSG_PREFIX: $$APP_NAME version is: \"$$APP_VERSION\".) message($$MSG_PREFIX: Detected Qt version: \"$$QT_VERSION\".) @@ -25,6 +25,19 @@ include(../../pri/build_opts.pri) DEFINES *= RSSGUARD_DLLSPEC=Q_DECL_EXPORT CONFIG += unversioned_libname unversioned_soname skip_target_version_ext +# create pkgconfig file +unix { +CONFIG += create_pc create_prl no_install_prl +QMAKE_PKGCONFIG_NAME = rssguard +QMAKE_PKGCONFIG_FILE = $$QMAKE_PKGCONFIG_NAME +QMAKE_PKGCONFIG_DESCRIPTION = Bindings for librssguard +QMAKE_PKGCONFIG_PREFIX = $$PREFIX +QMAKE_PKGCONFIG_LIBDIR = $$LIBDIR +QMAKE_PKGCONFIG_INCDIR = $$headers.path +QMAKE_PKGCONFIG_VERSION = $$APP_VERSION +QMAKE_PKGCONFIG_CFLAGS = -I\${includedir} +} + RESOURCES += ../../resources/sql.qrc \ ../../resources/rssguard.qrc \ ../../resources/icons.qrc Index: rssguard-3.6.0/src/rssguard/rssguard.pro =================================================================== --- rssguard-3.6.0.orig/src/rssguard/rssguard.pro +++ rssguard-3.6.0/src/rssguard/rssguard.pro @@ -47,7 +47,7 @@ INCLUDEPATH += $$PWD/../librssguard \ DEPENDPATH += $$PWD/../librssguard win32: LIBS += -L$$OUT_PWD/../librssguard/ -llibrssguard -unix: LIBS += -L$$OUT_PWD/../librssguard/ -lrssguard +unix: LIBS += -L$$OUT_PWD/../librssguard/ -lrssguard-$$APP_VERSION # Create new "make 7zip" target and "make zip" target. win32 { Index: rssguard-3.6.0/pri/install.pri =================================================================== --- rssguard-3.6.0.orig/pri/install.pri +++ rssguard-3.6.0/pri/install.pri @@ -190,14 +190,17 @@ unix:!mac:!android { appdata.files = ../../resources/desktop/$${APP_REVERSE_NAME}.appdata.xml appdata.path = $$quote($$PREFIX/share/metainfo/) - lib.files = $$OUT_PWD/../librssguard/librssguard.so - lib.path = $$quote($$PREFIX/lib/) + lib.files = $$OUT_PWD/../librssguard/librssguard-$${APP_VERSION}.so + lib.path = $$quote($$LIBDIR/) lib.CONFIG = no_check_exist + pkgconfig.files = $$OUT_PWD/../librssguard/rssguard.pc + pkgconfig.path = $$quote($$LIBDIR/pkgconfig/) + desktop_icon.files = ../../resources/graphics/$${TARGET}.png desktop_icon.path = $$quote($$PREFIX/share/icons/hicolor/512x512/apps/) - INSTALLS += target lib desktop_file desktop_icon appdata + INSTALLS += target lib pkgconfig desktop_file desktop_icon appdata INSTALL_HEADERS_PREFIX = $$quote($$PREFIX/include/librssguard/) } ++++++ rssguard-3.5.2-fix_no_return_nonvoid.patch -> rssguard-3.6.0-fix_no_return_nonvoid.patch ++++++ --- /work/SRC/openSUSE:Factory/rssguard/rssguard-3.5.2-fix_no_return_nonvoid.patch 2017-11-08 15:13:19.299065208 +0100 +++ /work/SRC/openSUSE:Factory/.rssguard.new.2738/rssguard-3.6.0-fix_no_return_nonvoid.patch 2020-05-03 22:46:32.511070132 +0200 @@ -1,12 +1,21 @@ -Index: rssguard-3.5.2/src/services/gmail/network/gmailnetworkfactory.cpp -=================================================================== ---- rssguard-3.5.2.orig/src/services/gmail/network/gmailnetworkfactory.cpp -+++ rssguard-3.5.2/src/services/gmail/network/gmailnetworkfactory.cpp -@@ -372,6 +372,7 @@ bool GmailNetworkFactory::obtainAndDecod - else { - return false; - } -+ return 0; - } - - QList<Message> GmailNetworkFactory::decodeLiteMessages(const QString& messages_json_data, const QString& stream_id, +From b4bd7af18f9c83199a81c3ea081c9e1423010459 Mon Sep 17 00:00:00 2001 +From: Martin Rotter <rotter.marti...@gmail.com> +Date: Fri, 1 May 2020 19:51:14 +0200 +Subject: [PATCH] Fix warning. + +--- + src/librssguard/miscellaneous/databasefactory.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/librssguard/miscellaneous/databasefactory.cpp b/src/librssguard/miscellaneous/databasefactory.cpp +index 07888ee9..d0ea5a3d 100644 +--- a/src/librssguard/miscellaneous/databasefactory.cpp ++++ b/src/librssguard/miscellaneous/databasefactory.cpp +@@ -462,6 +462,7 @@ QSqlDatabase DatabaseFactory::connection(const QString& connection_name, Desired + + case UsedDriver::SQLITE: + case UsedDriver::SQLITE_MEMORY: ++ default: + return sqliteConnection(connection_name, desired_type); + } + } ++++++ rssguard-3.5.9.tar.gz -> rssguard-3.6.0.tar.gz ++++++ ++++ 151672 lines of diff (skipped)