| 1 |
commit: ae75bb2605050c62397e489d9929ddadb1dd246e |
| 2 |
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> |
| 3 |
AuthorDate: Mon Oct 31 15:16:09 2022 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 31 15:46:33 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae75bb26 |
| 7 |
|
| 8 |
media-gfx/freecad: swap patch |
| 9 |
|
| 10 |
Swap a patch, available in two different versions to reduce number of |
| 11 |
files in ${FILESDIR}. This patch is also used by 0.20.1. |
| 12 |
|
| 13 |
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/28051 |
| 15 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 16 |
|
| 17 |
...1231-0003-Gentoo-specific-don-t-check-vcs.patch | 26 ---------------------- |
| 18 |
media-gfx/freecad/freecad-9999.ebuild | 4 +++- |
| 19 |
2 files changed, 3 insertions(+), 27 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch |
| 22 |
deleted file mode 100644 |
| 23 |
index ac8d194d00ea..000000000000 |
| 24 |
--- a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch |
| 25 |
+++ /dev/null |
| 26 |
@@ -1,26 +0,0 @@ |
| 27 |
-From acc8a26b73a87ae024bce30e9f1531610b6e0e5f Mon Sep 17 00:00:00 2001 |
| 28 |
-From: Bernd Waibel <waebbl-gentoo@××××××.net> |
| 29 |
-Date: Sat, 13 Feb 2021 14:54:28 +0100 |
| 30 |
-Subject: [PATCH] [Gentoo specific] don't check vcs |
| 31 |
- |
| 32 |
-Signed-off-by: Bernd Waibel <waebbl-gentoo@××××××.net> |
| 33 |
---- |
| 34 |
- src/Tools/SubWCRev.py | 2 +- |
| 35 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 36 |
- |
| 37 |
-diff --git a/src/Tools/SubWCRev.py b/src/Tools/SubWCRev.py |
| 38 |
-index 9795450..59938bd 100644 |
| 39 |
---- a/src/Tools/SubWCRev.py |
| 40 |
-+++ b/src/Tools/SubWCRev.py |
| 41 |
-@@ -455,7 +455,7 @@ def main(): |
| 42 |
- if o in ("-b", "--bindir"): |
| 43 |
- bindir = a |
| 44 |
- |
| 45 |
-- vcs=[GitControl(), DebianGitHub(), BazaarControl(), Subversion(), MercurialControl(), DebianChangelog(), UnknownControl()] |
| 46 |
-+ vcs=[UnknownControl()] |
| 47 |
- for i in vcs: |
| 48 |
- if i.extractInfo(srcdir, bindir): |
| 49 |
- # Open the template file and the version file |
| 50 |
--- |
| 51 |
-2.30.1 |
| 52 |
- |
| 53 |
|
| 54 |
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild |
| 55 |
index 67ba7b4138f4..95e48c37bdac 100644 |
| 56 |
--- a/media-gfx/freecad/freecad-9999.ebuild |
| 57 |
+++ b/media-gfx/freecad/freecad-9999.ebuild |
| 58 |
@@ -120,7 +120,7 @@ REQUIRED_USE=" |
| 59 |
" |
| 60 |
|
| 61 |
PATCHES=( |
| 62 |
- "${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch |
| 63 |
+ "${FILESDIR}"/${PN}-0.19.4-Gentoo-specific-don-t-check-vcs.patch |
| 64 |
"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch |
| 65 |
) |
| 66 |
|
| 67 |
@@ -138,6 +138,8 @@ src_prepare() { |
| 68 |
# Fix desktop file |
| 69 |
sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die |
| 70 |
|
| 71 |
+ find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings" |
| 72 |
+ |
| 73 |
cmake_src_prepare |
| 74 |
} |
Archives