Adopt upstream install dir changes, use upstream .desktop and mimeinfo files

218d849355

.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = freecad-git
 	pkgdesc = A general purpose 3D CAD modeler - git checkout
-	pkgver = 0.19pre.r1038.g7b315d3a1
+	pkgver = 0.19pre.r1386.g945e76d91
 	pkgrel = 1
 	epoch = 1
 	url = https://www.freecadweb.org/
@@ -36,11 +36,7 @@ pkgbase = freecad-git
 	provides = freecad
 	conflicts = freecad
 	source = freecad-git::git+https://github.com/FreeCAD/FreeCAD.git
-	source = freecad.desktop
-	source = freecad.xml
 	md5sums = SKIP
-	md5sums = 9e958fe0b5267a8eae2433731b949a24
-	md5sums = c2f4154c8e4678825411de8e7fa54c6b
 
 pkgname = freecad-git
 

PKGBUILD

@@ -3,7 +3,7 @@
 
 _appname=freecad
 pkgname="${_appname}-git"
-pkgver=0.19pre.r1038.g7b315d3a1
+pkgver=0.19pre.r1386.g945e76d91
 pkgrel=1
 epoch=1
 pkgdesc='A general purpose 3D CAD modeler - git checkout'
@@ -19,12 +19,8 @@ makedepends=('boost' 'cmake' 'eigen' 'git' 'gcc-fortran'
 optdepends=('pycollada: Create, edit and load COLLADA documents.')
 provides=('freecad')
 conflicts=('freecad')
-source=("${pkgname}::git+https://github.com/FreeCAD/FreeCAD.git"
+source=("${pkgname}::git+https://github.com/FreeCAD/FreeCAD.git")
-        "freecad.desktop"
+md5sums=('SKIP')
-        "freecad.xml")
-md5sums=('SKIP'
-         '9e958fe0b5267a8eae2433731b949a24'
-         'c2f4154c8e4678825411de8e7fa54c6b')
 
 pkgver() {
     cd "${srcdir}/${pkgname}"
@@ -41,8 +37,8 @@ build() {
     cmake . \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX="/usr/lib/freecad" \
+        -DCMAKE_INSTALL_DATAROOTDIR="/usr/share" \
         -DCMAKE_INSTALL_DOCDIR="/usr/share/freecad/doc" \
-        -DCMAKE_INSTALL_DATADIR="/usr/share/freecad" \
         -DFREECAD_USE_OCC_VARIANT="Official Version" \
         -DBUILD_QT5=ON \
         -DPYTHON_EXECUTABLE=/usr/bin/python3 \
@@ -60,11 +56,11 @@ build() {
 
 package() {
     cd "${srcdir}/${pkgname}"
-    local bin="FreeCAD"
-    local bin_cmd="FreeCADCmd"
 
     make DESTDIR="${pkgdir}" install
 
+    local bin="FreeCAD"
+    local bin_cmd="FreeCADCmd"
     # Symlink binaries to /usr/bin.
     mkdir -p "${pkgdir}/usr/bin"
     ln -s "/usr/lib/freecad/bin/${bin}" "${pkgdir}/usr/bin/${bin}"
@@ -73,17 +69,6 @@ package() {
     ln -s "/usr/bin/${bin}" "${pkgdir}/usr/bin/${bin,,}"
     ln -s "/usr/bin/${bin_cmd}" "${pkgdir}/usr/bin/${bin_cmd,,}"
 
-    # Install pixmaps and desktop shortcut.
+    # do we actually need this line?
-    for i in 16 32 48 64; do
+    echo "Path=/usr/lib/freecad" >> "${pkgdir}/usr/share/applications/org.freecadweb.FreeCAD.desktop"
-        install -Dm644 "src/Gui/Icons/freecad-icon-${i}.png" \
-            "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${_appname}.png"
-    done
-    install -Dm644 "src/Gui/Icons/freecad.svg" \
-        "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_appname}.svg"
-    desktop-file-install \
-        --dir="${pkgdir}/usr/share/applications" "${srcdir}/${_appname}.desktop"
-
-    # Install mime info.
-    install -D -m644 "${srcdir}/${_appname}.xml" \
-        "${pkgdir}/usr/share/mime/packages/${_appname}.xml"
 }

freecad.desktop

@@ -1,14 +0,0 @@
-[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/lib/freecad
-Terminal=false
-Type=Application
-Icon=freecad
-Categories=Application;Science;Math;Education;
-StartupNotify=true
-MimeType=application/x-extension-fcstd;

freecad.xml

@@ -1,8 +0,0 @@
-<?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"/>
-	</mime-type>
-</mime-info>