commit rssguard for openSUSE:Factory

From cfb0c3490eec11e47790c1efd913c0fdd9a579b4 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 6 Jun 2019 09:07:04 +0200 Subject: [PATCH] min qt required is now 5.9.0 + fixed pw saving in tt-rss

Hello community, here is the log from the commit of package rssguard for openSUSE:Factory checked in at 2019-06-06 18:19:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rssguard (Old) and /work/SRC/openSUSE:Factory/.rssguard.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rssguard" Thu Jun 6 18:19:09 2019 rev:12 rq:708101 version:3.5.9 Changes: -------- --- /work/SRC/openSUSE:Factory/rssguard/rssguard.changes 2019-06-05 11:46:20.114993224 +0200 +++ /work/SRC/openSUSE:Factory/.rssguard.new.4811/rssguard.changes 2019-06-06 18:19:25.108649199 +0200 @@ -1,0 +2,5 @@ +Thu Jun 6 08:27:16 UTC 2019 - aloisio@gmx.com + +- Add rssguard-3.5.9-Qt59.patch to fix build on Leap + +------------------------------------------------------------------- New: ---- rssguard-3.5.9-Qt59.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rssguard.spec ++++++ --- /var/tmp/diff_new_pack.HYF1oK/_old 2019-06-06 18:19:25.612649052 +0200 +++ /var/tmp/diff_new_pack.HYF1oK/_new 2019-06-06 18:19:25.616649050 +0200 @@ -27,6 +27,8 @@ 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 BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -34,7 +36,7 @@ BuildRequires: libqt5-qtbase-common-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(Qt5Concurrent) -BuildRequires: pkgconfig(Qt5Core) >= 5.10 +BuildRequires: pkgconfig(Qt5Core) >= 5.9 BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5Sql) @@ -51,6 +53,8 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +chmod -x resources/desktop/com.github.rssguard.appdata.xml %build %qmake5 PREFIX=%{_prefix} USE_WEBENGINE=true ++++++ rssguard-3.5.9-Qt59.patch ++++++ plugin in some circumstances + fix #208 diff --git a/src/miscellaneous/textfactory.cpp b/src/miscellaneous/textfactory.cpp index 53451d63..f371d02d 100755 --- a/src/miscellaneous/textfactory.cpp +++ b/src/miscellaneous/textfactory.cpp @@ -10,10 +10,11 @@ #include <QDir> #include <QLocale> -#include <QRandomGenerator> #include <QString> #include <QStringList> +#include <random> + quint64 TextFactory::s_encryptionKey = 0x0; TextFactory::TextFactory() = default; @@ -128,7 +129,10 @@ quint64 TextFactory::initializeSecretEncryptionKey() { QString encryption_file_path = qApp->settings()->pathName() + QDir::separator() + ENCRYPTION_FILE_NAME; try { - s_encryptionKey = quint64(QString(IOFactory::readFile(encryption_file_path)).toLongLong()); + s_encryptionKey = quint64(QString(IOFactory::readFile(encryption_file_path)).toULongLong()); + + auto aa = s_encryptionKey; + auto bb = false; } catch (ApplicationException&) { // Well, key does not exist or is invalid, generate and save one. @@ -148,5 +152,10 @@ quint64 TextFactory::initializeSecretEncryptionKey() { } quint64 TextFactory::generateSecretEncryptionKey() { - return QRandomGenerator().generate64(); + std::random_device rd; + std::mt19937 mt(rd()); + std::uniform_int<quint64> dist(std::numeric_limits<quint64>().min() + 1000000UL, + std::numeric_limits<quint64>().max()); + + return dist(mt); }

From d347ba63072ab13c0dbc1792d1a2b837af997a46 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 6 Jun 2019 11:35:25 +0200 Subject: [PATCH] Fix random class name

--- src/miscellaneous/textfactory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/miscellaneous/textfactory.cpp b/src/miscellaneous/textfactory.cpp index 48597235..1ac6f049 100755 --- a/src/miscellaneous/textfactory.cpp +++ b/src/miscellaneous/textfactory.cpp @@ -151,8 +151,8 @@ quint64 TextFactory::initializeSecretEncryptionKey() { quint64 TextFactory::generateSecretEncryptionKey() { std::random_device rd; std::mt19937 mt(rd()); - std::uniform_int<quint64> dist(std::numeric_limits<quint64>().min() + 1000000UL, - std::numeric_limits<quint64>().max()); + std::uniform_int_distribution<quint64> dist(std::numeric_limits<quint64>().min() + 1000000UL, + std::numeric_limits<quint64>().max()); return dist(mt); }