From ae222440a3caada33739e7257c99f3692f20cc5c Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 13 Dec 2013 14:14:30 +0200 Subject: [PATCH 1/2] Change in build dependency for deb package. Add new architecture for deb file. --HG-- branch : develop --- dist/debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/debian/control b/dist/debian/control index 9d80fa72d..bf642828a 100644 --- a/dist/debian/control +++ b/dist/debian/control @@ -2,12 +2,12 @@ Source: valentina Section: graphics Priority: optional Maintainer: Roman Telezhinsky -Build-Depends: debhelper (>= 8.0.0), qtbase5-dev (>= 5.0.0), libqt5svg5-dev (>= 5.0.0), ccache (>= 3.1.9), g++ (>= 4.6.0), qt5-default (>= 5.0.0), qttools5-dev-tools (>= 5.0.0) +Build-Depends: debhelper (>= 8.0.0), qtbase5-dev (>= 5.0.0), libqt5svg5-dev (>= 5.0.0), ccache (>= 3.1.7), g++ (>= 4.6.0), qt5-default (>= 5.0.0), qttools5-dev-tools (>= 5.0.0) Standards-Version: 3.9.4 Homepage: https://bitbucket.org/dismine/valentina Package: valentina -Architecture: i386 +Architecture: i386 amd64 Depends: ${shlibs:Depends}, ${misc:Depends} Description: Pattern making program. Open source project of creating a pattern making program, whose allow From fe2308fff8edf4b45be26d7168540760368f3729 Mon Sep 17 00:00:00 2001 From: dismine Date: Sat, 14 Dec 2013 10:51:35 +0200 Subject: [PATCH 2/2] Macros Q_DECL_NOEXCEPT_EXPR don't work in gcc 4.6, so we couldn't compile program for Ubuntu 12.04 with gcc 4.6. --HG-- branch : develop --- src/exception/vexception.h | 2 +- src/exception/vexceptionbadid.h | 2 +- src/exception/vexceptionconversionerror.h | 2 +- src/exception/vexceptionemptyparameter.h | 2 +- src/exception/vexceptionobjecterror.h | 2 +- src/exception/vexceptionuniqueid.h | 2 +- src/exception/vexceptionwrongparameterid.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/exception/vexception.h b/src/exception/vexception.h index e0624d7e0..ce58a7e27 100644 --- a/src/exception/vexception.h +++ b/src/exception/vexception.h @@ -49,7 +49,7 @@ public: * @param e exception */ VException(const VException &e):what(e.What()){} - virtual ~VException() Q_DECL_NOEXCEPT_EXPR(true){} + virtual ~VException() noexcept (true){} /** * @brief raise method raise for exception */ diff --git a/src/exception/vexceptionbadid.h b/src/exception/vexceptionbadid.h index 7facb2bc6..91a407c0c 100644 --- a/src/exception/vexceptionbadid.h +++ b/src/exception/vexceptionbadid.h @@ -57,7 +57,7 @@ public: */ VExceptionBadId(const VExceptionBadId &e) :VException(e), id(e.BadId()), key(e.BadKey()){} - virtual ~VExceptionBadId() Q_DECL_NOEXCEPT_EXPR(true){} + virtual ~VExceptionBadId() noexcept (true){} /** * @brief ErrorMessage return main error message * @return main error message diff --git a/src/exception/vexceptionconversionerror.h b/src/exception/vexceptionconversionerror.h index 6af726bf1..9f725b28f 100644 --- a/src/exception/vexceptionconversionerror.h +++ b/src/exception/vexceptionconversionerror.h @@ -49,7 +49,7 @@ public: */ VExceptionConversionError(const VExceptionConversionError &e) :VException(e), str(e.String()){} - virtual ~VExceptionConversionError() Q_DECL_NOEXCEPT_EXPR(true) {} + virtual ~VExceptionConversionError() noexcept (true) {} /** * @brief ErrorMessage return main error message * @return main error message diff --git a/src/exception/vexceptionemptyparameter.h b/src/exception/vexceptionemptyparameter.h index 5dae4b74b..b514683a9 100644 --- a/src/exception/vexceptionemptyparameter.h +++ b/src/exception/vexceptionemptyparameter.h @@ -53,7 +53,7 @@ public: VExceptionEmptyParameter(const VExceptionEmptyParameter &e) :VException(e), name(e.Name()), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){} - virtual ~VExceptionEmptyParameter() Q_DECL_NOEXCEPT_EXPR(true) {} + virtual ~VExceptionEmptyParameter() noexcept (true) {} /** * @brief ErrorMessage return main error message * @return main error message diff --git a/src/exception/vexceptionobjecterror.h b/src/exception/vexceptionobjecterror.h index 888fd4cd2..71e90329b 100644 --- a/src/exception/vexceptionobjecterror.h +++ b/src/exception/vexceptionobjecterror.h @@ -52,7 +52,7 @@ public: VExceptionObjectError(const VExceptionObjectError &e) :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()), moreInfo(e.MoreInformation()){} - virtual ~VExceptionObjectError() Q_DECL_NOEXCEPT_EXPR(true) {} + virtual ~VExceptionObjectError() noexcept (true) {} /** * @brief ErrorMessage return main error message * @return main error message diff --git a/src/exception/vexceptionuniqueid.h b/src/exception/vexceptionuniqueid.h index 9b24fab35..7e8abd569 100644 --- a/src/exception/vexceptionuniqueid.h +++ b/src/exception/vexceptionuniqueid.h @@ -51,7 +51,7 @@ public: */ VExceptionUniqueId(const VExceptionUniqueId &e) :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){} - virtual ~VExceptionUniqueId() Q_DECL_NOEXCEPT_EXPR(true){} + virtual ~VExceptionUniqueId() noexcept (true){} /** * @brief ErrorMessage return main error message * @return main error message diff --git a/src/exception/vexceptionwrongparameterid.h b/src/exception/vexceptionwrongparameterid.h index 65304c3f8..bc10495c8 100644 --- a/src/exception/vexceptionwrongparameterid.h +++ b/src/exception/vexceptionwrongparameterid.h @@ -51,7 +51,7 @@ public: */ VExceptionWrongParameterId(const VExceptionWrongParameterId &e) :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){} - virtual ~VExceptionWrongParameterId() Q_DECL_NOEXCEPT_EXPR(true){} + virtual ~VExceptionWrongParameterId() noexcept (true){} /** * @brief ErrorMessage return main error message * @return main error message