From owner-svn-ports-all@freebsd.org Fri Mar 29 16:36:47 2019 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 02C6A156E396; Fri, 29 Mar 2019 16:36:47 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9AB836D99D; Fri, 29 Mar 2019 16:36:46 +0000 (UTC) (envelope-from kai@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 7483416FE; Fri, 29 Mar 2019 16:36:46 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2TGakLJ019123; Fri, 29 Mar 2019 16:36:46 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2TGak2J019122; Fri, 29 Mar 2019 16:36:46 GMT (envelope-from kai@FreeBSD.org) Message-Id: <201903291636.x2TGak2J019122@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Fri, 29 Mar 2019 16:36:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r497168 - in head/games/anki: . files X-SVN-Group: ports-head X-SVN-Commit-Author: kai X-SVN-Commit-Paths: in head/games/anki: . files X-SVN-Commit-Revision: 497168 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9AB836D99D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.957,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Fri, 29 Mar 2019 16:36:47 -0000 Author: kai Date: Fri Mar 29 16:36:45 2019 New Revision: 497168 URL: https://svnweb.freebsd.org/changeset/ports/497168 Log: games/anki: Unbreak Unbreak since www/py-qt5-webengine is usable again since r497003. Also update the patch for aqt/qt.py to load PyQt5.QtWebChannel explicitly. Otherwise Anki will crash upon invocation. PR: 233192 Approved by: mentors (implicit) Modified: head/games/anki/Makefile head/games/anki/files/patch-aqt_qt.py Modified: head/games/anki/Makefile ============================================================================== --- head/games/anki/Makefile Fri Mar 29 16:36:03 2019 (r497167) +++ head/games/anki/Makefile Fri Mar 29 16:36:45 2019 (r497168) @@ -14,8 +14,6 @@ COMMENT= Flashcard trainer with spaced repetition LICENSE= AGPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= Depends on www/py-qt5-webengine that is still broken - RUN_DEPENDS= lame:audio/lame \ ${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ Modified: head/games/anki/files/patch-aqt_qt.py ============================================================================== --- head/games/anki/files/patch-aqt_qt.py Fri Mar 29 16:36:03 2019 (r497167) +++ head/games/anki/files/patch-aqt_qt.py Fri Mar 29 16:36:45 2019 (r497168) @@ -1,6 +1,14 @@ --- aqt/qt.py.orig 2019-03-09 22:22:42 UTC +++ aqt/qt.py -@@ -42,7 +42,7 @@ qtmajor = (QT_VERSION & 0xff0000) >> 16 +@@ -14,6 +14,7 @@ from anki.utils import isWin, isMac + from PyQt5.Qt import * + # trigger explicit message in case of missing libraries + # instead of silently failing to import ++from PyQt5.QtWebChannel import * + from PyQt5.QtWebEngineWidgets import * + try: + from PyQt5 import sip +@@ -42,7 +43,7 @@ qtmajor = (QT_VERSION & 0xff0000) >> 16 qtminor = (QT_VERSION & 0x00ff00) >> 8 qtpoint = QT_VERSION & 0xff