All icons show, no more errors on startup.
I even can remove the Arch specific code from PluginManager.
I do not know if these changes would have any negative impact on other platforms.
Please advice on what to do next, to get this fixed.
Base installation from Aur:freecad-git
Changes in FreeCAD:
1.CMakeFiles.txt
Code: Select all
--- /home/kjetil/src/freecad/FreeCAD/CMakeLists.txt
+++ /home/kjetil/src/aurpac/freecad-org/freecad-git/src/freecad/CMakeLists.txt
@@ -92,12 +92,14 @@
# used as compiler defines
SET(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}")
SET(DOCDIR "${CMAKE_INSTALL_DOCDIR}")
+SET(HOMEDIR "${CMAKE_INSTALL_HOMEDIR}")
MESSAGE(STATUS "prefix: ${CMAKE_INSTALL_PREFIX}")
MESSAGE(STATUS "datadir: ${CMAKE_INSTALL_DATADIR}")
MESSAGE(STATUS "docdir: ${CMAKE_INSTALL_DOCDIR}")
MESSAGE(STATUS "includedir: ${CMAKE_INSTALL_INCLUDEDIR}")
MESSAGE(STATUS "libdir: ${CMAKE_INSTALL_LIBDIR}")
+MESSAGE(STATUS "homedir: ${CMAKE_INSTALL_HOMEDIR}")
# ==============================================================================
# == Win32 is default behaviour use the LibPack copied in Source tree ==========
Code: Select all
--- /home/kjetil/src/freecad/FreeCAD/src/App/CMakeLists.txt
+++ /home/kjetil/src/aurpac/freecad-org/freecad-git/src/freecad/src/App/CMakeLists.txt
@@ -7,6 +7,10 @@
IF(RESOURCEDIR)
add_definitions(-DRESOURCEDIR="${RESOURCEDIR}")
ENDIF(RESOURCEDIR)
+
+IF(HOMEDIR)
+ add_definitions(-DHOMEDIR="${HOMEDIR}")
+ENDIF(HOMEDIR)
IF(DOCDIR)
add_definitions(-DDOCDIR="${DOCDIR}")
Code: Select all
--- /home/kjetil/src/freecad/FreeCAD/src/App/Application.cpp
+++ /home/kjetil/src/aurpac/freecad-org/freecad-git/src/freecad/src/App/Application.cpp
@@ -531,7 +531,7 @@
if (dir.isAbsolute())
return path;
else
- return mConfig["AppHomePath"] + path;
+ return mConfig["AppHomePath"];
#else
return mConfig["AppHomePath"];
#endif
@@ -1137,7 +1137,13 @@
void Application::initConfig(int argc, char ** argv)
{
// find the home path....
+#ifdef HOMEDIR
+ std::string path(HOMEDIR);
+ path.append("/");
+ mConfig["AppHomePath"] = path;
+#else
mConfig["AppHomePath"] = FindHomePath(argv[0]);
+#endif
// Version of the application extracted from SubWCRef into src/Build/Version.h
// We only set these keys if not yet defined. Therefore it suffices to search
1
Code: Select all
--- /home/kjetil/Downloads/PKBUILD
+++ /home/kjetil/src/aurpac/freecad-org/freecad-git/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Christian Hesse <mail@eworm.de>
pkgname=freecad-git
-pkgver=0.16.pre.r3.g192dca3
+pkgver=0.16.pre.r111.g94a62e0
pkgrel=1
pkgdesc='A general purpose 3D CAD modeler - git checkout'
arch=('i686' 'x86_64')
@@ -51,10 +51,12 @@
-DCMAKE_INSTALL_DOCDIR:PATH="share/freecad/doc" \
-DCMAKE_INSTALL_DATADIR:PATH="share/freecad" \
-DCMAKE_INSTALL_LIBDIR:PATH="lib/freecad" \
+ -DCMAKE_INSTALL_HOMEDIR:PATH="/usr/share/freecad/" \
-DOCC_INCLUDE_DIR:PATH=/opt/opencascade/inc/ \
-DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2 \
-DPYSIDEUIC4BINARY:FILEPATH=/usr/bin/python2-pyside-uic \
-DFREECAD_USE_EXTERNAL_PIVY:BOOL=ON
make
}