git » freecad.git » commit 7f88d08

Fix for issue #1 and #6

author Alexander F. Rødseth
2024-05-13 18:27:40 UTC
committer Alexander F. Rødseth
2024-05-13 18:27:40 UTC
parent 05508ccc6bcf3b1f5025c14eeae6777ac3a17e5a

Fix for issue #1 and #6

.SRCINFO +5 -1
PKGBUILD +2 -2

diff --git a/.SRCINFO b/.SRCINFO
index 6f81c9e..2563422 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freecad
 	pkgdesc = Feature based parametric 3D CAD modeler
 	pkgver = 0.21.2
-	pkgrel = 20
+	pkgrel = 21
 	url = https://freecadweb.org/
 	arch = x86_64
 	license = LGPL
@@ -23,6 +23,7 @@ pkgbase = freecad
 	makedepends = swig
 	makedepends = utf8cpp
 	makedepends = nlohmann-json
+	depends = asciidoctor
 	depends = boost-libs
 	depends = coin
 	depends = fmt
@@ -49,12 +50,14 @@ pkgbase = freecad
 	depends = verdict
 	optdepends = graphviz: dependency graph support
 	optdepends = openscad: OpenSCAD support
+	options = !lto
 	source = git+https://github.com/freecad/freecad#tag=0.21.2
 	source = freecad-vtk9.3.patch
 	source = pyside6.patch
 	source = 62c3836c.patch
 	source = https://github.com/FreeCAD/FreeCAD/commit/6043c904.patch
 	source = https://github.com/FreeCAD/FreeCAD/commit/ac9a88c2.patch
+	source = desktop-icon-under-wayland.patch
 	source = fixups-with-qt6-enums.patch
 	b2sums = b20da85de907a41b14581583f9d69cab8fe79b1bdd50c24fc299c649ef0bfd7723c0b23aebc68ca5bbdee2da22c959004c7b595e19b542b1ec06a7275c0f5ea7
 	b2sums = f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5
@@ -62,6 +65,7 @@ pkgbase = freecad
 	b2sums = eb474708c3611293cfe3dfc287418b606f7735f6eb306f44f7394cd7e65256daddcee35984211982f25064e7ec81cc038d4eeb8d34af7399058ecfb6e8e99e9f
 	b2sums = de4b98c4b488045f9810dce124c271d6f4f629922e026f2d4f1efd6c9060b92309db41f8e0f6ebe5e7a27399911ac908cc8935c2501214326dbb1c4b739d46cc
 	b2sums = 02284db1b17dc88d0522eb3a726076b9f1ded740fdab1a185e48534c3606c77e51a12690b02bf5e0d9d1f72d1d8389ba84a54cba274200e69b6b10a431bbfdfe
+	b2sums = 6ef009021e507b9291f60c9479148a9697f1da4d9965e26575d74c612162431a0fc61de2e3856d8ed51ca10d9b7f6c9d25a24ad86e9acadd30c0176646c682a3
 	b2sums = 9cb72c3df3f1c8e49b4242b1e05f51c68e6df98891a0c485488433bb9eef1e814fe712761b62ef09cb37551643819a48cbf704df2121bf33401e410a05dce722
 
 pkgname = freecad
diff --git a/PKGBUILD b/PKGBUILD
index dc83e7c..11221cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -58,11 +58,11 @@ prepare() {
 }
 
 build() {
+  # -D BUILD_DESIGNER_PLUGIN=ON \
   cmake \
     -B build \
-    -D BUILD_DESIGNER_PLUGIN=ON \
-    -D BUILD_ENABLE_CXX_STD=C++17 \
     -D BUILD_FLAT_MESH=ON \
+    -D BUILD_ENABLE_CXX_STD=C++17 \
     -D CMAKE_BUILD_TYPE=Release \
     -D CMAKE_C_FLAGS="$CFLAGS -ffat-lto-objects -fPIC -w" \
     -D CMAKE_CXX_FLAGS="$CXXFLAGS -ffat-lto-objects -fPIC -w" \