From owner-svn-ports-all@freebsd.org Tue May 15 11:56:40 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A5EBDEB0D7C; Tue, 15 May 2018 11:56:40 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1D477173; Tue, 15 May 2018 11:56:40 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1064D2D0A; Tue, 15 May 2018 11:56:40 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4FBudcK015816; Tue, 15 May 2018 11:56:39 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4FBudw0015815; Tue, 15 May 2018 11:56:39 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201805151156.w4FBudw0015815@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Tue, 15 May 2018 11:56:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470012 - in head/www/qupzilla-qt5: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rakuco X-SVN-Commit-Paths: in head/www/qupzilla-qt5: . files X-SVN-Commit-Revision: 470012 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2018 11:56:40 -0000 Author: rakuco Date: Tue May 15 11:56:39 2018 New Revision: 470012 URL: https://svnweb.freebsd.org/changeset/ports/470012 Log: 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 Added: head/www/qupzilla-qt5/files/patch-git_ca2b5f22b (contents, props changed) Modified: head/www/qupzilla-qt5/Makefile Modified: head/www/qupzilla-qt5/Makefile ============================================================================== --- head/www/qupzilla-qt5/Makefile Tue May 15 11:18:08 2018 (r470011) +++ head/www/qupzilla-qt5/Makefile Tue May 15 11:56:39 2018 (r470012) @@ -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 Added: head/www/qupzilla-qt5/files/patch-git_ca2b5f22b ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/qupzilla-qt5/files/patch-git_ca2b5f22b Tue May 15 11:56:39 2018 (r470012) @@ -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