[arch-commits] Commit in freecad/trunk (PKGBUILD)

[Florian Pritz]

    Date: Thursday, March 30, 2017 @ 19:23:18
  Author: bluewind
Revision: 220118

Fix FS#53320 - [freecad] Cannot find icon

upgpkg: freecad 0.16-9

Modified:
  freecad/trunk/PKGBUILD

----------+
 PKGBUILD |   25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-30 18:54:11 UTC (rev 220117)
+++ PKGBUILD	2017-03-30 19:23:18 UTC (rev 220118)
@@ -9,7 +9,7 @@
 
 pkgname=freecad
 pkgver=0.16
-pkgrel=8
+pkgrel=9
 pkgdesc='A general purpose 3D CAD modeler'
 arch=('i686' 'x86_64')
 url='http://www.freecadweb.org/'
@@ -40,11 +40,6 @@
   # Remove features depending on Web module
   patch -Np1 -i ../remove-webgui.patch
 
-  sed -i \
-    -e "46i\\\tModDir = '/usr/share/freecad/Mod'" \
-    -e "50i\\\tLibDir = '/usr/lib/freecad'" \
-    src/App/FreeCADInit.py
-
   # http://www.freecadweb.org/tracker/view.php?id=2347
   sed -i 's/boost::re_detail/boost::BOOST_REGEX_DETAIL_NS/' \
     src/Mod/Drawing/App/FeaturePage.cpp
@@ -54,10 +49,9 @@
   cd "${srcdir}/FreeCAD-${pkgver}/"
   cmake \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX:PATH="/usr" \
-    -DCMAKE_INSTALL_DOCDIR:PATH="share/freecad/doc" \
-    -DCMAKE_INSTALL_DATADIR:PATH="share/freecad" \
-    -DCMAKE_INSTALL_LIBDIR:PATH="lib/freecad" \
+    -DCMAKE_INSTALL_PREFIX:PATH="/usr/lib/freecad" \
+    -DCMAKE_INSTALL_DOCDIR:PATH="/usr/share/freecad/doc" \
+    -DCMAKE_INSTALL_DATADIR:PATH="/usr/share/freecad" \
     -DOCC_INCLUDE_DIR:PATH=/opt/opencascade/inc/ \
     -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2 \
     -DFREECAD_USE_EXTERNAL_PIVY:BOOL=ON \
@@ -68,15 +62,16 @@
 
 package() {
   cd "${srcdir}/FreeCAD-${pkgver}"
+
   make DESTDIR="${pkgdir}" install
 
   # Symlink to /usr/bin
-  ln -sf "FreeCAD" "${pkgdir}/usr/bin/freecad"
-  ln -sf "FreeCADCmd" "${pkgdir}/usr/bin/freecadcmd"
+  install -dm755 "$pkgdir/usr/bin"
+  ln -srf "$pkgdir/usr/lib/freecad/bin/FreeCAD" "${pkgdir}/usr/bin/freecad"
+  ln -srf "$pkgdir/usr/lib/freecad/bin/FreeCAD" "${pkgdir}/usr/bin/FreeCAD"
+  ln -srf "$pkgdir/usr/lib/freecad/bin/FreeCADCmd" "${pkgdir}/usr/bin/freecadcmd"
+  ln -srf "$pkgdir/usr/lib/freecad/bin/FreeCADCmd" "${pkgdir}/usr/bin/FreeCADCmd"
 
-  cp -ra "${pkgdir}/usr/Mod" "${pkgdir}/usr/share/freecad/"
-  rm -r "${pkgdir}/usr/Mod"
-
   # Install pixmaps and desktop shortcut
   desktop-file-install \
     --dir="${pkgdir}/usr/share/applications" \