diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2023-08-19 11:05:02 +0200 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2023-08-19 11:05:16 +0200 |
| commit | 4226f432c5291af081cde0ca9bfb662a5ab4b4f3 (patch) | |
| tree | 2d27507dd571c548661d093e399422aed6485f8a /media-gfx/freecad | |
| parent | dev-ruby/activesupport: Stabilize 6.1.7.4 arm64, #909398 (diff) | |
| download | gentoo-4226f432c5291af081cde0ca9bfb662a5ab4b4f3.tar.gz gentoo-4226f432c5291af081cde0ca9bfb662a5ab4b4f3.tar.bz2 gentoo-4226f432c5291af081cde0ca9bfb662a5ab4b4f3.zip | |
media-gfx/freecad: updated live ebuild
* updated qt test patch
* updated desktop file name
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'media-gfx/freecad')
| -rw-r--r-- | media-gfx/freecad/files/freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch | 36 | ||||
| -rw-r--r-- | media-gfx/freecad/freecad-9999.ebuild | 2 |
2 files changed, 17 insertions, 21 deletions
diff --git a/media-gfx/freecad/files/freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch b/media-gfx/freecad/files/freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch index 5455c0ee2992..3eb2e79c4c3d 100644 --- a/media-gfx/freecad/files/freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch +++ b/media-gfx/freecad/files/freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch @@ -1,24 +1,20 @@ -From cb77c7d937c259224699273fee1ba5907588fa4c Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sun, 12 Feb 2023 19:54:13 +0100 -Subject: [PATCH] tests/src/Qt: only build test for BUILD_GUI=ON - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/tests/src/Qt/CMakeLists.txt -+++ b/tests/src/Qt/CMakeLists.txt -@@ -30,6 +30,7 @@ endfunction() - set(CMAKE_AUTOMOC ON) +--- a/tests/src/Base/CMakeLists.txt ++++ b/tests/src/Base/CMakeLists.txt +@@ -11,4 +11,6 @@ target_sources( + ${CMAKE_CURRENT_SOURCE_DIR}/tst_Tools.cpp + ) - # Qt Test +-setup_qt_test(InventorBuilder) +if(BUILD_GUI) - include_directories( - ${QtGui_INCLUDE_DIRS} - ${QtTest_INCLUDE_DIRS} -@@ -46,3 +47,4 @@ set (InventorBuilder_LIBS - SETUP_TESTS( - InventorBuilder ++ setup_qt_test(InventorBuilder) ++endif() +--- a/tests/src/Gui/CMakeLists.txt ++++ b/tests/src/Gui/CMakeLists.txt +@@ -6,4 +6,6 @@ target_sources( ) + + # Qt tests +-setup_qt_test(QuantitySpinBox) ++if(BUILD_GUI) ++ setup_qt_test(QuantitySpinBox) +endif() --- -2.39.1 - diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index 3c44e3745979..73fd4eaff9a1 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -152,7 +152,7 @@ pkg_setup() { src_prepare() { # Fix desktop file - sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die + 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" |