From e5f1e8c98b808669455fd46561d21e437e898154 Mon Sep 17 00:00:00 2001 From: Arn0 Date: Tue, 20 Jun 2023 17:38:31 +0700 Subject: desktop/rss-guard: Remove unused patches. Signed-off-by: Willy Sudiarto Raharjo --- desktop/rss-guard/01_min_qt_required_is_5.9.patch | 56 ----------------------- desktop/rss-guard/02_fix_random_class_name.patch | 24 ---------- 2 files changed, 80 deletions(-) delete mode 100644 desktop/rss-guard/01_min_qt_required_is_5.9.patch delete mode 100644 desktop/rss-guard/02_fix_random_class_name.patch (limited to 'desktop') diff --git a/desktop/rss-guard/01_min_qt_required_is_5.9.patch b/desktop/rss-guard/01_min_qt_required_is_5.9.patch deleted file mode 100644 index e54b533774..0000000000 --- a/desktop/rss-guard/01_min_qt_required_is_5.9.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/rssguard.pro b/rssguard.pro -index 21a897c7..f8eb8d28 100755 ---- a/rssguard.pro -+++ b/rssguard.pro -@@ -41,8 +41,8 @@ TARGET = rssguard - - message(rssguard: Welcome RSS Guard qmake script.) - --lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 7) { -- warning(rssguard: At least Qt \"5.7.0\" is required!!!) -+lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 9) { -+ warning(rssguard: At least Qt \"5.9.0\" is required!!!) - } - - APP_NAME = "RSS Guard" -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 - #include --#include - #include - #include - -+#include -+ - 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 dist(std::numeric_limits().min() + 1000000UL, -+ std::numeric_limits().max()); -+ -+ return dist(mt); - } diff --git a/desktop/rss-guard/02_fix_random_class_name.patch b/desktop/rss-guard/02_fix_random_class_name.patch deleted file mode 100644 index 06c49f7aba..0000000000 --- a/desktop/rss-guard/02_fix_random_class_name.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 dist(std::numeric_limits().min() + 1000000UL, -- std::numeric_limits().max()); -+ std::uniform_int_distribution dist(std::numeric_limits().min() + 1000000UL, -+ std::numeric_limits().max()); - - return dist(mt); - } -- cgit v1.2.3