summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernd Waibel <waebbl-gentoo@posteo.net>2022-10-31 16:16:09 +0100
committerJoonas Niilola <juippis@gentoo.org>2022-10-31 17:46:33 +0200
commitae75bb2605050c62397e489d9929ddadb1dd246e (patch)
tree34be3aade2c65463182e8fd41e826d15a72ed49d /media-gfx/freecad/freecad-9999.ebuild
parentmedia-gfx/freecad: drop 0.19.4-r1, 0.20-r1 (diff)
downloadgentoo-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/freecad/freecad-9999.ebuild')
-rw-r--r--media-gfx/freecad/freecad-9999.ebuild4
1 files changed, 3 insertions, 1 deletions
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
}