From owner-svn-ports-all@freebsd.org Tue May 15 18:51:52 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 BD4A6EEFACF; Tue, 15 May 2018 18:51:52 +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 6CB9C745FF; Tue, 15 May 2018 18:51:52 +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 4F12A75EE; Tue, 15 May 2018 18:51:52 +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 w4FIpqDn029134; Tue, 15 May 2018 18:51:52 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4FIppwd029133; Tue, 15 May 2018 18:51:51 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201805151851.w4FIppwd029133@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 18:51:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470045 - in head/biology/ugene: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rakuco X-SVN-Commit-Paths: in head/biology/ugene: . files X-SVN-Commit-Revision: 470045 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 18:51:53 -0000 Author: rakuco Date: Tue May 15 18:51:51 2018 New Revision: 470045 URL: https://svnweb.freebsd.org/changeset/ports/470045 Log: Add upstream patch to fix the build with Qt 5.10. _tmp/ui/ui_Bowtie2Settings.h:189:35: error: no viable conversion from 'QLatin1String' to 'const QKeySequence' gbarCheckBox->setShortcut(QLatin1String("")); ^~~~~~~~~~~~~~~~~ PR: 228213 Added: head/biology/ugene/files/patch-git_279756e4 (contents, props changed) Modified: head/biology/ugene/Makefile Modified: head/biology/ugene/Makefile ============================================================================== --- head/biology/ugene/Makefile Tue May 15 18:40:40 2018 (r470044) +++ head/biology/ugene/Makefile Tue May 15 18:51:51 2018 (r470045) @@ -3,7 +3,7 @@ PORTNAME= ugene DISTVERSION= 1.22.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= biology science MASTER_SITES= http://ugene.unipro.ru/downloads/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} QueryDesigner_UserManual.pdf \ Added: head/biology/ugene/files/patch-git_279756e4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/ugene/files/patch-git_279756e4 Tue May 15 18:51:51 2018 (r470045) @@ -0,0 +1,30 @@ +From 279756e448f53af5a495a2ce3a12abdf833fc703 Mon Sep 17 00:00:00 2001 +From: Kevin Kofler +Date: Tue, 2 Jan 2018 22:21:03 +0100 +Subject: [PATCH] Fix build against Qt 5.10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +src/plugins/external_tool_support/src/bowtie2/Bowtie2Settings.ui: Remove +shortcut setting that breaks the build with Qt 5.10. + +UGENE can be built with Qt ≥ 5.6 and a separate QtWebKit. With Qt 5.10, +we were hitting a build error: uic was producing code that did not +compile. +--- + src/plugins/external_tool_support/src/bowtie2/Bowtie2Settings.ui | 3 --- + 1 file changed, 3 deletions(-) + +--- src/plugins/external_tool_support/src/ui/Bowtie2Settings.ui ++++ src/plugins/external_tool_support/src/ui/Bowtie2Settings.ui +@@ -254,9 +254,6 @@ + + Disallow gaps (--gbar) + +- +- +- + + +