aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with develop

Browse Source
This commit is contained in:
dismine 2014-02-11 08:41:27 +02:00
commit e594054191
14 changed files with 89 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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.

2
dist/debian/changelog vendored
View File

@ -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

4
dist/debian/control vendored
View File

@ -2,12 +2,12 @@ Source: valentina
Section: graphics
Priority: optional
Maintainer: Roman Telezhinsky <dismine@gmail.com>
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, 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

69
dist/rpm/valentina.spec vendored Normal file
View File

@ -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.2
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 <dismine@gmail.com>
%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

4
dist/valentina.desktop vendored
View File

@ -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

2
dist/valentina.nsi vendored
View File

@ -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

2
src/exception/vexception.h
View File

@ -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
*/

2
src/exception/vexceptionbadid.h
View File

@ -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

2
src/exception/vexceptionconversionerror.h
View File

@ -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

2
src/exception/vexceptionemptyparameter.h
View File

@ -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

2
src/exception/vexceptionobjecterror.h
View File

@ -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

2
src/exception/vexceptionuniqueid.h
View File

@ -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

2
src/exception/vexceptionwrongparameterid.h
View File

@ -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

2
src/version.h
View File

@ -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 "