Use vendor desktop entries

5 files changed, 9 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7a9e4882edac..439091c7dae3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vivado
 	pkgdesc = FPGA/CPLD design suite for Xilinx devices
 	pkgver = 2019.2
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.xilinx.com/products/design-tools/vivado.html
 	arch = x86_64
 	license = custom
@@ -17,14 +17,8 @@ pkgbase = vivado
 	options = !strip
 	source = file:///Xilinx_Vivado_2019.2_1106_2127.tar.gz
 	source = spoof_homedir.c
-	source = Xilinx-VivadoIDE.desktop
-	source = Xilinx-SDK.desktop
-	source = Xilinx-DocNav.desktop
 	md5sums = e2b2762964ef5f014591b13d77d823ab
 	md5sums = 69d14ad64f6ec44e041eaa8ffcb6f87c
-	md5sums = b7cad6d39ef5293d4f433b8c9959f486
-	md5sums = 44bb51e1c8832f001cb7d21b90cb5796
-	md5sums = 4d37975f586923ad02a50056ff569703
 
 pkgname = vivado
 
diff --git a/PKGBUILD b/PKGBUILD
index e12f2963acfc..f42ceb346e9c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,7 +28,7 @@
 pkgname=vivado
 pkgver=2019.2
 _more_ver=1106_2127
-pkgrel=3
+pkgrel=4
 pkgdesc="FPGA/CPLD design suite for Xilinx devices"
 url="https://www.xilinx.com/products/design-tools/vivado.html"
 arch=('x86_64')
@@ -43,19 +43,13 @@ depends=('ncurses5-compat-libs'
          'xterm')
 
 source=("file:///Xilinx_Vivado_${pkgver}_${_more_ver}.tar.gz"
-        'spoof_homedir.c'
-        'Xilinx-VivadoIDE.desktop'
-        'Xilinx-SDK.desktop'
-        'Xilinx-DocNav.desktop')
+        'spoof_homedir.c')
 
 noextract=("Xilinx_Vivado_${pkgver}_${_more_ver}.tar.gz")
 
 # checksum from https://www.xilinx.com/support/download.html
 md5sums=('e2b2762964ef5f014591b13d77d823ab'
-         '69d14ad64f6ec44e041eaa8ffcb6f87c'
-         'b7cad6d39ef5293d4f433b8c9959f486'
-         '44bb51e1c8832f001cb7d21b90cb5796'
-         '4d37975f586923ad02a50056ff569703')
+         '69d14ad64f6ec44e041eaa8ffcb6f87c')
 
 # takes forever for probably minimal gain
 options=('!strip')
@@ -66,8 +60,6 @@ prepare() {
 	bsdtar -xf "Xilinx_Vivado_${pkgver}_${_more_ver}.tar.gz"
 
 	mkdir -p "$srcdir/installer_temp"
-
-	sed -i "s/%VERSION%/$pkgver/g" *.desktop
 }
 
 build() {
@@ -90,9 +82,11 @@ package() {
 	install -Dm644 "$pkgdir/opt/Xilinx/Vivado/${pkgver}/data/xicom/cable_drivers/lin64/install_script/install_drivers/52-xilinx-ftdi-usb.rules" -t "$pkgdir/usr/lib/udev/rules.d/"
 	install -Dm644 "$pkgdir/opt/Xilinx/Vivado/${pkgver}/data/xicom/cable_drivers/lin64/install_script/install_drivers/52-xilinx-pcusb.rules" -t "$pkgdir/usr/lib/udev/rules.d/"
 
-	install -Dm644 "$srcdir/Xilinx-VivadoIDE.desktop" -t "$pkgdir/usr/share/applications/"
-	install -Dm644 "$srcdir/Xilinx-SDK.desktop" -t "$pkgdir/usr/share/applications/"
-	install -Dm644 "$srcdir/Xilinx-DocNav.desktop" -t "$pkgdir/usr/share/applications/"
+	# install desktop files
+	for deskfile in "$srcdir"/installer_temp/Desktop/*.desktop; do
+		sed -i -e "s|$pkgdir||g" "$deskfile"
+		install -Dm644 -t "$pkgdir/usr/share/applications/" "$deskfile"
+	done
 
 	# clean up artefacts, remove leading $pkgdir from paths
 	rm -rf "$pkgdir/opt/Xilinx/.xinstall/"
diff --git a/Xilinx-DocNav.desktop b/Xilinx-DocNav.desktop
deleted file mode 100644
index d999408dec6b..000000000000
--- a/Xilinx-DocNav.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Xilinx Documentation Navigator
-Exec=/opt/Xilinx/DocNav/docnav
-Icon=/opt/Xilinx/DocNav/resources/doc_nav_application_48.png
-Categories=Development;
-Comment=Xilinx Documentation Navigator
diff --git a/Xilinx-SDK.desktop b/Xilinx-SDK.desktop
deleted file mode 100644
index d11725384a3d..000000000000
--- a/Xilinx-SDK.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Xilinx SDK
-Exec=sh -c "unset LANG && unset QT_PLUGIN_PATH && source /opt/Xilinx/SDK/%VERSION%/settings64.sh && xsdk"
-Icon=/opt/Xilinx/SDK/%VERSION%/data/sdk/images/sdk_logo.png
-Categories=Development;
-Comment=Xilinx Software Development Kit
diff --git a/Xilinx-VivadoIDE.desktop b/Xilinx-VivadoIDE.desktop
deleted file mode 100644
index 28f1e7ba2f2c..000000000000
--- a/Xilinx-VivadoIDE.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Xilinx Vivado IDE
-Exec=sh -c "unset LANG && unset QT_PLUGIN_PATH && source /opt/Xilinx/Vivado/%VERSION%/settings64.sh && vivado"
-Icon=/opt/Xilinx/Vivado/%VERSION%/doc/images/vivado_logo.png
-Categories=Development;
-Comment=Vivado Integrated Development Environment