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

[Alexander Rødseth]

    Date: Sunday, March 28, 2021 @ 18:17:47
  Author: arodseth
Revision: 907088

update dependencies

Modified:
  freecad/trunk/PKGBUILD

----------+
 PKGBUILD |   33 ++++++++-------------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-28 18:04:10 UTC (rev 907087)
+++ PKGBUILD	2021-03-28 18:17:47 UTC (rev 907088)
@@ -11,7 +11,7 @@
 
 pkgname=freecad
 pkgver=0.19.1
-pkgrel=1
+pkgrel=2
 _commit=a88db11e0a908f6e38f92bfc5187b13ebe470438 # tag: 0.19.1
 pkgdesc='General purpose 3D CAD modeler'
 arch=(x86_64)
@@ -20,29 +20,15 @@
 depends=(boost-libs glew jsoncpp libspnav med netcdf opencascade openmpi
          pyside2-tools python-matplotlib python-pivy python-ply python-pyside2
          qt5-svg qt5-tools qt5-webkit qt5-x11extras qt5-xmlpatterns
-         shared-mime-info xerces-c)
+         xerces-c)
 makedepends=(boost cmake coin eigen gcc-fortran gendesk git ninja pyside2
              python-shiboken2 shiboken2 swig)
-source=("git+https://github.com/FreeCAD/FreeCAD#commit=$_commit"
-        freecad.xml)
+source=("git+https://github.com/FreeCAD/FreeCAD#commit=$_commit" freecad.xml)
 sha256sums=('SKIP'
             '4ee1daf47c8371a3e17173d85a0dd4a106dacd7899d783ccd97a6f3e0dd1a21f')
 
 prepare() {
   cd FreeCAD/src
-
-#  # Fix missing "std::" qualifiers, sledge hammer style
-#  find . \
-#    ! -wholename "*/Mod/Sketcher/*" \
-#    ! -wholename "*/Mod/PartDesign/*" \
-#    -name "*.cpp" -type f \
-#    -exec sed -i '1i using namespace std;' {} \;
-
-  # Add missing include
-#  sed -i '1i \#include <Inventor\/SbByteBuffer.h>' \
-#    Gui/Quarter/QuarterWidget.cpp
-
-  # Create desktop shortcut
   gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name FreeCAD \
     --mimetypes='application/x-extension-fcstd' --startupnotify=true
 }
@@ -51,8 +37,6 @@
   # OpenCascade requires that /bin comes before /usr/bin in $PATH
   export PATH="/usr/bin:$PATH"
 
-  # Configure with CMake and build with Ninja
-  # C++14 mode required by Boost.Geometry 1.75
   mkdir -p build
   cd build
   cmake ../FreeCAD \
@@ -61,11 +45,11 @@
     -D CMAKE_BUILD_TYPE=Release \
     -D CMAKE_C_FLAGS="$CFLAGS -fPIC -w" \
     -D CMAKE_CXX_FLAGS="$CXXFLAGS -fPIC -w" \
-    -D CMAKE_INSTALL_DATADIR="/usr/share/freecad" \
-    -D CMAKE_INSTALL_DOCDIR="/usr/share/freecad/doc" \
-    -D CMAKE_INSTALL_PREFIX="/usr/lib/freecad" \
+    -D CMAKE_INSTALL_DATADIR=/usr/share/freecad \
+    -D CMAKE_INSTALL_DOCDIR=/usr/share/freecad/doc \
+    -D CMAKE_INSTALL_PREFIX=/usr/lib/freecad \
     -D FREECAD_USE_EXTERNAL_PIVY=ON \
-    -D FREECAD_USE_OCC_VARIANT="Official Version" \
+    -D FREECAD_USE_OCC_VARIANT='Official Version' \
     -D FREECAD_USE_QT_FILEDIALOG=ON \
     -D PYTHON_EXECUTABLE=/usr/bin/python \
     -G Ninja
@@ -82,9 +66,8 @@
   # Package MIME info
   install -Dm644 freecad.xml "$pkgdir/usr/share/mime/packages/freecad.xml"
 
+  # Package icons
   cd FreeCAD/src/Gui/Icons
-
-  # Package icons
   for i in 16 32 48 64; do
     install -Dm644 "freecad-icon-$i.png" \
       "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/freecad.png"