svn commit: r470045 - in head/biology/ugene: . files

Raphael Kubo da Costa rakuco at FreeBSD.org
Tue May 15 18:51:53 UTC 2018


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 <kevin.kofler at chello.at>
+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 @@
+             <property name="text">
+              <string>Disallow gaps (--gbar)</string>
+             </property>
+-            <property name="shortcut">
+-             <string notr="true"/>
+-            </property>
+            </widget>
+           </item>
+          </layout>


More information about the svn-ports-head mailing list