From 207de9e328f11c48e9fbef1daaaa0af90a8f7768 Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Tue, 15 May 2018 11:56:39 +0000 Subject: [PATCH] Add an upstream patch to fix the build with Qt 5.10. In file included from webtab/searchtoolbar.cpp:21: ../../build/ui_searchtoolbar.h:76:31: error: no viable conversion from 'QLatin1String' to 'const QKeySequence' previous->setShortcut(QLatin1String("Ctrl+Shift+G")); PR: 228213 --- www/qupzilla-qt5/Makefile | 2 +- www/qupzilla-qt5/files/patch-git_ca2b5f22b | 44 ++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 www/qupzilla-qt5/files/patch-git_ca2b5f22b diff --git a/www/qupzilla-qt5/Makefile b/www/qupzilla-qt5/Makefile index 3d64133e3907..b51425a4bb54 100644 --- a/www/qupzilla-qt5/Makefile +++ b/www/qupzilla-qt5/Makefile @@ -2,7 +2,7 @@ PORTNAME= qupzilla PORTVERSION= 1.8.9 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/ PKGNAMESUFFIX= -qt5 diff --git a/www/qupzilla-qt5/files/patch-git_ca2b5f22b b/www/qupzilla-qt5/files/patch-git_ca2b5f22b new file mode 100644 index 000000000000..ff0c0bc0f6c5 --- /dev/null +++ b/www/qupzilla-qt5/files/patch-git_ca2b5f22b @@ -0,0 +1,44 @@ +commit ca2b5f22bedec6dbfa85863e8611ac6c40f1174c +Author: David Rosca +Date: Sun Dec 3 10:13:10 2017 +0100 + + SearchToolbar: Don't set shortcuts from UI file + + Fixes build with Qt 5.10 + + Closes #2515 + +--- src/lib/webtab/searchtoolbar.cpp.orig 2015-11-11 15:13:24 UTC ++++ src/lib/webtab/searchtoolbar.cpp +@@ -35,7 +35,9 @@ SearchToolBar::SearchToolBar(WebView* view, QWidget* p + + ui->closeButton->setIcon(IconProvider::standardIcon(QStyle::SP_DialogCloseButton)); + ui->next->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowDown)); ++ ui->next->setShortcut(QKeySequence("Ctrl+G")); + ui->previous->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowUp)); ++ ui->previous->setShortcut(QKeySequence("Ctrl+Shift+G")); + + connect(ui->closeButton, SIGNAL(clicked()), this, SLOT(hide())); + connect(ui->lineEdit, SIGNAL(textChanged(QString)), this, SLOT(findNext())); +--- src/lib/webtab/searchtoolbar.ui.orig 2015-11-11 15:13:24 UTC ++++ src/lib/webtab/searchtoolbar.ui +@@ -64,9 +64,6 @@ + 0 + + +- +- Ctrl+Shift+G +- + + true + +@@ -79,9 +76,6 @@ + 0 + 0 + +- +- +- Ctrl+G + + + true