Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/
Date: Sun, 28 Nov 2021 09:58:17
Message-Id: 1638093491.c9c70febe01d558f88c2d621515b889075afd1f1.fordfrog@gentoo
1 commit: c9c70febe01d558f88c2d621515b889075afd1f1
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 28 09:57:56 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 28 09:58:11 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9c70feb
7
8 media-gfx/freecad: dropped patch in live
9
10 patch is already applied by upstream and so prevented building freecad
11
12 Package-Manager: Portage-3.0.28, Repoman-3.0.3
13 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
14
15 ...9999-Add-memory-header-for-std-shared_ptr.patch | 31 ----------------------
16 media-gfx/freecad/freecad-9999.ebuild | 1 -
17 2 files changed, 32 deletions(-)
18
19 diff --git a/media-gfx/freecad/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch b/media-gfx/freecad/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch
20 deleted file mode 100644
21 index 81a8f22d8937..000000000000
22 --- a/media-gfx/freecad/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch
23 +++ /dev/null
24 @@ -1,31 +0,0 @@
25 -From: Bernd Waibel <waebbl-gentoo@××××××.net>
26 -Date: Sat, 16 Oct 2021 17:02:19 +0200
27 -Subject: [PATCH] Add memory header for std::shared_ptr
28 -
29 -Signed-off-by: Bernd Waibel <waebbl-gentoo@××××××.net>
30 ----
31 - src/App/Metadata.h | 3 ++-
32 - 1 file changed, 2 insertions(+), 1 deletion(-)
33 -
34 -diff --git a/src/App/Metadata.h b/src/App/Metadata.h
35 -index de8be3ea8e..2c5fd8f417 100644
36 ---- a/src/App/Metadata.h
37 -+++ b/src/App/Metadata.h
38 -@@ -30,6 +30,7 @@
39 - #include <string>
40 - #include <vector>
41 - #include <map>
42 -+#include <memory>
43 -
44 - #include <xercesc/dom/DOM.hpp>
45 - #include <xercesc/parsers/XercesDOMParser.hpp>
46 -@@ -296,4 +297,4 @@ namespace App {
47 -
48 - }
49 -
50 --#endif
51 -\ No newline at end of file
52 -+#endif
53 ---
54 -2.33.1
55 -
56
57 diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
58 index cef63f28477e..df78793c7f3b 100644
59 --- a/media-gfx/freecad/freecad-9999.ebuild
60 +++ b/media-gfx/freecad/freecad-9999.ebuild
61 @@ -120,7 +120,6 @@ REQUIRED_USE="
62 PATCHES=(
63 "${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
64 "${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
65 - "${FILESDIR}"/${P}-Add-memory-header-for-std-shared_ptr.patch
66 )
67
68 DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )