From e378d9b888a8e3ef82eee532fe79a3a6b3f8b5a7 Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 9 Dec 2013 18:30:08 +0200 Subject: [PATCH 1/5] Fix valentina.desktop --HG-- branch : develop --- dist/valentina.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/valentina.desktop b/dist/valentina.desktop index b752430eb..79f109d82 100644 --- a/dist/valentina.desktop +++ b/dist/valentina.desktop @@ -5,6 +5,6 @@ GenericName=Pattern making program Comment=Open source project of creating a pattern making program, whose allow create and modeling patterns of clothing Icon=valentina Exec=valentina -Categories=Qt;Graphics; -Version=0.2 +Categories=Graphics;VectorGraphics;2DGraphics; +Version=1.0 Name[uk]=valentina From b07c9fbffcc0c69314d33ea1f68e306b741abf58 Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 11 Dec 2013 12:37:27 +0200 Subject: [PATCH 2/5] Spec file for project. --HG-- branch : develop --- dist/rpm/valentina.spec | 69 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 dist/rpm/valentina.spec diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec new file mode 100644 index 000000000..736bd8fe9 --- /dev/null +++ b/dist/rpm/valentina.spec @@ -0,0 +1,69 @@ +Name:valentina + +# Fedora specifics +%if 0%{?fedora_version} > 0 || 0%{?rhel_version} > 0 || 0%{?centos_version} > 0 +BuildRequires: pkgconfig(Qt5Core) libqt5-qttools >= 5.0.0 libQtSvg-devel >= 5.0.0 ccache +%endif + +# SUSE Specifics +%if 0%{?suse_version} > 0 +BuildRequires: libqt5-qtbase-devel >= 5.0.0 libqt5-qttools >= 5.0.0 libQt5Svg-devel >= 5.0.0 ccache update-desktop-files +%endif + +Version: 0.2.1 +Release: 1 +URL: https://bitbucket.org/dismine/valentina +License: GPL-3.0+ +Source0: %{name}-%{version}.tar.gz +Group: Graphics +Summary: Pattern Making Application +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Packager: Roman Telezhinsky + +%description +Open source project of creating a pattern making program, whose allow +create and modeling patterns of clothing. + +%prep +%setup -q -n %{name}-%{version} + +%build +qmake-qt5 +%{__make} %{?jobs:-j %jobs} + +%install +mkdir -p $RPM_BUILD_ROOT/usr/{bin,share} +mkdir -p $RPM_BUILD_ROOT/usr/share/%{name}/translations +%{__install} -Dm 755 -s bin/%{name} %{buildroot}%{_bindir}/%{name} +%{__install} -Dm 644 dist/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop +%{__install} -Dm 644 dist/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png +%{__install} -Dm 644 dist/%{name}.1.gz %{buildroot}%{_mandir}/man1/%{name}.1.gz +%{__install} -Dm 644 share/translations/valentina_uk.qm %{buildroot}%{_datadir}/%{name}/translations/valentina_uk.qm +%{__install} -Dm 644 share/translations/valentina_ru.qm %{buildroot}%{_datadir}/%{name}/translations/valentina_ru.qm +%if 0%{?suse_version} > 0 +%suse_update_desktop_file -r %{name} VectorGraphics +%endif + +%clean +[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc README LICENSE +%doc %{_mandir}/man1/%{name}.1.gz +%{_bindir}/* +%{_datadir}/applications/%{name}.desktop +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/%{name}/translations/valentina_uk.qm +%{_datadir}/%{name}/translations/valentina_ru.qm +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/translations + + +%changelog +* Mon Dec 9 2013 Roman Telezhinsky + - Initial build + + + From ae222440a3caada33739e7257c99f3692f20cc5c Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 13 Dec 2013 14:14:30 +0200 Subject: [PATCH 3/5] 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 4/5] 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 From 3f55cb8a2d897cb8aad028129c003e96ef35771b Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 11 Feb 2014 08:38:56 +0200 Subject: [PATCH 5/5] Prepare for release v0.2.2. --HG-- branch : develop --- ChangeLog | 6 ++++++ dist/debian/changelog | 2 +- dist/debian/control | 2 +- dist/rpm/valentina.spec | 2 +- dist/valentina.nsi | 2 +- src/version.h | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e376ebce..18b2a5113 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +# Version 0.2.2 Released February 11, 2014 +- Macros Q_DECL_NOEXCEPT_EXPR don't work in gcc 4.6. +- Change in build dependency for deb package. Add new architecture for deb file. +- Added spec file for rpm package. +- Fix valentina.desktop. + # Version 0.2.1 Released December 8, 2013 - Problem with compilation in console in Ubuntu. - Problem with compilation on windows with msvc. diff --git a/dist/debian/changelog b/dist/debian/changelog index dec65916b..06d0d7f98 100644 --- a/dist/debian/changelog +++ b/dist/debian/changelog @@ -1,4 +1,4 @@ -valentina (0.2+1hg20131126-ppa1-3) saucy; urgency=low +valentina (0.2.2) saucy; urgency=low * Add new dependions qttools5-dev-tools diff --git a/dist/debian/control b/dist/debian/control index bf642828a..3ca5aada7 100644 --- a/dist/debian/control +++ b/dist/debian/control @@ -2,7 +2,7 @@ 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.7), 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, 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 diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index 736bd8fe9..39e13ab9e 100644 --- a/dist/rpm/valentina.spec +++ b/dist/rpm/valentina.spec @@ -10,7 +10,7 @@ BuildRequires: pkgconfig(Qt5Core) libqt5-qttools >= 5.0.0 libQtSvg-devel >= 5.0 BuildRequires: libqt5-qtbase-devel >= 5.0.0 libqt5-qttools >= 5.0.0 libQt5Svg-devel >= 5.0.0 ccache update-desktop-files %endif -Version: 0.2.1 +Version: 0.2.2 Release: 1 URL: https://bitbucket.org/dismine/valentina License: GPL-3.0+ diff --git a/dist/valentina.nsi b/dist/valentina.nsi index 96d91c792..657ee900c 100644 --- a/dist/valentina.nsi +++ b/dist/valentina.nsi @@ -4,7 +4,7 @@ !define MUI_PRODUCT "Valentina" !define MUI_FILE "valentina" - !define MUI_VERSION "0.2" + !define MUI_VERSION "0.2.2" !define MUI_BRANDINGTEXT "Valentina ${MUI_VERSION}" CRCCheck On diff --git a/src/version.h b/src/version.h index 237f0912b..e4a035cfd 100644 --- a/src/version.h +++ b/src/version.h @@ -33,7 +33,7 @@ extern const int MAJOR_VERSION = 0; extern const int MINOR_VERSION = 2; -extern const int DEBUG_VERSION = 1; +extern const int DEBUG_VERSION = 2; extern const QString APP_VERSION(QStringLiteral("%1.%2.%3").arg(MAJOR_VERSION).arg(MINOR_VERSION).arg(DEBUG_VERSION)); extern const QString WARRANTY("The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE "