[arch-commits] Commit in liteide/trunk (PKGBUILD liteide.png)

[Alexander Rødseth]

    Date: Wednesday, October 25, 2017 @ 22:23:01
  Author: arodseth
Revision: 264309

fix for FS#56076 (change icon)

Modified:
  liteide/trunk/PKGBUILD
Deleted:
  liteide/trunk/liteide.png

----------+
 PKGBUILD |   36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-25 22:22:13 UTC (rev 264308)
+++ PKGBUILD	2017-10-25 22:23:01 UTC (rev 264309)
@@ -6,32 +6,27 @@
 
 pkgname=liteide
 pkgver=33
-pkgrel=1
+pkgrel=2
 pkgdesc='IDE for editing and building projects written in the Go programming language'
 license=('LGPL')
 arch=('x86_64' 'i686')
 url='https://github.com/visualfc/liteide'
-replaces=('golangide')
-conflicts=('golangide')
-makedepends=('gendesk' 'git' 'gcc-go' 'mercurial' 'setconf')
+makedepends=('gcc-go' 'gendesk' 'git' 'mercurial' 'setconf')
 depends=('go-tools' 'qt5-webkit')
 optdepends=('go: go compiler'
             'gcc-go: go compiler')
 options=('!strip' '!emptydirs')
-source=("$pkgname-x$pkgver::git+https://github.com/visualfc/liteide.git#commit=34d5902698b684fe21e831e086ac9987b36eff63"
-        'liteide.png')
-md5sums=('SKIP'
-         '7f459be003d754a3a2c34be91b8c0b1f')
+source=("$pkgname-x$pkgver::git+https://github.com/visualfc/liteide.git#commit=34d5902698b684fe21e831e086ac9987b36eff63")
+md5sums=('SKIP')
 
 prepare() {
-  gendesk -f -n --name 'LiteIDE' --pkgname "$pkgname" --pkgdesc "$pkgdesc"
+  gendesk -f -n --name LiteIDE --pkgname "$pkgname" --pkgdesc "$pkgdesc"
   chmod +x "liteide-x$pkgver/build/"*_*.sh
 
+  # Fix for FS#4662 until fixed by upstream
   cd "liteide-x$pkgver/liteidex/os_deploy/linux/liteenv"
-  for bits in 32 64; do
-    # Fix for FS#4662 until fixed by upstream
-    sed -i 's/^GOROOT/#GOROOT/g' "linux$bits.env"
-  done
+  sed -i 's|^GOROOT|#GOROOT|g' linux32.env
+  sed -i 's|^GOROOT|#GOROOT|g' linux64.env
 }
 
 build() {
@@ -38,7 +33,7 @@
   cd "liteide-x$pkgver/build"
 
   mkdir -p go
-  export GOPATH=`pwd`/go
+  export GOPATH="$(pwd)/go"
   export QTDIR=/usr
 
   ./update_pkg.sh
@@ -45,8 +40,8 @@
   ./build_linux.sh
 
   # https://github.com/visualfc/liteide/issues/633
-  go get -u -v github.com/visualfc/gotools
-  go get -u -v github.com/nsf/gocode
+  go get -u github.com/visualfc/gotools
+  go get -u github.com/nsf/gocode
 }
 
 package() {
@@ -79,12 +74,13 @@
   install -Dm644 LGPL_EXCEPTION.TXT \
     "$pkgdir/usr/share/licenses/$pkgname/LGPL_EXCEPTION"
 
-  cd ../..
+  cd "$srcdir"
 
-  msg2 'Packaging menu entry and icon...'
+  msg2 'Packaging desktop shortcut...'
   install -Dm644 "$pkgname.desktop" \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$pkgname.png" \
+  install -d "$pkgdir/usr/share/pixmaps"
+  ln -s /usr/share/liteide/welcome/images/liteide400.png \
     "$pkgdir/usr/share/pixmaps/$pkgname.png"
 
   msg2 'Cleaning up...'
@@ -95,4 +91,4 @@
     "$pkgdir/usr/share/liteide/liteenv"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et:

Deleted: liteide.png
===================================================================
(Binary files differ)