* [gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/, media-gfx/valentina/files/
@ 2016-02-18 17:58 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2016-02-18 17:58 UTC (permalink / raw
To: gentoo-commits
commit: f6d9becf7de6e4345543d98d9badea17043a2963
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 17:58:42 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 17:58:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6d9becf
media-gfx/valentina: new package
Package-Manager: portage-2.2.27
media-gfx/valentina/Manifest | 1 +
media-gfx/valentina/files/locales.patch | 48 +++++++++++++++++++++++++
media-gfx/valentina/metadata.xml | 8 +++++
media-gfx/valentina/valentina-0.4.2.ebuild | 58 ++++++++++++++++++++++++++++++
media-gfx/valentina/valentina-9999.ebuild | 53 +++++++++++++++++++++++++++
5 files changed, 168 insertions(+)
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
new file mode 100644
index 0000000..dd83a30
--- /dev/null
+++ b/media-gfx/valentina/Manifest
@@ -0,0 +1 @@
+DIST valentina-0.4.2.zip 21431337 SHA256 7d80d7cf49250cc48f7ae791e1ee3a8de2216f818fe100b883302099d984de05 SHA512 e04615fe0d79e8d0adebaea1808ee123d979babcd9f9320e897921aeda811ece37aff20575fb4bc033f21a91b498f409dbf1a4b8999e8b3c841c2f842ce41263 WHIRLPOOL 59714a19dee39cadc86f5542e52b4424fd7724bbbf5c9e3f6f33ebc48c313bc2b7c5f3f11f82b660f9a2619d05e76bc91f65201c95ae1473efaa540e132020d9
diff --git a/media-gfx/valentina/files/locales.patch b/media-gfx/valentina/files/locales.patch
new file mode 100644
index 0000000..a908462
--- /dev/null
+++ b/media-gfx/valentina/files/locales.patch
@@ -0,0 +1,48 @@
+diff --git a/src/app/translations.pri b/src/app/translations.pri
+index b2dd2c4..87c55f7 100755
+--- a/src/app/translations.pri
++++ b/src/app/translations.pri
+@@ -9,22 +9,27 @@ PMSYSTEMS += \
+ p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 p16 p17 p18 p19 p20 p21 p22 p23 p24 p25 p26 p27 p28 p29 p30 \
+ p31 p32 p33 p34 p35 p36 p37 p38 p39 p40 p41 p42 p43 p44 p45 p46 p47 p48 p49 p50 p51 p52 p53 p54 p998
+
+-LANGUAGES += \
+- ru_RU \
+- uk_UA \
+- de_DE \
+- cs_CZ \
+- he_IL \
+- fr_FR \
+- it_IT \
+- nl_NL \
+- id_ID \
+- es_ES \
+- fi_FI \
+- en_US \
+- en_CA \
+- en_IN \
+- ro_RO
++isEmpty(LOCALES){
++ LANGUAGES += \
++ ru_RU \
++ uk_UA \
++ de_DE \
++ cs_CZ \
++ he_IL \
++ fr_FR \
++ it_IT \
++ nl_NL \
++ id_ID \
++ es_ES \
++ fi_FI \
++ en_US \
++ en_CA \
++ en_IN \
++ ro_RO \
++ zh_CN
++ } else {
++ LANGUAGES = $${LOCALES}
++ }
+
+ for(lang, LANGUAGES) {
+ INSTALL_TRANSLATIONS += $${TRANSLATIONS_PATH}/valentina_$${lang}.qm
diff --git a/media-gfx/valentina/metadata.xml b/media-gfx/valentina/metadata.xml
new file mode 100644
index 0000000..7208ccb
--- /dev/null
+++ b/media-gfx/valentina/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>fordfrog@gentoo.org</email>
+ <name>Miroslav Šulc</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-gfx/valentina/valentina-0.4.2.ebuild b/media-gfx/valentina/valentina-0.4.2.ebuild
new file mode 100644
index 0000000..a82b3f1
--- /dev/null
+++ b/media-gfx/valentina/valentina-0.4.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils
+
+DESCRIPTION="Cloth patternmaking software"
+HOMEPAGE="http://valentinaproject.bitbucket.org/"
+SRC_URI="https://bitbucket.org/dismine/valentina/get/v0.4.2.zip -> ${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# en_IN not supported in Gentoo so not added here
+LANGS="cs_CZ de_DE en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL ro_RO ru_RU uk_UA zh_CN"
+
+for LANG in ${LANGS}; do
+ IUSE="${IUSE} linguas_${LANG}"
+done
+
+CDEPEND="
+ app-text/poppler
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ dev-qt/qtxmlpatterns:5"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+ app-arch/unzip"
+
+S=${WORKDIR}/dismine-${PN}-44d43351cb59
+
+src_prepare() {
+ epatch "${FILESDIR}/locales.patch"
+}
+
+src_configure() {
+ local locales=""
+
+ for LANG in ${LANGS}; do
+ if use linguas_${LANG}; then
+ locales="${locales} ${LANG}"
+ fi
+ done
+
+ eqmake5 LOCALES="${locales}" CONFIG+=no_ccache Valentina.pro -r
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+}
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
new file mode 100644
index 0000000..bb08d8f
--- /dev/null
+++ b/media-gfx/valentina/valentina-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit mercurial qmake-utils
+
+DESCRIPTION="Cloth patternmaking software"
+HOMEPAGE="http://valentinaproject.bitbucket.org/"
+SRC_URI=""
+EHG_REPO_URI="https://bitbucket.org/dismine/valentina"
+EHG_REVISION="develop"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# en_IN not supported in Gentoo so not added here
+LANGS="cs_CZ de_DE en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL ro_RO ru_RU uk_UA zh_CN"
+
+for LANG in ${LANGS}; do
+ IUSE="${IUSE} linguas_${LANG}"
+done
+
+CDEPEND="
+ app-text/poppler
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ dev-qt/qtxmlpatterns:5"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+src_configure() {
+ local locales=""
+
+ for LANG in ${LANGS}; do
+ if use linguas_${LANG}; then
+ locales="${locales} ${LANG}"
+ fi
+ done
+
+ eqmake5 LOCALES="${locales}" CONFIG+=no_ccache Valentina.pro -r
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/, media-gfx/valentina/files/
@ 2016-02-19 21:28 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2016-02-19 21:28 UTC (permalink / raw
To: gentoo-commits
commit: 01f80d5ee8e1764bd76ee1f07c2a8fbfa0af7f38
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 21:04:08 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 21:28:24 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01f80d5e
media-gfx/valentina: disabled compilation of tests
Package-Manager: portage-2.2.27
.../files/disable-tests-compilation.patch | 35 ++++++++++++++++++++++
media-gfx/valentina/valentina-0.4.2-r3.ebuild | 5 ++--
media-gfx/valentina/valentina-9999.ebuild | 2 +-
3 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/media-gfx/valentina/files/disable-tests-compilation.patch b/media-gfx/valentina/files/disable-tests-compilation.patch
new file mode 100644
index 0000000..a819a02
--- /dev/null
+++ b/media-gfx/valentina/files/disable-tests-compilation.patch
@@ -0,0 +1,35 @@
+# HG changeset patch
+# User Roman Telezhynskyi <kroluku@gmail.com>
+# Date 1455906661 -7200
+# Branch develop
+# Node ID 8edb1b0f161a5f472a0e6a8a8b5b8a1ae7cf33c5
+# Parent 42a73e7a17757ce9d12e16f616a41f52efdf4b91
+CONFIG key to disable building tests.
+
+diff --git a/src/src.pro b/src/src.pro
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -1,8 +1,17 @@
+ TEMPLATE = subdirs
+-SUBDIRS = \
+- libs \
+- app \
+- test
+
+-app.depends = libs
+-test.depends = libs
++noTests{ # For enable run qmake with CONFIG+=noTests
++ SUBDIRS = \
++ libs \
++ app
++
++} else {
++ SUBDIRS = \
++ libs \
++ app \
++ test
++
++ test.depends = libs
++}
++
++app.depends = libs
diff --git a/media-gfx/valentina/valentina-0.4.2-r3.ebuild b/media-gfx/valentina/valentina-0.4.2-r3.ebuild
index 30affd1..cb70b61 100644
--- a/media-gfx/valentina/valentina-0.4.2-r3.ebuild
+++ b/media-gfx/valentina/valentina-0.4.2-r3.ebuild
@@ -40,7 +40,8 @@ S=${WORKDIR}/dismine-${PN}-44d43351cb59
src_prepare() {
epatch "${FILESDIR}/locales.patch" \
- "${FILESDIR}/fix-insecure-runpaths.patch"
+ "${FILESDIR}/fix-insecure-runpaths.patch" \
+ "${FILESDIR}/disable-tests-compilation.patch"
}
src_configure() {
@@ -52,7 +53,7 @@ src_configure() {
fi
done
- eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r
+ eqmake5 LOCALES="${locales}" "CONFIG+=noStripDebugSymbols no_ccache noRunPath noTests" Valentina.pro -r
}
src_install() {
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
index 70fd441..3ce700b 100644
--- a/media-gfx/valentina/valentina-9999.ebuild
+++ b/media-gfx/valentina/valentina-9999.ebuild
@@ -46,7 +46,7 @@ src_configure() {
fi
done
- eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r
+ eqmake5 LOCALES="${locales}" "CONFIG+=noStripDebugSymbols no_ccache noRunPath noTests" Valentina.pro -r
}
src_install() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/, media-gfx/valentina/files/
@ 2017-10-23 17:42 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2017-10-23 17:42 UTC (permalink / raw
To: gentoo-commits
commit: 17516adb95147f7c975fb2f11ae708d922ca17bf
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 23 17:41:20 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Oct 23 17:41:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17516adb
media-gfx/valentina: fixed repoman warnings, improved the ebuilds, fixed sources and homepages
Package-Manager: Portage-2.3.12, Repoman-2.3.3
...on.patch => 0.5.0-disable-tests-compilation.patch} | 0
...npaths.patch => 0.5.0-fix-insecure-runpaths.patch} | 0
.../files/{locales.patch => 0.5.0-locales.patch} | 0
...lentina-0.5.0.ebuild => valentina-0.5.0-r1.ebuild} | 19 ++++++++++---------
media-gfx/valentina/valentina-9999.ebuild | 14 +++++++-------
5 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/media-gfx/valentina/files/disable-tests-compilation.patch b/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch
similarity index 100%
rename from media-gfx/valentina/files/disable-tests-compilation.patch
rename to media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch
diff --git a/media-gfx/valentina/files/fix-insecure-runpaths.patch b/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch
similarity index 100%
rename from media-gfx/valentina/files/fix-insecure-runpaths.patch
rename to media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch
diff --git a/media-gfx/valentina/files/locales.patch b/media-gfx/valentina/files/0.5.0-locales.patch
similarity index 100%
rename from media-gfx/valentina/files/locales.patch
rename to media-gfx/valentina/files/0.5.0-locales.patch
diff --git a/media-gfx/valentina/valentina-0.5.0.ebuild b/media-gfx/valentina/valentina-0.5.0-r1.ebuild
similarity index 69%
rename from media-gfx/valentina/valentina-0.5.0.ebuild
rename to media-gfx/valentina/valentina-0.5.0-r1.ebuild
index 172cf895fa3..96dceba5eb9 100644
--- a/media-gfx/valentina/valentina-0.5.0.ebuild
+++ b/media-gfx/valentina/valentina-0.5.0-r1.ebuild
@@ -3,11 +3,11 @@
EAPI=6
-inherit epatch qmake-utils gnome2-utils fdo-mime
+inherit epatch qmake-utils gnome2-utils xdg-utils
DESCRIPTION="Cloth patternmaking software"
-HOMEPAGE="http://valentinaproject.bitbucket.org/"
-SRC_URI="https://bitbucket.org/dismine/valentina/get/v0.4.2.zip -> ${P}.zip"
+HOMEPAGE="https://valentina-project.org/"
+SRC_URI="https://github.com/valentina-project/vpo2/archive/v${PV}.zip -> ${P}.zip"
LICENSE="GPL-3"
SLOT="0"
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="gnome"
# en_IN not supported in Gentoo so not added here
-LANGS="cs_CZ de_DE en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL ro_RO ru_RU uk_UA"
+LANGS="cs_CZ de_DE el_GR en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL pt_BR ro_RO ru_RU uk_UA zh_CN"
for LANG in ${LANGS}; do
IUSE="${IUSE} linguas_${LANG}"
@@ -38,9 +38,9 @@ DEPEND="${CDEPEND}
S=${WORKDIR}/dismine-${PN}-44d43351cb59
src_prepare() {
- epatch "${FILESDIR}/locales.patch" \
- "${FILESDIR}/fix-insecure-runpaths.patch" \
- "${FILESDIR}/disable-tests-compilation.patch"
+ epatch "${FILESDIR}/${PV}-locales.patch" \
+ "${FILESDIR}/${PV}-fix-insecure-runpaths.patch" \
+ "${FILESDIR}/${PV}-disable-tests-compilation.patch"
default
}
@@ -60,7 +60,7 @@ src_configure() {
src_install() {
emake install INSTALL_ROOT="${D}"
- dodoc LICENSE_GPL.txt ChangeLog.txt README.txt
+ dodoc AUTHORS.txt ChangeLog.txt README.md
doman dist/debian/${PN}.1
doman dist/debian/tape.1
@@ -71,7 +71,8 @@ src_install() {
}
pkg_postinst() {
- fdo-mime_desktop_database_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
if use gnome ; then
gnome2_icon_cache_update
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
index 26d48b1311b..66229d43a07 100644
--- a/media-gfx/valentina/valentina-9999.ebuild
+++ b/media-gfx/valentina/valentina-9999.ebuild
@@ -3,13 +3,12 @@
EAPI=6
-inherit mercurial qmake-utils gnome2-utils fdo-mime
+inherit git-r3 qmake-utils gnome2-utils xdg-utils
DESCRIPTION="Cloth patternmaking software"
-HOMEPAGE="http://valentinaproject.bitbucket.org/"
-SRC_URI=""
-EHG_REPO_URI="https://bitbucket.org/dismine/valentina"
-EHG_REVISION="develop"
+HOMEPAGE="https://valentina-project.org/"
+EGIT_REPO_URI="https://github.com/valentina-project/vpo2.git"
+EGIT_BRANCH="develop"
LICENSE="GPL-3"
SLOT="0"
@@ -51,7 +50,7 @@ src_configure() {
src_install() {
emake install INSTALL_ROOT="${D}"
- dodoc LICENSE_GPL.txt ChangeLog.txt README.txt
+ dodoc AUTHORS.txt ChangeLog.txt README.md
doman dist/debian/${PN}.1
doman dist/debian/tape.1
@@ -62,7 +61,8 @@ src_install() {
}
pkg_postinst() {
- fdo-mime_desktop_database_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
if use gnome ; then
gnome2_icon_cache_update
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/, media-gfx/valentina/files/
@ 2019-03-01 12:29 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2019-03-01 12:29 UTC (permalink / raw
To: gentoo-commits
commit: 47dac3a08c2c8b7402419875f1dab968ffe3a5b3
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 1 12:28:40 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Mar 1 12:28:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47dac3a0
media-gfx/valentina-0.6.1: fixed bug #678670
Closes: https://bugs.gentoo.org/678670
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-gfx/valentina/files/5823.patch | 50 ++++++++++++++++++++++++++++++
media-gfx/valentina/valentina-0.6.1.ebuild | 6 +++-
2 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/media-gfx/valentina/files/5823.patch b/media-gfx/valentina/files/5823.patch
new file mode 100644
index 00000000000..79df9a74c5a
--- /dev/null
+++ b/media-gfx/valentina/files/5823.patch
@@ -0,0 +1,50 @@
+# HG changeset patch
+# User Roman Telezhynskyi <kroluku@gmail.com>
+# Date 1551441739 -7200
+# Fri Mar 01 14:02:19 2019 +0200
+# Branch release
+# Node ID 82e62ea2d785e093af68089e509b224f3f4f843f
+# Parent 0108ef767e2447e5b5f39378bcf245e25947a25d
+Don't use Qt OpenGL module since Q5.4.
+
+diff -r 0108ef767e24 -r 82e62ea2d785 src/app/valentina/valentina.pro
+--- a/src/app/valentina/valentina.pro Sun Feb 24 17:29:12 2019 +0200
++++ b/src/app/valentina/valentina.pro Fri Mar 01 14:02:19 2019 +0200
+@@ -297,7 +297,6 @@
+ $$[QT_INSTALL_BINS]/icuuc*.dll \ # Different name for different Qt releases
+ $$[QT_INSTALL_BINS]/Qt5Core.dll \
+ $$[QT_INSTALL_BINS]/Qt5Concurrent.dll \
+- $$[QT_INSTALL_BINS]/Qt5OpenGL.dll \
+ $$[QT_INSTALL_BINS]/Qt5Gui.dll \
+ $$[QT_INSTALL_BINS]/Qt5Network.dll \
+ $$[QT_INSTALL_BINS]/Qt5PrintSupport.dll \
+@@ -309,6 +308,11 @@
+ $$[QT_INSTALL_BINS]/libstdc++-6.dll \
+ $$[QT_INSTALL_BINS]/libwinpthread-1.dll
+
++ # Don't use Qt OpenGL module since Q5.4
++ equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
++ package.files += $$[QT_INSTALL_BINS]/Qt5OpenGL.dll
++ }
++
+ # For support Windows 7+
+ greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 6) {
+ package.files += $$[QT_INSTALL_BINS]/Qt5WinExtras.dll
+diff -r 0108ef767e24 -r 82e62ea2d785 src/libs/vwidgets/vwidgets.pro
+--- a/src/libs/vwidgets/vwidgets.pro Sun Feb 24 17:29:12 2019 +0200
++++ b/src/libs/vwidgets/vwidgets.pro Fri Mar 01 14:02:19 2019 +0200
+@@ -7,7 +7,12 @@
+ # File with common stuff for whole project
+ include(../../../common.pri)
+
+-QT += widgets printsupport opengl
++QT += widgets printsupport
++
++# Don't use Qt OpenGL module since Q5.4
++equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
++ QT += opengl
++}
+
+ # Name of the library
+ TARGET = vwidgets
+
diff --git a/media-gfx/valentina/valentina-0.6.1.ebuild b/media-gfx/valentina/valentina-0.6.1.ebuild
index c9b39504031..a59fb86953a 100644
--- a/media-gfx/valentina/valentina-0.6.1.ebuild
+++ b/media-gfx/valentina/valentina-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -38,6 +38,10 @@ DEPEND="${CDEPEND}
S=${WORKDIR}/dismine-${PN}-b639b75d1688
+PATCHES=(
+ "${FILESDIR}/5823.patch"
+)
+
src_configure() {
local locales=""
local locale
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/, media-gfx/valentina/files/
@ 2019-12-30 17:02 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2019-12-30 17:02 UTC (permalink / raw
To: gentoo-commits
commit: 28418c3c72b33359b7ddde9da433b40bf29c6fa5
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 17:01:41 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 17:01:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28418c3c
media-gfx/valentina: 0.6.1 - fixed building with qt 5.14
Closes: https://bugs.gentoo.org/704244
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-gfx/valentina/files/5858.patch | 1495 ++++++++++++++++++++++++++++
media-gfx/valentina/valentina-0.6.1.ebuild | 1 +
2 files changed, 1496 insertions(+)
diff --git a/media-gfx/valentina/files/5858.patch b/media-gfx/valentina/files/5858.patch
new file mode 100644
index 00000000000..b24d89eb8e1
--- /dev/null
+++ b/media-gfx/valentina/files/5858.patch
@@ -0,0 +1,1495 @@
+# HG changeset patch
+# User Roman Telezhynskyi <kroluku@gmail.com>
+# Date 1577703657 -7200
+# Mon Dec 30 13:00:57 2019 +0200
+# Branch release
+# Node ID fb8691f522f3515d7c3014a0ea90b60b352a444e
+# Parent 065a26d8b5779ca5c8c2486509352c8c48190a33
+Fix move sematic.
+
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/qmuparser/qmuparsercallback.cpp
+--- a/src/libs/qmuparser/qmuparsercallback.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/qmuparser/qmuparsercallback.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -208,6 +208,21 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++QmuParserCallback &QmuParserCallback::operator=(QmuParserCallback &&a_Fun) Q_DECL_NOTHROW
++{
++ Swap(a_Fun);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void QmuParserCallback::Swap(QmuParserCallback &a_Fun) Q_DECL_NOTHROW
++{
++ std::swap(d, a_Fun.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ /**
+ * @brief Return true if the function is conservative.
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/qmuparser/qmuparsercallback.h
+--- a/src/libs/qmuparser/qmuparsercallback.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/qmuparser/qmuparsercallback.h Mon Dec 30 13:00:57 2019 +0200
+@@ -86,11 +86,10 @@
+ QmuParserCallback &operator=(const QmuParserCallback &a_Fun);
+
+ #ifdef Q_COMPILER_RVALUE_REFS
+- QmuParserCallback &operator=(QmuParserCallback &&a_Fun) Q_DECL_NOTHROW { Swap(a_Fun); return *this; }
++ QmuParserCallback &operator=(QmuParserCallback &&a_Fun) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(QmuParserCallback &a_Fun) Q_DECL_NOTHROW
+- { std::swap(d, a_Fun.d); }
++ void Swap(QmuParserCallback &a_Fun) Q_DECL_NOTHROW;
+
+ Q_REQUIRED_RESULT QmuParserCallback* Clone() const;
+
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vabstractarc.cpp
+--- a/src/libs/vgeometry/vabstractarc.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vabstractarc.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -78,6 +78,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VAbstractArc &VAbstractArc::operator=(VAbstractArc &&arc) Q_DECL_NOTHROW
++{
++ Swap(arc);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VAbstractArc::Swap(VAbstractArc &arc) Q_DECL_NOTHROW
++{
++ VAbstractCurve::Swap(arc);
++ std::swap(d, arc.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VAbstractArc::~VAbstractArc()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vabstractarc.h
+--- a/src/libs/vgeometry/vabstractarc.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vabstractarc.h Mon Dec 30 13:00:57 2019 +0200
+@@ -58,11 +58,10 @@
+
+ VAbstractArc& operator= (const VAbstractArc &arc);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VAbstractArc &operator=(VAbstractArc &&arc) Q_DECL_NOTHROW { Swap(arc); return *this; }
++ VAbstractArc &operator=(VAbstractArc &&arc) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VAbstractArc &arc) Q_DECL_NOTHROW
+- { VAbstractCurve::Swap(arc); std::swap(d, arc.d); }
++ void Swap(VAbstractArc &arc) Q_DECL_NOTHROW;
+
+ QString GetFormulaF1 () const;
+ void SetFormulaF1 (const QString &formula, qreal value);
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vabstractcurve.cpp
+--- a/src/libs/vgeometry/vabstractcurve.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vabstractcurve.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -59,6 +59,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VAbstractCurve &VAbstractCurve::operator=(VAbstractCurve &&curve) Q_DECL_NOTHROW
++{
++ Swap(curve);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VAbstractCurve::Swap(VAbstractCurve &curve) Q_DECL_NOTHROW
++{
++ VGObject::Swap(curve);
++ std::swap(d, curve.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VAbstractCurve::~VAbstractCurve()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vabstractcurve.h
+--- a/src/libs/vgeometry/vabstractcurve.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vabstractcurve.h Mon Dec 30 13:00:57 2019 +0200
+@@ -57,11 +57,10 @@
+
+ VAbstractCurve& operator= (const VAbstractCurve &curve);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VAbstractCurve &operator=(VAbstractCurve &&curve) Q_DECL_NOTHROW { Swap(curve); return *this; }
++ VAbstractCurve &operator=(VAbstractCurve &&curve) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VAbstractCurve &curve) Q_DECL_NOTHROW
+- { VGObject::Swap(curve); std::swap(d, curve.d); }
++ void Swap(VAbstractCurve &curve) Q_DECL_NOTHROW;
+
+ virtual QVector<QPointF> GetPoints() const =0;
+ static QVector<QPointF> GetSegmentPoints(const QVector<QPointF> &points, const QPointF &begin, const QPointF &end,
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/varc.cpp
+--- a/src/libs/vgeometry/varc.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/varc.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -116,6 +116,23 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VArc &VArc::operator=(VArc &&arc) Q_DECL_NOTHROW
++{
++ Swap(arc);
++ return *this;
++}
++#endif
++
++
++//---------------------------------------------------------------------------------------------------------------------
++inline void VArc::Swap(VArc &arc) Q_DECL_NOTHROW
++{
++ VAbstractArc::Swap(arc);
++ std::swap(d, arc.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VArc VArc::Rotate(const QPointF &originPoint, qreal degrees, const QString &prefix) const
+ {
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/varc.h
+--- a/src/libs/vgeometry/varc.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/varc.h Mon Dec 30 13:00:57 2019 +0200
+@@ -66,11 +66,10 @@
+
+ VArc& operator= (const VArc &arc);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VArc &operator=(VArc &&arc) Q_DECL_NOTHROW { Swap(arc); return *this; }
++ VArc &operator=(VArc &&arc) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VArc &arc) Q_DECL_NOTHROW
+- { VAbstractArc::Swap(arc); std::swap(d, arc.d); }
++ void Swap(VArc &arc) Q_DECL_NOTHROW;
+
+ QString GetFormulaRadius () const;
+ void SetFormulaRadius (const QString &formula, qreal value);
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vcubicbezier.cpp
+--- a/src/libs/vgeometry/vcubicbezier.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vcubicbezier.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -64,6 +64,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VCubicBezier &VCubicBezier::operator=(VCubicBezier &&curve) Q_DECL_NOTHROW
++{
++ Swap(curve);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VCubicBezier::Swap(VCubicBezier &curve) Q_DECL_NOTHROW
++{
++ VAbstractCubicBezier::Swap(curve);
++ std::swap(d, curve.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VCubicBezier VCubicBezier::Rotate(const QPointF &originPoint, qreal degrees, const QString &prefix) const
+ {
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vcubicbezier.h
+--- a/src/libs/vgeometry/vcubicbezier.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vcubicbezier.h Mon Dec 30 13:00:57 2019 +0200
+@@ -57,11 +57,10 @@
+
+ VCubicBezier &operator=(const VCubicBezier &curve);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VCubicBezier &operator=(VCubicBezier &&curve) Q_DECL_NOTHROW { Swap(curve); return *this; }
++ VCubicBezier &operator=(VCubicBezier &&curve) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VCubicBezier &curve) Q_DECL_NOTHROW
+- { VAbstractCubicBezier::Swap(curve); std::swap(d, curve.d); }
++ void Swap(VCubicBezier &curve) Q_DECL_NOTHROW;
+
+ virtual VPointF GetP1() const override;
+ void SetP1(const VPointF &p);
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vcubicbezierpath.cpp
+--- a/src/libs/vgeometry/vcubicbezierpath.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vcubicbezierpath.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -78,6 +78,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VCubicBezierPath &VCubicBezierPath::operator=(VCubicBezierPath &&curve) Q_DECL_NOTHROW
++{
++ Swap(curve);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VCubicBezierPath::Swap(VCubicBezierPath &curve) Q_DECL_NOTHROW
++{
++ VAbstractCubicBezierPath::Swap(curve);
++ std::swap(d, curve.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VCubicBezierPath VCubicBezierPath::Rotate(const QPointF &originPoint, qreal degrees, const QString &prefix) const
+ {
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vcubicbezierpath.h
+--- a/src/libs/vgeometry/vcubicbezierpath.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vcubicbezierpath.h Mon Dec 30 13:00:57 2019 +0200
+@@ -58,11 +58,10 @@
+
+ VCubicBezierPath &operator=(const VCubicBezierPath &curve);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VCubicBezierPath &operator=(VCubicBezierPath &&curve) Q_DECL_NOTHROW { Swap(curve); return *this; }
++ VCubicBezierPath &operator=(VCubicBezierPath &&curve) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VCubicBezierPath &curve) Q_DECL_NOTHROW
+- { VAbstractCubicBezierPath::Swap(curve); std::swap(d, curve.d); }
++ void Swap(VCubicBezierPath &curve) Q_DECL_NOTHROW;
+
+ VPointF &operator[](int indx);
+
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vellipticalarc.cpp
+--- a/src/libs/vgeometry/vellipticalarc.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vellipticalarc.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -123,6 +123,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VEllipticalArc &VEllipticalArc::operator=(VEllipticalArc &&arc) Q_DECL_NOTHROW
++{
++ Swap(arc);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VEllipticalArc::Swap(VEllipticalArc &arc) Q_DECL_NOTHROW
++{
++ VAbstractArc::Swap(arc);
++ std::swap(d, arc.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VEllipticalArc VEllipticalArc::Rotate(QPointF originPoint, qreal degrees, const QString &prefix) const
+ {
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vellipticalarc.h
+--- a/src/libs/vgeometry/vellipticalarc.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vellipticalarc.h Mon Dec 30 13:00:57 2019 +0200
+@@ -69,11 +69,10 @@
+
+ VEllipticalArc& operator= (const VEllipticalArc &arc);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VEllipticalArc &operator=(VEllipticalArc &&arc) Q_DECL_NOTHROW { Swap(arc); return *this; }
++ VEllipticalArc &operator=(VEllipticalArc &&arc) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VEllipticalArc &arc) Q_DECL_NOTHROW
+- { VAbstractArc::Swap(arc); std::swap(d, arc.d); }
++ void Swap(VEllipticalArc &arc) Q_DECL_NOTHROW;
+
+ QString GetFormulaRotationAngle () const;
+ void SetFormulaRotationAngle (const QString &formula, qreal value);
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vgobject.cpp
+--- a/src/libs/vgeometry/vgobject.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vgobject.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -84,6 +84,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++
++//---------------------------------------------------------------------------------------------------------------------
++VGObject &VGObject::operator=(VGObject &&obj) Q_DECL_NOTHROW
++{
++ Swap(obj);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VGObject::Swap(VGObject &obj) Q_DECL_NOTHROW
++{
++ std::swap(d, obj.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VGObject::~VGObject()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vgobject.h
+--- a/src/libs/vgeometry/vgobject.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vgobject.h Mon Dec 30 13:00:57 2019 +0200
+@@ -59,11 +59,10 @@
+
+ VGObject& operator= (const VGObject &obj);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VGObject &operator=(VGObject &&obj) Q_DECL_NOTHROW { Swap(obj); return *this; }
++ VGObject &operator=(VGObject &&obj) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VGObject &obj) Q_DECL_NOTHROW
+- { std::swap(d, obj.d); }
++ void Swap(VGObject &obj) Q_DECL_NOTHROW;
+
+ quint32 getIdObject() const;
+ void setIdObject(const quint32 &value);
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vplacelabelitem.cpp
+--- a/src/libs/vgeometry/vplacelabelitem.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vplacelabelitem.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -208,6 +208,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VPlaceLabelItem &VPlaceLabelItem::operator=(VPlaceLabelItem &&item) Q_DECL_NOTHROW
++{
++ Swap(item);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VPlaceLabelItem::Swap(VPlaceLabelItem &item) Q_DECL_NOTHROW
++{
++ VPointF::Swap(item);
++ std::swap(d, item.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ PlaceLabelImg VPlaceLabelItem::LabelShape() const
+ {
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vplacelabelitem.h
+--- a/src/libs/vgeometry/vplacelabelitem.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vplacelabelitem.h Mon Dec 30 13:00:57 2019 +0200
+@@ -47,11 +47,10 @@
+
+ VPlaceLabelItem &operator=(const VPlaceLabelItem &item);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VPlaceLabelItem &operator=(VPlaceLabelItem &&item) Q_DECL_NOTHROW { Swap(item); return *this; }
++ VPlaceLabelItem &operator=(VPlaceLabelItem &&item) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VPlaceLabelItem &item) Q_DECL_NOTHROW
+- { VPointF::Swap(item); std::swap(d, item.d); }
++ void Swap(VPlaceLabelItem &item) Q_DECL_NOTHROW;
+
+ QString GetWidthFormula() const;
+ QString& GetWidthFormula();
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vpointf.cpp
+--- a/src/libs/vgeometry/vpointf.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vpointf.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -101,6 +101,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VPointF &VPointF::operator=(VPointF &&point) Q_DECL_NOTHROW
++{
++ Swap(point);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VPointF::Swap(VPointF &point) Q_DECL_NOTHROW
++{
++ VGObject::Swap(point);
++ std::swap(d, point.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VPointF::operator QPointF() const
+ {
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vpointf.h
+--- a/src/libs/vgeometry/vpointf.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vpointf.h Mon Dec 30 13:00:57 2019 +0200
+@@ -62,11 +62,10 @@
+
+ VPointF &operator=(const VPointF &point);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VPointF &operator=(VPointF &&point) Q_DECL_NOTHROW { Swap(point); return *this; }
++ VPointF &operator=(VPointF &&point) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VPointF &point) Q_DECL_NOTHROW
+- { VGObject::Swap(point); std::swap(d, point.d); }
++ void Swap(VPointF &point) Q_DECL_NOTHROW;
+
+ explicit operator QPointF() const;
+ VPointF Rotate(const QPointF &originPoint, qreal degrees, const QString &prefix = QString()) const;
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vspline.cpp
+--- a/src/libs/vgeometry/vspline.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vspline.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -246,6 +246,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VSpline &VSpline::operator=(VSpline &&spline) Q_DECL_NOTHROW
++{
++ Swap(spline);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VSpline::Swap(VSpline &spline) Q_DECL_NOTHROW
++{
++ VAbstractCubicBezier::Swap(spline);
++ std::swap(d, spline.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ /**
+ * @brief GetP1 return first spline point.
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vspline.h
+--- a/src/libs/vgeometry/vspline.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vspline.h Mon Dec 30 13:00:57 2019 +0200
+@@ -67,11 +67,10 @@
+
+ VSpline &operator=(const VSpline &spline);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VSpline &operator=(VSpline &&spline) Q_DECL_NOTHROW { Swap(spline); return *this; }
++ VSpline &operator=(VSpline &&spline) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VSpline &spline) Q_DECL_NOTHROW
+- { VAbstractCubicBezier::Swap(spline); std::swap(d, spline.d); }
++ void Swap(VSpline &spline) Q_DECL_NOTHROW;
+
+ virtual VPointF GetP1 () const override;
+ void SetP1 (const VPointF &p);
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vsplinepath.cpp
+--- a/src/libs/vgeometry/vsplinepath.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vsplinepath.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -301,6 +301,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VSplinePath &VSplinePath::operator=(VSplinePath &&path) Q_DECL_NOTHROW
++{
++ Swap(path);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VSplinePath::Swap(VSplinePath &path) Q_DECL_NOTHROW
++{
++ VAbstractCubicBezierPath::Swap(path);
++ std::swap(d, path.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ /**
+ * @brief operator [] return spline point by index.
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vsplinepath.h
+--- a/src/libs/vgeometry/vsplinepath.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vsplinepath.h Mon Dec 30 13:00:57 2019 +0200
+@@ -67,11 +67,10 @@
+ VSplinePoint &operator[](int indx);
+ VSplinePath &operator=(const VSplinePath &path);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VSplinePath &operator=(VSplinePath &&path) Q_DECL_NOTHROW { Swap(path); return *this; }
++ VSplinePath &operator=(VSplinePath &&path) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VSplinePath &path) Q_DECL_NOTHROW
+- { VAbstractCubicBezierPath::Swap(path); std::swap(d, path.d); }
++ void Swap(VSplinePath &path) Q_DECL_NOTHROW;
+
+ void append(const VSplinePoint &point);
+
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vsplinepoint.cpp
+--- a/src/libs/vgeometry/vsplinepoint.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vsplinepoint.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -74,6 +74,20 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VFSplinePoint &VFSplinePoint::operator=(VFSplinePoint &&point) Q_DECL_NOTHROW
++{
++ Swap(point);
++ return *this;
++}
++#endif
++
++void VFSplinePoint::Swap(VFSplinePoint &point) Q_DECL_NOTHROW
++{
++ std::swap(d, point.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VFSplinePoint::~VFSplinePoint()
+ {}
+@@ -219,6 +233,21 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VSplinePoint &VSplinePoint::operator=(VSplinePoint &&point) Q_DECL_NOTHROW
++{
++ Swap(point);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VSplinePoint::Swap(VSplinePoint &point) Q_DECL_NOTHROW
++{
++ std::swap(d, point.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VSplinePoint::~VSplinePoint()
+ {
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vsplinepoint.h
+--- a/src/libs/vgeometry/vsplinepoint.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vgeometry/vsplinepoint.h Mon Dec 30 13:00:57 2019 +0200
+@@ -53,11 +53,10 @@
+
+ VFSplinePoint &operator=(const VFSplinePoint &point);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VFSplinePoint &operator=(VFSplinePoint &&point) Q_DECL_NOTHROW { Swap(point); return *this; }
++ VFSplinePoint &operator=(VFSplinePoint &&point) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VFSplinePoint &point) Q_DECL_NOTHROW
+- { std::swap(d, point.d); }
++ void Swap(VFSplinePoint &point) Q_DECL_NOTHROW;
+
+ VPointF P() const;
+ void SetP(const VPointF &value);
+@@ -93,11 +92,10 @@
+
+ VSplinePoint &operator=(const VSplinePoint &point);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VSplinePoint &operator=(VSplinePoint &&point) Q_DECL_NOTHROW { Swap(point); return *this; }
++ VSplinePoint &operator=(VSplinePoint &&point) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VSplinePoint &point) Q_DECL_NOTHROW
+- { std::swap(d, point.d); }
++ void Swap(VSplinePoint &point) Q_DECL_NOTHROW;
+
+ VPointF P() const;
+ void SetP(const VPointF &value);
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vabstractpiece.cpp
+--- a/src/libs/vlayout/vabstractpiece.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vlayout/vabstractpiece.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -778,6 +778,21 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VAbstractPiece &VAbstractPiece::operator=(VAbstractPiece &&piece) Q_DECL_NOTHROW
++{
++ Swap(piece);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VAbstractPiece::Swap(VAbstractPiece &piece) Q_DECL_NOTHROW
++{
++ std::swap(d, piece.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VAbstractPiece::~VAbstractPiece()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vabstractpiece.h
+--- a/src/libs/vlayout/vabstractpiece.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vlayout/vabstractpiece.h Mon Dec 30 13:00:57 2019 +0200
+@@ -154,11 +154,10 @@
+
+ VAbstractPiece &operator=(const VAbstractPiece &piece);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VAbstractPiece &operator=(VAbstractPiece &&piece) Q_DECL_NOTHROW { Swap(piece); return *this; }
++ VAbstractPiece &operator=(VAbstractPiece &&piece) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VAbstractPiece &piece) Q_DECL_NOTHROW
+- { std::swap(d, piece.d); }
++ void Swap(VAbstractPiece &piece) Q_DECL_NOTHROW;
+
+ QString GetName() const;
+ void SetName(const QString &value);
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vcontour.cpp
+--- a/src/libs/vlayout/vcontour.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vlayout/vcontour.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -66,6 +66,21 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VContour &VContour::operator=(VContour &&contour) Q_DECL_NOTHROW
++{
++ Swap(contour);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VContour::Swap(VContour &contour) Q_DECL_NOTHROW
++{
++ std::swap(d, contour.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VContour::~VContour()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vcontour.h
+--- a/src/libs/vlayout/vcontour.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vlayout/vcontour.h Mon Dec 30 13:00:57 2019 +0200
+@@ -55,11 +55,10 @@
+
+ VContour &operator=(const VContour &contour);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VContour &operator=(VContour &&contour) Q_DECL_NOTHROW { Swap(contour); return *this; }
++ VContour &operator=(VContour &&contour) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VContour &contour) Q_DECL_NOTHROW
+- { std::swap(d, contour.d); }
++ void Swap(VContour &contour) Q_DECL_NOTHROW;
+
+ void SetContour(const QVector<QPointF> &contour);
+ QVector<QPointF> GetContour() const;
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vlayoutpaper.cpp
+--- a/src/libs/vlayout/vlayoutpaper.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vlayout/vlayoutpaper.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -75,6 +75,21 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VLayoutPaper &VLayoutPaper::operator=(VLayoutPaper &&paper) Q_DECL_NOTHROW
++{
++ Swap(paper);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VLayoutPaper::Swap(VLayoutPaper &paper) Q_DECL_NOTHROW
++{
++ std::swap(d, paper.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VLayoutPaper::~VLayoutPaper()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vlayoutpaper.h
+--- a/src/libs/vlayout/vlayoutpaper.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vlayout/vlayoutpaper.h Mon Dec 30 13:00:57 2019 +0200
+@@ -57,11 +57,10 @@
+
+ VLayoutPaper &operator=(const VLayoutPaper &paper);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VLayoutPaper &operator=(VLayoutPaper &&paper) Q_DECL_NOTHROW { Swap(paper); return *this; }
++ VLayoutPaper &operator=(VLayoutPaper &&paper) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VLayoutPaper &paper) Q_DECL_NOTHROW
+- { std::swap(d, paper.d); }
++ void Swap(VLayoutPaper &paper) Q_DECL_NOTHROW;
+
+ int GetHeight() const;
+ void SetHeight(int height);
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vlayoutpiece.cpp
+--- a/src/libs/vlayout/vlayoutpiece.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vlayout/vlayoutpiece.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -388,6 +388,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VLayoutPiece &VLayoutPiece::operator=(VLayoutPiece &&detail) Q_DECL_NOTHROW
++{
++ Swap(detail);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VLayoutPiece::Swap(VLayoutPiece &detail) Q_DECL_NOTHROW
++{
++ VAbstractPiece::Swap(detail);
++ std::swap(d, detail.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VLayoutPiece::~VLayoutPiece()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vlayoutpiece.h
+--- a/src/libs/vlayout/vlayoutpiece.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vlayout/vlayoutpiece.h Mon Dec 30 13:00:57 2019 +0200
+@@ -65,11 +65,10 @@
+
+ VLayoutPiece &operator=(const VLayoutPiece &detail);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VLayoutPiece &operator=(VLayoutPiece &&detail) Q_DECL_NOTHROW { Swap(detail); return *this; }
++ VLayoutPiece &operator=(VLayoutPiece &&detail) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VLayoutPiece &detail) Q_DECL_NOTHROW
+- { VAbstractPiece::Swap(detail); std::swap(d, detail.d); }
++ void Swap(VLayoutPiece &detail) Q_DECL_NOTHROW;
+
+ static VLayoutPiece Create(const VPiece &piece, const VContainer *pattern);
+
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vlayoutpiecepath.cpp
+--- a/src/libs/vlayout/vlayoutpiecepath.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vlayout/vlayoutpiecepath.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -61,6 +61,21 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VLayoutPiecePath &VLayoutPiecePath::operator=(VLayoutPiecePath &&path) Q_DECL_NOTHROW
++{
++ Swap(path);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VLayoutPiecePath::Swap(VLayoutPiecePath &path) Q_DECL_NOTHROW
++{
++ std::swap(d, path.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VLayoutPiecePath::~VLayoutPiecePath()
+ {
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vlayoutpiecepath.h
+--- a/src/libs/vlayout/vlayoutpiecepath.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vlayout/vlayoutpiecepath.h Mon Dec 30 13:00:57 2019 +0200
+@@ -46,11 +46,10 @@
+
+ VLayoutPiecePath &operator=(const VLayoutPiecePath &path);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VLayoutPiecePath &operator=(VLayoutPiecePath &&path) Q_DECL_NOTHROW { Swap(path); return *this; }
++ VLayoutPiecePath &operator=(VLayoutPiecePath &&path) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VLayoutPiecePath &path) Q_DECL_NOTHROW
+- { std::swap(d, path.d); }
++ void Swap(VLayoutPiecePath &path) Q_DECL_NOTHROW;
+
+ QPainterPath GetPainterPath() const;
+
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/floatItemData/vabstractfloatitemdata.cpp
+--- a/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -50,6 +50,21 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VAbstractFloatItemData &VAbstractFloatItemData::operator=(VAbstractFloatItemData &&data) Q_DECL_NOTHROW
++{
++ Swap(data);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VAbstractFloatItemData::Swap(VAbstractFloatItemData &data) Q_DECL_NOTHROW
++{
++ std::swap(d, data.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VAbstractFloatItemData::~VAbstractFloatItemData()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/floatItemData/vabstractfloatitemdata.h
+--- a/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata.h Mon Dec 30 13:00:57 2019 +0200
+@@ -44,11 +44,10 @@
+
+ VAbstractFloatItemData &operator=(const VAbstractFloatItemData &data);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VAbstractFloatItemData &operator=(VAbstractFloatItemData &&data) Q_DECL_NOTHROW { Swap(data); return *this; }
++ VAbstractFloatItemData &operator=(VAbstractFloatItemData &&data) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VAbstractFloatItemData &data) Q_DECL_NOTHROW
+- { std::swap(d, data.d); }
++ void Swap(VAbstractFloatItemData &data) Q_DECL_NOTHROW;
+
+ // methods, which set and return values of different parameters
+ QPointF GetPos() const;
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/floatItemData/vgrainlinedata.cpp
+--- a/src/libs/vpatterndb/floatItemData/vgrainlinedata.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/floatItemData/vgrainlinedata.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -55,6 +55,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VGrainlineData &VGrainlineData::operator=(VGrainlineData &&data) Q_DECL_NOTHROW
++{
++ Swap(data);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VGrainlineData::Swap(VGrainlineData &data) Q_DECL_NOTHROW
++{
++ VAbstractFloatItemData::Swap(data);
++ std::swap(d, data.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VGrainlineData::~VGrainlineData()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/floatItemData/vgrainlinedata.h
+--- a/src/libs/vpatterndb/floatItemData/vgrainlinedata.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/floatItemData/vgrainlinedata.h Mon Dec 30 13:00:57 2019 +0200
+@@ -51,11 +51,10 @@
+
+ VGrainlineData &operator=(const VGrainlineData &data);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VGrainlineData &operator=(VGrainlineData &&data) Q_DECL_NOTHROW { Swap(data); return *this; }
++ VGrainlineData &operator=(VGrainlineData &&data) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VGrainlineData &data) Q_DECL_NOTHROW
+- { VAbstractFloatItemData::Swap(data); std::swap(d, data.d); }
++ void Swap(VGrainlineData &data) Q_DECL_NOTHROW;
+
+ // methods, which set and return values of different parameters
+ QString GetLength() const;
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/floatItemData/vpatternlabeldata.cpp
+--- a/src/libs/vpatterndb/floatItemData/vpatternlabeldata.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/floatItemData/vpatternlabeldata.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -54,6 +54,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VPatternLabelData &VPatternLabelData::operator=(VPatternLabelData &&data) Q_DECL_NOTHROW
++{
++ Swap(data);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VPatternLabelData::Swap(VPatternLabelData &data) Q_DECL_NOTHROW
++{
++ VAbstractFloatItemData::Swap(data);
++ std::swap(d, data.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VPatternLabelData::~VPatternLabelData()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/floatItemData/vpatternlabeldata.h
+--- a/src/libs/vpatterndb/floatItemData/vpatternlabeldata.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/floatItemData/vpatternlabeldata.h Mon Dec 30 13:00:57 2019 +0200
+@@ -48,11 +48,10 @@
+
+ VPatternLabelData &operator=(const VPatternLabelData &data);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VPatternLabelData &operator=(VPatternLabelData &&data) Q_DECL_NOTHROW { Swap(data); return *this; }
++ VPatternLabelData &operator=(VPatternLabelData &&data) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VPatternLabelData &data) Q_DECL_NOTHROW
+- { VAbstractFloatItemData::Swap(data); std::swap(d, data.d); }
++ void Swap(VPatternLabelData &data) Q_DECL_NOTHROW;
+
+ // methods, which set up label parameters
+ QString GetLabelWidth() const;
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/floatItemData/vpiecelabeldata.cpp
+--- a/src/libs/vpatterndb/floatItemData/vpiecelabeldata.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/floatItemData/vpiecelabeldata.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -55,6 +55,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VPieceLabelData &VPieceLabelData::operator=(VPieceLabelData &&data) Q_DECL_NOTHROW
++{
++ Swap(data);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VPieceLabelData::Swap(VPieceLabelData &data) Q_DECL_NOTHROW
++{
++ VPatternLabelData::Swap(data);
++ std::swap(d, data.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VPieceLabelData::~VPieceLabelData()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/floatItemData/vpiecelabeldata.h
+--- a/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h Mon Dec 30 13:00:57 2019 +0200
+@@ -51,11 +51,10 @@
+
+ VPieceLabelData &operator=(const VPieceLabelData &data);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VPieceLabelData &operator=(VPieceLabelData &&data) Q_DECL_NOTHROW { Swap(data); return *this; }
++ VPieceLabelData &operator=(VPieceLabelData &&data) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VPieceLabelData &data) Q_DECL_NOTHROW
+- { VPatternLabelData::Swap(data); std::swap(d, data.d); }
++ void Swap(VPieceLabelData &data) Q_DECL_NOTHROW;
+
+ void Clear();
+
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vcurvevariable.cpp
+--- a/src/libs/vpatterndb/variables/vcurvevariable.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/variables/vcurvevariable.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -64,6 +64,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VCurveVariable &VCurveVariable::operator=(VCurveVariable &&var) Q_DECL_NOTHROW
++{
++ Swap(var);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VCurveVariable::Swap(VCurveVariable &var) Q_DECL_NOTHROW
++{
++ VInternalVariable::Swap(var);
++ std::swap(d, var.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VCurveVariable::~VCurveVariable()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vcurvevariable.h
+--- a/src/libs/vpatterndb/variables/vcurvevariable.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/variables/vcurvevariable.h Mon Dec 30 13:00:57 2019 +0200
+@@ -49,11 +49,10 @@
+
+ VCurveVariable &operator=(const VCurveVariable &var);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VCurveVariable &operator=(VCurveVariable &&var) Q_DECL_NOTHROW { Swap(var); return *this; }
++ VCurveVariable &operator=(VCurveVariable &&var) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VCurveVariable &var) Q_DECL_NOTHROW
+- { VInternalVariable::Swap(var); std::swap(d, var.d); }
++ void Swap(VCurveVariable &var) Q_DECL_NOTHROW;
+
+ virtual bool Filter(quint32 id) override;
+
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vincrement.cpp
+--- a/src/libs/vpatterndb/variables/vincrement.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/variables/vincrement.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -74,6 +74,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VIncrement &VIncrement::operator=(VIncrement &&incr) Q_DECL_NOTHROW
++{
++ Swap(incr);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VIncrement::Swap(VIncrement &incr) Q_DECL_NOTHROW
++{
++ VVariable::Swap(incr);
++ std::swap(d, incr.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VIncrement::~VIncrement()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vincrement.h
+--- a/src/libs/vpatterndb/variables/vincrement.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/variables/vincrement.h Mon Dec 30 13:00:57 2019 +0200
+@@ -55,11 +55,10 @@
+
+ VIncrement &operator=(const VIncrement &incr);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VIncrement &operator=(VIncrement &&incr) Q_DECL_NOTHROW { Swap(incr); return *this; }
++ VIncrement &operator=(VIncrement &&incr) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VIncrement &incr) Q_DECL_NOTHROW
+- { VVariable::Swap(incr); std::swap(d, incr.d); }
++ void Swap(VIncrement &incr) Q_DECL_NOTHROW;
+
+ quint32 getIndex() const;
+ QString GetFormula() const;
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vinternalvariable.cpp
+--- a/src/libs/vpatterndb/variables/vinternalvariable.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/variables/vinternalvariable.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -50,6 +50,21 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VInternalVariable &VInternalVariable::operator=(VInternalVariable &&var) Q_DECL_NOTHROW
++{
++ Swap(var);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VInternalVariable::Swap(VInternalVariable &var) Q_DECL_NOTHROW
++{
++ std::swap(d, var.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VInternalVariable::~VInternalVariable()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vinternalvariable.h
+--- a/src/libs/vpatterndb/variables/vinternalvariable.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/variables/vinternalvariable.h Mon Dec 30 13:00:57 2019 +0200
+@@ -48,11 +48,10 @@
+
+ VInternalVariable &operator=(const VInternalVariable &var);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VInternalVariable &operator=(VInternalVariable &&var) Q_DECL_NOTHROW { Swap(var); return *this; }
++ VInternalVariable &operator=(VInternalVariable &&var) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VInternalVariable &var) Q_DECL_NOTHROW
+- { std::swap(d, var.d); }
++ void Swap(VInternalVariable &var) Q_DECL_NOTHROW;
+
+ virtual qreal GetValue() const;
+ virtual qreal* GetValue();
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vlineangle.cpp
+--- a/src/libs/vpatterndb/variables/vlineangle.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/variables/vlineangle.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -77,6 +77,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VLineAngle &VLineAngle::operator=(VLineAngle &&var) Q_DECL_NOTHROW
++{
++ Swap(var);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VLineAngle::Swap(VLineAngle &var) Q_DECL_NOTHROW
++{
++ VInternalVariable::Swap(var);
++ std::swap(d, var.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VLineAngle::~VLineAngle()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vlineangle.h
+--- a/src/libs/vpatterndb/variables/vlineangle.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/variables/vlineangle.h Mon Dec 30 13:00:57 2019 +0200
+@@ -50,11 +50,10 @@
+
+ VLineAngle &operator=(const VLineAngle &var);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VLineAngle &operator=(VLineAngle &&var) Q_DECL_NOTHROW { Swap(var); return *this; }
++ VLineAngle &operator=(VLineAngle &&var) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VLineAngle &var) Q_DECL_NOTHROW
+- { VInternalVariable::Swap(var); std::swap(d, var.d); }
++ void Swap(VLineAngle &var) Q_DECL_NOTHROW;
+
+ virtual bool Filter(quint32 id) override;
+ void SetValue(const VPointF *p1, const VPointF *p2);
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vlinelength.cpp
+--- a/src/libs/vpatterndb/variables/vlinelength.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/variables/vlinelength.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -75,6 +75,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VLengthLine &VLengthLine::operator=(VLengthLine &&var) Q_DECL_NOTHROW
++{
++ Swap(var);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VLengthLine::Swap(VLengthLine &var) Q_DECL_NOTHROW
++{
++ VInternalVariable::Swap(var);
++ std::swap(d, var.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VLengthLine::~VLengthLine()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vlinelength.h
+--- a/src/libs/vpatterndb/variables/vlinelength.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/variables/vlinelength.h Mon Dec 30 13:00:57 2019 +0200
+@@ -52,11 +52,10 @@
+
+ VLengthLine &operator=(const VLengthLine &var);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VLengthLine &operator=(VLengthLine &&var) Q_DECL_NOTHROW { Swap(var); return *this; }
++ VLengthLine &operator=(VLengthLine &&var) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VLengthLine &var) Q_DECL_NOTHROW
+- { VInternalVariable::Swap(var); std::swap(d, var.d); }
++ void Swap(VLengthLine &var) Q_DECL_NOTHROW;
+
+ virtual bool Filter(quint32 id) override;
+ void SetValue(const VPointF *p1, const VPointF *p2);
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vmeasurement.cpp
+--- a/src/libs/vpatterndb/variables/vmeasurement.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/variables/vmeasurement.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -92,6 +92,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VMeasurement &VMeasurement::operator=(VMeasurement &&m) Q_DECL_NOTHROW
++{
++ Swap(m);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VMeasurement::Swap(VMeasurement &m) Q_DECL_NOTHROW
++{
++ VVariable::Swap(m);
++ std::swap(d, m.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VMeasurement::~VMeasurement()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vmeasurement.h
+--- a/src/libs/vpatterndb/variables/vmeasurement.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/variables/vmeasurement.h Mon Dec 30 13:00:57 2019 +0200
+@@ -62,11 +62,10 @@
+
+ VMeasurement &operator=(const VMeasurement &m);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VMeasurement &operator=(VMeasurement &&m) Q_DECL_NOTHROW { Swap(m); return *this; }
++ VMeasurement &operator=(VMeasurement &&m) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VMeasurement &m) Q_DECL_NOTHROW
+- { VVariable::Swap(m); std::swap(d, m.d); }
++ void Swap(VMeasurement &m) Q_DECL_NOTHROW;
+
+ QString GetGuiText() const;
+
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vvariable.cpp
+--- a/src/libs/vpatterndb/variables/vvariable.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/variables/vvariable.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -63,6 +63,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VVariable &VVariable::operator=(VVariable &&var) Q_DECL_NOTHROW
++{
++ Swap(var);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VVariable::Swap(VVariable &var) Q_DECL_NOTHROW
++{
++ VInternalVariable::Swap(var);
++ std::swap(d, var.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VVariable::~VVariable()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vvariable.h
+--- a/src/libs/vpatterndb/variables/vvariable.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/variables/vvariable.h Mon Dec 30 13:00:57 2019 +0200
+@@ -52,11 +52,10 @@
+
+ VVariable &operator=(const VVariable &var);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VVariable &operator=(VVariable &&var) Q_DECL_NOTHROW { Swap(var); return *this; }
++ VVariable &operator=(VVariable &&var) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VVariable &var) Q_DECL_NOTHROW
+- { VInternalVariable::Swap(var); std::swap(d, var.d); }
++ void Swap(VVariable &var) Q_DECL_NOTHROW;
+
+ QString GetDescription() const;
+ void SetDescription(const QString &desc);
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vcontainer.cpp
+--- a/src/libs/vpatterndb/vcontainer.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/vcontainer.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -130,6 +130,21 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VContainer &VContainer::operator=(VContainer &&data) Q_DECL_NOTHROW
++{
++ Swap(data);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VContainer::Swap(VContainer &data) Q_DECL_NOTHROW
++{
++ std::swap(d, data.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ /**
+ * @brief VContainer create container from another container
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vcontainer.h
+--- a/src/libs/vpatterndb/vcontainer.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/vcontainer.h Mon Dec 30 13:00:57 2019 +0200
+@@ -131,11 +131,10 @@
+
+ VContainer &operator=(const VContainer &data);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VContainer &operator=(VContainer &&data) Q_DECL_NOTHROW { Swap(data); return *this; }
++ VContainer &operator=(VContainer &&data) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VContainer &data) Q_DECL_NOTHROW
+- { std::swap(d, data.d); }
++ void Swap(VContainer &data) Q_DECL_NOTHROW;
+
+ static QString UniqueNamespace();
+
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vnodedetail.cpp
+--- a/src/libs/vpatterndb/vnodedetail.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/vnodedetail.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -122,6 +122,21 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VNodeDetail &VNodeDetail::operator=(VNodeDetail &&node) Q_DECL_NOTHROW
++{
++ Swap(node);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VNodeDetail::Swap(VNodeDetail &node) Q_DECL_NOTHROW
++{
++ std::swap(d, node.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VNodeDetail::~VNodeDetail()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vnodedetail.h
+--- a/src/libs/vpatterndb/vnodedetail.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/vnodedetail.h Mon Dec 30 13:00:57 2019 +0200
+@@ -74,11 +74,10 @@
+ */
+ VNodeDetail &operator=(const VNodeDetail &node);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VNodeDetail &operator=(VNodeDetail &&node) Q_DECL_NOTHROW { Swap(node); return *this; }
++ VNodeDetail &operator=(VNodeDetail &&node) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VNodeDetail &node) Q_DECL_NOTHROW
+- { std::swap(d, node.d); }
++ void Swap(VNodeDetail &node) Q_DECL_NOTHROW;
+
+ /**
+ * @brief getId return object id.
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vpiece.cpp
+--- a/src/libs/vpatterndb/vpiece.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/vpiece.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -351,6 +351,22 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VPiece &VPiece::operator=(VPiece &&piece) Q_DECL_NOTHROW
++{
++ Swap(piece);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VPiece::Swap(VPiece &piece) Q_DECL_NOTHROW
++{
++ VAbstractPiece::Swap(piece);
++ std::swap(d, piece.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VPiece::~VPiece()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vpiece.h
+--- a/src/libs/vpatterndb/vpiece.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/vpiece.h Mon Dec 30 13:00:57 2019 +0200
+@@ -84,11 +84,10 @@
+
+ VPiece &operator=(const VPiece &piece);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VPiece &operator=(VPiece &&piece) Q_DECL_NOTHROW { Swap(piece); return *this; }
++ VPiece &operator=(VPiece &&piece) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VPiece &piece) Q_DECL_NOTHROW
+- { VAbstractPiece::Swap(piece); std::swap(d, piece.d); }
++ void Swap(VPiece &piece) Q_DECL_NOTHROW;
+
+ VPiecePath GetPath() const;
+ VPiecePath &GetPath();
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vpiecenode.cpp
+--- a/src/libs/vpatterndb/vpiecenode.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/vpiecenode.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -91,6 +91,21 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VPieceNode &VPieceNode::operator=(VPieceNode &&node) Q_DECL_NOTHROW
++{
++ Swap(node);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VPieceNode::Swap(VPieceNode &node) Q_DECL_NOTHROW
++{
++ std::swap(d, node.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VPieceNode::~VPieceNode()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vpiecenode.h
+--- a/src/libs/vpatterndb/vpiecenode.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/vpiecenode.h Mon Dec 30 13:00:57 2019 +0200
+@@ -49,11 +49,10 @@
+
+ VPieceNode &operator=(const VPieceNode &node);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VPieceNode &operator=(VPieceNode &&node) Q_DECL_NOTHROW { Swap(node); return *this; }
++ VPieceNode &operator=(VPieceNode &&node) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VPieceNode &node) Q_DECL_NOTHROW
+- { std::swap(d, node.d); }
++ void Swap(VPieceNode &node) Q_DECL_NOTHROW;
+
+ friend QDataStream& operator<<(QDataStream& out, const VPieceNode& p);
+ friend QDataStream& operator>>(QDataStream& in, VPieceNode& p);
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vpiecepath.cpp
+--- a/src/libs/vpatterndb/vpiecepath.cpp Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/vpiecepath.cpp Mon Dec 30 13:00:57 2019 +0200
+@@ -217,6 +217,21 @@
+ return *this;
+ }
+
++#ifdef Q_COMPILER_RVALUE_REFS
++//---------------------------------------------------------------------------------------------------------------------
++VPiecePath &VPiecePath::operator=(VPiecePath &&path) Q_DECL_NOTHROW
++{
++ Swap(path);
++ return *this;
++}
++#endif
++
++//---------------------------------------------------------------------------------------------------------------------
++void VPiecePath::Swap(VPiecePath &path) Q_DECL_NOTHROW
++{
++ std::swap(d, path.d);
++}
++
+ //---------------------------------------------------------------------------------------------------------------------
+ VPiecePath::~VPiecePath()
+ {}
+diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vpiecepath.h
+--- a/src/libs/vpatterndb/vpiecepath.h Sun Dec 29 14:37:46 2019 +0200
++++ b/src/libs/vpatterndb/vpiecepath.h Mon Dec 30 13:00:57 2019 +0200
+@@ -54,11 +54,10 @@
+
+ VPiecePath &operator=(const VPiecePath &path);
+ #ifdef Q_COMPILER_RVALUE_REFS
+- VPiecePath &operator=(VPiecePath &&path) Q_DECL_NOTHROW { Swap(path); return *this; }
++ VPiecePath &operator=(VPiecePath &&path) Q_DECL_NOTHROW;
+ #endif
+
+- inline void Swap(VPiecePath &path) Q_DECL_NOTHROW
+- { std::swap(d, path.d); }
++ void Swap(VPiecePath &path) Q_DECL_NOTHROW;
+
+ void Append(const VPieceNode &node);
+ void Clear();
diff --git a/media-gfx/valentina/valentina-0.6.1.ebuild b/media-gfx/valentina/valentina-0.6.1.ebuild
index a59fb86953a..9ef76a59c09 100644
--- a/media-gfx/valentina/valentina-0.6.1.ebuild
+++ b/media-gfx/valentina/valentina-0.6.1.ebuild
@@ -40,6 +40,7 @@ S=${WORKDIR}/dismine-${PN}-b639b75d1688
PATCHES=(
"${FILESDIR}/5823.patch"
+ "${FILESDIR}/5858.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/, media-gfx/valentina/files/
@ 2024-12-10 8:15 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2024-12-10 8:15 UTC (permalink / raw
To: gentoo-commits
commit: 5a743e422ff735844fa7de4052f85d083aa9518f
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 08:15:20 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 08:15:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a743e42
media-gfx/valentina: dropped obsolete 0.6.1-r1
Bug: https://bugs.gentoo.org/945638
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-gfx/valentina/Manifest | 2 -
media-gfx/valentina/files/5823.patch | 50 --------
.../valentina-0.6.1-disable-vcs-version.patch | 75 ------------
media-gfx/valentina/valentina-0.6.1-r1.ebuild | 126 ---------------------
4 files changed, 253 deletions(-)
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index 6f9b0dbf37b0..7dc50f499cef 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -1,3 +1 @@
-DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720
-DIST valentina-v0.6.1.tar.bz2 25575677 BLAKE2B 56d5adc973df319b3a65f877768c2195e1af2db39118e18fb17636e5739610d55e4ade4d4516a6817347dcdb0e4468e4587cff91fc5a5ea74a35029c52bf858c SHA512 52a3a02bd08f85c6241fe29baa9c8a2b80d2e8b071877bc68f98c3ff7bcdf810d9975903f804bf4e120f1a65c06de405fd44bc822292ab7b6191b778ec703542
DIST valentina-v0.7.52.tar.bz2 30819274 BLAKE2B 3b9b2ac2c4083371420dca4911bf5162d9d772ddf0a8b4582dac7ca47e6f027279a99bd3d674a7f0ce15e962cdf1afbdb573f8a14a5f6c02baae1f7a5aae37a1 SHA512 71ff3dc4ccea2ee3df34fda0364b211a80d4f953e6d3b9bf9b40ba1f4d1531e751d077983e8d13acb1f524c9883d2f565289d1b67d5de0a152c9a4df1428d6df
diff --git a/media-gfx/valentina/files/5823.patch b/media-gfx/valentina/files/5823.patch
deleted file mode 100644
index 79df9a74c5a6..000000000000
--- a/media-gfx/valentina/files/5823.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-# HG changeset patch
-# User Roman Telezhynskyi <kroluku@gmail.com>
-# Date 1551441739 -7200
-# Fri Mar 01 14:02:19 2019 +0200
-# Branch release
-# Node ID 82e62ea2d785e093af68089e509b224f3f4f843f
-# Parent 0108ef767e2447e5b5f39378bcf245e25947a25d
-Don't use Qt OpenGL module since Q5.4.
-
-diff -r 0108ef767e24 -r 82e62ea2d785 src/app/valentina/valentina.pro
---- a/src/app/valentina/valentina.pro Sun Feb 24 17:29:12 2019 +0200
-+++ b/src/app/valentina/valentina.pro Fri Mar 01 14:02:19 2019 +0200
-@@ -297,7 +297,6 @@
- $$[QT_INSTALL_BINS]/icuuc*.dll \ # Different name for different Qt releases
- $$[QT_INSTALL_BINS]/Qt5Core.dll \
- $$[QT_INSTALL_BINS]/Qt5Concurrent.dll \
-- $$[QT_INSTALL_BINS]/Qt5OpenGL.dll \
- $$[QT_INSTALL_BINS]/Qt5Gui.dll \
- $$[QT_INSTALL_BINS]/Qt5Network.dll \
- $$[QT_INSTALL_BINS]/Qt5PrintSupport.dll \
-@@ -309,6 +308,11 @@
- $$[QT_INSTALL_BINS]/libstdc++-6.dll \
- $$[QT_INSTALL_BINS]/libwinpthread-1.dll
-
-+ # Don't use Qt OpenGL module since Q5.4
-+ equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
-+ package.files += $$[QT_INSTALL_BINS]/Qt5OpenGL.dll
-+ }
-+
- # For support Windows 7+
- greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 6) {
- package.files += $$[QT_INSTALL_BINS]/Qt5WinExtras.dll
-diff -r 0108ef767e24 -r 82e62ea2d785 src/libs/vwidgets/vwidgets.pro
---- a/src/libs/vwidgets/vwidgets.pro Sun Feb 24 17:29:12 2019 +0200
-+++ b/src/libs/vwidgets/vwidgets.pro Fri Mar 01 14:02:19 2019 +0200
-@@ -7,7 +7,12 @@
- # File with common stuff for whole project
- include(../../../common.pri)
-
--QT += widgets printsupport opengl
-+QT += widgets printsupport
-+
-+# Don't use Qt OpenGL module since Q5.4
-+equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
-+ QT += opengl
-+}
-
- # Name of the library
- TARGET = vwidgets
-
diff --git a/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch b/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch
deleted file mode 100644
index 471d7a85313c..000000000000
--- a/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/common.pri b/common.pri
-index 523aa7c..33be789 100644
---- a/common.pri
-+++ b/common.pri
-@@ -212,37 +212,7 @@ defineReplace(enable_ccache){
- }
-
- defineReplace(FindBuildRevision){
--CONFIG(debug, debug|release){
-- # Debug mode
-- return(\\\"unknown\\\")
--}else{
-- # Release mode
--
-- macx{
-- HG = /usr/local/bin/hg # Can't defeat PATH variable on Mac OS.
-- }else {
-- HG = hg # All other platforms are OK.
-- }
--
-- #build revision number for using in version
-- unix {
-- DVCS_HESH=$$system("$${HG} log -r. --template '{node|short}'")
-- } else {
-- # Use escape character before "|" on Windows
-- DVCS_HESH=$$system($${HG} log -r. --template "{node^|short}")
-- }
-- isEmpty(DVCS_HESH){
-- DVCS_HESH=$$system("git rev-parse --short HEAD")
-- isEmpty(DVCS_HESH){
-- DVCS_HESH = \\\"unknown\\\" # if we can't find build revision left unknown.
-- } else {
-- DVCS_HESH=\\\"Git:$${DVCS_HESH}\\\"
-- }
-- } else {
-- DVCS_HESH=\\\"Hg:$${DVCS_HESH}\\\"
-- }
-- return($${DVCS_HESH})
--}
-+return(\\\"unknown\\\")
- }
-
- # Default prefix. Use for creation install path.
-diff --git a/src/libs/vmisc/vmisc.pro b/src/libs/vmisc/vmisc.pro
-index cf8db51..fff1c0e 100644
---- a/src/libs/vmisc/vmisc.pro
-+++ b/src/libs/vmisc/vmisc.pro
-@@ -98,10 +98,7 @@ CONFIG(debug, debug|release){
- HG = hg # All other platforms all OK.
- }
- #latest tag distance number for using in version
-- HG_DISTANCE=$$system($${HG} log -r. --template '{latesttagdistance}')
-- isEmpty(HG_DISTANCE){
-- HG_DISTANCE = 0 # if we can't find local revision left 0.
-- }
-+ HG_DISTANCE = 0 # if we can't find local revision left 0.
- message("Latest tag distance:" $${HG_DISTANCE})
- DEFINES += "LATEST_TAG_DISTANCE=$${HG_DISTANCE}" # Make available latest tag distance number in sources.
- }
-diff --git a/src/libs/vtest/vtest.pro b/src/libs/vtest/vtest.pro
-index a336d48..c943fc5 100644
---- a/src/libs/vtest/vtest.pro
-+++ b/src/libs/vtest/vtest.pro
-@@ -92,10 +92,7 @@ CONFIG(debug, debug|release){
- HG = hg # All other platforms all OK.
- }
- #latest tag distance number for using in version
-- HG_DISTANCE=$$system($${HG} log -r. --template '{latesttagdistance}')
-- isEmpty(HG_DISTANCE){
-- HG_DISTANCE = 0 # if we can't find local revision left 0.
-- }
-+ HG_DISTANCE = 0 # if we can't find local revision left 0.
- message("Latest tag distance:" $${HG_DISTANCE})
- DEFINES += "LATEST_TAG_DISTANCE=$${HG_DISTANCE}" # Make available latest tag distance number in sources.
- }
diff --git a/media-gfx/valentina/valentina-0.6.1-r1.ebuild b/media-gfx/valentina/valentina-0.6.1-r1.ebuild
deleted file mode 100644
index 573945103dcb..000000000000
--- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Cloth patternmaking software"
-HOMEPAGE="https://smart-pattern.com.ua/"
-SRC_URI="https://gitlab.com/smart-pattern/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
- https://dev.gentoo.org/~fordfrog/distfiles/valentina-5858.patch.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN"
-
-for LANG in ${LANGS}; do
- IUSE="${IUSE} l10n_${LANG}"
-done
-
-RDEPEND="
- app-text/poppler
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5"
-DEPEND="
- ${RDEPEND}
- dev-qt/qttest:5
-"
-BDEPEND="
- dev-qt/linguist-tools:5
-"
-
-S=${WORKDIR}/${PN}-v${PV}
-
-PATCHES=(
- "${FILESDIR}/5823.patch"
- "${FILESDIR}/${P}-disable-vcs-version.patch"
- "${WORKDIR}/valentina-5858.patch"
-)
-
-src_configure() {
- local locales=""
- local locale
-
- for LANG in ${LANGS}; do
- if use l10n_${LANG}; then
- case ${LANG} in
- "cs")
- locale="cs_CZ"
- ;;
- "de")
- locale="de_DE"
- ;;
- "el")
- locale="el_GR"
- ;;
- "en")
- locale="en_CA en_IN en_US"
- ;;
- "es")
- locale="es_ES"
- ;;
- "fi")
- locale="fi_FI"
- ;;
- "fr")
- locale="fr_FR"
- ;;
- "he")
- locale="he_IL"
- ;;
- "id")
- locale="id_ID"
- ;;
- "it")
- locale="it_IT"
- ;;
- "nl")
- locale="nl_NL"
- ;;
- "pt-BR")
- locale="pt_BR"
- ;;
- "ro")
- locale="ro_RO"
- ;;
- "ru")
- locale="ru_RU"
- ;;
- "uk")
- locale="uk_UA"
- ;;
- "zh-CN")
- locale="zh_CN"
- ;;
- esac
-
- locales="${locales} ${locale}"
- fi
- done
-
- eqmake5 LOCALES="${locales}" "CONFIG+=noDebugSymbols no_ccache noRunPath noTests noWindowsInstaller" Valentina.pro -r
-}
-
-src_install() {
- emake install INSTALL_ROOT="${D}"
-
- dodoc AUTHORS.txt ChangeLog.txt README.txt
-
- doman dist/debian/${PN}.1
- doman dist/debian/tape.1
-
- cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die
- insinto /usr/share/mime/packages
- doins dist/debian/${PN}.xml
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-12-10 8:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-10 8:15 [gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/, media-gfx/valentina/files/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2019-12-30 17:02 Miroslav Šulc
2019-03-01 12:29 Miroslav Šulc
2017-10-23 17:42 Miroslav Šulc
2016-02-19 21:28 Miroslav Šulc
2016-02-18 17:58 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox