Arch Linux User Repository

Patch which fixes installation problems.

From 2a207d925bae5adba72a7b97c2494b500f5944b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Fri, 15 May 2020 18:19:25 +0200
Subject: [PATCH] Fix icon source, add missing auxiliary files.

---
 .gitignore                         |  3 +++
 PKGBUILD                           |  6 +++---
 src/freecad-linkstage3-git.desktop | 14 ++++++++++++++
 src/freecad.xml                    |  9 +++++++++
 4 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 src/freecad-linkstage3-git.desktop
 create mode 100644 src/freecad.xml

diff --git a/.gitignore b/.gitignore
index 61c4a9b..77aef83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@
 !PKGBUILD
 !.SRCINFO
 !temporary_fixes.patch
+!src
+!src/*
+src/FreeCAD
diff --git a/PKGBUILD b/PKGBUILD
index ddfcf94..5647cc9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Salamandar <felix@piedallu.me>

 pkgname=freecad-linkstage3-git
-pkgver=asm3.0.9.1.r44.gf670d46f2
+pkgver=asm3.0.11.r445.gebd99b956
 pkgrel=1
 pkgdesc='A general purpose 3D CAD modeler - LinkStage3 dev branch, git checkout'
 arch=('x86_64')
@@ -103,10 +103,10 @@ package() {
       --dir="${pkgdir}/usr/share/applications" \
       "${srcdir}/${pkgname}.desktop"
   for i in 16 32 48 64; do
-      install -Dm644 "src/Gui/Icons/freecad-icon-${i}.png" \
+      install -Dm644 "${srcdir}/${_gitname}/src/Gui/Icons/freecad-icon-${i}.png" \
           "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/freecad.png"
   done
-  install -Dm644 "src/Gui/Icons/freecad.svg" \
+  install -Dm644 "${srcdir}/${_gitname}/src/Gui/Icons/freecad.svg" \
       "${pkgdir}/usr/share/icons/hicolor/scalable/apps/freecad.svg"

   # Mime info
diff --git a/src/freecad-linkstage3-git.desktop b/src/freecad-linkstage3-git.desktop
new file mode 100644
index 0000000..af8376d
--- /dev/null
+++ b/src/freecad-linkstage3-git.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=FreeCAD
+Comment=A general purpose 3D CAD modeler
+GenericName=CAD Application
+Exec=/usr/bin/freecad %F
+Path=/usr/share/freecad
+Terminal=false
+Type=Application
+Icon=freecad
+Categories=Application;Science;Math;Education;
+StartupNotify=true
+MimeType=application/x-extension-fcstd;
diff --git a/src/freecad.xml b/src/freecad.xml
new file mode 100644
index 0000000..f163c28
--- /dev/null
+++ b/src/freecad.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+   <mime-type type="application/x-extension-fcstd">
+       <sub-class-of type="application/zip"/>
+       <comment>FreeCAD document</comment>
+       <glob pattern="*.fcstd"/>
+       <icon name="freecad"/>
+   </mime-type>
+</mime-info>
-- 
2.26.2

He's not going to. Whatever you try. The process is interrupted at the stage of compilation. ../src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp: In the "void SMESH_MeshEditor::InsertNodesIntoLink(const SMDS_MeshElement, const SMDS_MeshNode, const SMDS_MeshNode, std::__cxxx11::list<const SMDS_MeshNode*>&, bool)" member function: ../src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp:9039:5: Warning: "iBestQuad" may be used without initialization in this function [-Wmaybe-uninitialized] == sync, corrected by elderman == for | == sync, corrected by elderman == for | == for | == for | == for | == for | == for | | ^~ ../src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp: In the "SMESH_MeshEditor::Sew_Error SMESH_MeshEditor::SewFreeBorder(const SMDS_MeshNode, const SMDS_MeshNode, const SMDS_MeshNode, const SMDS_MeshNode, const SMDS_MeshNode, const SMDS_MeshNode, const SMDS_MeshNode, bool, bool, bool)" function: ../src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp:8436:13: Warning: "iPrevNode" may be used without initialization in this function [-Wmaybe-uninitialized] 8436 | int iPrevNode, iNode = 0, nbNodes = elem->NbNodes(); | ^~~~~~~~~ ../src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp: In the "void SMESH_MeshEditor::DoubleElements(const TIDSortedElemSet&)" member function: ../src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp:10619:23: Warning: "type" may be used without initialization in this function [-Wmaybe-uninitialized] == sync, corrected by elderman == sync, corrected by elderman == for | == for | == sync, corrected by elderman == for | == for | == for | == for | == for | == for | == for | == for | == for | == for | == for | == for |== for | == for== for== for== for== for== sync, == for== for== sync, == for== for== sync, == for== for== for== sync, == for== for== for== sync, == for== for== sync, == for== for== sync, == for== for== for== sync, == for== for== sync, == for== for== sync, == for== for== == for== sync, == for== for== | ^~~~ ../src/3rdParty/salomesmesh/src/SMESH/SMESH/SMESH_MeshEditor.cpp: In the "bool SMESH_MeshEditor::TriToQuad(TIDSortedElemSet&, SMESH::Controls::NumericalFunctorPtr, double)" function: ../src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp:3331:21: Warning: "link13" may be used without initialization in this function [-Wmaybe-uninitialized] 3331 | linkNode2 = link13->second; | ~~~~~~~~~~^~~~~~~~~~~~~~~~ ../src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp:3325:21: warning: "link12" may be used without initialization in this function [-Wmaybe-uninitialized] 3325 | linkNode2 = link12->second; | ~~~~~~~~~~^~~~~~~~~~~~~~~~ ../src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp: In the "void SMESH_MeshEditor::QuadTo4Tri(TIDSortedElemSet&)" member function: ../src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp:1604:35: warning: "subMeshDS" may be used without initialization in this function [-Wmaybe-uninitialized] 1604 | GetMeshDS()->RemoveFreeElement( quad, subMeshDS, /fromGroups=/false ); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp: In the "void SMESH_MeshEditor::Smooth(TIDSortedElemSet&, std::set<const SMDS_MeshNode*>&, SMESH_MeshEditor::SmoothMethod, int, double, bool)" function: ../src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp:4161:25: warning: "v" may be used without initialization in this function [-Wmaybe-uninitialized] 4161 | newUV.SetY( ElCLib::InPeriod( newUV.Y(), v1, v2 )); | ~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp:4159:25: warning: "u" may be used without initialization in this function [-Wmaybe-uninitialized] 4159 | newUV.SetX( ElCLib::InPeriod( newUV.X(), u1, u2 )); | ~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ninja: build stopped: subcommand failed. ==> Error: There has been a failure in build(). Interruption... ==> Error: Makepkg failed to build freecad-linkstage3-git.

I get this error.

Error on file "/tmp/yay/freecad-linkstage3-git/src/freecad-linkstage3-git.desktop": No such file or directory
==> ERROR: A failure occurred in package().
    Aborting...
Error making: freecad-linkstage3-git

But even after copying 'freecad.desktop' and 'freecad.xml' from the original package, i get this:

install: cannot stat 'src/Gui/Icons/freecad-icon-16.png': No such file or directory

Which can be resolved by adding this '${srcdir}/${_gitname}/' at the 2 install lines

I'm on it today, expect a new revision.

There is another issue with this package, related to the location of .so files. It causes all native modules (the starting GUI, Part workbench...) to fail, with an import error visible in the console.

I am not sure of the quality of my fix, but succeeded to have it to work by changing the following in PKGBUILD (build function):

    -DBUILD_QT5=ON \
    -DCMAKE_INSTALL_PREFIX='/usr/lib/freecad' \
-   -DCMAKE_INSTALL_LIBDIR='/usr/lib' \
+   -DCMAKE_INSTALL_LIBDIR='/usr/lib/freecad/lib' \
    -DCMAKE_INSTALL_DOCDIR='/usr/share/freecad/doc' \
    -DCMAKE_INSTALL_DATADIR='/usr/share/freecad' \

@vollassitoni69 I ran into this issue today, it is caused by one of the provided patches in the AUR being already fixed upstream. A temporary fix would be either to remove the part concerning the CMakeLists.txt in the file temporary_fixes.patch.

Another possible (dirty) fix is to edit the PKGBUILD, by replacing (currently at line 85):

    patch -Np1 -i "${srcdir}/temporary_fixes.patch"

by something like

    patch -Np1 -i "${srcdir}/temporary_fixes.patch" || echo patch failure ignored

Hi, I'm having some trouble building this when installing freecad-assembly3-git:

==> Starting prepare()...
patching file CMakeLists.txt
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file CMakeLists.txt.rej
patching file src/Gui/View3DInventorViewer.cpp
==> ERROR: A failure occurred in prepare().
    Aborting...
Error making: freecad-linkstage3-git

The contents of ~/.cache/yay/freecad_linkstage3_git/src/FreeCad/CMakeLists.txt.rej are

--- CMakeLists.txt
+++ CMakeLists.txt
@@ -734,7 +734,7 @@ endif()
                 add_compile_options(${OPENMPI_CFLAGS})
                 link_directories(${OPENMPI_LIBRARY_DIRS})
                 link_libraries(${OPENMPI_LIBRARIES})
-                find_file(MpidotH mpi.h PATHS ${OPENMPI_INCLUDE_DIRS} NO_DEFAULT_PATH)
+                find_file(MpidotH mpi.h PATHS ${OPENMPI_INCLUDE_DIRS})
                 if(NOT MpidotH)
                     message( WARNING "mpi.h was not found. Check for error above.")
                 endif()

Sorry if this is not very helpful, I'm pretty new to the Linux world :) Thanks!

This package is still a WIP ;) It shouldn't ask for phonon-qt4, or maybe through dependencies…

I'm trying to track down why the install is asking for phonon-qt4 and not phonon-qt5 ?