PR#2: Switch to using Qt5, bump version - rpms/quiterss

rpms / quiterss

#2 Switch to using Qt5, bump version

Closed 3 years ago by genodeftest. Opened 5 years ago by genodeftest.

Unknown source master into master

Christian Stadelmann • 5 years ago

ee2930b

Main-application-Use-old-data-dir-if-still-present.patch

file added

+33

		`@@ -0,0 +1,33 @@`
		`+ From 5c1aa5044282a2e09235fa854bee3bb67d809489 Mon Sep 17 00:00:00 2001`
		`+ From: Christian Stadelmann <dev@genodeftest.de>`
		`+ Date: Sun, 27 Aug 2017 14:21:06 +0200`
		`+ Subject: [PATCH] Main application: Use old data dir if still present`
		`+`
		`+ ---`
		`+ src/application/mainapplication.cpp \| 10 +++++++++-`
		`+ 1 file changed, 9 insertions(+), 1 deletion(-)`
		`+`
		`+ diff --git a/src/application/mainapplication.cpp b/src/application/mainapplication.cpp`
		`+ index db6312c..c0f1c72 100644`
		`+ --- a/src/application/mainapplication.cpp`
		`+ +++ b/src/application/mainapplication.cpp`
		`+ @@ -195,7 +195,15 @@ void MainApplication::checkDir()`
		`+ soundNotifyDir_ = "sound";`
		`+ } else {`
		`+ #ifdef HAVE_QT5`
		`+ - dataDir_ = QStandardPaths::writableLocation(QStandardPaths::DataLocation);`
		`+ + // Workaround for https://github.com/QuiteRSS/quiterss/issues/792`
		`+ + // Reuse data dir from Qt4 if present`
		`+ + QString oldDataDir_ = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/data/QuiteRss/QuiteRss";`
		`+ + QDir oldDataDir(oldDataDir_);`
		`+ + if (oldDataDir.exists()) {`
		`+ + dataDir_ = oldDataDir_;`
		`+ + } else {`
		`+ + dataDir_ = QStandardPaths::writableLocation(QStandardPaths::DataLocation);`
		`+ + }`
		`+ cacheDir_ = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);`
		`+ #else`
		`+ dataDir_ = QDesktopServices::storageLocation(QDesktopServices::DataLocation);`
		`+ --`
		`+ libgit2 0.25.1`
		`+`

quiterss.spec

file modified

+22 -12

		`@@ -1,18 +1,23 @@`
		`Name: quiterss`
		`- Version: 0.18.9`
		`- Release: 3%{?dist}`
		`+ Version: 0.18.12`
		`+ Release: 1%{?dist}`
		`License: GPLv3`
		`Summary: RSS/Atom aggregator`
		`+ URL: https://quiterss.org/`
		`Source0: https://github.com/QuiteRSS/quiterss/archive/%{name}-%{version}.tar.gz`
		`- URL: http://quiterss.org/`
		`- # BuildRequires: pkgconfig(QtGui), pkgconfig(QtNetwork), pkgconfig(QtXml), pkgconfig(QtSql)`
		`- BuildRequires: qtsingleapplication-devel`
		`- # qtwebkit-devel`
		`- BuildRequires: pkgconfig(QtWebKit)`
		`+`
		`+ # Workaround for https://github.com/QuiteRSS/quiterss/issues/792`
		`+ Patch0: Main-application-Use-old-data-dir-if-still-present.patch`
		`+`
		`+ # BuildRequires: pkgconfig(Qt5Gui), pkgconfig(Qt5Network), pkgconfig(Qt5Xml), pkgconfig(Qt5Sql)`
		`+ BuildRequires: qtsingleapplication-qt5-devel`
		`+ BuildRequires: pkgconfig(Qt5Multimedia)`
		`+ # qt5-webkit-devel`
		`+ BuildRequires: pkgconfig(Qt5WebKit)`
		`# sqlite-devel`
		`- BuildRequires: pkgconfig(sqlite3)`
		`+ BuildRequires: pkgconfig(sqlite3)`
		`# phonon-devel`
		`- BuildRequires: pkgconfig(phonon)`
		`+ BuildRequires: pkgconfig(phonon4qt5)`
		`BuildRequires: desktop-file-utils`

		`%description`
		`@@ -22,9 +27,10 @@`
		`%setup -q`
		`# be asure`
		`rm -rf 3rdparty/{qtsingleapplication,sqlite}`
		`+ %patch0 -p1`

		`%build`
		`- %{qmake_qt4} PREFIX=%{_prefix} SYSTEMQTSA=True`
		`+ %{qmake_qt5} PREFIX=%{_prefix} SYSTEMQTSA=True`
		`make release %{?_smp_mflags}`

		`%install`
		`@@ -37,8 +43,8 @@`

		`%postun`
		`if [ $1 -eq 0 ] ; then`
		`- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null`
		`- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null \|\| :`
		`+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null`
		`+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null \|\| :`
		`fi`

		`%posttrans`
		`@@ -56,6 +62,10 @@`
		`%{_datadir}/icons/hicolor/*/apps/%{name}.png`

		`%changelog`
		`+ * Wed Sep 05 2018 Christian Stadelmann - 0.18.12-1`
		`+ - Switch to using Qt5`
		`+ - Version bump`
		`+`
		`* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.18.9-3`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (quiterss-0.18.9.tar.gz) = 1c068cc58e2c24123d62101e629e0138d5d9e3773f841e0aa8fe7a29e057e8397e2d60cfd1d3ebe81240c9ce9caf25ad61da1a37d41965daac951b45c906f80b`
		`+ SHA512 (quiterss-0.18.12.tar.gz) = e047d88d3be2d24e264869c9fe5a9327d66b7f6907bb74b5fc7e53b2cbb69c232f130826c8ad79ac95dd3dc5137d1d1779a23c20ddb35c56fccfbaff4fb4f3e4`

genodeftest commented 5 years ago

This update ports QuiteRSS to Qt5. I've started building QuiteRSS with Qt5 about one year ago and have been using the qt5 builds ever since. I have not seen any issues.

Updating QuiteRSS to use Qt5 is very important due to its security implications: QuiteRSS uses QtWebKit for rendering web content. The Qt4 version packaged as qtwebkit has not seen any security fixes in years. It probably has several hundred known CVEs open. The Qt5 version packaged as qt5-qtwebkit is now being updated with security fixes on a regular basis. It is very important to use the Qt5 version of QtWebKit.

PS: You may also want to push this update to the f29 and f28 branches.

genodeftest commented 5 years ago

This is an updated version of #1.

genodeftest commented 5 years ago

Can you please merge this pull request? This is a highly security-sensitive issue!

tieugene commented 4 years ago

I think it is hack but not bug fix.
Moving old data into new location (before creating new data storage) will be better.

genodeftest commented 3 years ago

quiterss has been updated to Qt5 and the maintainer chose a different way in handling the user data directory so this pull request is no longer useful.

Pull-Request has been closed by genodeftest

3 years ago