Browse Source

xap/ugene: Upgraded to ugene-34.0.

current-20200608
parent
commit
2698ad8d92
  1. 1
      xap/ugene/ugene-33.0.tar.gz.sha256
  2. 132
      xap/ugene/ugene-34.0-qpainterpath-include.patch
  3. 1
      xap/ugene/ugene-34.0.tar.gz.sha256
  4. 13
      xap/ugene/ugene.SlackBuild

1
xap/ugene/ugene-33.0.tar.gz.sha256

@ -1 +0,0 @@
61a151a9aa2aae9c843db33463d60ca4538cee3f2b5238cc7db4e7498a77e784 ugene-33.0.tar.gz

132
xap/ugene/ugene-34.0-qpainterpath-include.patch

@ -0,0 +1,132 @@
diff -Naur ugene-34.0.orig/src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp ugene-34.0/src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp
--- ugene-34.0.orig/src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp 2020-03-23 11:31:05.000000000 +0000
+++ ugene-34.0/src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp 2020-06-13 19:53:24.205679490 +0100
@@ -24,6 +24,7 @@
#include <U2Lang/Descriptor.h>
#include <QPainter>
+#include <QPainterPath>
#include <QPalette>
#include <QTextDocument>
#include <QAbstractTextDocumentLayout>
diff -Naur ugene-34.0.orig/src/corelibs/U2Gui/src/util/GUIUtils.cpp ugene-34.0/src/corelibs/U2Gui/src/util/GUIUtils.cpp
--- ugene-34.0.orig/src/corelibs/U2Gui/src/util/GUIUtils.cpp 2020-03-23 11:31:05.000000000 +0000
+++ ugene-34.0/src/corelibs/U2Gui/src/util/GUIUtils.cpp 2020-06-13 19:53:06.228392856 +0100
@@ -27,6 +27,7 @@
#include <QPainter>
#include <QProcess>
#include <QUrl>
+#include <QPainterPath>
#include <U2Core/AppContext.h>
#include <U2Core/AppSettings.h>
diff -Naur ugene-34.0.orig/src/corelibs/U2View/src/ov_msa/AlignmentLogo.h ugene-34.0/src/corelibs/U2View/src/ov_msa/AlignmentLogo.h
--- ugene-34.0.orig/src/corelibs/U2View/src/ov_msa/AlignmentLogo.h 2020-03-23 11:31:05.000000000 +0000
+++ ugene-34.0/src/corelibs/U2View/src/ov_msa/AlignmentLogo.h 2020-06-13 19:52:16.460622835 +0100
@@ -29,6 +29,7 @@
#include <QMainWindow>
#include <QGraphicsItem>
+#include <QPainterPath>
namespace U2 {
diff -Naur ugene-34.0.orig/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.h ugene-34.0/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.h
--- ugene-34.0.orig/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.h 2020-03-23 11:31:05.000000000 +0000
+++ ugene-34.0/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.h 2020-06-13 19:52:33.107872757 +0100
@@ -23,6 +23,7 @@
#define _U2_GRAPHICS_CIRCULAR_BRANCH_ITEM_H_
#include <U2Core/Task.h>
+#include <QPainterPath>
#include "GraphicsBranchItem.h"
class QGraphicsItem;
diff -Naur ugene-34.0.orig/src/corelibs/U2View/src/ov_sequence/Overview.cpp ugene-34.0/src/corelibs/U2View/src/ov_sequence/Overview.cpp
--- ugene-34.0.orig/src/corelibs/U2View/src/ov_sequence/Overview.cpp 2020-03-23 11:31:05.000000000 +0000
+++ ugene-34.0/src/corelibs/U2View/src/ov_sequence/Overview.cpp 2020-06-13 19:51:57.811344586 +0100
@@ -38,6 +38,7 @@
#include <QVBoxLayout>
#include <QToolTip>
+#include <QPainterPath>
namespace U2 {
diff -Naur ugene-34.0.orig/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.h ugene-34.0/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.h
--- ugene-34.0.orig/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.h 2020-03-23 11:31:05.000000000 +0000
+++ ugene-34.0/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.h 2020-06-13 19:51:01.330513725 +0100
@@ -28,6 +28,7 @@
#include <U2Core/AnnotationSelection.h>
#include <QPainter>
+#include <QPainterPath>
namespace U2 {
diff -Naur ugene-34.0.orig/src/plugins/circular_view/src/CircularItems.cpp ugene-34.0/src/plugins/circular_view/src/CircularItems.cpp
--- ugene-34.0.orig/src/plugins/circular_view/src/CircularItems.cpp 2020-03-23 11:31:05.000000000 +0000
+++ ugene-34.0/src/plugins/circular_view/src/CircularItems.cpp 2020-06-13 19:48:04.175017252 +0100
@@ -23,6 +23,7 @@
#include <limits>
#include <QGraphicsLineItem>
+#include <QPainterPath>
#include <U2Algorithm/GeomUtils.h>
diff -Naur ugene-34.0.orig/src/plugins/circular_view/src/CircularItems.h ugene-34.0/src/plugins/circular_view/src/CircularItems.h
--- ugene-34.0.orig/src/plugins/circular_view/src/CircularItems.h 2020-03-23 11:31:05.000000000 +0000
+++ ugene-34.0/src/plugins/circular_view/src/CircularItems.h 2020-06-13 19:48:56.656762297 +0100
@@ -24,6 +24,7 @@
#include <QFont>
#include <QGraphicsPathItem>
+#include <QPainterPath>
#include <U2Core/Annotation.h>
diff -Naur ugene-34.0.orig/src/plugins/circular_view/src/CircularView.h ugene-34.0/src/plugins/circular_view/src/CircularView.h
--- ugene-34.0.orig/src/plugins/circular_view/src/CircularView.h 2020-03-23 11:31:05.000000000 +0000
+++ ugene-34.0/src/plugins/circular_view/src/CircularView.h 2020-06-13 19:47:22.767349263 +0100
@@ -41,6 +41,7 @@
#include <QFont>
#include <QAction>
#include <QScrollBar>
+#include <QPainterPath>
namespace U2 {
diff -Naur ugene-34.0.orig/src/plugins/query_designer/src/QueryViewItems.h ugene-34.0/src/plugins/query_designer/src/QueryViewItems.h
--- ugene-34.0.orig/src/plugins/query_designer/src/QueryViewItems.h 2020-03-23 11:31:05.000000000 +0000
+++ ugene-34.0/src/plugins/query_designer/src/QueryViewItems.h 2020-06-13 19:50:29.858059029 +0100
@@ -33,6 +33,7 @@
#include <QFontMetricsF>
#include <QKeyEvent>
#include <QFlag>
+#include <QPainterPath>
#define GRID_STEP 40
diff -Naur ugene-34.0.orig/src/plugins/workflow_designer/src/ItemViewStyle.h ugene-34.0/src/plugins/workflow_designer/src/ItemViewStyle.h
--- ugene-34.0.orig/src/plugins/workflow_designer/src/ItemViewStyle.h 2020-03-23 11:31:05.000000000 +0000
+++ ugene-34.0/src/plugins/workflow_designer/src/ItemViewStyle.h 2020-06-13 19:49:20.049081604 +0100
@@ -26,6 +26,7 @@
#include <QAction>
#include <QGraphicsScene>
#include <QGraphicsItem>
+#include <QPainterPath>
class QDomElement;
diff -Naur ugene-34.0.orig/src/plugins/workflow_designer/src/WorkflowViewItems.h ugene-34.0/src/plugins/workflow_designer/src/WorkflowViewItems.h
--- ugene-34.0.orig/src/plugins/workflow_designer/src/WorkflowViewItems.h 2020-03-23 11:31:05.000000000 +0000
+++ ugene-34.0/src/plugins/workflow_designer/src/WorkflowViewItems.h 2020-06-13 19:50:05.937720134 +0100
@@ -29,6 +29,7 @@
#include <QWidget>
#include <QGraphicsScene>
#include <QGraphicsItem>
+#include <QPainterPath>
class QDomElement;

1
xap/ugene/ugene-34.0.tar.gz.sha256

@ -0,0 +1 @@
569b9997497680412e03d821c7d48903830012a65c5899a5aea3cb80e9f4ee25 ugene-34.0.tar.gz

13
xap/ugene/ugene.SlackBuild

@ -1,6 +1,6 @@
#!/bin/bash
# Build script for Slackware
# Copyright (C) 2009-2013,2015-2019 Damien Goutte-Gattat
# Copyright (C) 2009-2013,2015-2020 Damien Goutte-Gattat
#
# Redistribution and use of this script, with or without modifications,
# is permitted provided that the following conditions are met:
@ -23,12 +23,10 @@
# Contact: Damien Goutte-Gattat <dgouttegattat@incenp.org>
#
# Latest ugene sourcecode is available at: <http://ugene.unipro.ru/>.
#
# Depends: l/qt5-webkit
# Source package infos
NAMESRC=${NAMESRC:-ugene}
VERSION=${VERSION:-33.0}
VERSION=${VERSION:-34.0}
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz}
WGET=${WGET:-https://github.com/ugeneunipro/ugene/archive/$VERSION.tar.gz}
@ -80,6 +78,8 @@ cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME
# Fix missing includes
patch -p1 < $CWD/ugene-34.0-qpainterpath-include.patch
qmake-qt5 $COMP_OPTS INSTALL_MANDIR=/usr/man QMAKE_CXXFLAGS_RELEASE+=-fpermissive -r
make -j $JOBS release
make install INSTALL_ROOT=$PKG
@ -92,11 +92,6 @@ install -m 644 LICENSE.txt LICENSE.3rd_party.txt $PKG/usr/doc/$NAME
install -D -m 644 $CWD/slack-desc $PKG/install/slack-desc
install -m 755 $CWD/doinst.sh $PKG/install/doinst.sh
# Add dependency infos
cat <<EOF > $PKG/install/slack-required
qt5-webkit
EOF
# Package the tree
cd $PKG
mkdir -p $OUT

Loading…
Cancel
Save