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

[David Runge]

    Date: Saturday, July 18, 2020 @ 11:10:21
  Author: dvzrv
Revision: 664411

upgpkg: element 0.44.0-2: Rebuild to prevent file clash with element-desktop.

Rename XDG desktop file name (and upstreaming changes) to fix file name clash with element-desktop (FS#67315).

Modified:
  element/trunk/PKGBUILD

----------+
 PKGBUILD |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-18 10:34:03 UTC (rev 664410)
+++ PKGBUILD	2020-07-18 11:10:21 UTC (rev 664411)
@@ -2,17 +2,16 @@
 
 pkgname=element
 pkgver=0.44.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A modular LV2/VST3 audio plugin host"
 arch=('x86_64')
 url="https://github.com/kushview/element"
 license=('GPL3')
 groups=('pro-audio')
-depends=('cairo' 'fontconfig' 'gcc-libs' 'glibc' 'gdk-pixbuf2' 'libx11'
-'libxext')
-makedepends=('alsa-lib' 'atk' 'boost' 'curl' 'freetype2' 'git' 'glib2' 'gtk2'
-'harfbuzz' 'jack' 'ladspa' 'lilv' 'lua' 'lv2' 'pango' 'readline' 'serd' 'sord'
-'sratom' 'suil' 'waf')
+depends=('cairo' 'gcc-libs' 'glibc' 'gdk-pixbuf2' 'libx11' 'libxext')
+makedepends=('alsa-lib' 'atk' 'boost' 'curl' 'fontconfig' 'freetype2' 'git'
+'glib2' 'gtk2' 'harfbuzz' 'jack' 'ladspa' 'lilv' 'lua' 'lv2' 'pango' 'readline'
+'serd' 'sord' 'sratom' 'suil' 'waf')
 checkdepends=('xorg-server-xvfb')
 optdepends=('lua: for LUA scripting')
 source=("git+https://github.com/kushview/${pkgname}#tag=${pkgver}?signed"
@@ -48,11 +47,11 @@
 }
 
 package() {
-  depends+=('libasound.so' 'libatk-1.0.so' 'libcurl.so' 'libfreetype.so'
-  'libgdk-x11-2.0.so' 'libgio-2.0.so' 'libgobject-2.0.so' 'libglib-2.0.so'
-  'libgtk-x11-2.0.so' 'libharfbuzz.so' 'libjack.so' 'liblilv-0.so'
-  'libpangoft2-1.0.so' 'libpango-1.0.so' 'libreadline.so' 'libserd-0.so'
-  'libsord-0.so' 'libsratom-0.so' 'libsuil-0.so')
+  depends+=('libasound.so' 'libatk-1.0.so' 'libcurl.so' 'libfontconfig.so'
+  'libfreetype.so' 'libgdk-x11-2.0.so' 'libgio-2.0.so' 'libgobject-2.0.so'
+  'libglib-2.0.so' 'libgtk-x11-2.0.so' 'libharfbuzz.so' 'libjack.so'
+  'liblilv-0.so' 'libpangoft2-1.0.so' 'libpango-1.0.so' 'libreadline.so'
+  'libserd-0.so' 'libsord-0.so' 'libsratom-0.so' 'libsuil-0.so')
   cd "$pkgname"
   waf install --destdir="${pkgdir}"
   install -vDm 644 {AUTHORS,CODE_OF_CONDUCT,CONTRIBUTING,README}.md \
@@ -61,4 +60,7 @@
     -t "${pkgdir}/usr/share/doc/${pkgname}/docs"
   install -vDm 644 docs/img/*.png \
     -t "${pkgdir}/usr/share/doc/${pkgname}/docs/img"
+  # move XDG desktop integration so there's no file name clash with element-desktop
+  # https://github.com/kushview/Element/issues/216
+  mv -v "${pkgdir}/usr/share/applications/"{,net.kushview.}"${pkgname}.desktop"
 }