From owner-svn-ports-all@freebsd.org Tue Jun 19 10:18:21 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 B51BA100DAA9; Tue, 19 Jun 2018 10:18:20 +0000 (UTC) (envelope-from novel@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 627A278131; Tue, 19 Jun 2018 10:18:20 +0000 (UTC) (envelope-from novel@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 43AA112215; Tue, 19 Jun 2018 10:18:20 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5JAIKL9088211; Tue, 19 Jun 2018 10:18:20 GMT (envelope-from novel@FreeBSD.org) Received: (from novel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5JAIJZW088209; Tue, 19 Jun 2018 10:18:19 GMT (envelope-from novel@FreeBSD.org) Message-Id: <201806191018.w5JAIJZW088209@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: novel set sender to novel@FreeBSD.org using -f From: Roman Bogorodskiy Date: Tue, 19 Jun 2018 10:18:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472780 - in head/www/qutebrowser: . files X-SVN-Group: ports-head X-SVN-Commit-Author: novel X-SVN-Commit-Paths: in head/www/qutebrowser: . files X-SVN-Commit-Revision: 472780 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, 19 Jun 2018 10:18:21 -0000 Author: novel Date: Tue Jun 19 10:18:19 2018 New Revision: 472780 URL: https://svnweb.freebsd.org/changeset/ports/472780 Log: www/qutebrowser: add workaround for missing PyQt5.QtQuickWidgets Currently there's no port that provides PyQt5.QtQuickWidgets which is used by qutebrowser. It's used only in a single place, so roll back the commit that added it. PR: 229123 Reported by: serpent7776@gmail.com Added: head/www/qutebrowser/files/ head/www/qutebrowser/files/patch-qutebrowser_browser_webengine_webview.py (contents, props changed) Modified: head/www/qutebrowser/Makefile Modified: head/www/qutebrowser/Makefile ============================================================================== --- head/www/qutebrowser/Makefile Tue Jun 19 09:54:47 2018 (r472779) +++ head/www/qutebrowser/Makefile Tue Jun 19 10:18:19 2018 (r472780) @@ -2,6 +2,7 @@ PORTNAME= qutebrowser DISTVERSION= 1.3.2 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= CHEESESHOP Added: head/www/qutebrowser/files/patch-qutebrowser_browser_webengine_webview.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/qutebrowser/files/patch-qutebrowser_browser_webengine_webview.py Tue Jun 19 10:18:19 2018 (r472780) @@ -0,0 +1,24 @@ +--- qutebrowser/browser/webengine/webview.py.orig 2018-06-10 13:42:47 UTC ++++ qutebrowser/browser/webengine/webview.py +@@ -24,7 +24,6 @@ import functools + import sip + from PyQt5.QtCore import pyqtSignal, pyqtSlot, QUrl, PYQT_VERSION + from PyQt5.QtGui import QPalette +-from PyQt5.QtQuickWidgets import QQuickWidget + from PyQt5.QtWebEngineWidgets import (QWebEngineView, QWebEnginePage, + QWebEngineScript) + +@@ -72,9 +71,10 @@ class WebEngineView(QWebEngineView): + if proxy is not None: + return proxy + +- # This should only find the RenderWidgetHostViewQtDelegateWidget, +- # but not e.g. a QMenu +- children = self.findChildren(QQuickWidget) ++ # We don't want e.g. a QMenu. ++ rwhv_class = 'QtWebEngineCore::RenderWidgetHostViewQtDelegateWidget' ++ children = [child for child in self.findChildren(QWidget) ++ if child.inherits(rwhv_class)] + + if not children: + return None