[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: bfcfbfe0dacfc3ee5a6601a4f85f206309fc09de Author: Miroslav Šulc gentoo org> AuthorDate: Thu Jan 28 12:45:02 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Jan 28 12:45:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfcfbfe0 media-gfx/valentina: patched out vcs calls in 0.6.1-r1 Closes: https://bugs.gentoo.org/762601 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> .../valentina-0.6.1-disable-vcs-version.patch | 75 ++ media-gfx/valentina/valentina-0.6.1-r1.ebuild | 3 +- 2 files changed, 77 insertions(+), 1 deletion(-) 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 new file mode 100644 index 000..471d7a85313 --- /dev/null +++ b/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch @@ -0,0 +1,75 @@ +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 index d6decfb393a..e770ab6d6e9 100644 --- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild +++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -45,6 +45,7 @@ S=${WORKDIR}/${PN}-v${PV} PATCHES=( "${FILESDIR}/5823.patch" + "${FILESDIR}/${P}-disable-vcs-version.patch" "${WORKDIR}/valentina-5858.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 072218d4f057afb1f5a5e02d3b84968fa913d8e6 Author: Miroslav Šulc gentoo org> AuthorDate: Mon Dec 30 17:38:15 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Dec 30 17:38:15 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072218d4 media-gfx/valentina: updated 1) eapi7 2) moved from xdg-utils to xdg 3) removed new patch from the repo due to the size 4) removed gnome use flag Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> media-gfx/valentina/Manifest |1 + media-gfx/valentina/files/5858.patch | 1495 ...tina-0.6.1.ebuild => valentina-0.6.1-r1.ebuild} | 20 +- media-gfx/valentina/valentina-.ebuild | 17 +- 4 files changed, 11 insertions(+), 1522 deletions(-) diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 7e3b734a2bb..6f5a9f26ddd 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1 +1,2 @@ DIST valentina-0.6.1.zip 38326440 BLAKE2B 33d9163058b890254120bb0849972941f36526c71ed0acd8df82867a0116a35be4818c31c3ebb8a7322cf53bca4f9e77b2de10ea0df51c46b764f8f9e7abb8d2 SHA512 6511194c734a1b6cd8a1ed489213c288e90bd653dbd8373c4ee13be78e2ae4fe00a35e19a5ee074e868319ab1a13eb8baea35dedb7242b3888d03aa4b4dc69ce +DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720 diff --git a/media-gfx/valentina/files/5858.patch b/media-gfx/valentina/files/5858.patch deleted file mode 100644 index b24d89eb8e1..000 --- a/media-gfx/valentina/files/5858.patch +++ /dev/null @@ -1,1495 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# 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/sr
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 1a5a24193e56f815fa1929f904fcd787c7eb7636 Author: Miroslav Šulc gentoo org> AuthorDate: Tue Oct 24 08:30:35 2017 + Commit: Miroslav Šulc gentoo org> CommitDate: Tue Oct 24 08:30:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a5a2419 media-gfx/valentina: fixed homepage, sources and issues with version 0.5.0 Package-Manager: Portage-2.3.12, Repoman-2.3.3 media-gfx/valentina/Manifest | 4 +- .../files/0.5.0-disable-tests-compilation.patch| 35 -- .../files/0.5.0-fix-insecure-runpaths.patch| 56 -- media-gfx/valentina/files/0.5.0-locales.patch | 48 --- ...a-0.5.0-r1.ebuild => valentina-0.5.0-r2.ebuild} | 17 +++ media-gfx/valentina/valentina-.ebuild | 10 ++-- 6 files changed, 17 insertions(+), 153 deletions(-) diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 8d506f0de2a..370ab1039f0 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1 +1,3 @@ -DIST valentina-0.5.0.zip 21431337 SHA256 7d80d7cf49250cc48f7ae791e1ee3a8de2216f818fe100b883302099d984de05 SHA512 e04615fe0d79e8d0adebaea1808ee123d979babcd9f9320e897921aeda811ece37aff20575fb4bc033f21a91b498f409dbf1a4b8999e8b3c841c2f842ce41263 WHIRLPOOL 59714a19dee39cadc86f5542e52b4424fd7724bbbf5c9e3f6f33ebc48c313bc2b7c5f3f11f82b660f9a2619d05e76bc91f65201c95ae1473efaa540e132020d9 +DIST valentina-0.5.0.zip 37175844 SHA256 f750027814e765b169c41934927f205350525b947f50559fd9bfcba016e095cb SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf WHIRLPOOL 271b471f25a59f356cca5b2c00e1a200e504c5184d2001e93c954ce0c921a56585811029e79e424f91c8550d44ea498d501f0f05c8aff62981cfc8be339ae673 +DIST valentina-4798.patch 25302 SHA256 3ff7b9555933fb361aad3b96b8486b2d5e4988fb0ee34f3fc98609d0673e3baf SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4 WHIRLPOOL 245496681adb86b6662b29426bfac11d7db6e9d7b2ab48e89d6508c5211fdc520bac450d1af051c066e00e914608fdc412cbae38dc0230dfc0090c0af6c4f979 +DIST valentina-4802.patch 6733 SHA256 abee2e871f9f741cdf26ac151dca24a0cfc9d3f22bbe2abfdb88ad7c42768c96 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4 WHIRLPOOL bb4f89a44eb5204192b680ba29226d04439b2326b37992e7a8623e713a94f20ec3043f31a059037f90a24feb2d283773f21c06f1777e4f61bf5f7a8d5f7d54af diff --git a/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch b/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch deleted file mode 100644 index a819a02a336..000 --- a/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch +++ /dev/null @@ -1,35 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# 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/files/0.5.0-fix-insecure-runpaths.patch b/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch deleted file mode 100644 index a98a069dfb5..000 --- a/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch +++ /dev/null @@ -1,56 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# Date 1455895311 -7200 -# Branch develop -# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725 -# Parent a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c -CONFIG key to disable setting custom rpath option. - -diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro a/src/app/tape/tape.pro -+++ b/src/app/tape/tape.pro -@@ -348,10 +348,16 @@ - # Path to recource file. - win32:RC_FILE = share/resources/tape.rc - --unix:!macx{ --# suppress the default RPATH --QMAKE_LFLAGS_RPATH = --QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" -+noRunPath{ # For enable run qmake with CONFIG+=noRunPath -+# do nothing -+} else { -+unix:!macx{ -+# suppress the default RPATH -+# helps to run the program without Qt Creator -+# see problem with path to libqmuparser and libpropertybrowser -+QMAKE_LFLAGS_RPATH = -+QMAKE_LFLAGS += "-Wl,-rpath,\
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 4f74a03e5eab0f11d5802a525e65f22e310faf5a Author: Miroslav Šulc gentoo org> AuthorDate: Fri Feb 19 15:46:50 2016 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Feb 19 15:47:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f74a03e media-gfx/valentina: fixed qa warning about insecure runpaths Package-Manager: portage-2.2.27 .../valentina/files/fix-insecure-runpaths.patch| 56 ++ ...a-0.4.2-r2.ebuild => valentina-0.4.2-r3.ebuild} | 5 +- media-gfx/valentina/valentina-.ebuild | 2 +- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/media-gfx/valentina/files/fix-insecure-runpaths.patch b/media-gfx/valentina/files/fix-insecure-runpaths.patch new file mode 100644 index 000..a98a069 --- /dev/null +++ b/media-gfx/valentina/files/fix-insecure-runpaths.patch @@ -0,0 +1,56 @@ +# HG changeset patch +# User Roman Telezhynskyi +# Date 1455895311 -7200 +# Branch develop +# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725 +# Parent a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c +CONFIG key to disable setting custom rpath option. + +diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro +--- a/src/app/tape/tape.pro b/src/app/tape/tape.pro +@@ -348,10 +348,16 @@ + # Path to recource file. + win32:RC_FILE = share/resources/tape.rc + +-unix:!macx{ +-# suppress the default RPATH +-QMAKE_LFLAGS_RPATH = +-QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++noRunPath{ # For enable run qmake with CONFIG+=noRunPath ++# do nothing ++} else { ++unix:!macx{ ++# suppress the default RPATH ++# helps to run the program without Qt Creator ++# see problem with path to libqmuparser and libpropertybrowser ++QMAKE_LFLAGS_RPATH = ++QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++} + } + + # When the GNU linker sees a library, it discards all symbols that it doesn't need. +diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro +--- a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro +@@ -476,10 +476,16 @@ + copyToDestdir($$pdftops_path, $$shell_path($${OUT_PWD}/$$DESTDIR)) + } + +-unix:!macx{ +-# suppress the default RPATH +-QMAKE_LFLAGS_RPATH = +-QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++noRunPath{ # For enable run qmake with CONFIG+=noRunPath ++# do nothing ++} else { ++unix:!macx{ ++# suppress the default RPATH ++# helps to run the program without Qt Creator ++# see problem with path to libqmuparser and libpropertybrowser ++QMAKE_LFLAGS_RPATH = ++QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++} + } + + # When the GNU linker sees a library, it discards all symbols that it doesn't need. diff --git a/media-gfx/valentina/valentina-0.4.2-r2.ebuild b/media-gfx/valentina/valentina-0.4.2-r3.ebuild similarity index 92% rename from media-gfx/valentina/valentina-0.4.2-r2.ebuild rename to media-gfx/valentina/valentina-0.4.2-r3.ebuild index 76ac359..30affd1 100644 --- a/media-gfx/valentina/valentina-0.4.2-r2.ebuild +++ b/media-gfx/valentina/valentina-0.4.2-r3.ebuild @@ -39,7 +39,8 @@ DEPEND="${CDEPEND} S=${WORKDIR}/dismine-${PN}-44d43351cb59 src_prepare() { - epatch "${FILESDIR}/locales.patch" + epatch "${FILESDIR}/locales.patch" \ + "${FILESDIR}/fix-insecure-runpaths.patch" } src_configure() { @@ -51,7 +52,7 @@ src_configure() { fi done - eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r + eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r } src_install() { diff --git a/media-gfx/valentina/valentina-.ebuild b/media-gfx/valentina/valentina-.ebuild index 7ddd9fa..70fd441 100644 --- a/media-gfx/valentina/valentina-.ebuild +++ b/media-gfx/valentina/valentina-.ebuild @@ -46,7 +46,7 @@ src_configure() { fi done - eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r + eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r } src_install() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 4f74a03e5eab0f11d5802a525e65f22e310faf5a Author: Miroslav Šulc gentoo org> AuthorDate: Fri Feb 19 15:46:50 2016 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Feb 19 15:47:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f74a03e media-gfx/valentina: fixed qa warning about insecure runpaths Package-Manager: portage-2.2.27 .../valentina/files/fix-insecure-runpaths.patch| 56 ++ ...a-0.4.2-r2.ebuild => valentina-0.4.2-r3.ebuild} | 5 +- media-gfx/valentina/valentina-.ebuild | 2 +- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/media-gfx/valentina/files/fix-insecure-runpaths.patch b/media-gfx/valentina/files/fix-insecure-runpaths.patch new file mode 100644 index 000..a98a069 --- /dev/null +++ b/media-gfx/valentina/files/fix-insecure-runpaths.patch @@ -0,0 +1,56 @@ +# HG changeset patch +# User Roman Telezhynskyi +# Date 1455895311 -7200 +# Branch develop +# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725 +# Parent a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c +CONFIG key to disable setting custom rpath option. + +diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro +--- a/src/app/tape/tape.pro b/src/app/tape/tape.pro +@@ -348,10 +348,16 @@ + # Path to recource file. + win32:RC_FILE = share/resources/tape.rc + +-unix:!macx{ +-# suppress the default RPATH +-QMAKE_LFLAGS_RPATH = +-QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++noRunPath{ # For enable run qmake with CONFIG+=noRunPath ++# do nothing ++} else { ++unix:!macx{ ++# suppress the default RPATH ++# helps to run the program without Qt Creator ++# see problem with path to libqmuparser and libpropertybrowser ++QMAKE_LFLAGS_RPATH = ++QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++} + } + + # When the GNU linker sees a library, it discards all symbols that it doesn't need. +diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro +--- a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro +@@ -476,10 +476,16 @@ + copyToDestdir($$pdftops_path, $$shell_path($${OUT_PWD}/$$DESTDIR)) + } + +-unix:!macx{ +-# suppress the default RPATH +-QMAKE_LFLAGS_RPATH = +-QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++noRunPath{ # For enable run qmake with CONFIG+=noRunPath ++# do nothing ++} else { ++unix:!macx{ ++# suppress the default RPATH ++# helps to run the program without Qt Creator ++# see problem with path to libqmuparser and libpropertybrowser ++QMAKE_LFLAGS_RPATH = ++QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++} + } + + # When the GNU linker sees a library, it discards all symbols that it doesn't need. diff --git a/media-gfx/valentina/valentina-0.4.2-r2.ebuild b/media-gfx/valentina/valentina-0.4.2-r3.ebuild similarity index 92% rename from media-gfx/valentina/valentina-0.4.2-r2.ebuild rename to media-gfx/valentina/valentina-0.4.2-r3.ebuild index 76ac359..30affd1 100644 --- a/media-gfx/valentina/valentina-0.4.2-r2.ebuild +++ b/media-gfx/valentina/valentina-0.4.2-r3.ebuild @@ -39,7 +39,8 @@ DEPEND="${CDEPEND} S=${WORKDIR}/dismine-${PN}-44d43351cb59 src_prepare() { - epatch "${FILESDIR}/locales.patch" + epatch "${FILESDIR}/locales.patch" \ + "${FILESDIR}/fix-insecure-runpaths.patch" } src_configure() { @@ -51,7 +52,7 @@ src_configure() { fi done - eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r + eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r } src_install() { diff --git a/media-gfx/valentina/valentina-.ebuild b/media-gfx/valentina/valentina-.ebuild index 7ddd9fa..70fd441 100644 --- a/media-gfx/valentina/valentina-.ebuild +++ b/media-gfx/valentina/valentina-.ebuild @@ -46,7 +46,7 @@ src_configure() { fi done - eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r + eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r } src_install() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 1a5a24193e56f815fa1929f904fcd787c7eb7636 Author: Miroslav Šulc gentoo org> AuthorDate: Tue Oct 24 08:30:35 2017 + Commit: Miroslav Šulc gentoo org> CommitDate: Tue Oct 24 08:30:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a5a2419 media-gfx/valentina: fixed homepage, sources and issues with version 0.5.0 Package-Manager: Portage-2.3.12, Repoman-2.3.3 media-gfx/valentina/Manifest | 4 +- .../files/0.5.0-disable-tests-compilation.patch| 35 -- .../files/0.5.0-fix-insecure-runpaths.patch| 56 -- media-gfx/valentina/files/0.5.0-locales.patch | 48 --- ...a-0.5.0-r1.ebuild => valentina-0.5.0-r2.ebuild} | 17 +++ media-gfx/valentina/valentina-.ebuild | 10 ++-- 6 files changed, 17 insertions(+), 153 deletions(-) diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 8d506f0de2a..370ab1039f0 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1 +1,3 @@ -DIST valentina-0.5.0.zip 21431337 SHA256 7d80d7cf49250cc48f7ae791e1ee3a8de2216f818fe100b883302099d984de05 SHA512 e04615fe0d79e8d0adebaea1808ee123d979babcd9f9320e897921aeda811ece37aff20575fb4bc033f21a91b498f409dbf1a4b8999e8b3c841c2f842ce41263 WHIRLPOOL 59714a19dee39cadc86f5542e52b4424fd7724bbbf5c9e3f6f33ebc48c313bc2b7c5f3f11f82b660f9a2619d05e76bc91f65201c95ae1473efaa540e132020d9 +DIST valentina-0.5.0.zip 37175844 SHA256 f750027814e765b169c41934927f205350525b947f50559fd9bfcba016e095cb SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf WHIRLPOOL 271b471f25a59f356cca5b2c00e1a200e504c5184d2001e93c954ce0c921a56585811029e79e424f91c8550d44ea498d501f0f05c8aff62981cfc8be339ae673 +DIST valentina-4798.patch 25302 SHA256 3ff7b9555933fb361aad3b96b8486b2d5e4988fb0ee34f3fc98609d0673e3baf SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4 WHIRLPOOL 245496681adb86b6662b29426bfac11d7db6e9d7b2ab48e89d6508c5211fdc520bac450d1af051c066e00e914608fdc412cbae38dc0230dfc0090c0af6c4f979 +DIST valentina-4802.patch 6733 SHA256 abee2e871f9f741cdf26ac151dca24a0cfc9d3f22bbe2abfdb88ad7c42768c96 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4 WHIRLPOOL bb4f89a44eb5204192b680ba29226d04439b2326b37992e7a8623e713a94f20ec3043f31a059037f90a24feb2d283773f21c06f1777e4f61bf5f7a8d5f7d54af diff --git a/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch b/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch deleted file mode 100644 index a819a02a336..000 --- a/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch +++ /dev/null @@ -1,35 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# 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/files/0.5.0-fix-insecure-runpaths.patch b/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch deleted file mode 100644 index a98a069dfb5..000 --- a/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch +++ /dev/null @@ -1,56 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# Date 1455895311 -7200 -# Branch develop -# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725 -# Parent a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c -CONFIG key to disable setting custom rpath option. - -diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro a/src/app/tape/tape.pro -+++ b/src/app/tape/tape.pro -@@ -348,10 +348,16 @@ - # Path to recource file. - win32:RC_FILE = share/resources/tape.rc - --unix:!macx{ --# suppress the default RPATH --QMAKE_LFLAGS_RPATH = --QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" -+noRunPath{ # For enable run qmake with CONFIG+=noRunPath -+# do nothing -+} else { -+unix:!macx{ -+# suppress the default RPATH -+# helps to run the program without Qt Creator -+# see problem with path to libqmuparser and libpropertybrowser -+QMAKE_LFLAGS_RPATH = -+QMAKE_LFLAGS += "-Wl,-rpath,\
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 4f74a03e5eab0f11d5802a525e65f22e310faf5a Author: Miroslav Šulc gentoo org> AuthorDate: Fri Feb 19 15:46:50 2016 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Feb 19 15:47:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f74a03e media-gfx/valentina: fixed qa warning about insecure runpaths Package-Manager: portage-2.2.27 .../valentina/files/fix-insecure-runpaths.patch| 56 ++ ...a-0.4.2-r2.ebuild => valentina-0.4.2-r3.ebuild} | 5 +- media-gfx/valentina/valentina-.ebuild | 2 +- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/media-gfx/valentina/files/fix-insecure-runpaths.patch b/media-gfx/valentina/files/fix-insecure-runpaths.patch new file mode 100644 index 000..a98a069 --- /dev/null +++ b/media-gfx/valentina/files/fix-insecure-runpaths.patch @@ -0,0 +1,56 @@ +# HG changeset patch +# User Roman Telezhynskyi +# Date 1455895311 -7200 +# Branch develop +# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725 +# Parent a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c +CONFIG key to disable setting custom rpath option. + +diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro +--- a/src/app/tape/tape.pro b/src/app/tape/tape.pro +@@ -348,10 +348,16 @@ + # Path to recource file. + win32:RC_FILE = share/resources/tape.rc + +-unix:!macx{ +-# suppress the default RPATH +-QMAKE_LFLAGS_RPATH = +-QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++noRunPath{ # For enable run qmake with CONFIG+=noRunPath ++# do nothing ++} else { ++unix:!macx{ ++# suppress the default RPATH ++# helps to run the program without Qt Creator ++# see problem with path to libqmuparser and libpropertybrowser ++QMAKE_LFLAGS_RPATH = ++QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++} + } + + # When the GNU linker sees a library, it discards all symbols that it doesn't need. +diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro +--- a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro +@@ -476,10 +476,16 @@ + copyToDestdir($$pdftops_path, $$shell_path($${OUT_PWD}/$$DESTDIR)) + } + +-unix:!macx{ +-# suppress the default RPATH +-QMAKE_LFLAGS_RPATH = +-QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++noRunPath{ # For enable run qmake with CONFIG+=noRunPath ++# do nothing ++} else { ++unix:!macx{ ++# suppress the default RPATH ++# helps to run the program without Qt Creator ++# see problem with path to libqmuparser and libpropertybrowser ++QMAKE_LFLAGS_RPATH = ++QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++} + } + + # When the GNU linker sees a library, it discards all symbols that it doesn't need. diff --git a/media-gfx/valentina/valentina-0.4.2-r2.ebuild b/media-gfx/valentina/valentina-0.4.2-r3.ebuild similarity index 92% rename from media-gfx/valentina/valentina-0.4.2-r2.ebuild rename to media-gfx/valentina/valentina-0.4.2-r3.ebuild index 76ac359..30affd1 100644 --- a/media-gfx/valentina/valentina-0.4.2-r2.ebuild +++ b/media-gfx/valentina/valentina-0.4.2-r3.ebuild @@ -39,7 +39,8 @@ DEPEND="${CDEPEND} S=${WORKDIR}/dismine-${PN}-44d43351cb59 src_prepare() { - epatch "${FILESDIR}/locales.patch" + epatch "${FILESDIR}/locales.patch" \ + "${FILESDIR}/fix-insecure-runpaths.patch" } src_configure() { @@ -51,7 +52,7 @@ src_configure() { fi done - eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r + eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r } src_install() { diff --git a/media-gfx/valentina/valentina-.ebuild b/media-gfx/valentina/valentina-.ebuild index 7ddd9fa..70fd441 100644 --- a/media-gfx/valentina/valentina-.ebuild +++ b/media-gfx/valentina/valentina-.ebuild @@ -46,7 +46,7 @@ src_configure() { fi done - eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r + eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r } src_install() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: bfcfbfe0dacfc3ee5a6601a4f85f206309fc09de Author: Miroslav Šulc gentoo org> AuthorDate: Thu Jan 28 12:45:02 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Jan 28 12:45:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfcfbfe0 media-gfx/valentina: patched out vcs calls in 0.6.1-r1 Closes: https://bugs.gentoo.org/762601 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> .../valentina-0.6.1-disable-vcs-version.patch | 75 ++ media-gfx/valentina/valentina-0.6.1-r1.ebuild | 3 +- 2 files changed, 77 insertions(+), 1 deletion(-) 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 new file mode 100644 index 000..471d7a85313 --- /dev/null +++ b/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch @@ -0,0 +1,75 @@ +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 index d6decfb393a..e770ab6d6e9 100644 --- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild +++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -45,6 +45,7 @@ S=${WORKDIR}/${PN}-v${PV} PATCHES=( "${FILESDIR}/5823.patch" + "${FILESDIR}/${P}-disable-vcs-version.patch" "${WORKDIR}/valentina-5858.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 072218d4f057afb1f5a5e02d3b84968fa913d8e6 Author: Miroslav Šulc gentoo org> AuthorDate: Mon Dec 30 17:38:15 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Dec 30 17:38:15 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072218d4 media-gfx/valentina: updated 1) eapi7 2) moved from xdg-utils to xdg 3) removed new patch from the repo due to the size 4) removed gnome use flag Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> media-gfx/valentina/Manifest |1 + media-gfx/valentina/files/5858.patch | 1495 ...tina-0.6.1.ebuild => valentina-0.6.1-r1.ebuild} | 20 +- media-gfx/valentina/valentina-.ebuild | 17 +- 4 files changed, 11 insertions(+), 1522 deletions(-) diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 7e3b734a2bb..6f5a9f26ddd 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1 +1,2 @@ DIST valentina-0.6.1.zip 38326440 BLAKE2B 33d9163058b890254120bb0849972941f36526c71ed0acd8df82867a0116a35be4818c31c3ebb8a7322cf53bca4f9e77b2de10ea0df51c46b764f8f9e7abb8d2 SHA512 6511194c734a1b6cd8a1ed489213c288e90bd653dbd8373c4ee13be78e2ae4fe00a35e19a5ee074e868319ab1a13eb8baea35dedb7242b3888d03aa4b4dc69ce +DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720 diff --git a/media-gfx/valentina/files/5858.patch b/media-gfx/valentina/files/5858.patch deleted file mode 100644 index b24d89eb8e1..000 --- a/media-gfx/valentina/files/5858.patch +++ /dev/null @@ -1,1495 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# 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/sr
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 072218d4f057afb1f5a5e02d3b84968fa913d8e6 Author: Miroslav Šulc gentoo org> AuthorDate: Mon Dec 30 17:38:15 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Dec 30 17:38:15 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072218d4 media-gfx/valentina: updated 1) eapi7 2) moved from xdg-utils to xdg 3) removed new patch from the repo due to the size 4) removed gnome use flag Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> media-gfx/valentina/Manifest |1 + media-gfx/valentina/files/5858.patch | 1495 ...tina-0.6.1.ebuild => valentina-0.6.1-r1.ebuild} | 20 +- media-gfx/valentina/valentina-.ebuild | 17 +- 4 files changed, 11 insertions(+), 1522 deletions(-) diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 7e3b734a2bb..6f5a9f26ddd 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1 +1,2 @@ DIST valentina-0.6.1.zip 38326440 BLAKE2B 33d9163058b890254120bb0849972941f36526c71ed0acd8df82867a0116a35be4818c31c3ebb8a7322cf53bca4f9e77b2de10ea0df51c46b764f8f9e7abb8d2 SHA512 6511194c734a1b6cd8a1ed489213c288e90bd653dbd8373c4ee13be78e2ae4fe00a35e19a5ee074e868319ab1a13eb8baea35dedb7242b3888d03aa4b4dc69ce +DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720 diff --git a/media-gfx/valentina/files/5858.patch b/media-gfx/valentina/files/5858.patch deleted file mode 100644 index b24d89eb8e1..000 --- a/media-gfx/valentina/files/5858.patch +++ /dev/null @@ -1,1495 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# 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/sr
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 1a5a24193e56f815fa1929f904fcd787c7eb7636 Author: Miroslav Šulc gentoo org> AuthorDate: Tue Oct 24 08:30:35 2017 + Commit: Miroslav Šulc gentoo org> CommitDate: Tue Oct 24 08:30:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a5a2419 media-gfx/valentina: fixed homepage, sources and issues with version 0.5.0 Package-Manager: Portage-2.3.12, Repoman-2.3.3 media-gfx/valentina/Manifest | 4 +- .../files/0.5.0-disable-tests-compilation.patch| 35 -- .../files/0.5.0-fix-insecure-runpaths.patch| 56 -- media-gfx/valentina/files/0.5.0-locales.patch | 48 --- ...a-0.5.0-r1.ebuild => valentina-0.5.0-r2.ebuild} | 17 +++ media-gfx/valentina/valentina-.ebuild | 10 ++-- 6 files changed, 17 insertions(+), 153 deletions(-) diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 8d506f0de2a..370ab1039f0 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1 +1,3 @@ -DIST valentina-0.5.0.zip 21431337 SHA256 7d80d7cf49250cc48f7ae791e1ee3a8de2216f818fe100b883302099d984de05 SHA512 e04615fe0d79e8d0adebaea1808ee123d979babcd9f9320e897921aeda811ece37aff20575fb4bc033f21a91b498f409dbf1a4b8999e8b3c841c2f842ce41263 WHIRLPOOL 59714a19dee39cadc86f5542e52b4424fd7724bbbf5c9e3f6f33ebc48c313bc2b7c5f3f11f82b660f9a2619d05e76bc91f65201c95ae1473efaa540e132020d9 +DIST valentina-0.5.0.zip 37175844 SHA256 f750027814e765b169c41934927f205350525b947f50559fd9bfcba016e095cb SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf WHIRLPOOL 271b471f25a59f356cca5b2c00e1a200e504c5184d2001e93c954ce0c921a56585811029e79e424f91c8550d44ea498d501f0f05c8aff62981cfc8be339ae673 +DIST valentina-4798.patch 25302 SHA256 3ff7b9555933fb361aad3b96b8486b2d5e4988fb0ee34f3fc98609d0673e3baf SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4 WHIRLPOOL 245496681adb86b6662b29426bfac11d7db6e9d7b2ab48e89d6508c5211fdc520bac450d1af051c066e00e914608fdc412cbae38dc0230dfc0090c0af6c4f979 +DIST valentina-4802.patch 6733 SHA256 abee2e871f9f741cdf26ac151dca24a0cfc9d3f22bbe2abfdb88ad7c42768c96 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4 WHIRLPOOL bb4f89a44eb5204192b680ba29226d04439b2326b37992e7a8623e713a94f20ec3043f31a059037f90a24feb2d283773f21c06f1777e4f61bf5f7a8d5f7d54af diff --git a/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch b/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch deleted file mode 100644 index a819a02a336..000 --- a/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch +++ /dev/null @@ -1,35 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# 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/files/0.5.0-fix-insecure-runpaths.patch b/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch deleted file mode 100644 index a98a069dfb5..000 --- a/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch +++ /dev/null @@ -1,56 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# Date 1455895311 -7200 -# Branch develop -# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725 -# Parent a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c -CONFIG key to disable setting custom rpath option. - -diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro a/src/app/tape/tape.pro -+++ b/src/app/tape/tape.pro -@@ -348,10 +348,16 @@ - # Path to recource file. - win32:RC_FILE = share/resources/tape.rc - --unix:!macx{ --# suppress the default RPATH --QMAKE_LFLAGS_RPATH = --QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" -+noRunPath{ # For enable run qmake with CONFIG+=noRunPath -+# do nothing -+} else { -+unix:!macx{ -+# suppress the default RPATH -+# helps to run the program without Qt Creator -+# see problem with path to libqmuparser and libpropertybrowser -+QMAKE_LFLAGS_RPATH = -+QMAKE_LFLAGS += "-Wl,-rpath,\
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: bfcfbfe0dacfc3ee5a6601a4f85f206309fc09de Author: Miroslav Šulc gentoo org> AuthorDate: Thu Jan 28 12:45:02 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Jan 28 12:45:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfcfbfe0 media-gfx/valentina: patched out vcs calls in 0.6.1-r1 Closes: https://bugs.gentoo.org/762601 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> .../valentina-0.6.1-disable-vcs-version.patch | 75 ++ media-gfx/valentina/valentina-0.6.1-r1.ebuild | 3 +- 2 files changed, 77 insertions(+), 1 deletion(-) 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 new file mode 100644 index 000..471d7a85313 --- /dev/null +++ b/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch @@ -0,0 +1,75 @@ +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 index d6decfb393a..e770ab6d6e9 100644 --- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild +++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -45,6 +45,7 @@ S=${WORKDIR}/${PN}-v${PV} PATCHES=( "${FILESDIR}/5823.patch" + "${FILESDIR}/${P}-disable-vcs-version.patch" "${WORKDIR}/valentina-5858.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 072218d4f057afb1f5a5e02d3b84968fa913d8e6 Author: Miroslav Šulc gentoo org> AuthorDate: Mon Dec 30 17:38:15 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Dec 30 17:38:15 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072218d4 media-gfx/valentina: updated 1) eapi7 2) moved from xdg-utils to xdg 3) removed new patch from the repo due to the size 4) removed gnome use flag Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> media-gfx/valentina/Manifest |1 + media-gfx/valentina/files/5858.patch | 1495 ...tina-0.6.1.ebuild => valentina-0.6.1-r1.ebuild} | 20 +- media-gfx/valentina/valentina-.ebuild | 17 +- 4 files changed, 11 insertions(+), 1522 deletions(-) diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 7e3b734a2bb..6f5a9f26ddd 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1 +1,2 @@ DIST valentina-0.6.1.zip 38326440 BLAKE2B 33d9163058b890254120bb0849972941f36526c71ed0acd8df82867a0116a35be4818c31c3ebb8a7322cf53bca4f9e77b2de10ea0df51c46b764f8f9e7abb8d2 SHA512 6511194c734a1b6cd8a1ed489213c288e90bd653dbd8373c4ee13be78e2ae4fe00a35e19a5ee074e868319ab1a13eb8baea35dedb7242b3888d03aa4b4dc69ce +DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720 diff --git a/media-gfx/valentina/files/5858.patch b/media-gfx/valentina/files/5858.patch deleted file mode 100644 index b24d89eb8e1..000 --- a/media-gfx/valentina/files/5858.patch +++ /dev/null @@ -1,1495 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# 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/sr
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 4f74a03e5eab0f11d5802a525e65f22e310faf5a Author: Miroslav Šulc gentoo org> AuthorDate: Fri Feb 19 15:46:50 2016 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Feb 19 15:47:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f74a03e media-gfx/valentina: fixed qa warning about insecure runpaths Package-Manager: portage-2.2.27 .../valentina/files/fix-insecure-runpaths.patch| 56 ++ ...a-0.4.2-r2.ebuild => valentina-0.4.2-r3.ebuild} | 5 +- media-gfx/valentina/valentina-.ebuild | 2 +- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/media-gfx/valentina/files/fix-insecure-runpaths.patch b/media-gfx/valentina/files/fix-insecure-runpaths.patch new file mode 100644 index 000..a98a069 --- /dev/null +++ b/media-gfx/valentina/files/fix-insecure-runpaths.patch @@ -0,0 +1,56 @@ +# HG changeset patch +# User Roman Telezhynskyi +# Date 1455895311 -7200 +# Branch develop +# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725 +# Parent a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c +CONFIG key to disable setting custom rpath option. + +diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro +--- a/src/app/tape/tape.pro b/src/app/tape/tape.pro +@@ -348,10 +348,16 @@ + # Path to recource file. + win32:RC_FILE = share/resources/tape.rc + +-unix:!macx{ +-# suppress the default RPATH +-QMAKE_LFLAGS_RPATH = +-QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++noRunPath{ # For enable run qmake with CONFIG+=noRunPath ++# do nothing ++} else { ++unix:!macx{ ++# suppress the default RPATH ++# helps to run the program without Qt Creator ++# see problem with path to libqmuparser and libpropertybrowser ++QMAKE_LFLAGS_RPATH = ++QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++} + } + + # When the GNU linker sees a library, it discards all symbols that it doesn't need. +diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro +--- a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro +@@ -476,10 +476,16 @@ + copyToDestdir($$pdftops_path, $$shell_path($${OUT_PWD}/$$DESTDIR)) + } + +-unix:!macx{ +-# suppress the default RPATH +-QMAKE_LFLAGS_RPATH = +-QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++noRunPath{ # For enable run qmake with CONFIG+=noRunPath ++# do nothing ++} else { ++unix:!macx{ ++# suppress the default RPATH ++# helps to run the program without Qt Creator ++# see problem with path to libqmuparser and libpropertybrowser ++QMAKE_LFLAGS_RPATH = ++QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++} + } + + # When the GNU linker sees a library, it discards all symbols that it doesn't need. diff --git a/media-gfx/valentina/valentina-0.4.2-r2.ebuild b/media-gfx/valentina/valentina-0.4.2-r3.ebuild similarity index 92% rename from media-gfx/valentina/valentina-0.4.2-r2.ebuild rename to media-gfx/valentina/valentina-0.4.2-r3.ebuild index 76ac359..30affd1 100644 --- a/media-gfx/valentina/valentina-0.4.2-r2.ebuild +++ b/media-gfx/valentina/valentina-0.4.2-r3.ebuild @@ -39,7 +39,8 @@ DEPEND="${CDEPEND} S=${WORKDIR}/dismine-${PN}-44d43351cb59 src_prepare() { - epatch "${FILESDIR}/locales.patch" + epatch "${FILESDIR}/locales.patch" \ + "${FILESDIR}/fix-insecure-runpaths.patch" } src_configure() { @@ -51,7 +52,7 @@ src_configure() { fi done - eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r + eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r } src_install() { diff --git a/media-gfx/valentina/valentina-.ebuild b/media-gfx/valentina/valentina-.ebuild index 7ddd9fa..70fd441 100644 --- a/media-gfx/valentina/valentina-.ebuild +++ b/media-gfx/valentina/valentina-.ebuild @@ -46,7 +46,7 @@ src_configure() { fi done - eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r + eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r } src_install() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 1a5a24193e56f815fa1929f904fcd787c7eb7636 Author: Miroslav Šulc gentoo org> AuthorDate: Tue Oct 24 08:30:35 2017 + Commit: Miroslav Šulc gentoo org> CommitDate: Tue Oct 24 08:30:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a5a2419 media-gfx/valentina: fixed homepage, sources and issues with version 0.5.0 Package-Manager: Portage-2.3.12, Repoman-2.3.3 media-gfx/valentina/Manifest | 4 +- .../files/0.5.0-disable-tests-compilation.patch| 35 -- .../files/0.5.0-fix-insecure-runpaths.patch| 56 -- media-gfx/valentina/files/0.5.0-locales.patch | 48 --- ...a-0.5.0-r1.ebuild => valentina-0.5.0-r2.ebuild} | 17 +++ media-gfx/valentina/valentina-.ebuild | 10 ++-- 6 files changed, 17 insertions(+), 153 deletions(-) diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 8d506f0de2a..370ab1039f0 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1 +1,3 @@ -DIST valentina-0.5.0.zip 21431337 SHA256 7d80d7cf49250cc48f7ae791e1ee3a8de2216f818fe100b883302099d984de05 SHA512 e04615fe0d79e8d0adebaea1808ee123d979babcd9f9320e897921aeda811ece37aff20575fb4bc033f21a91b498f409dbf1a4b8999e8b3c841c2f842ce41263 WHIRLPOOL 59714a19dee39cadc86f5542e52b4424fd7724bbbf5c9e3f6f33ebc48c313bc2b7c5f3f11f82b660f9a2619d05e76bc91f65201c95ae1473efaa540e132020d9 +DIST valentina-0.5.0.zip 37175844 SHA256 f750027814e765b169c41934927f205350525b947f50559fd9bfcba016e095cb SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf WHIRLPOOL 271b471f25a59f356cca5b2c00e1a200e504c5184d2001e93c954ce0c921a56585811029e79e424f91c8550d44ea498d501f0f05c8aff62981cfc8be339ae673 +DIST valentina-4798.patch 25302 SHA256 3ff7b9555933fb361aad3b96b8486b2d5e4988fb0ee34f3fc98609d0673e3baf SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4 WHIRLPOOL 245496681adb86b6662b29426bfac11d7db6e9d7b2ab48e89d6508c5211fdc520bac450d1af051c066e00e914608fdc412cbae38dc0230dfc0090c0af6c4f979 +DIST valentina-4802.patch 6733 SHA256 abee2e871f9f741cdf26ac151dca24a0cfc9d3f22bbe2abfdb88ad7c42768c96 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4 WHIRLPOOL bb4f89a44eb5204192b680ba29226d04439b2326b37992e7a8623e713a94f20ec3043f31a059037f90a24feb2d283773f21c06f1777e4f61bf5f7a8d5f7d54af diff --git a/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch b/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch deleted file mode 100644 index a819a02a336..000 --- a/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch +++ /dev/null @@ -1,35 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# 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/files/0.5.0-fix-insecure-runpaths.patch b/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch deleted file mode 100644 index a98a069dfb5..000 --- a/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch +++ /dev/null @@ -1,56 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# Date 1455895311 -7200 -# Branch develop -# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725 -# Parent a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c -CONFIG key to disable setting custom rpath option. - -diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro a/src/app/tape/tape.pro -+++ b/src/app/tape/tape.pro -@@ -348,10 +348,16 @@ - # Path to recource file. - win32:RC_FILE = share/resources/tape.rc - --unix:!macx{ --# suppress the default RPATH --QMAKE_LFLAGS_RPATH = --QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" -+noRunPath{ # For enable run qmake with CONFIG+=noRunPath -+# do nothing -+} else { -+unix:!macx{ -+# suppress the default RPATH -+# helps to run the program without Qt Creator -+# see problem with path to libqmuparser and libpropertybrowser -+QMAKE_LFLAGS_RPATH = -+QMAKE_LFLAGS += "-Wl,-rpath,\
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: bfcfbfe0dacfc3ee5a6601a4f85f206309fc09de Author: Miroslav Šulc gentoo org> AuthorDate: Thu Jan 28 12:45:02 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Jan 28 12:45:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfcfbfe0 media-gfx/valentina: patched out vcs calls in 0.6.1-r1 Closes: https://bugs.gentoo.org/762601 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> .../valentina-0.6.1-disable-vcs-version.patch | 75 ++ media-gfx/valentina/valentina-0.6.1-r1.ebuild | 3 +- 2 files changed, 77 insertions(+), 1 deletion(-) 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 new file mode 100644 index 000..471d7a85313 --- /dev/null +++ b/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch @@ -0,0 +1,75 @@ +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 index d6decfb393a..e770ab6d6e9 100644 --- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild +++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -45,6 +45,7 @@ S=${WORKDIR}/${PN}-v${PV} PATCHES=( "${FILESDIR}/5823.patch" + "${FILESDIR}/${P}-disable-vcs-version.patch" "${WORKDIR}/valentina-5858.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 1a5a24193e56f815fa1929f904fcd787c7eb7636 Author: Miroslav Šulc gentoo org> AuthorDate: Tue Oct 24 08:30:35 2017 + Commit: Miroslav Šulc gentoo org> CommitDate: Tue Oct 24 08:30:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a5a2419 media-gfx/valentina: fixed homepage, sources and issues with version 0.5.0 Package-Manager: Portage-2.3.12, Repoman-2.3.3 media-gfx/valentina/Manifest | 4 +- .../files/0.5.0-disable-tests-compilation.patch| 35 -- .../files/0.5.0-fix-insecure-runpaths.patch| 56 -- media-gfx/valentina/files/0.5.0-locales.patch | 48 --- ...a-0.5.0-r1.ebuild => valentina-0.5.0-r2.ebuild} | 17 +++ media-gfx/valentina/valentina-.ebuild | 10 ++-- 6 files changed, 17 insertions(+), 153 deletions(-) diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 8d506f0de2a..370ab1039f0 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1 +1,3 @@ -DIST valentina-0.5.0.zip 21431337 SHA256 7d80d7cf49250cc48f7ae791e1ee3a8de2216f818fe100b883302099d984de05 SHA512 e04615fe0d79e8d0adebaea1808ee123d979babcd9f9320e897921aeda811ece37aff20575fb4bc033f21a91b498f409dbf1a4b8999e8b3c841c2f842ce41263 WHIRLPOOL 59714a19dee39cadc86f5542e52b4424fd7724bbbf5c9e3f6f33ebc48c313bc2b7c5f3f11f82b660f9a2619d05e76bc91f65201c95ae1473efaa540e132020d9 +DIST valentina-0.5.0.zip 37175844 SHA256 f750027814e765b169c41934927f205350525b947f50559fd9bfcba016e095cb SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf WHIRLPOOL 271b471f25a59f356cca5b2c00e1a200e504c5184d2001e93c954ce0c921a56585811029e79e424f91c8550d44ea498d501f0f05c8aff62981cfc8be339ae673 +DIST valentina-4798.patch 25302 SHA256 3ff7b9555933fb361aad3b96b8486b2d5e4988fb0ee34f3fc98609d0673e3baf SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4 WHIRLPOOL 245496681adb86b6662b29426bfac11d7db6e9d7b2ab48e89d6508c5211fdc520bac450d1af051c066e00e914608fdc412cbae38dc0230dfc0090c0af6c4f979 +DIST valentina-4802.patch 6733 SHA256 abee2e871f9f741cdf26ac151dca24a0cfc9d3f22bbe2abfdb88ad7c42768c96 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4 WHIRLPOOL bb4f89a44eb5204192b680ba29226d04439b2326b37992e7a8623e713a94f20ec3043f31a059037f90a24feb2d283773f21c06f1777e4f61bf5f7a8d5f7d54af diff --git a/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch b/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch deleted file mode 100644 index a819a02a336..000 --- a/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch +++ /dev/null @@ -1,35 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# 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/files/0.5.0-fix-insecure-runpaths.patch b/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch deleted file mode 100644 index a98a069dfb5..000 --- a/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch +++ /dev/null @@ -1,56 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# Date 1455895311 -7200 -# Branch develop -# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725 -# Parent a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c -CONFIG key to disable setting custom rpath option. - -diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro a/src/app/tape/tape.pro -+++ b/src/app/tape/tape.pro -@@ -348,10 +348,16 @@ - # Path to recource file. - win32:RC_FILE = share/resources/tape.rc - --unix:!macx{ --# suppress the default RPATH --QMAKE_LFLAGS_RPATH = --QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" -+noRunPath{ # For enable run qmake with CONFIG+=noRunPath -+# do nothing -+} else { -+unix:!macx{ -+# suppress the default RPATH -+# helps to run the program without Qt Creator -+# see problem with path to libqmuparser and libpropertybrowser -+QMAKE_LFLAGS_RPATH = -+QMAKE_LFLAGS += "-Wl,-rpath,\
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 072218d4f057afb1f5a5e02d3b84968fa913d8e6 Author: Miroslav Šulc gentoo org> AuthorDate: Mon Dec 30 17:38:15 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Dec 30 17:38:15 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072218d4 media-gfx/valentina: updated 1) eapi7 2) moved from xdg-utils to xdg 3) removed new patch from the repo due to the size 4) removed gnome use flag Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> media-gfx/valentina/Manifest |1 + media-gfx/valentina/files/5858.patch | 1495 ...tina-0.6.1.ebuild => valentina-0.6.1-r1.ebuild} | 20 +- media-gfx/valentina/valentina-.ebuild | 17 +- 4 files changed, 11 insertions(+), 1522 deletions(-) diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 7e3b734a2bb..6f5a9f26ddd 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1 +1,2 @@ DIST valentina-0.6.1.zip 38326440 BLAKE2B 33d9163058b890254120bb0849972941f36526c71ed0acd8df82867a0116a35be4818c31c3ebb8a7322cf53bca4f9e77b2de10ea0df51c46b764f8f9e7abb8d2 SHA512 6511194c734a1b6cd8a1ed489213c288e90bd653dbd8373c4ee13be78e2ae4fe00a35e19a5ee074e868319ab1a13eb8baea35dedb7242b3888d03aa4b4dc69ce +DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720 diff --git a/media-gfx/valentina/files/5858.patch b/media-gfx/valentina/files/5858.patch deleted file mode 100644 index b24d89eb8e1..000 --- a/media-gfx/valentina/files/5858.patch +++ /dev/null @@ -1,1495 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# 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/sr
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: bfcfbfe0dacfc3ee5a6601a4f85f206309fc09de Author: Miroslav Šulc gentoo org> AuthorDate: Thu Jan 28 12:45:02 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Jan 28 12:45:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfcfbfe0 media-gfx/valentina: patched out vcs calls in 0.6.1-r1 Closes: https://bugs.gentoo.org/762601 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> .../valentina-0.6.1-disable-vcs-version.patch | 75 ++ media-gfx/valentina/valentina-0.6.1-r1.ebuild | 3 +- 2 files changed, 77 insertions(+), 1 deletion(-) 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 new file mode 100644 index 000..471d7a85313 --- /dev/null +++ b/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch @@ -0,0 +1,75 @@ +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 index d6decfb393a..e770ab6d6e9 100644 --- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild +++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -45,6 +45,7 @@ S=${WORKDIR}/${PN}-v${PV} PATCHES=( "${FILESDIR}/5823.patch" + "${FILESDIR}/${P}-disable-vcs-version.patch" "${WORKDIR}/valentina-5858.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 4f74a03e5eab0f11d5802a525e65f22e310faf5a Author: Miroslav Šulc gentoo org> AuthorDate: Fri Feb 19 15:46:50 2016 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Feb 19 15:47:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f74a03e media-gfx/valentina: fixed qa warning about insecure runpaths Package-Manager: portage-2.2.27 .../valentina/files/fix-insecure-runpaths.patch| 56 ++ ...a-0.4.2-r2.ebuild => valentina-0.4.2-r3.ebuild} | 5 +- media-gfx/valentina/valentina-.ebuild | 2 +- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/media-gfx/valentina/files/fix-insecure-runpaths.patch b/media-gfx/valentina/files/fix-insecure-runpaths.patch new file mode 100644 index 000..a98a069 --- /dev/null +++ b/media-gfx/valentina/files/fix-insecure-runpaths.patch @@ -0,0 +1,56 @@ +# HG changeset patch +# User Roman Telezhynskyi +# Date 1455895311 -7200 +# Branch develop +# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725 +# Parent a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c +CONFIG key to disable setting custom rpath option. + +diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro +--- a/src/app/tape/tape.pro b/src/app/tape/tape.pro +@@ -348,10 +348,16 @@ + # Path to recource file. + win32:RC_FILE = share/resources/tape.rc + +-unix:!macx{ +-# suppress the default RPATH +-QMAKE_LFLAGS_RPATH = +-QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++noRunPath{ # For enable run qmake with CONFIG+=noRunPath ++# do nothing ++} else { ++unix:!macx{ ++# suppress the default RPATH ++# helps to run the program without Qt Creator ++# see problem with path to libqmuparser and libpropertybrowser ++QMAKE_LFLAGS_RPATH = ++QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++} + } + + # When the GNU linker sees a library, it discards all symbols that it doesn't need. +diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro +--- a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro +@@ -476,10 +476,16 @@ + copyToDestdir($$pdftops_path, $$shell_path($${OUT_PWD}/$$DESTDIR)) + } + +-unix:!macx{ +-# suppress the default RPATH +-QMAKE_LFLAGS_RPATH = +-QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++noRunPath{ # For enable run qmake with CONFIG+=noRunPath ++# do nothing ++} else { ++unix:!macx{ ++# suppress the default RPATH ++# helps to run the program without Qt Creator ++# see problem with path to libqmuparser and libpropertybrowser ++QMAKE_LFLAGS_RPATH = ++QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++} + } + + # When the GNU linker sees a library, it discards all symbols that it doesn't need. diff --git a/media-gfx/valentina/valentina-0.4.2-r2.ebuild b/media-gfx/valentina/valentina-0.4.2-r3.ebuild similarity index 92% rename from media-gfx/valentina/valentina-0.4.2-r2.ebuild rename to media-gfx/valentina/valentina-0.4.2-r3.ebuild index 76ac359..30affd1 100644 --- a/media-gfx/valentina/valentina-0.4.2-r2.ebuild +++ b/media-gfx/valentina/valentina-0.4.2-r3.ebuild @@ -39,7 +39,8 @@ DEPEND="${CDEPEND} S=${WORKDIR}/dismine-${PN}-44d43351cb59 src_prepare() { - epatch "${FILESDIR}/locales.patch" + epatch "${FILESDIR}/locales.patch" \ + "${FILESDIR}/fix-insecure-runpaths.patch" } src_configure() { @@ -51,7 +52,7 @@ src_configure() { fi done - eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r + eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r } src_install() { diff --git a/media-gfx/valentina/valentina-.ebuild b/media-gfx/valentina/valentina-.ebuild index 7ddd9fa..70fd441 100644 --- a/media-gfx/valentina/valentina-.ebuild +++ b/media-gfx/valentina/valentina-.ebuild @@ -46,7 +46,7 @@ src_configure() { fi done - eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r + eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r } src_install() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 072218d4f057afb1f5a5e02d3b84968fa913d8e6 Author: Miroslav Šulc gentoo org> AuthorDate: Mon Dec 30 17:38:15 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Dec 30 17:38:15 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072218d4 media-gfx/valentina: updated 1) eapi7 2) moved from xdg-utils to xdg 3) removed new patch from the repo due to the size 4) removed gnome use flag Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> media-gfx/valentina/Manifest |1 + media-gfx/valentina/files/5858.patch | 1495 ...tina-0.6.1.ebuild => valentina-0.6.1-r1.ebuild} | 20 +- media-gfx/valentina/valentina-.ebuild | 17 +- 4 files changed, 11 insertions(+), 1522 deletions(-) diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 7e3b734a2bb..6f5a9f26ddd 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1 +1,2 @@ DIST valentina-0.6.1.zip 38326440 BLAKE2B 33d9163058b890254120bb0849972941f36526c71ed0acd8df82867a0116a35be4818c31c3ebb8a7322cf53bca4f9e77b2de10ea0df51c46b764f8f9e7abb8d2 SHA512 6511194c734a1b6cd8a1ed489213c288e90bd653dbd8373c4ee13be78e2ae4fe00a35e19a5ee074e868319ab1a13eb8baea35dedb7242b3888d03aa4b4dc69ce +DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720 diff --git a/media-gfx/valentina/files/5858.patch b/media-gfx/valentina/files/5858.patch deleted file mode 100644 index b24d89eb8e1..000 --- a/media-gfx/valentina/files/5858.patch +++ /dev/null @@ -1,1495 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# 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/sr
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: bfcfbfe0dacfc3ee5a6601a4f85f206309fc09de Author: Miroslav Šulc gentoo org> AuthorDate: Thu Jan 28 12:45:02 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Jan 28 12:45:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfcfbfe0 media-gfx/valentina: patched out vcs calls in 0.6.1-r1 Closes: https://bugs.gentoo.org/762601 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> .../valentina-0.6.1-disable-vcs-version.patch | 75 ++ media-gfx/valentina/valentina-0.6.1-r1.ebuild | 3 +- 2 files changed, 77 insertions(+), 1 deletion(-) 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 new file mode 100644 index 000..471d7a85313 --- /dev/null +++ b/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch @@ -0,0 +1,75 @@ +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 index d6decfb393a..e770ab6d6e9 100644 --- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild +++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -45,6 +45,7 @@ S=${WORKDIR}/${PN}-v${PV} PATCHES=( "${FILESDIR}/5823.patch" + "${FILESDIR}/${P}-disable-vcs-version.patch" "${WORKDIR}/valentina-5858.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 1a5a24193e56f815fa1929f904fcd787c7eb7636 Author: Miroslav Šulc gentoo org> AuthorDate: Tue Oct 24 08:30:35 2017 + Commit: Miroslav Šulc gentoo org> CommitDate: Tue Oct 24 08:30:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a5a2419 media-gfx/valentina: fixed homepage, sources and issues with version 0.5.0 Package-Manager: Portage-2.3.12, Repoman-2.3.3 media-gfx/valentina/Manifest | 4 +- .../files/0.5.0-disable-tests-compilation.patch| 35 -- .../files/0.5.0-fix-insecure-runpaths.patch| 56 -- media-gfx/valentina/files/0.5.0-locales.patch | 48 --- ...a-0.5.0-r1.ebuild => valentina-0.5.0-r2.ebuild} | 17 +++ media-gfx/valentina/valentina-.ebuild | 10 ++-- 6 files changed, 17 insertions(+), 153 deletions(-) diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 8d506f0de2a..370ab1039f0 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1 +1,3 @@ -DIST valentina-0.5.0.zip 21431337 SHA256 7d80d7cf49250cc48f7ae791e1ee3a8de2216f818fe100b883302099d984de05 SHA512 e04615fe0d79e8d0adebaea1808ee123d979babcd9f9320e897921aeda811ece37aff20575fb4bc033f21a91b498f409dbf1a4b8999e8b3c841c2f842ce41263 WHIRLPOOL 59714a19dee39cadc86f5542e52b4424fd7724bbbf5c9e3f6f33ebc48c313bc2b7c5f3f11f82b660f9a2619d05e76bc91f65201c95ae1473efaa540e132020d9 +DIST valentina-0.5.0.zip 37175844 SHA256 f750027814e765b169c41934927f205350525b947f50559fd9bfcba016e095cb SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf WHIRLPOOL 271b471f25a59f356cca5b2c00e1a200e504c5184d2001e93c954ce0c921a56585811029e79e424f91c8550d44ea498d501f0f05c8aff62981cfc8be339ae673 +DIST valentina-4798.patch 25302 SHA256 3ff7b9555933fb361aad3b96b8486b2d5e4988fb0ee34f3fc98609d0673e3baf SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4 WHIRLPOOL 245496681adb86b6662b29426bfac11d7db6e9d7b2ab48e89d6508c5211fdc520bac450d1af051c066e00e914608fdc412cbae38dc0230dfc0090c0af6c4f979 +DIST valentina-4802.patch 6733 SHA256 abee2e871f9f741cdf26ac151dca24a0cfc9d3f22bbe2abfdb88ad7c42768c96 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4 WHIRLPOOL bb4f89a44eb5204192b680ba29226d04439b2326b37992e7a8623e713a94f20ec3043f31a059037f90a24feb2d283773f21c06f1777e4f61bf5f7a8d5f7d54af diff --git a/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch b/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch deleted file mode 100644 index a819a02a336..000 --- a/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch +++ /dev/null @@ -1,35 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# 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/files/0.5.0-fix-insecure-runpaths.patch b/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch deleted file mode 100644 index a98a069dfb5..000 --- a/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch +++ /dev/null @@ -1,56 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# Date 1455895311 -7200 -# Branch develop -# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725 -# Parent a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c -CONFIG key to disable setting custom rpath option. - -diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro a/src/app/tape/tape.pro -+++ b/src/app/tape/tape.pro -@@ -348,10 +348,16 @@ - # Path to recource file. - win32:RC_FILE = share/resources/tape.rc - --unix:!macx{ --# suppress the default RPATH --QMAKE_LFLAGS_RPATH = --QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" -+noRunPath{ # For enable run qmake with CONFIG+=noRunPath -+# do nothing -+} else { -+unix:!macx{ -+# suppress the default RPATH -+# helps to run the program without Qt Creator -+# see problem with path to libqmuparser and libpropertybrowser -+QMAKE_LFLAGS_RPATH = -+QMAKE_LFLAGS += "-Wl,-rpath,\
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 4f74a03e5eab0f11d5802a525e65f22e310faf5a Author: Miroslav Šulc gentoo org> AuthorDate: Fri Feb 19 15:46:50 2016 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Feb 19 15:47:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f74a03e media-gfx/valentina: fixed qa warning about insecure runpaths Package-Manager: portage-2.2.27 .../valentina/files/fix-insecure-runpaths.patch| 56 ++ ...a-0.4.2-r2.ebuild => valentina-0.4.2-r3.ebuild} | 5 +- media-gfx/valentina/valentina-.ebuild | 2 +- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/media-gfx/valentina/files/fix-insecure-runpaths.patch b/media-gfx/valentina/files/fix-insecure-runpaths.patch new file mode 100644 index 000..a98a069 --- /dev/null +++ b/media-gfx/valentina/files/fix-insecure-runpaths.patch @@ -0,0 +1,56 @@ +# HG changeset patch +# User Roman Telezhynskyi +# Date 1455895311 -7200 +# Branch develop +# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725 +# Parent a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c +CONFIG key to disable setting custom rpath option. + +diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro +--- a/src/app/tape/tape.pro b/src/app/tape/tape.pro +@@ -348,10 +348,16 @@ + # Path to recource file. + win32:RC_FILE = share/resources/tape.rc + +-unix:!macx{ +-# suppress the default RPATH +-QMAKE_LFLAGS_RPATH = +-QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++noRunPath{ # For enable run qmake with CONFIG+=noRunPath ++# do nothing ++} else { ++unix:!macx{ ++# suppress the default RPATH ++# helps to run the program without Qt Creator ++# see problem with path to libqmuparser and libpropertybrowser ++QMAKE_LFLAGS_RPATH = ++QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++} + } + + # When the GNU linker sees a library, it discards all symbols that it doesn't need. +diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro +--- a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro +@@ -476,10 +476,16 @@ + copyToDestdir($$pdftops_path, $$shell_path($${OUT_PWD}/$$DESTDIR)) + } + +-unix:!macx{ +-# suppress the default RPATH +-QMAKE_LFLAGS_RPATH = +-QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++noRunPath{ # For enable run qmake with CONFIG+=noRunPath ++# do nothing ++} else { ++unix:!macx{ ++# suppress the default RPATH ++# helps to run the program without Qt Creator ++# see problem with path to libqmuparser and libpropertybrowser ++QMAKE_LFLAGS_RPATH = ++QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++} + } + + # When the GNU linker sees a library, it discards all symbols that it doesn't need. diff --git a/media-gfx/valentina/valentina-0.4.2-r2.ebuild b/media-gfx/valentina/valentina-0.4.2-r3.ebuild similarity index 92% rename from media-gfx/valentina/valentina-0.4.2-r2.ebuild rename to media-gfx/valentina/valentina-0.4.2-r3.ebuild index 76ac359..30affd1 100644 --- a/media-gfx/valentina/valentina-0.4.2-r2.ebuild +++ b/media-gfx/valentina/valentina-0.4.2-r3.ebuild @@ -39,7 +39,8 @@ DEPEND="${CDEPEND} S=${WORKDIR}/dismine-${PN}-44d43351cb59 src_prepare() { - epatch "${FILESDIR}/locales.patch" + epatch "${FILESDIR}/locales.patch" \ + "${FILESDIR}/fix-insecure-runpaths.patch" } src_configure() { @@ -51,7 +52,7 @@ src_configure() { fi done - eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r + eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r } src_install() { diff --git a/media-gfx/valentina/valentina-.ebuild b/media-gfx/valentina/valentina-.ebuild index 7ddd9fa..70fd441 100644 --- a/media-gfx/valentina/valentina-.ebuild +++ b/media-gfx/valentina/valentina-.ebuild @@ -46,7 +46,7 @@ src_configure() { fi done - eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r + eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r } src_install() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: bfcfbfe0dacfc3ee5a6601a4f85f206309fc09de Author: Miroslav Šulc gentoo org> AuthorDate: Thu Jan 28 12:45:02 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Jan 28 12:45:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfcfbfe0 media-gfx/valentina: patched out vcs calls in 0.6.1-r1 Closes: https://bugs.gentoo.org/762601 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> .../valentina-0.6.1-disable-vcs-version.patch | 75 ++ media-gfx/valentina/valentina-0.6.1-r1.ebuild | 3 +- 2 files changed, 77 insertions(+), 1 deletion(-) 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 new file mode 100644 index 000..471d7a85313 --- /dev/null +++ b/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch @@ -0,0 +1,75 @@ +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 index d6decfb393a..e770ab6d6e9 100644 --- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild +++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -45,6 +45,7 @@ S=${WORKDIR}/${PN}-v${PV} PATCHES=( "${FILESDIR}/5823.patch" + "${FILESDIR}/${P}-disable-vcs-version.patch" "${WORKDIR}/valentina-5858.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 072218d4f057afb1f5a5e02d3b84968fa913d8e6 Author: Miroslav Šulc gentoo org> AuthorDate: Mon Dec 30 17:38:15 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Dec 30 17:38:15 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072218d4 media-gfx/valentina: updated 1) eapi7 2) moved from xdg-utils to xdg 3) removed new patch from the repo due to the size 4) removed gnome use flag Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> media-gfx/valentina/Manifest |1 + media-gfx/valentina/files/5858.patch | 1495 ...tina-0.6.1.ebuild => valentina-0.6.1-r1.ebuild} | 20 +- media-gfx/valentina/valentina-.ebuild | 17 +- 4 files changed, 11 insertions(+), 1522 deletions(-) diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 7e3b734a2bb..6f5a9f26ddd 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1 +1,2 @@ DIST valentina-0.6.1.zip 38326440 BLAKE2B 33d9163058b890254120bb0849972941f36526c71ed0acd8df82867a0116a35be4818c31c3ebb8a7322cf53bca4f9e77b2de10ea0df51c46b764f8f9e7abb8d2 SHA512 6511194c734a1b6cd8a1ed489213c288e90bd653dbd8373c4ee13be78e2ae4fe00a35e19a5ee074e868319ab1a13eb8baea35dedb7242b3888d03aa4b4dc69ce +DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720 diff --git a/media-gfx/valentina/files/5858.patch b/media-gfx/valentina/files/5858.patch deleted file mode 100644 index b24d89eb8e1..000 --- a/media-gfx/valentina/files/5858.patch +++ /dev/null @@ -1,1495 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# 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/sr
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: bfcfbfe0dacfc3ee5a6601a4f85f206309fc09de Author: Miroslav Šulc gentoo org> AuthorDate: Thu Jan 28 12:45:02 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Jan 28 12:45:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfcfbfe0 media-gfx/valentina: patched out vcs calls in 0.6.1-r1 Closes: https://bugs.gentoo.org/762601 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> .../valentina-0.6.1-disable-vcs-version.patch | 75 ++ media-gfx/valentina/valentina-0.6.1-r1.ebuild | 3 +- 2 files changed, 77 insertions(+), 1 deletion(-) 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 new file mode 100644 index 000..471d7a85313 --- /dev/null +++ b/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch @@ -0,0 +1,75 @@ +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 index d6decfb393a..e770ab6d6e9 100644 --- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild +++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -45,6 +45,7 @@ S=${WORKDIR}/${PN}-v${PV} PATCHES=( "${FILESDIR}/5823.patch" + "${FILESDIR}/${P}-disable-vcs-version.patch" "${WORKDIR}/valentina-5858.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 072218d4f057afb1f5a5e02d3b84968fa913d8e6 Author: Miroslav Šulc gentoo org> AuthorDate: Mon Dec 30 17:38:15 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Dec 30 17:38:15 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072218d4 media-gfx/valentina: updated 1) eapi7 2) moved from xdg-utils to xdg 3) removed new patch from the repo due to the size 4) removed gnome use flag Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> media-gfx/valentina/Manifest |1 + media-gfx/valentina/files/5858.patch | 1495 ...tina-0.6.1.ebuild => valentina-0.6.1-r1.ebuild} | 20 +- media-gfx/valentina/valentina-.ebuild | 17 +- 4 files changed, 11 insertions(+), 1522 deletions(-) diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 7e3b734a2bb..6f5a9f26ddd 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1 +1,2 @@ DIST valentina-0.6.1.zip 38326440 BLAKE2B 33d9163058b890254120bb0849972941f36526c71ed0acd8df82867a0116a35be4818c31c3ebb8a7322cf53bca4f9e77b2de10ea0df51c46b764f8f9e7abb8d2 SHA512 6511194c734a1b6cd8a1ed489213c288e90bd653dbd8373c4ee13be78e2ae4fe00a35e19a5ee074e868319ab1a13eb8baea35dedb7242b3888d03aa4b4dc69ce +DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720 diff --git a/media-gfx/valentina/files/5858.patch b/media-gfx/valentina/files/5858.patch deleted file mode 100644 index b24d89eb8e1..000 --- a/media-gfx/valentina/files/5858.patch +++ /dev/null @@ -1,1495 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# 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/sr
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 1a5a24193e56f815fa1929f904fcd787c7eb7636 Author: Miroslav Šulc gentoo org> AuthorDate: Tue Oct 24 08:30:35 2017 + Commit: Miroslav Šulc gentoo org> CommitDate: Tue Oct 24 08:30:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a5a2419 media-gfx/valentina: fixed homepage, sources and issues with version 0.5.0 Package-Manager: Portage-2.3.12, Repoman-2.3.3 media-gfx/valentina/Manifest | 4 +- .../files/0.5.0-disable-tests-compilation.patch| 35 -- .../files/0.5.0-fix-insecure-runpaths.patch| 56 -- media-gfx/valentina/files/0.5.0-locales.patch | 48 --- ...a-0.5.0-r1.ebuild => valentina-0.5.0-r2.ebuild} | 17 +++ media-gfx/valentina/valentina-.ebuild | 10 ++-- 6 files changed, 17 insertions(+), 153 deletions(-) diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 8d506f0de2a..370ab1039f0 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1 +1,3 @@ -DIST valentina-0.5.0.zip 21431337 SHA256 7d80d7cf49250cc48f7ae791e1ee3a8de2216f818fe100b883302099d984de05 SHA512 e04615fe0d79e8d0adebaea1808ee123d979babcd9f9320e897921aeda811ece37aff20575fb4bc033f21a91b498f409dbf1a4b8999e8b3c841c2f842ce41263 WHIRLPOOL 59714a19dee39cadc86f5542e52b4424fd7724bbbf5c9e3f6f33ebc48c313bc2b7c5f3f11f82b660f9a2619d05e76bc91f65201c95ae1473efaa540e132020d9 +DIST valentina-0.5.0.zip 37175844 SHA256 f750027814e765b169c41934927f205350525b947f50559fd9bfcba016e095cb SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf WHIRLPOOL 271b471f25a59f356cca5b2c00e1a200e504c5184d2001e93c954ce0c921a56585811029e79e424f91c8550d44ea498d501f0f05c8aff62981cfc8be339ae673 +DIST valentina-4798.patch 25302 SHA256 3ff7b9555933fb361aad3b96b8486b2d5e4988fb0ee34f3fc98609d0673e3baf SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4 WHIRLPOOL 245496681adb86b6662b29426bfac11d7db6e9d7b2ab48e89d6508c5211fdc520bac450d1af051c066e00e914608fdc412cbae38dc0230dfc0090c0af6c4f979 +DIST valentina-4802.patch 6733 SHA256 abee2e871f9f741cdf26ac151dca24a0cfc9d3f22bbe2abfdb88ad7c42768c96 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4 WHIRLPOOL bb4f89a44eb5204192b680ba29226d04439b2326b37992e7a8623e713a94f20ec3043f31a059037f90a24feb2d283773f21c06f1777e4f61bf5f7a8d5f7d54af diff --git a/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch b/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch deleted file mode 100644 index a819a02a336..000 --- a/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch +++ /dev/null @@ -1,35 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# 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/files/0.5.0-fix-insecure-runpaths.patch b/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch deleted file mode 100644 index a98a069dfb5..000 --- a/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch +++ /dev/null @@ -1,56 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# Date 1455895311 -7200 -# Branch develop -# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725 -# Parent a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c -CONFIG key to disable setting custom rpath option. - -diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro a/src/app/tape/tape.pro -+++ b/src/app/tape/tape.pro -@@ -348,10 +348,16 @@ - # Path to recource file. - win32:RC_FILE = share/resources/tape.rc - --unix:!macx{ --# suppress the default RPATH --QMAKE_LFLAGS_RPATH = --QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" -+noRunPath{ # For enable run qmake with CONFIG+=noRunPath -+# do nothing -+} else { -+unix:!macx{ -+# suppress the default RPATH -+# helps to run the program without Qt Creator -+# see problem with path to libqmuparser and libpropertybrowser -+QMAKE_LFLAGS_RPATH = -+QMAKE_LFLAGS += "-Wl,-rpath,\
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 4f74a03e5eab0f11d5802a525e65f22e310faf5a Author: Miroslav Šulc gentoo org> AuthorDate: Fri Feb 19 15:46:50 2016 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Feb 19 15:47:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f74a03e media-gfx/valentina: fixed qa warning about insecure runpaths Package-Manager: portage-2.2.27 .../valentina/files/fix-insecure-runpaths.patch| 56 ++ ...a-0.4.2-r2.ebuild => valentina-0.4.2-r3.ebuild} | 5 +- media-gfx/valentina/valentina-.ebuild | 2 +- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/media-gfx/valentina/files/fix-insecure-runpaths.patch b/media-gfx/valentina/files/fix-insecure-runpaths.patch new file mode 100644 index 000..a98a069 --- /dev/null +++ b/media-gfx/valentina/files/fix-insecure-runpaths.patch @@ -0,0 +1,56 @@ +# HG changeset patch +# User Roman Telezhynskyi +# Date 1455895311 -7200 +# Branch develop +# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725 +# Parent a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c +CONFIG key to disable setting custom rpath option. + +diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro +--- a/src/app/tape/tape.pro b/src/app/tape/tape.pro +@@ -348,10 +348,16 @@ + # Path to recource file. + win32:RC_FILE = share/resources/tape.rc + +-unix:!macx{ +-# suppress the default RPATH +-QMAKE_LFLAGS_RPATH = +-QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++noRunPath{ # For enable run qmake with CONFIG+=noRunPath ++# do nothing ++} else { ++unix:!macx{ ++# suppress the default RPATH ++# helps to run the program without Qt Creator ++# see problem with path to libqmuparser and libpropertybrowser ++QMAKE_LFLAGS_RPATH = ++QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++} + } + + # When the GNU linker sees a library, it discards all symbols that it doesn't need. +diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro +--- a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro +@@ -476,10 +476,16 @@ + copyToDestdir($$pdftops_path, $$shell_path($${OUT_PWD}/$$DESTDIR)) + } + +-unix:!macx{ +-# suppress the default RPATH +-QMAKE_LFLAGS_RPATH = +-QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++noRunPath{ # For enable run qmake with CONFIG+=noRunPath ++# do nothing ++} else { ++unix:!macx{ ++# suppress the default RPATH ++# helps to run the program without Qt Creator ++# see problem with path to libqmuparser and libpropertybrowser ++QMAKE_LFLAGS_RPATH = ++QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++} + } + + # When the GNU linker sees a library, it discards all symbols that it doesn't need. diff --git a/media-gfx/valentina/valentina-0.4.2-r2.ebuild b/media-gfx/valentina/valentina-0.4.2-r3.ebuild similarity index 92% rename from media-gfx/valentina/valentina-0.4.2-r2.ebuild rename to media-gfx/valentina/valentina-0.4.2-r3.ebuild index 76ac359..30affd1 100644 --- a/media-gfx/valentina/valentina-0.4.2-r2.ebuild +++ b/media-gfx/valentina/valentina-0.4.2-r3.ebuild @@ -39,7 +39,8 @@ DEPEND="${CDEPEND} S=${WORKDIR}/dismine-${PN}-44d43351cb59 src_prepare() { - epatch "${FILESDIR}/locales.patch" + epatch "${FILESDIR}/locales.patch" \ + "${FILESDIR}/fix-insecure-runpaths.patch" } src_configure() { @@ -51,7 +52,7 @@ src_configure() { fi done - eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r + eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r } src_install() { diff --git a/media-gfx/valentina/valentina-.ebuild b/media-gfx/valentina/valentina-.ebuild index 7ddd9fa..70fd441 100644 --- a/media-gfx/valentina/valentina-.ebuild +++ b/media-gfx/valentina/valentina-.ebuild @@ -46,7 +46,7 @@ src_configure() { fi done - eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r + eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r } src_install() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 1a5a24193e56f815fa1929f904fcd787c7eb7636 Author: Miroslav Šulc gentoo org> AuthorDate: Tue Oct 24 08:30:35 2017 + Commit: Miroslav Šulc gentoo org> CommitDate: Tue Oct 24 08:30:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a5a2419 media-gfx/valentina: fixed homepage, sources and issues with version 0.5.0 Package-Manager: Portage-2.3.12, Repoman-2.3.3 media-gfx/valentina/Manifest | 4 +- .../files/0.5.0-disable-tests-compilation.patch| 35 -- .../files/0.5.0-fix-insecure-runpaths.patch| 56 -- media-gfx/valentina/files/0.5.0-locales.patch | 48 --- ...a-0.5.0-r1.ebuild => valentina-0.5.0-r2.ebuild} | 17 +++ media-gfx/valentina/valentina-.ebuild | 10 ++-- 6 files changed, 17 insertions(+), 153 deletions(-) diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 8d506f0de2a..370ab1039f0 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1 +1,3 @@ -DIST valentina-0.5.0.zip 21431337 SHA256 7d80d7cf49250cc48f7ae791e1ee3a8de2216f818fe100b883302099d984de05 SHA512 e04615fe0d79e8d0adebaea1808ee123d979babcd9f9320e897921aeda811ece37aff20575fb4bc033f21a91b498f409dbf1a4b8999e8b3c841c2f842ce41263 WHIRLPOOL 59714a19dee39cadc86f5542e52b4424fd7724bbbf5c9e3f6f33ebc48c313bc2b7c5f3f11f82b660f9a2619d05e76bc91f65201c95ae1473efaa540e132020d9 +DIST valentina-0.5.0.zip 37175844 SHA256 f750027814e765b169c41934927f205350525b947f50559fd9bfcba016e095cb SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf WHIRLPOOL 271b471f25a59f356cca5b2c00e1a200e504c5184d2001e93c954ce0c921a56585811029e79e424f91c8550d44ea498d501f0f05c8aff62981cfc8be339ae673 +DIST valentina-4798.patch 25302 SHA256 3ff7b9555933fb361aad3b96b8486b2d5e4988fb0ee34f3fc98609d0673e3baf SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4 WHIRLPOOL 245496681adb86b6662b29426bfac11d7db6e9d7b2ab48e89d6508c5211fdc520bac450d1af051c066e00e914608fdc412cbae38dc0230dfc0090c0af6c4f979 +DIST valentina-4802.patch 6733 SHA256 abee2e871f9f741cdf26ac151dca24a0cfc9d3f22bbe2abfdb88ad7c42768c96 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4 WHIRLPOOL bb4f89a44eb5204192b680ba29226d04439b2326b37992e7a8623e713a94f20ec3043f31a059037f90a24feb2d283773f21c06f1777e4f61bf5f7a8d5f7d54af diff --git a/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch b/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch deleted file mode 100644 index a819a02a336..000 --- a/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch +++ /dev/null @@ -1,35 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# 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/files/0.5.0-fix-insecure-runpaths.patch b/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch deleted file mode 100644 index a98a069dfb5..000 --- a/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch +++ /dev/null @@ -1,56 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi -# Date 1455895311 -7200 -# Branch develop -# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725 -# Parent a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c -CONFIG key to disable setting custom rpath option. - -diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro a/src/app/tape/tape.pro -+++ b/src/app/tape/tape.pro -@@ -348,10 +348,16 @@ - # Path to recource file. - win32:RC_FILE = share/resources/tape.rc - --unix:!macx{ --# suppress the default RPATH --QMAKE_LFLAGS_RPATH = --QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" -+noRunPath{ # For enable run qmake with CONFIG+=noRunPath -+# do nothing -+} else { -+unix:!macx{ -+# suppress the default RPATH -+# helps to run the program without Qt Creator -+# see problem with path to libqmuparser and libpropertybrowser -+QMAKE_LFLAGS_RPATH = -+QMAKE_LFLAGS += "-Wl,-rpath,\
[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
commit: 4f74a03e5eab0f11d5802a525e65f22e310faf5a Author: Miroslav Šulc gentoo org> AuthorDate: Fri Feb 19 15:46:50 2016 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Feb 19 15:47:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f74a03e media-gfx/valentina: fixed qa warning about insecure runpaths Package-Manager: portage-2.2.27 .../valentina/files/fix-insecure-runpaths.patch| 56 ++ ...a-0.4.2-r2.ebuild => valentina-0.4.2-r3.ebuild} | 5 +- media-gfx/valentina/valentina-.ebuild | 2 +- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/media-gfx/valentina/files/fix-insecure-runpaths.patch b/media-gfx/valentina/files/fix-insecure-runpaths.patch new file mode 100644 index 000..a98a069 --- /dev/null +++ b/media-gfx/valentina/files/fix-insecure-runpaths.patch @@ -0,0 +1,56 @@ +# HG changeset patch +# User Roman Telezhynskyi +# Date 1455895311 -7200 +# Branch develop +# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725 +# Parent a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c +CONFIG key to disable setting custom rpath option. + +diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro +--- a/src/app/tape/tape.pro b/src/app/tape/tape.pro +@@ -348,10 +348,16 @@ + # Path to recource file. + win32:RC_FILE = share/resources/tape.rc + +-unix:!macx{ +-# suppress the default RPATH +-QMAKE_LFLAGS_RPATH = +-QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++noRunPath{ # For enable run qmake with CONFIG+=noRunPath ++# do nothing ++} else { ++unix:!macx{ ++# suppress the default RPATH ++# helps to run the program without Qt Creator ++# see problem with path to libqmuparser and libpropertybrowser ++QMAKE_LFLAGS_RPATH = ++QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++} + } + + # When the GNU linker sees a library, it discards all symbols that it doesn't need. +diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro +--- a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro +@@ -476,10 +476,16 @@ + copyToDestdir($$pdftops_path, $$shell_path($${OUT_PWD}/$$DESTDIR)) + } + +-unix:!macx{ +-# suppress the default RPATH +-QMAKE_LFLAGS_RPATH = +-QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++noRunPath{ # For enable run qmake with CONFIG+=noRunPath ++# do nothing ++} else { ++unix:!macx{ ++# suppress the default RPATH ++# helps to run the program without Qt Creator ++# see problem with path to libqmuparser and libpropertybrowser ++QMAKE_LFLAGS_RPATH = ++QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" ++} + } + + # When the GNU linker sees a library, it discards all symbols that it doesn't need. diff --git a/media-gfx/valentina/valentina-0.4.2-r2.ebuild b/media-gfx/valentina/valentina-0.4.2-r3.ebuild similarity index 92% rename from media-gfx/valentina/valentina-0.4.2-r2.ebuild rename to media-gfx/valentina/valentina-0.4.2-r3.ebuild index 76ac359..30affd1 100644 --- a/media-gfx/valentina/valentina-0.4.2-r2.ebuild +++ b/media-gfx/valentina/valentina-0.4.2-r3.ebuild @@ -39,7 +39,8 @@ DEPEND="${CDEPEND} S=${WORKDIR}/dismine-${PN}-44d43351cb59 src_prepare() { - epatch "${FILESDIR}/locales.patch" + epatch "${FILESDIR}/locales.patch" \ + "${FILESDIR}/fix-insecure-runpaths.patch" } src_configure() { @@ -51,7 +52,7 @@ src_configure() { fi done - eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r + eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r } src_install() { diff --git a/media-gfx/valentina/valentina-.ebuild b/media-gfx/valentina/valentina-.ebuild index 7ddd9fa..70fd441 100644 --- a/media-gfx/valentina/valentina-.ebuild +++ b/media-gfx/valentina/valentina-.ebuild @@ -46,7 +46,7 @@ src_configure() { fi done - eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r + eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r } src_install() {