Fixed desktop files

2 files changed, 15 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e70c7579b5d..a148dfb55395 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 # Generated by mksrcinfo v8
-# Thu Mar  3 18:06:58 UTC 2016
+# Sat Mar  5 22:46:34 UTC 2016
 pkgbase = textadept
 	pkgdesc = A fast, minimalist, and remarkably extensible cross-platform text editor
 	pkgver = 8.6
-	pkgrel = 1
+	pkgrel = 2
 	url = http://foicica.com/textadept/
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = mercurial
-	makedepends = gendesk
 	depends = lua
 	depends = gtk2
 	provides = textadept
diff --git a/PKGBUILD b/PKGBUILD
index 5a4f4a28b105..489dcb47dcb1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,19 @@
 # Based on a contribution of: bitwave
 pkgname=textadept
 pkgver=8.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A fast, minimalist, and remarkably extensible cross-platform text editor"
 arch=('i686' 'x86_64')
 url="http://foicica.com/textadept/"
 license=('MIT')
 depends=('lua' 'gtk2')
-makedepends=('mercurial' 'gendesk')
+makedepends=('mercurial')
 provides=("$pkgname")
 conflicts=('textadept-bin')
 replaces=('textadept-bin')
 source=("hg+http://foicica.com/hg/textadept#revision=f27778cd1d49"
         'http://foicica.com/textadept/download/textadept_LATEST.modules.zip')
 
-prepare() {
-  gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc"
-}
-
 build() {
   cd "$srcdir/$pkgname/src"
   unset MAKEFLAGS
@@ -35,26 +31,21 @@ package() {
   make PREFIX=/usr DESTDIR="$pkgdir/" install
   make curses PREFIX=/usr DESTDIR="$pkgdir/" install
   
-  # Additional modules
-  cd "$srcdir/${pkgname}_$pkgver.modules"
-  cp -r modules "$pkgdir/usr/share/$pkgname/"
-
-  # Icons
-  rm "$pkgdir/usr/share/$pkgname/core/images/"{*.ico,*.icns}
-
-  for res in 16 32 48 64 128 256; do
-    install -d "$pkgdir/usr/share/icons/hicolor/${res}x${res}/apps"
-
-    ln -s /usr/share/textadept/core/images/ta_${res}x${res}.png \
-      "$pkgdir/usr/share/icons/hicolor/${res}x${res}/apps/$pkgname.png"
-  done
-  
+  # Icon
   install -d "$pkgdir/usr/share/icons/hicolor/scalable/apps"
   ln -s /usr/share/$pkgname/core/images/$pkgname.svg \
     "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg"
   
-  # Desktop file
-  install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+  # Desktop files
+  install -d "$pkgdir/usr/share/applications"
+  install -m644 *.desktop "$pkgdir/usr/share/applications/"
+  for i in "$pkgdir/usr/share/applications/"*.desktop; do
+    sed -i 's@^Icon=textadept.svg@Icon=textadept@' "$i"
+  done
+  
+  # Additional modules
+  cd "$srcdir/${pkgname}_$pkgver.modules"
+  cp -r modules "$pkgdir/usr/share/$pkgname/"
 
   # License
   install -d "$pkgdir/usr/share/licenses/textadept"