fixed integration of .desktop icons

3 files changed, 16 insertions, 102 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f990e945971..a95bf6fa37f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = davinci-resolve
 	pkgdesc = Professional A/V post-production software suite from Blackmagic Design
 	pkgver = 18.6.3
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.blackmagicdesign.com/support/family/davinci-resolve-and-fusion
+	install = davinci-resolve.install
 	arch = x86_64
 	license = Commercial
 	makedepends = libarchive
@@ -33,7 +34,7 @@ pkgbase = davinci-resolve
 	conflicts = davinci-resolve-beta
 	conflicts = davinci-resolve-studio-beta
 	options = !strip
-	source = DaVinci_Resolve_18.6.3_Linux.zip::https://swr.cloud.blackmagicdesign.com/DaVinciResolve/v18.6.3/DaVinci_Resolve_18.6.3_Linux.zip?verify=1700083694-PKqT9xqx2GABMJ0Yg2BK9aeQLpiZl1WwPCu4vSCekeA%3D
+	source = DaVinci_Resolve_18.6.3_Linux.zip::https://swr.cloud.blackmagicdesign.com/DaVinciResolve/v18.6.3/DaVinci_Resolve_18.6.3_Linux.zip?verify=1700408857-pmIzirgjiNzNnFdxXakH5A9IumRz0h70S%2BIfjMBHhXw%3D
 	sha256sums = 5b8bad7788f50f1c552d8d34cf07346233d32eb33fc026c6c4acfc2608b714ac
 
 pkgname = davinci-resolve
diff --git a/PKGBUILD b/PKGBUILD
index fb35361ae86e..067de6b7089b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=davinci-resolve
 major_version=18.6
 minor_version=3
 pkgver=${major_version}.${minor_version}
-pkgrel=2
+pkgrel=3
 
 if [ "$pkgname" == "davinci-resolve" ]; then
     # Variables for FREE edition
@@ -108,6 +108,8 @@ _archive=${_archive_name}.zip
 _installer_binary=${_archive_run_name}.run
 source=("${_archive}"::"$_srcurl")
 
+install='davinci-resolve.install'
+
 prepare()
 {
 	pushd "${srcdir}"
diff --git a/davinci-resolve.install b/davinci-resolve.install
index 2d6e48655712..7727a24b0c90 100644
--- a/davinci-resolve.install
+++ b/davinci-resolve.install
@@ -1,100 +1,11 @@
-#	These are fragments from the original code.
-#	I do not see any need for it yet, but maybe I will be able to find out later.
-
-#	echo "Removing old files..."
-#	DIRS_TO_REMOVE=(
-#		"Onboarding"
-#		"libs"
-#		"plugins"
-#		"UI_Resource")
-
-#	if [[ -d ${/opt/${_pkgname}} ]]; then
-#		echo "Removing old files"
-#		for dir in "${DIRS_TO_REMOVE[@]}"; do
-#			rm -rf "/opt/${_pkgname}/$dir"
-#		done
-#	fi
-
-#if [[ $EUID -ne 0 ]]; then
-#	# Script being run as non-root user
-#	USER_UID=$EUID
-#else
-#	# Script being run as root
-#	USER_UID=$SUDO_UID
-#	if [ -z "$USER_UID" ]; then
-#		USER_UID=$PKEXEC_UID
-#	fi
-#	if [ -z "$USER_UID" ]; then
-#		USER_UID=0
-#	fi
-#fi
-
-#USER_HOME=`awk -v val=$USER_UID -F ":" '\$3==val{print \$6;exit}' /etc/passwd`
-
-# TODO: We should talk to the BMD developers about it. Pretty sensitive subject systemd @_@
-#	if [[ -d ${/opt/${_pkgname}} && ${/opt/${_pkgname}} == /home/resolve* ]]; then
-#		chown $USER_UID "$/opt/${_pkgname}"
-#	else
-#		# Uninstall the panel daemon only on Standalone install
-#		# Uninstall BMD panel daemon
-#		SVC_NAME=bmdpaneld
-
-#		# Kill the daemon in case it is running
-#		killall -9 ${SVC_NAME}
-
-#		if [ -f /etc/init.d/${SVC_NAME} ]; then
-#			echo "#Uninstalling BMD panel service..."
-#			service ${SVC_NAME} stop
-#			/sbin/chkconfig --del ${SVC_NAME}
-#			rm -f /etc/init.d/${SVC_NAME}
-#		fi
-#		mkdir -m 0775 -p "$/opt/${_pkgname}"
-#		chown $USER_UID "$/opt/${_pkgname}" -R
-#	fi
-
-post_install()
-{
-	echo "Updating icon cache..."
-	gtk-update-icon-cache "share/icons/hicolor" -f 2>&1  >> /dev/null
-	update-mime-database "share/mime/" 2>&1  >> /dev/null
-	
-	echo "Installing the default app associations..."
-	if [ ! "$(grep -ir 'application/x-resolveproj=com.blackmagicdesign.resolve.desktop' /usr/share/applications/defaults.list)" ]; then
-		echo "application/x-resolveproj=com.blackmagicdesign.resolve.desktop" >> /usr/share/applications/defaults.list
-	fi
-
-	if [ ! "$(grep -ir 'application/x-resolveproj=com.blackmagicdesign.resolve.desktop;' /usr/share/applications/mimeinfo.cache)" ]; then
-		echo "/application\/x-resolveproj=com.blackmagicdesign.resolve.desktop;/d" >> /usr/share/applications/mimeinfo.cache
-	fi
-
-	# reload the udev rules
-	udevadm control --reload-rules 2>&1
-	udevadm trigger 2>&1
-
-	# Ensure panel permissions are correctly set for the current session
-	DEVICES=`lsusb | grep "ID 1edb\|ID 096e" | sed -e "s/:/ /g" | awk '{print"/dev/bus/usb/"$2"/"$4}'`
-	for DEV in $DEVICES
-	do
-		echo "Fixing usb permissions for $DEV"
-		chmod a+w $DEV
-	done
-}
-
-post_remove()
-{
-	# Remove entry from /usr/share/applications/defaults.list
-	if [ "$(grep -ir 'application/x-resolveproj=com.blackmagicdesign.resolve.desktop' /usr/share/applications/defaults.list)" ]; then
-		sed -i '/application\/x-resolveproj=com.blackmagicdesign.resolve.desktop/d' /usr/share/applications/defaults.list
-	fi
-
-	# Removing entry from /usr/share/applications/mimeinfo.cache
-	if [ "$(grep -ir 'application/x-resolveproj=com.blackmagicdesign.resolve.desktop;' /usr/share/applications/mimeinfo.cache)" ]; then
-		sed -i '/application\/x-resolveproj=com.blackmagicdesign.resolve.desktop;/d' /usr/share/applications/mimeinfo.cache
-	fi
-
-	# Remove udev rules
-	for rule in /usr/lib/udev/rules.d/75-davincipanel.rules /usr/lib/udev/rules.d/75-sdx.rules
-	do
-		[[ -f $rule ]] && rm -rf $rule
-	done
+post_install() {
+if [[ -f /usr/bin/xdg-desktop-menu ]]; then
+    xdg-desktop-menu install --novendor /usr/share/desktop-directories/DaVinciResolve.directory /usr/share/applications/DaVinciResolve.desktop
+    xdg-desktop-menu install --novendor /usr/share/desktop-directories/DaVinciResolve.directory /usr/share/applications/blackmagicraw-player.desktop
+    xdg-desktop-menu install --novendor /usr/share/desktop-directories/DaVinciResolve.directory /usr/share/applications/blackmagicraw-speedtest.desktop
+    xdg-desktop-menu install --novendor /usr/share/desktop-directories/DaVinciResolve.directory /usr/share/applications/DaVinciControlPanelsSetup.desktop
+    xdg-desktop-menu install --novendor /usr/share/desktop-directories/DaVinciResolve.directory /usr/share/applications/DaVinciResolveCaptureLogs.desktop
+    xdg-desktop-menu install --novendor /usr/share/desktop-directories/DaVinciResolve.directory /usr/share/applications/DaVinciResolveInstaller.desktop
+    xdg-desktop-menu forceupdate
+fi
 }
\ No newline at end of file