diff options
| author |   Chris Mayo <aklhfex@gmail.com> | 2024-10-29 19:57:30 +0000 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2024-11-24 20:24:22 +0000 |
| commit | 4441effb71a9457ea25cef1006500c8c71e9757b (patch) | |
| tree | 07c233f918bc0808141ef7bfe754a256d91fe825 /media-gfx/freecad | |
| parent | media-gfx/freecad: does not need sci-libs/opencascade built with vtk (diff) | |
| download | gentoo-4441effb71a9457ea25cef1006500c8c71e9757b.tar.gz gentoo-4441effb71a9457ea25cef1006500c8c71e9757b.tar.bz2 gentoo-4441effb71a9457ea25cef1006500c8c71e9757b.zip | |
media-gfx/freecad: Stop converting line endings
Closes: https://bugs.gentoo.org/939791
Signed-off-by: Chris Mayo <aklhfex@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-gfx/freecad')
| -rw-r--r-- | media-gfx/freecad/files/freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch | 15 | ||||
| -rw-r--r-- | media-gfx/freecad/freecad-1.0.0-r1.ebuild | 5 |
2 files changed, 16 insertions, 4 deletions
diff --git a/media-gfx/freecad/files/freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch new file mode 100644 index 000000000000..d901e47e2ca0 --- /dev/null +++ b/media-gfx/freecad/files/freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch @@ -0,0 +1,15 @@ +--- a/src/Tools/SubWCRev.py ++++ b/src/Tools/SubWCRev.py +@@ -510,12 +510,6 @@ def main(): + bindir = a
+
+ vcs = [
+- GitControl(),
+- DebianGitHub(),
+- BazaarControl(),
+- Subversion(),
+- MercurialControl(),
+- DebianChangelog(),
+ UnknownControl(),
+ ]
+ for i in vcs:
diff --git a/media-gfx/freecad/freecad-1.0.0-r1.ebuild b/media-gfx/freecad/freecad-1.0.0-r1.ebuild index 80786d6c93dc..a1ac43e6031f 100644 --- a/media-gfx/freecad/freecad-1.0.0-r1.ebuild +++ b/media-gfx/freecad/freecad-1.0.0-r1.ebuild @@ -130,7 +130,6 @@ DEPEND="${RDEPEND} ) " BDEPEND=" - app-text/dos2unix dev-lang/swig test? ( $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') @@ -164,7 +163,7 @@ REQUIRED_USE=" # There is no py3.12 support planned for pyside2 PATCHES=( - "${FILESDIR}"/${PN}-1.0.0-Gentoo-specific-don-t-check-vcs.patch + "${FILESDIR}"/${PN}-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch "${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch ) @@ -183,8 +182,6 @@ src_prepare() { # Fix desktop file sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecad.FreeCAD.desktop || die - find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings" - cmake_src_prepare } |