[med-svn] [Git][med-team/libbpp-qt][master] 3 commits: New upstream version 2.4.0
Julien Y. Dutheil
gitlab at salsa.debian.org
Sat Apr 7 07:02:51 BST 2018
Julien Y. Dutheil pushed to branch master at Debian Med / libbpp-qt
Commits:
69454666 by Julien Y. Dutheil at 2018-04-07T07:38:51+02:00
New upstream version 2.4.0
- - - - -
58ac56f5 by Julien Y. Dutheil at 2018-04-07T07:38:52+02:00
Update upstream source from tag 'upstream/2.4.0'
Update to upstream version '2.4.0'
with Debian dir 306ba465b83cf4fee76cf0a9ce57c08e93da035c
- - - - -
ebef3cde by Julien Y. Dutheil at 2018-04-07T08:02:15+02:00
Drafted version 2.4.0.
- - - - -
10 changed files:
- CMakeLists.txt
- Doxyfile
- bpp-qt.spec
- debian/changelog
- debian/control
- debian/patches/unforce-cxxflags.patch
- debian/rules
- src/Bpp/Qt/QtGraphicDevice.cpp
- src/Bpp/Qt/QtGraphicDevice.h
- src/Bpp/Qt/Tree/TreeCanvas.h
Changes:
=====================================
CMakeLists.txt
=====================================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,8 +34,8 @@ ELSE(NO_DEP_CHECK)
# library implements.
# In other words, the library implements all the interface numbers in the
# range from number current - age to current.
-SET(${PROJECT_NAME}_VERSION_CURRENT "1")
-SET(${PROJECT_NAME}_VERSION_REVISION "1")
+SET(${PROJECT_NAME}_VERSION_CURRENT "2")
+SET(${PROJECT_NAME}_VERSION_REVISION "0")
SET(${PROJECT_NAME}_VERSION_AGE "0")
# Effective version number computation
@@ -52,7 +52,7 @@ if (CMAKE_INSTALL_PREFIX)
endif (CMAKE_INSTALL_PREFIX)
include (GNUInstallDirs)
-find_package (bpp-phyl 11.0.0 REQUIRED)
+find_package (bpp-phyl 12.0.0 REQUIRED)
# Find the Qt installation
#set (QT_USE_IMPORTED_TARGETS TRUE)
@@ -102,10 +102,10 @@ ENDIF(NO_DEP_CHECK)
# Packager
SET(CPACK_PACKAGE_NAME "libbpp-qt")
SET(CPACK_PACKAGE_VENDOR "Bio++ Development Team")
-SET(CPACK_PACKAGE_VERSION "2.3.1")
+SET(CPACK_PACKAGE_VERSION "2.4.0")
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-SET(CPACK_PACKAGE_VERSION_MINOR "3")
-SET(CPACK_PACKAGE_VERSION_PATCH "1")
+SET(CPACK_PACKAGE_VERSION_MINOR "4")
+SET(CPACK_PACKAGE_VERSION_PATCH "0")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The Bio++ Qt graphic library")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING.txt")
SET(CPACK_RESOURCE_FILE_AUTHORS "${CMAKE_SOURCE_DIR}/AUTHORS.txt")
@@ -114,6 +114,8 @@ SET(CPACK_SOURCE_GENERATOR "TGZ")
# /!\ This assumes that an external build is used
SET(CPACK_SOURCE_IGNORE_FILES
"/build/"
+ "/html/"
+ "/BppQt.tag"
"/\\\\.git/"
"/\\\\.gitignore"
${CPACK_SOURCE_IGNORE_FILES}
=====================================
Doxyfile
=====================================
--- a/Doxyfile
+++ b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME = bpp-qt
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 2.3.0
+PROJECT_NUMBER = 2.4.0
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
=====================================
bpp-qt.spec
=====================================
--- a/bpp-qt.spec
+++ b/bpp-qt.spec
@@ -1,57 +1,82 @@
-%define _basename bpp-qt
-%define _version 2.3.1
-%define _release 1
%define _prefix /usr
-URL: http://biopp.univ-montp2.fr/
+URL: https://github.com/BioPP/bpp-qt
-Name: %{_basename}
-Version: %{_version}
-Release: %{_release}
+Name: bpp-qt
+Version: 2.4.0
+Release: 1%{?dist}
License: CECILL-2.0
Vendor: The Bio++ Project
-Source: http://biopp.univ-montp2.fr/repos/sources/%{_basename}-%{_version}.tar.gz
+Source: %{name}-%{version}.tar.gz
Summary: Bio++ Qt graphic library
Group: Development/Libraries/C and C++
-Requires: bpp-core = %{_version}
-Requires: bpp-phyl = %{_version}
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
-Requires: qt >= 4.6.0
+Requires: bpp-core = %{version}
+Requires: bpp-phyl = %{version}
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?scientificlinux_version}
+Requires: libqt5core5 >= 5.0.0
+Requires: libqt5gui5 >= 5.0.0
+Requires: libqt5widgets5 >= 5.0.0
%endif
%if 0%{?suse_version}
-Requires: libqt4 >= 4.6.0
+Requires: libQt5Core5 >= 5.0.0
+Requires: libQt5Gui5 >= 5.0.0
+Requires: libQt5Widgets5 >= 5.0.0
%endif
-%if 0%{?mdkversion}
+%if 0%{?mageia} || 0%{?mdkversion}
%ifarch x86_64
-Requires: lib64qtgui4 >= 4.6.0
+Requires: lib64proxy-webkit >= 0.4.14
+Requires: lib64qt5core5 >= 5.0.0
+Requires: lib64qt5gui5 >= 5.0.0
+Requires: lib64qt5widgets5 >= 5.0.0
+Requires: qt5-qtdeclarative >= 5.0.0
+Requires: qt5-qtbase >= 5.0.0
%else
-Requires: libqtgui4 >= 4.6.0
+Requires: libproxy-webkit >= 0.4.14
+Requires: libqt5core5 >= 5.0.0
+Requires: libqt5gui5 >= 5.0.0
+Requires: libqt5widgets5 >= 5.0.0
+Requires: qt5-qtdeclarative >= 5.0.0
+Requires: qt5-qtbase >= 5.0.0
%endif
%endif
-BuildRoot: %{_builddir}/%{_basename}-root
+
+
+BuildRoot: %{_builddir}/%{name}-root
+
BuildRequires: cmake >= 2.8.11
BuildRequires: gcc-c++ >= 4.7.0
-BuildRequires: libbpp-core3 = %{_version}
-BuildRequires: libbpp-core-devel = %{_version}
-BuildRequires: libbpp-phyl11 = %{_version}
-BuildRequires: libbpp-phyl-devel = %{_version}
-
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
-BuildRequires: qt >= 4.6.0
-BuildRequires: qt-devel >= 4.6.0
+BuildRequires: libbpp-core4 = %{version}
+BuildRequires: libbpp-core-devel = %{version}
+BuildRequires: libbpp-phyl12 = %{version}
+BuildRequires: libbpp-phyl-devel = %{version}
+
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?scientificlinux_version}
+BuildRequires: qt5-qtdeclarative >= 5.0.0
+BuildRequires: qt5-qtbase >= 5.0.0
+BuildRequires: qt5-qtdeclarative-devel >= 5.0.0
+BuildRequires: qt5-qtbase-devel >= 5.0.0
%endif
%if 0%{?suse_version}
-BuildRequires: libqt4 >= 4.6.0
-BuildRequires: libqt4-devel >= 4.6.0
+BuildRequires: libQt5Core5 >= 5.0.0
+BuildRequires: libQt5Gui5 >= 5.0.0
+BuildRequires: libQt5Widgets5 >= 5.0.0
+BuildRequires: libqt5-qtdeclarative-devel >= 5.0.0
+BuildRequires: libqt5-qtbase-devel >= 5.0.0
%endif
-%if 0%{?mdkversion}
+%if 0%{?mageia} || 0%{?mdkversion}
%ifarch x86_64
-BuildRequires: lib64qtgui4 >= 4.6.0
-BuildRequires: lib64qt4-devel >= 4.6.0
+BuildRequires: lib64proxy-webkit >= 0.4.14
+BuildRequires: lib64qt5core5 >= 5.0.0
+BuildRequires: lib64qt5gui5 >= 5.0.0
+BuildRequires: lib64qt5widgets5 >= 5.0.0
+BuildRequires: lib64qt5base5-devel >= 5.0.0
%else
-BuildRequires: libqtgui4 >= 4.6.0
-BuildRequires: libqt4-devel >= 4.6.0
+BuildRequires: libproxy-webkit >= 0.4.14
+BuildRequires: libqt5core5 >= 5.0.0
+BuildRequires: libqt5gui5 >= 5.0.0
+BuildRequires: libqt5widgets5 >= 5.0.0
+BuildRequires: libqt5base5-devel >= 5.0.0
%endif
%endif
@@ -62,40 +87,54 @@ AutoProv: yes
This library contains graphic classes developed in Qt.
It is part of the Bio++ project.
-%package -n libbpp-qt1
+%package -n libbpp-qt2
Summary: Bio++ Qt graphic library
Group: Development/Libraries/C and C++
-%description -n libbpp-qt1
+%description -n libbpp-qt2
This library contains graphic classes developed in Qt.
It is part of the Bio++ project.
%package -n libbpp-qt-devel
Summary: Libraries, includes to develop applications with %{_basename}
Group: Development/Libraries/C and C++
-Requires: libbpp-qt1 = %{_version}
-Requires: libbpp-phyl11 = %{_version}
-Requires: libbpp-phyl-devel = %{_version}
-Requires: libbpp-core3 = %{_version}
-Requires: libbpp-core-devel = %{_version}
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
-Requires: qt >= 4.6.0
-Requires: qt-devel >= 4.6.0
+Requires: libbpp-qt2 = %{version}
+Requires: libbpp-phyl12 = %{version}
+Requires: libbpp-phyl-devel = %{version}
+Requires: libbpp-core4 = %{version}
+Requires: libbpp-core-devel = %{version}
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?scientificlinux_version}
+
+Requires: qt5-qtdeclarative >= 5.0.0
+Requires: qt5-qtbase >= 5.0.0
+Requires: qt5-qtdeclarative-devel >= 5.0.0
+Requires: qt5-qtbase-devel >= 5.0.0
%endif
%if 0%{?suse_version}
-Requires: libqt4 >= 4.6.0
-Requires: libqt4-devel >= 4.6.0
+Requires: libQt5Core5 >= 5.0.0
+Requires: libQt5Gui5 >= 5.0.0
+Requires: libQt5Widgets5 >= 5.0.0
+Requires: libqt5-qtdeclarative-devel >= 5.0.0
+Requires: libqt5-qtbase-devel >= 5.0.0
%endif
-%if 0%{?mdkversion}
+%if 0%{?mageia} || 0%{?mdkversion}
%ifarch x86_64
-Requires: lib64qtgui4 >= 4.6.0
-Requires: lib64qt4-devel >= 4.6.0
+Requires: lib64proxy-webkit >= 0.4.14
+Requires: lib64qt5core5 >= 5.0.0
+Requires: lib64qt5gui5 >= 5.0.0
+Requires: lib64qt5widgets5 >= 5.0.0
+Requires: lib64qt5base5-devel >= 5.0.0
%else
-Requires: libqtgui4 >= 4.6.0
-Requires: libqt4-devel >= 4.6.0
+Requires: libproxy-webkit >= 0.4.14
+Requires: libqt5core5 >= 5.0.0
+Requires: libqt5gui5 >= 5.0.0
+Requires: libqt5widgets5 >= 5.0.0
+Requires: libqt5base5-devel >= 5.0.0
%endif
%endif
+
+
%description -n libbpp-qt-devel
The libbpp-qt-devel package contains the header files and static libraries for
building applications which use %{_basename}.
@@ -115,11 +154,11 @@ make DESTDIR=$RPM_BUILD_ROOT install
%clean
rm -rf $RPM_BUILD_ROOT
-%post -n libbpp-qt1 -p /sbin/ldconfig
+%post -n libbpp-qt2 -p /sbin/ldconfig
-%postun -n libbpp-qt1 -p /sbin/ldconfig
+%postun -n libbpp-qt2 -p /sbin/ldconfig
-%files -n libbpp-qt1
+%files -n libbpp-qt2
%defattr(-,root,root)
%doc AUTHORS.txt COPYING.txt INSTALL.txt ChangeLog
%{_prefix}/%{_lib}/lib*.so.*
@@ -135,6 +174,10 @@ rm -rf $RPM_BUILD_ROOT
%{_prefix}/include/*
%changelog
+* Mon Feb 26 2018 Julien Dutheil <julien.dutheil at univ-montp2.fr> 2.4.0-1
+- Removed dynamic exception specifications
+- Port to Qt5
+- Increased interface number
* Tue Jun 06 2017 Julien Dutheil <julien.dutheil at univ-montp2.fr> 2.3.1-1
- Increased interface number
* Wed May 10 2017 Julien Dutheil <julien.dutheil at univ-montp2.fr> 2.3.0-1
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
-libbpp-qt (2.3.2-2) UNRELEASED; urgency=medium
+libbpp-qt (2.4.0-1) UNRELEASED; urgency=medium
+ [ Andreas Tille ]
* Provide full license text of CeCILL license
+ [ Julien Y. Dutheil ]
+ * New upstream version
+ * Removed unnecessary override
+
-- Andreas Tille <tille at debian.org> Fri, 06 Apr 2018 07:56:23 +0200
libbpp-qt (2.3.2-1) unstable; urgency=medium
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 11~),
d-shlibs (>= 0.80),
qt5-qmake,
qtdeclarative5-dev,
- libbpp-phyl-dev (>= 2.3.2)
+ libbpp-phyl-dev (>= 2.4.0)
Standards-Version: 4.1.3
Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libbpp-qt.git
Vcs-Git: https://anonscm.debian.org/git/debian-med/libbpp-qt.git
@@ -18,9 +18,9 @@ Homepage: http://biopp.univ-montp2.fr/wiki/index.php/Main_Page
Package: libbpp-qt-dev
Architecture: any
Section: libdevel
-Depends: libbpp-qt1 (= ${binary:Version}),
+Depends: libbpp-qt2 (= ${binary:Version}),
${misc:Depends},
- libbpp-phyl-dev (>= 2.3.2),
+ libbpp-phyl-dev (>= 2.4.0),
qtdeclarative5-dev
Description: Bio++ Qt Graphic classes library development files
Bio++ is a set of C++ libraries for Bioinformatics, including sequence
@@ -32,7 +32,7 @@ Description: Bio++ Qt Graphic classes library development files
Contains development files of the Bio++ graphical classes developed
with Qt.
-Package: libbpp-qt1
+Package: libbpp-qt2
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
=====================================
debian/patches/unforce-cxxflags.patch
=====================================
--- a/debian/patches/unforce-cxxflags.patch
+++ b/debian/patches/unforce-cxxflags.patch
@@ -11,7 +11,7 @@ Comment: Upstream version 2.3.0 now has additional -std=c++11 which might
# Compile options
-set (CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wshadow -Wconversion")
-+set (CMAKE_CXX_FLAGS "-std=c++11 -Wno-deprecated -g")
++#set (CMAKE_CXX_FLAGS "-std=c++11 -g")
IF(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,8 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+CMAKE_EXTRA_FLAGS += -DBUILD_TESTING=OFF
+
%:
dh $@
@@ -12,9 +14,6 @@ override_dh_install:
d-shlibmove --commit \
--multiarch \
--devunversioned \
- --override s/libQt5Core5-dev/qtdeclarative5-dev/ \
- --override s/libQt5Gui5-dev/qtdeclarative5-dev/ \
- --override s/libQt5Widgets5-dev/qtdeclarative5-dev/ \
--exclude-la \
--movedev debian/tmp/usr/include/* usr/include \
--movedev debian/tmp/usr/lib/*/cmake usr/lib/$(DEB_HOST_MULTIARCH) \
=====================================
src/Bpp/Qt/QtGraphicDevice.cpp
=====================================
--- a/src/Bpp/Qt/QtGraphicDevice.cpp
+++ b/src/Bpp/Qt/QtGraphicDevice.cpp
@@ -66,7 +66,7 @@ QtGraphicDevice::QtGraphicDevice() :
QtGraphicDevice::~QtGraphicDevice() {}
-void QtGraphicDevice::begin() throw (Exception)
+void QtGraphicDevice::begin()
{
scene_.reset(new QGraphicsScene());
}
@@ -99,7 +99,7 @@ void QtGraphicDevice::setCurrentPointSize(unsigned int size)
currentPen_.setWidth(static_cast<int>(size));
}
-void QtGraphicDevice::setCurrentLineType(short type) throw (Exception)
+void QtGraphicDevice::setCurrentLineType(short type)
{
AbstractGraphicDevice::setCurrentLineType(type);
currentPen_.setStyle(supportedLineTypes_[type]);
@@ -128,7 +128,7 @@ void QtGraphicDevice::drawCircle(double x, double y, double radius, short fill)
}
-void QtGraphicDevice::drawText(double x, double y, const std::string& text, short hpos, short vpos, double angle) throw (UnvalidFlagException)
+void QtGraphicDevice::drawText(double x, double y, const std::string& text, short hpos, short vpos, double angle)
{
qreal xset = 0, yset = 0;
QString qtext = text.c_str();
=====================================
src/Bpp/Qt/QtGraphicDevice.h
=====================================
--- a/src/Bpp/Qt/QtGraphicDevice.h
+++ b/src/Bpp/Qt/QtGraphicDevice.h
@@ -88,19 +88,19 @@ class QtGraphicDevice:
public:
QGraphicsScene& getScene() { return *scene_; }
- void begin() throw (Exception);
+ void begin();
void end();
void setCurrentForegroundColor(const RGBColor& color);
void setCurrentBackgroundColor(const RGBColor& color);
void setCurrentFont(const Font& font);
void setCurrentPointSize(unsigned int size);
- void setCurrentLineType(short type) throw (Exception);
+ void setCurrentLineType(short type);
void drawLine(double x1, double y1, double x2, double y2);
void drawRect(double x, double y, double width, double height, short fill = FILL_EMPTY);
void drawCircle(double x, double y, double radius, short fill = FILL_EMPTY);
- void drawText(double x, double y, const std::string& text, short hpos = TEXT_HORIZONTAL_LEFT, short vpos = TEXT_VERTICAL_BOTTOM, double angle = 0) throw (UnvalidFlagException);
+ void drawText(double x, double y, const std::string& text, short hpos = TEXT_HORIZONTAL_LEFT, short vpos = TEXT_VERTICAL_BOTTOM, double angle = 0);
void comment(const std::string& comment) {}
=====================================
src/Bpp/Qt/Tree/TreeCanvas.h
=====================================
--- a/src/Bpp/Qt/Tree/TreeCanvas.h
+++ b/src/Bpp/Qt/Tree/TreeCanvas.h
@@ -77,7 +77,7 @@ class NodeMouseEvent:
bool hasNodeId() const { return hasNode_; }
- int getNodeId() const throw (NodeNotFoundException)
+ int getNodeId() const
{
if (!hasNode_)
throw NodeNotFoundException("NodeMouseEvent::getNodeId().", "");
@@ -148,7 +148,7 @@ class TreeCanvas:
virtual unsigned int drawingWidth() const { return drawingWidth_; }
virtual unsigned int drawingHeight() const { return drawingHeight_; }
- void collapseNode(int nodeId, bool tf) throw (NodeNotFoundException)
+ void collapseNode(int nodeId, bool tf)
{
if (!currentTree_) return;
if (!currentTree_->hasNode(nodeId))
@@ -158,7 +158,7 @@ class TreeCanvas:
nodeCollapsed_[nodeId] = tf;
}
- bool isNodeCollapsed(int nodeId) const throw (NodeNotFoundException)
+ bool isNodeCollapsed(int nodeId) const
{
if (!currentTree_) return false;
if (!currentTree_->hasNode(nodeId))
View it on GitLab: https://salsa.debian.org/med-team/libbpp-qt/compare/c1c3aff413dc02629f18defc7bbdb3e654b74522...ebef3cde7252b904992f30a165ac9e2f72472241
---
View it on GitLab: https://salsa.debian.org/med-team/libbpp-qt/compare/c1c3aff413dc02629f18defc7bbdb3e654b74522...ebef3cde7252b904992f30a165ac9e2f72472241
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180407/888b6711/attachment-0001.html>
More information about the debian-med-commit
mailing list