diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2018-06-06 21:56:57 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2018-06-06 22:00:12 +0200 |
commit | 0a1ab7ec71123d22c0a04dd5536bdd58963d4c26 (patch) | |
tree | d63d02f50aabc629cfc997dab23101a93ecb99ed /pkgs/applications/networking/newsreaders | |
parent | 31ab326e4e663dda17060378a7d3cf3444a10a21 (diff) |
quiterss: 0.18.10 -> 0.18.11
Diffstat (limited to 'pkgs/applications/networking/newsreaders')
-rw-r--r-- | pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch | 157 | ||||
-rw-r--r-- | pkgs/applications/networking/newsreaders/quiterss/default.nix | 15 |
2 files changed, 168 insertions, 4 deletions
diff --git a/pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch b/pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch new file mode 100644 index 000000000000..d9b994d9b37c --- /dev/null +++ b/pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch @@ -0,0 +1,157 @@ +Date: Wed, 6 Jun 2018 20:46:38 +0200 + +This reverts commit eceda92a16f1f4e5c5b584acd745398571df2bd6. +--- + src/application/mainapplication.cpp | 3 --- + src/application/mainwindow.cpp | 11 ----------- + src/application/mainwindow.h | 2 -- + src/newstabwidget.cpp | 6 +----- + src/newstabwidget.h | 2 +- + src/optionsdialog.cpp | 2 -- + src/webview/webpage.cpp | 13 +------------ + src/webview/webpage.h | 3 --- + 8 files changed, 3 insertions(+), 39 deletions(-) + +diff --git a/src/application/mainapplication.cpp b/src/application/mainapplication.cpp +index e93ec9c1..a5913bdf 100644 +--- a/src/application/mainapplication.cpp ++++ b/src/application/mainapplication.cpp +@@ -566,9 +566,6 @@ void MainApplication::c2fLoadSettings() + settings.beginGroup("ClickToFlash"); + c2fWhitelist_ = settings.value("whitelist", QStringList()).toStringList(); + c2fEnabled_ = settings.value("enabled", true).toBool(); +-#if QT_VERSION >= 0x050900 +- c2fEnabled_ = false; +-#endif + settings.endGroup(); + } + +diff --git a/src/application/mainwindow.cpp b/src/application/mainwindow.cpp +index 337a7c4e..42255d2c 100644 +--- a/src/application/mainwindow.cpp ++++ b/src/application/mainwindow.cpp +@@ -8140,14 +8140,3 @@ void MainWindow::createBackup() + QFile::copy(settings.fileName(), backupFileName); + } + } +- +-void MainWindow::webViewFullScreen(bool on) +-{ +- setFullScreen(); +- feedsWidget_->setVisible(!on); +- pushButtonNull_->setVisible(!on); +- tabBarWidget_->setVisible(!on); +- currentNewsTab->newsWidget_->setVisible(!on); +- pushButtonNull_->setVisible(!on); +- statusBar()->setVisible(!on); +-} +diff --git a/src/application/mainwindow.h b/src/application/mainwindow.h +index 995f96dc..93b75c11 100644 +--- a/src/application/mainwindow.h ++++ b/src/application/mainwindow.h +@@ -271,8 +271,6 @@ public: + + AdBlockIcon *adBlockIcon() { return adblockIcon_; } + +- void webViewFullScreen(bool on); +- + public slots: + void restoreFeedsOnStartUp(); + void addFeed(); +diff --git a/src/newstabwidget.cpp b/src/newstabwidget.cpp +index 77d74d3b..c6c130f7 100644 +--- a/src/newstabwidget.cpp ++++ b/src/newstabwidget.cpp +@@ -1842,12 +1842,8 @@ void NewsTabWidget::loadNewspaper(int refresh) + *----------------------------------------------------------------------------*/ + void NewsTabWidget::slotSetHtmlWebView(const QString &html, const QUrl &baseUrl) + { +- QUrl url = baseUrl; +-#if QT_VERSION >= 0x050900 +- url.setScheme(""); +-#endif + webView_->history()->setMaximumItemCount(0); +- webView_->setHtml(html, url); ++ webView_->setHtml(html, baseUrl); + webView_->history()->setMaximumItemCount(100); + } + +diff --git a/src/newstabwidget.h b/src/newstabwidget.h +index 7f5c3957..8d1266ac 100644 +--- a/src/newstabwidget.h ++++ b/src/newstabwidget.h +@@ -127,7 +127,6 @@ public: + QToolBar *newsToolBar_; + QSplitter *newsTabWidgetSplitter_; + +- QWidget *newsWidget_; + WebView *webView_; + QToolBar *webToolBar_; + LocationBar *locationBar_; +@@ -199,6 +198,7 @@ private: + + MainWindow *mainWindow_; + QSqlDatabase db_; ++ QWidget *newsWidget_; + + FeedsModel *feedsModel_; + FeedsProxyModel *feedsProxyModel_; +diff --git a/src/optionsdialog.cpp b/src/optionsdialog.cpp +index 73136dec..c082bc30 100644 +--- a/src/optionsdialog.cpp ++++ b/src/optionsdialog.cpp +@@ -741,9 +741,7 @@ void OptionsDialog::createBrowserWidget() + browserWidget_ = new QTabWidget(); + browserWidget_->addTab(generalBrowserWidget, tr("General")); + browserWidget_->addTab(historyBrowserWidget_, tr("History")); +-#if QT_VERSION < 0x050900 + browserWidget_->addTab(click2FlashWidget_, tr("Click to Flash")); +-#endif + browserWidget_->addTab(downloadsWidget, tr("Downloads")); + } + +diff --git a/src/webview/webpage.cpp b/src/webview/webpage.cpp +index 6401ec87..0254a167 100644 +--- a/src/webview/webpage.cpp ++++ b/src/webview/webpage.cpp +@@ -51,10 +51,7 @@ WebPage::WebPage(QObject *parent) + this, SLOT(downloadRequested(QNetworkRequest))); + connect(this, SIGNAL(printRequested(QWebFrame*)), + mainApp->mainWindow(), SLOT(slotPrint(QWebFrame*))); +-#if QT_VERSION >= 0x050900 +- connect(this, SIGNAL(fullScreenRequested(QWebFullScreenRequest)), +- this, SLOT(slotFullScreenRequested(QWebFullScreenRequest))); +-#endif ++ + livingPages_.append(this); + } + +@@ -286,11 +283,3 @@ void WebPage::cleanBlockedObjects() + mainFrame()->scrollToAnchor(mainFrame()->url().fragment()); + } + } +- +-#if QT_VERSION >= 0x050900 +-void WebPage::slotFullScreenRequested(QWebFullScreenRequest fullScreenRequest) +-{ +- fullScreenRequest.accept(); +- mainApp->mainWindow()->webViewFullScreen(fullScreenRequest.toggleOn()); +-} +-#endif +diff --git a/src/webview/webpage.h b/src/webview/webpage.h +index 5c376c50..91e72758 100644 +--- a/src/webview/webpage.h ++++ b/src/webview/webpage.h +@@ -68,9 +68,6 @@ private slots: + void downloadRequested(const QNetworkRequest &request); + void cleanBlockedObjects(); + void urlChanged(const QUrl &url); +-#if QT_VERSION >= 0x050900 +- void slotFullScreenRequested(QWebFullScreenRequest fullScreenRequest); +-#endif + + private: + NetworkManagerProxy *networkManagerProxy_; +-- +2.16.2 + diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index 7bd50a47f813..6bd42183d038 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -1,17 +1,24 @@ -{ stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtwebkit, pkgconfig, sqlite }: +{ stdenv, fetchFromGitHub, qmake, pkgconfig +, qtbase, qttools, qtwebkit, sqlite +}: stdenv.mkDerivation rec { name = "quiterss-${version}"; - version = "0.18.10"; + version = "0.18.11"; src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; rev = "${version}"; - sha256 = "1bv5aw6fscrwlycirvzm6fvbwmg8lbd1ycldkwbvybhjyfjaxkpm"; + sha256 = "0n9byhibi2qpgrb7x08knvqnmyn5c7vm24cl6y3zcvz52pz8y2yc"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + # Revert this commit until qt5.qtwebkit (currently an older version) from + # nixpkgs supports it (the commit states WebKit 602.1 while the current + # version in nixos-unstable is 538.1) + patches = [ ./0001-Revert-change-WebKit-602.1-c2f.patch ]; + + nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ qtbase qttools qtwebkit sqlite.dev ]; meta = with stdenv.lib; { |