Removed omedit.patch file, added gnuplot dependency and DH5_USE_18_API compile flag

2 files changed, 11 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8fe8509385e0..cbdb2ab5f829 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openmodelica-git
 	pkgdesc = The Open Source Modelica Suite
-	pkgver = 1.10.0.dev.r547.ge5b632e
-	pkgrel = 3
+	pkgver = 1.11.0.dev.r98.g2f90cbe
+	pkgrel = 1
 	url = https://openmodelica.org
 	arch = i686
 	arch = x86_64
@@ -37,11 +37,11 @@ pkgbase = openmodelica-git
 	depends = qt5-webkit
 	depends = qt5-svg
 	depends = qt5-tools
+	depends = gnuplot
 	provides = openmodelica
 	conflicts = openmodelica
 	conflicts = openmodelica-svn
-	source = omedit.patch
-	md5sums = 79376887eb1c754893b2e1cf01720145
+	conflicts = openmodelica-dev
 
 pkgname = openmodelica-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 62c285ba70a1..f09d98901a12 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,21 @@
 # Maintainer: Xwang <xwaang1976@gmail.com>
 pkgname=openmodelica-git
-pkgver=1.10.0.dev.r547.ge5b632e
-pkgrel=3
+pkgver=1.11.0.dev.r98.g2f90cbe
+pkgrel=1
 pkgdesc="The Open Source Modelica Suite"
 arch=('i686' 'x86_64')
 url="https://openmodelica.org"
 license=('OSMC-PL')
 
-depends=('java-environment' 'lpsolve' 'hdf5-openmpi' 'omniorb' 'openscenegraph' 'sundials' 'libatomic_ops' 'python' 'gtkglext' 'ruby' 'coin-or-ipopt' 'qjson' 'suitesparse' 'boost-libs' 'qt5-webkit' 'qt5-svg' 'qt5-tools')
+depends=('java-environment' 'lpsolve' 'hdf5-openmpi' 'omniorb' 'openscenegraph' 'sundials' 'libatomic_ops' 'python' 'gtkglext' 'ruby' 'coin-or-ipopt' 'qjson' 'suitesparse' 'boost-libs' 'qt5-webkit' 'qt5-svg' 'qt5-tools' 'gnuplot')
 
 makedepends=('autoconf' 'automake' 'libtool' 'gcc' 'gcc-fortran-multilib' 'boost' 'clang' 'cmake' 'jre7-openjdk' 'antlr2' 'subversion' 'lib32-expat' 'lib32-ncurses' 'lib32-readline')
 
 provides=('openmodelica')
-conflicts=('openmodelica' 'openmodelica-svn')
+conflicts=('openmodelica' 'openmodelica-svn' 'openmodelica-dev')
 
-source=("omedit.patch") 
-md5sums=('79376887eb1c754893b2e1cf01720145')
+#source=("omedit.patch") 
+#md5sums=('79376887eb1c754893b2e1cf01720145')
 
 prepare() {
     # clone all submodules
@@ -42,6 +42,7 @@ pkgver() {
 build() {
     cd "$srcdir/$pkgname"
     autoconf
+    export CPPFLAGS="$CPPFLAGS -DH5_USE_18_API"
     ./configure --prefix=/usr/ --without-omc --with-omniORB  --with-cppruntime --with-lapack='-llapack -lblas'
     make
 }