Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/solvespace/files/, media-gfx/solvespace/
Date: Mon, 28 Feb 2022 21:12:33
Message-Id: 1646082735.bfe34cee1837f876589efb047ec867252e8267a2.asturm@gentoo
1 commit: bfe34cee1837f876589efb047ec867252e8267a2
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 26 20:29:30 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 28 21:12:15 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfe34cee
7
8 media-gfx/solvespace: Drop 2.3
9
10 Bug: https://bugs.gentoo.org/784359
11 Package-Manager: Portage-3.0.30, Repoman-3.0.3
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 media-gfx/solvespace/Manifest | 2 -
15 .../solvespace-2.3-gcc11-missing-limits-inc.patch | 19 -------
16 media-gfx/solvespace/solvespace-2.3.ebuild | 61 ----------------------
17 3 files changed, 82 deletions(-)
18
19 diff --git a/media-gfx/solvespace/Manifest b/media-gfx/solvespace/Manifest
20 index 16f31c32664c..0ea117d9b3ce 100644
21 --- a/media-gfx/solvespace/Manifest
22 +++ b/media-gfx/solvespace/Manifest
23 @@ -1,5 +1,3 @@
24 DIST libdxfrw-0.6.3-0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz 691804 BLAKE2B 84c90a591fac71144e9e13aace7c1a00dfc1bd6f27b0bcde6b60541f5b5d3ccc04ae1c759f60cb467445cc884840d04bf4613b5cc553fbbf6951cac33a084d50 SHA512 9ab498aa7f369be79d800e8ca5ec55fa54be79d0778937b81d4c8da776b3419cb8a75400b54b205efc338da32e2e781afd0bed1bd8efed1a0b212dc8682a2615
25 -DIST libdxfrw-0.6.3-87ff1082f49b1286a033ac8f38fe8dde0975bb8b.tar.gz 691867 BLAKE2B bd3414930efe8cc1185a20f889dda3ec8ea46e40d3a1a4c24975683fc444161acdff576a1f40c34203e523e88bacf3841c50928340e7865650a113e65375f930 SHA512 0f8e2561887fbc5101787f0d7818328864b5c4a679ef539fcdbda8c124ab4a808663f9ba645d397f154596eab1eb7c6f0bdf3883bf6975392863e01bada3a1f0
26 DIST mimalloc-2.0.1-dc6bce256d4f3ce87761f9337977dff3d8b1776c.tar.gz 912721 BLAKE2B 0129b7650303be9bd82e9a99f6a81cc5aacf93c4e2d36813520d59b61410c00c2b84979b9aa901dc9f67a88110115882987b4eceebe880c548adbab4a328c415 SHA512 bf1770ae0225207aa072a103cb13671ac8a759aeb8e81dec6b1bf4192dc87c927153c34a4d6c42075d021cdb4a294a2863e9f70eed386912ccc0699120bd967e
27 -DIST solvespace-2.3.tar.gz 2115940 BLAKE2B 67e2d81e0a609d0344a6f28d33a78609b01c7105785f93aa1124f0592fe0e31d4846e6dd406339b2ef2c5f3961f91302a73c5391fe2e0f435e78c3a97ed67612 SHA512 9d22e467337591cd9a4935124d18733b8337f5785ab5738f4a94300f283ffe7d313569e379ae77e509d14182ffde8c9db7beaebb46ea7c0507c6b05010fe1a56
28 DIST solvespace-3.0.tar.gz 2734860 BLAKE2B 2efc9d98723c60abdb1c76ac086c40ff2f9b8bc9c315978731493d115fa55a080176ef48d930e3b503c0de0604dbfd2bc3bd99a581f359eb07a23034d09f84bf SHA512 b07b41fac1d67c5350082600a2f09e3fa611a1273e0c93ff93d11a7a1dbf550ff33465686eaff04fdb8350d1fe854ab0301d8723ef31cc65c687ba59cb89187f
29
30 diff --git a/media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch b/media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch
31 deleted file mode 100644
32 index ecf02fc5c01e..000000000000
33 --- a/media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch
34 +++ /dev/null
35 @@ -1,19 +0,0 @@
36 -https://bugs.gentoo.org/790776
37 ---- a/src/exportvector.cpp
38 -+++ b/src/exportvector.cpp
39 -@@ -4,6 +4,7 @@
40 - // Copyright 2008-2013 Jonathan Westhues.
41 - //-----------------------------------------------------------------------------
42 - #include <libdxfrw.h>
43 -+#include <limits>
44 - #include "solvespace.h"
45 -
46 - VectorFileWriter::~VectorFileWriter() {
47 ---- a/src/importdxf.cpp
48 -+++ b/src/importdxf.cpp
49 -@@ -1,3 +1,5 @@
50 -+#include <limits>
51 -+
52 - #include "solvespace.h"
53 - #include "libdxfrw.h"
54 - #include "libdwgr.h"
55
56 diff --git a/media-gfx/solvespace/solvespace-2.3.ebuild b/media-gfx/solvespace/solvespace-2.3.ebuild
57 deleted file mode 100644
58 index 25975546f2b6..000000000000
59 --- a/media-gfx/solvespace/solvespace-2.3.ebuild
60 +++ /dev/null
61 @@ -1,61 +0,0 @@
62 -# Copyright 1999-2021 Gentoo Authors
63 -# Distributed under the terms of the GNU General Public License v2
64 -
65 -EAPI=6
66 -
67 -DXFRW_COMMIT="87ff1082f49b1286a033ac8f38fe8dde0975bb8b"
68 -DXFRW_PV="0.6.3"
69 -DXFRW_P="libdxfrw-${DXFRW_PV}-${DXFRW_COMMIT}"
70 -
71 -inherit cmake-utils gnome2-utils
72 -
73 -DESCRIPTION="Parametric 2d/3d CAD"
74 -HOMEPAGE="http://solvespace.com"
75 -SRC_URI="https://github.com/solvespace/solvespace/archive/v${PV}.tar.gz -> ${P}.tar.gz
76 - https://github.com/solvespace/libdxfrw/archive/${DXFRW_COMMIT}.tar.gz -> ${DXFRW_P}.tar.gz"
77 -
78 -LICENSE="GPL-3"
79 -SLOT="0"
80 -KEYWORDS="~amd64 ~x86"
81 -
82 -RDEPEND="dev-cpp/gtkmm:2.4=
83 - dev-cpp/pangomm:1.4
84 - dev-libs/json-c:=
85 - media-libs/fontconfig
86 - media-libs/freetype:2
87 - media-libs/glew:0=
88 - media-libs/libpng:0=
89 - virtual/opengl"
90 -DEPEND="${RDEPEND}
91 - virtual/pkgconfig"
92 -
93 -# NOTE: please keep commit hash actually when version up
94 -GIT_COMMIT_HASH="4d1e1341d926ac356b295d5cc3d61c7a6cd7d07d"
95 -
96 -PATCHES=(
97 - "${FILESDIR}"/${PN}-2.3-gcc11-missing-limits-inc.patch
98 -)
99 -
100 -src_prepare() {
101 - rm -r "extlib/libdxfrw" || die "rm extlib/libdxfrw failed"
102 - mv "${WORKDIR}/libdxfrw-${DXFRW_COMMIT}" "extlib/libdxfrw" || die "move libdxfrw-${DXFRW_COMMIT} failed"
103 - sed -i '/include(GetGitCommitHash)/d' CMakeLists.txt || die 'remove GetGitCommitHash by sed failed'
104 - # fixed in master already
105 - sed -i -e 's/CHAR_WIDTH/CHAR_WIDTH_/' src/textwin.cpp src/toolbar.cpp src/win32/w32main.cpp src/ui.h || die 'sed failed'
106 - cmake-utils_src_prepare
107 -}
108 -
109 -src_configure() {
110 - local mycmakeargs=(
111 - -DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}"
112 - )
113 - cmake-utils_src_configure
114 -}
115 -
116 -pkg_postinst() {
117 - gnome2_icon_cache_update
118 -}
119 -
120 -pkg_postrm() {
121 - gnome2_icon_cache_update
122 -}