Fix error on fzn-gecode solver not finding libraries

4 files changed, 9 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 80926bef0646..73a3be92d424 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = minizinc-ide
 	pkgdesc = Simple IDE for writing and running MiniZinc models
 	pkgver = 2.6.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.minizinc.org/ide/
 	install = minizinc-ide.install
 	arch = x86_64
@@ -10,11 +10,9 @@ pkgbase = minizinc-ide
 	conflicts = libminizinc
 	options = !strip
 	source = minizinc-ide.desktop
-	source = fzn-gecode-gist-lib-path.patch
 	source = https://raw.githubusercontent.com/MiniZinc/MiniZincIDE/master/resources/icon.png
 	source = https://github.com/MiniZinc/MiniZincIDE/releases/download/2.6.0/MiniZincIDE-2.6.0-bundle-linux-x86_64.tgz
-	sha256sums = e0bca68c0897cbcd63bf603ad1f352c16c5fc62ee8f151daa7e793361007d242
-	sha256sums = 80ab03ebe936ce85b107523ae242d97905763ed30596639e1778cdea796b9e1e
+	sha256sums = 9928044890140a0f0e6f17df8b5f11acfea0b4fd7a8f494309a38b37bb7d71c2
 	sha256sums = eaa69a6d1b8a3e307d1b400b74273995abb914fbe1246c65fc9b3955b2094023
 	sha256sums = a4174281806aa3c9edad5030f9befbc0fd450d503ad68e91813323870c30e5c9
 
diff --git a/PKGBUILD b/PKGBUILD
index 27e486153498..0e03a347ea8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Fabio Tardivo <x95a31x at gmail dot com>
 pkgname=minizinc-ide
 pkgver=2.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple IDE for writing and running MiniZinc models"
 arch=(x86_64)
 url=http://www.minizinc.org/ide/
@@ -13,20 +13,15 @@ install=$pkgname.install
 conflicts=(libminizinc)
 source=(
     minizinc-ide.desktop
-    fzn-gecode-gist-lib-path.patch
     https://raw.githubusercontent.com/MiniZinc/MiniZincIDE/master/resources/icon.png
     https://github.com/MiniZinc/MiniZincIDE/releases/download/$pkgver/MiniZincIDE-$pkgver-bundle-linux-$arch.tgz
 )
-sha256sums=('e0bca68c0897cbcd63bf603ad1f352c16c5fc62ee8f151daa7e793361007d242'
-            '80ab03ebe936ce85b107523ae242d97905763ed30596639e1778cdea796b9e1e'
+sha256sums=('9928044890140a0f0e6f17df8b5f11acfea0b4fd7a8f494309a38b37bb7d71c2'
             'eaa69a6d1b8a3e307d1b400b74273995abb914fbe1246c65fc9b3955b2094023'
             'a4174281806aa3c9edad5030f9befbc0fd450d503ad68e91813323870c30e5c9')
 
-prepare() {
-    # Workaround for https://github.com/MiniZinc/MiniZincIDE/issues/90
-    cd $srcdir/MiniZincIDE-$pkgver-bundle-linux-$arch
-    # patch --strip=0 --input=${srcdir}/fzn-gecode-gist-lib-path.patch
-}
+# Workaround for https://github.com/MiniZinc/MiniZincIDE/issues/90
+# implemented in .desktop file, by adding it as environment variable
 
 package() {    
     # Create MiniZinc directory
diff --git a/fzn-gecode-gist-lib-path.patch b/fzn-gecode-gist-lib-path.patch
deleted file mode 100644
index bf7f63608e1a..000000000000
--- a/fzn-gecode-gist-lib-path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- bin/run-fzn-gecode-gist
-+++ bin/run-fzn-gecode-gist
-@@ -1,3 +1,4 @@
- #!/bin/bash
--DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-+DIR=$( cd "$( dirname "$( readlink -f "${BASH_SOURCE[0]}" )" )" && pwd )
-+export LD_LIBRARY_PATH="$DIR/../lib":$LD_LIBRARY_PATH
- exec "$DIR"/fzn-gecode-gist -mode gist "$@"
- 
diff --git a/minizinc-ide.desktop b/minizinc-ide.desktop
index 7c2d83c6252e..26b45aa56376 100644
--- a/minizinc-ide.desktop
+++ b/minizinc-ide.desktop
@@ -3,6 +3,8 @@ Type=Application
 Name=MiniZinc IDE
 Comment=Simple IDE for writing and running MiniZinc models
 Icon=/opt/minizinc-ide/resources/icon.png
-Exec=MiniZincIDE
+#Exec= env LD_LIBRARY_PATH=/opt/minizinc-ide/lib:$LD_LIBRARY_PATH
+#Exec=MiniZincIDE
+Exec=sh -c "LD_LIBRARY_PATH=/opt/minizinc-ide/lib:$LDLIBRARY_PATH MiniZincIDE"
 Terminal=false
 Categories=Development;IDE;