commit: 5a743e422ff735844fa7de4052f85d083aa9518f Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Tue Dec 10 08:15:20 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Tue Dec 10 08:15:29 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a743e42
media-gfx/valentina: dropped obsolete 0.6.1-r1 Bug: https://bugs.gentoo.org/945638 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-gfx/valentina/Manifest | 2 - media-gfx/valentina/files/5823.patch | 50 -------- .../valentina-0.6.1-disable-vcs-version.patch | 75 ------------ media-gfx/valentina/valentina-0.6.1-r1.ebuild | 126 --------------------- 4 files changed, 253 deletions(-) diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 6f9b0dbf37b0..7dc50f499cef 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1,3 +1 @@ -DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720 -DIST valentina-v0.6.1.tar.bz2 25575677 BLAKE2B 56d5adc973df319b3a65f877768c2195e1af2db39118e18fb17636e5739610d55e4ade4d4516a6817347dcdb0e4468e4587cff91fc5a5ea74a35029c52bf858c SHA512 52a3a02bd08f85c6241fe29baa9c8a2b80d2e8b071877bc68f98c3ff7bcdf810d9975903f804bf4e120f1a65c06de405fd44bc822292ab7b6191b778ec703542 DIST valentina-v0.7.52.tar.bz2 30819274 BLAKE2B 3b9b2ac2c4083371420dca4911bf5162d9d772ddf0a8b4582dac7ca47e6f027279a99bd3d674a7f0ce15e962cdf1afbdb573f8a14a5f6c02baae1f7a5aae37a1 SHA512 71ff3dc4ccea2ee3df34fda0364b211a80d4f953e6d3b9bf9b40ba1f4d1531e751d077983e8d13acb1f524c9883d2f565289d1b67d5de0a152c9a4df1428d6df diff --git a/media-gfx/valentina/files/5823.patch b/media-gfx/valentina/files/5823.patch deleted file mode 100644 index 79df9a74c5a6..000000000000 --- a/media-gfx/valentina/files/5823.patch +++ /dev/null @@ -1,50 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi <[email protected]> -# Date 1551441739 -7200 -# Fri Mar 01 14:02:19 2019 +0200 -# Branch release -# Node ID 82e62ea2d785e093af68089e509b224f3f4f843f -# Parent 0108ef767e2447e5b5f39378bcf245e25947a25d -Don't use Qt OpenGL module since Q5.4. - -diff -r 0108ef767e24 -r 82e62ea2d785 src/app/valentina/valentina.pro ---- a/src/app/valentina/valentina.pro Sun Feb 24 17:29:12 2019 +0200 -+++ b/src/app/valentina/valentina.pro Fri Mar 01 14:02:19 2019 +0200 -@@ -297,7 +297,6 @@ - $$[QT_INSTALL_BINS]/icuuc*.dll \ # Different name for different Qt releases - $$[QT_INSTALL_BINS]/Qt5Core.dll \ - $$[QT_INSTALL_BINS]/Qt5Concurrent.dll \ -- $$[QT_INSTALL_BINS]/Qt5OpenGL.dll \ - $$[QT_INSTALL_BINS]/Qt5Gui.dll \ - $$[QT_INSTALL_BINS]/Qt5Network.dll \ - $$[QT_INSTALL_BINS]/Qt5PrintSupport.dll \ -@@ -309,6 +308,11 @@ - $$[QT_INSTALL_BINS]/libstdc++-6.dll \ - $$[QT_INSTALL_BINS]/libwinpthread-1.dll - -+ # Don't use Qt OpenGL module since Q5.4 -+ equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) { -+ package.files += $$[QT_INSTALL_BINS]/Qt5OpenGL.dll -+ } -+ - # For support Windows 7+ - greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 6) { - package.files += $$[QT_INSTALL_BINS]/Qt5WinExtras.dll -diff -r 0108ef767e24 -r 82e62ea2d785 src/libs/vwidgets/vwidgets.pro ---- a/src/libs/vwidgets/vwidgets.pro Sun Feb 24 17:29:12 2019 +0200 -+++ b/src/libs/vwidgets/vwidgets.pro Fri Mar 01 14:02:19 2019 +0200 -@@ -7,7 +7,12 @@ - # File with common stuff for whole project - include(../../../common.pri) - --QT += widgets printsupport opengl -+QT += widgets printsupport -+ -+# Don't use Qt OpenGL module since Q5.4 -+equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) { -+ QT += opengl -+} - - # Name of the library - TARGET = vwidgets - diff --git a/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch b/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch deleted file mode 100644 index 471d7a85313c..000000000000 --- a/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/common.pri b/common.pri -index 523aa7c..33be789 100644 ---- a/common.pri -+++ b/common.pri -@@ -212,37 +212,7 @@ defineReplace(enable_ccache){ - } - - defineReplace(FindBuildRevision){ --CONFIG(debug, debug|release){ -- # Debug mode -- return(\\\"unknown\\\") --}else{ -- # Release mode -- -- macx{ -- HG = /usr/local/bin/hg # Can't defeat PATH variable on Mac OS. -- }else { -- HG = hg # All other platforms are OK. -- } -- -- #build revision number for using in version -- unix { -- DVCS_HESH=$$system("$${HG} log -r. --template '{node|short}'") -- } else { -- # Use escape character before "|" on Windows -- DVCS_HESH=$$system($${HG} log -r. --template "{node^|short}") -- } -- isEmpty(DVCS_HESH){ -- DVCS_HESH=$$system("git rev-parse --short HEAD") -- isEmpty(DVCS_HESH){ -- DVCS_HESH = \\\"unknown\\\" # if we can't find build revision left unknown. -- } else { -- DVCS_HESH=\\\"Git:$${DVCS_HESH}\\\" -- } -- } else { -- DVCS_HESH=\\\"Hg:$${DVCS_HESH}\\\" -- } -- return($${DVCS_HESH}) --} -+return(\\\"unknown\\\") - } - - # Default prefix. Use for creation install path. -diff --git a/src/libs/vmisc/vmisc.pro b/src/libs/vmisc/vmisc.pro -index cf8db51..fff1c0e 100644 ---- a/src/libs/vmisc/vmisc.pro -+++ b/src/libs/vmisc/vmisc.pro -@@ -98,10 +98,7 @@ CONFIG(debug, debug|release){ - HG = hg # All other platforms all OK. - } - #latest tag distance number for using in version -- HG_DISTANCE=$$system($${HG} log -r. --template '{latesttagdistance}') -- isEmpty(HG_DISTANCE){ -- HG_DISTANCE = 0 # if we can't find local revision left 0. -- } -+ HG_DISTANCE = 0 # if we can't find local revision left 0. - message("Latest tag distance:" $${HG_DISTANCE}) - DEFINES += "LATEST_TAG_DISTANCE=$${HG_DISTANCE}" # Make available latest tag distance number in sources. - } -diff --git a/src/libs/vtest/vtest.pro b/src/libs/vtest/vtest.pro -index a336d48..c943fc5 100644 ---- a/src/libs/vtest/vtest.pro -+++ b/src/libs/vtest/vtest.pro -@@ -92,10 +92,7 @@ CONFIG(debug, debug|release){ - HG = hg # All other platforms all OK. - } - #latest tag distance number for using in version -- HG_DISTANCE=$$system($${HG} log -r. --template '{latesttagdistance}') -- isEmpty(HG_DISTANCE){ -- HG_DISTANCE = 0 # if we can't find local revision left 0. -- } -+ HG_DISTANCE = 0 # if we can't find local revision left 0. - message("Latest tag distance:" $${HG_DISTANCE}) - DEFINES += "LATEST_TAG_DISTANCE=$${HG_DISTANCE}" # Make available latest tag distance number in sources. - } diff --git a/media-gfx/valentina/valentina-0.6.1-r1.ebuild b/media-gfx/valentina/valentina-0.6.1-r1.ebuild deleted file mode 100644 index 573945103dcb..000000000000 --- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils xdg - -DESCRIPTION="Cloth patternmaking software" -HOMEPAGE="https://smart-pattern.com.ua/"; -SRC_URI="https://gitlab.com/smart-pattern/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 - https://dev.gentoo.org/~fordfrog/distfiles/valentina-5858.patch.bz2"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" - -LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN" - -for LANG in ${LANGS}; do - IUSE="${IUSE} l10n_${LANG}" -done - -RDEPEND=" - app-text/poppler - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5" -DEPEND=" - ${RDEPEND} - dev-qt/qttest:5 -" -BDEPEND=" - dev-qt/linguist-tools:5 -" - -S=${WORKDIR}/${PN}-v${PV} - -PATCHES=( - "${FILESDIR}/5823.patch" - "${FILESDIR}/${P}-disable-vcs-version.patch" - "${WORKDIR}/valentina-5858.patch" -) - -src_configure() { - local locales="" - local locale - - for LANG in ${LANGS}; do - if use l10n_${LANG}; then - case ${LANG} in - "cs") - locale="cs_CZ" - ;; - "de") - locale="de_DE" - ;; - "el") - locale="el_GR" - ;; - "en") - locale="en_CA en_IN en_US" - ;; - "es") - locale="es_ES" - ;; - "fi") - locale="fi_FI" - ;; - "fr") - locale="fr_FR" - ;; - "he") - locale="he_IL" - ;; - "id") - locale="id_ID" - ;; - "it") - locale="it_IT" - ;; - "nl") - locale="nl_NL" - ;; - "pt-BR") - locale="pt_BR" - ;; - "ro") - locale="ro_RO" - ;; - "ru") - locale="ru_RU" - ;; - "uk") - locale="uk_UA" - ;; - "zh-CN") - locale="zh_CN" - ;; - esac - - locales="${locales} ${locale}" - fi - done - - eqmake5 LOCALES="${locales}" "CONFIG+=noDebugSymbols no_ccache noRunPath noTests noWindowsInstaller" Valentina.pro -r -} - -src_install() { - emake install INSTALL_ROOT="${D}" - - dodoc AUTHORS.txt ChangeLog.txt README.txt - - doman dist/debian/${PN}.1 - doman dist/debian/tape.1 - - cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die - insinto /usr/share/mime/packages - doins dist/debian/${PN}.xml -}
