Fix MP3 workaround not working when launching using desktop entry

1 files changed, 9 insertions, 8 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 57e1e082eed8..6622cbdd5ebb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname='bitwig-studio'
 pkgver='1.3.8'
-pkgrel='2'
+pkgrel='3'
 pkgdesc='Music production system for production, remixing and performance'
 arch=('x86_64')
 url='http://www.bitwig.com/'
@@ -15,17 +15,19 @@ license=('custom')
 depends=('jack' 'xdg-utils' 'zenity' 'xcb-util-wm' 'libbsd')
 optdepends=('alsa-lib' 'oss' 'ffmpeg: MP3 support')
 provides=('bitwig-studio')
-conflicts=('bitwig-studio-demo-rc')
+replaces=('bitwig-studio-demo')
+conflicts=('bitwig-studio-demo' 'bitwig-studio-demo-rc')
 options=(!strip)
 source=("https://downloads.bitwig.com/stable/${pkgver}/bitwig-studio-${pkgver}.deb"
+        'bitwig-studio.desktop'
         'bitwig-studio.launcher')
 md5sums=('062f57caa81af1e1168680f24ec12370'
+         '6bbd6aedc339a634f089ecc9c8df1537'
          '32411d3b742f15addef7b86681825fee')
 
 package() {
   # Create pkgdir folders
   install -d ${pkgdir}/usr/bin
-  install -d ${pkgdir}/opt/bitwig-studio
   install -d ${pkgdir}/opt/bitwig-studio/libexec
   install -d ${pkgdir}/usr/share/{applications,icons}
   install -d ${pkgdir}/usr/share/licenses/${pkgname}
@@ -33,9 +35,12 @@ package() {
   # Unpack package contents
   bsdtar -xf ${srcdir}/data.tar.gz -C ${pkgdir}/
 
-  # Install launcher (replacing default symlink)
+  # Replace the launcher
   install -m755 ${srcdir}/bitwig-studio.launcher ${pkgdir}/usr/bin/bitwig-studio
 
+  # Replace the desktop launcher
+  install -m755 ${srcdir}/bitwig-studio.desktop ${pkgdir}/usr/share/applications/bitwig-studio.desktop
+
   # Workaround MP3 support by providing symlinks to ffmpeg
   ln -s /usr/bin/ffmpeg ${pkgdir}/opt/bitwig-studio/libexec/avconv
   ln -s /usr/bin/ffprobe ${pkgdir}/opt/bitwig-studio/libexec/avprobe
@@ -43,8 +48,4 @@ package() {
   # Install license
   install -m644 ${pkgdir}/opt/bitwig-studio/EULA.rtf \
     ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-  # Fix launcher category
-  sed -i 's:Categories=Multimedia:Categories=Multimedia;AudioVideo;Player;Recorder;:' \
-    ${pkgdir}/usr/share/applications/bitwig-studio.desktop
 }