diff options
| author |   Bernd Waibel <waebbl-gentoo@posteo.net> | 2022-10-31 16:16:09 +0100 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2022-10-31 17:46:33 +0200 |
| commit | ae75bb2605050c62397e489d9929ddadb1dd246e (patch) | |
| tree | 34be3aade2c65463182e8fd41e826d15a72ed49d /media-gfx | |
| parent | media-gfx/freecad: drop 0.19.4-r1, 0.20-r1 (diff) | |
| download | gentoo-ae75bb2605050c62397e489d9929ddadb1dd246e.tar.gz gentoo-ae75bb2605050c62397e489d9929ddadb1dd246e.tar.bz2 gentoo-ae75bb2605050c62397e489d9929ddadb1dd246e.zip | |
media-gfx/freecad: swap patch
Swap a patch, available in two different versions to reduce number of
files in ${FILESDIR}. This patch is also used by 0.20.1.
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28051
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch | 26 | ||||
| -rw-r--r-- | media-gfx/freecad/freecad-9999.ebuild | 4 |
2 files changed, 3 insertions, 27 deletions
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 deleted file mode 100644 index ac8d194d00ea..000000000000 --- a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch +++ /dev/null @@ -1,26 +0,0 @@ -From acc8a26b73a87ae024bce30e9f1531610b6e0e5f Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sat, 13 Feb 2021 14:54:28 +0100 -Subject: [PATCH] [Gentoo specific] don't check vcs - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- - src/Tools/SubWCRev.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Tools/SubWCRev.py b/src/Tools/SubWCRev.py -index 9795450..59938bd 100644 ---- a/src/Tools/SubWCRev.py -+++ b/src/Tools/SubWCRev.py -@@ -455,7 +455,7 @@ def main(): - if o in ("-b", "--bindir"):
- bindir = a
-
-- vcs=[GitControl(), DebianGitHub(), BazaarControl(), Subversion(), MercurialControl(), DebianChangelog(), UnknownControl()]
-+ vcs=[UnknownControl()]
- for i in vcs:
- if i.extractInfo(srcdir, bindir):
- # Open the template file and the version file
--- -2.30.1 - diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index 67ba7b4138f4..95e48c37bdac 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -120,7 +120,7 @@ REQUIRED_USE=" " PATCHES=( - "${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch + "${FILESDIR}"/${PN}-0.19.4-Gentoo-specific-don-t-check-vcs.patch "${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch ) @@ -138,6 +138,8 @@ src_prepare() { # Fix desktop file sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die + find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings" + cmake_src_prepare } |