OpenModelica v1.17.0

2 files changed, 53 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 253ebdbba9c3..89afe735c2b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,27 @@
-# Generated by mksrcinfo v8
-# Tue Oct  3 15:24:34 UTC 2017
 pkgbase = openmodelica
-	pkgdesc = The Open Source Modelica Suite - Metapackage
-	pkgver = 1.11.0
-	pkgrel = 2
-	url = https://openmodelica.org
-	arch = i686
+	pkgdesc = Open-source Modelica-based modeling and simulation environment
+	pkgver = 1.17.0
+	pkgrel = 1
+	url = https://www.openmodelica.org
 	arch = x86_64
-	groups = openmodelica
 	license = OSMC-PL
-	depends = openmodelica-omc
-	depends = openmodelica-omlibraries
-	depends = openmodelica-qwt
-	depends = openmodelica-omplot
-	depends = openmodelica-omedit
-	depends = openmodelica-omnotebook
-	depends = openmodelica-omshell
-	conflicts = openmodelica-dev
-	conflicts = openmodelica-git
-	conflicts = openmodelica-dev-omc
-	conflicts = openmodelica-dev-omlibraries
-	conflicts = openmodelica-dev-qwt
-	conflicts = openmodelica-dev-omplot
-	conflicts = openmodelica-dev-omedit
-	conflicts = openmodelica-dev-omnotebook
-	conflicts = openmodelica-dev-omshell
+	makedepends = gcc-fortran
+	makedepends = cmake
+	makedepends = git
+	depends = java-environment
+	depends = lapack
+	depends = openscenegraph
+	depends = omniorb
+	depends = libcurl-gnutls
+	depends = lpsolve
+	depends = boost-libs
+	depends = qt5-webkit
+	depends = qt5-xmlpatterns
+	depends = qt5-svg
+	depends = qt5-tools
+	depends = expat
+	source = openmodelica::git+https://github.com/OpenModelica/OpenModelica.git#tag=v1.17.0
+	sha256sums = SKIP
 
 pkgname = openmodelica
 
diff --git a/PKGBUILD b/PKGBUILD
index bc2c1ef2002c..917bc433c17d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,36 @@
 pkgname=openmodelica
-pkgver=1.11.0
-pkgrel=2
-
-pkgdesc="The Open Source Modelica Suite - Metapackage"
-arch=('i686' 'x86_64')
-url="https://openmodelica.org"
+pkgver=1.17.0
+pkgrel=1
+pkgdesc="Open-source Modelica-based modeling and simulation environment"
+url="https://www.openmodelica.org"
+_giturl="https://github.com/OpenModelica/OpenModelica.git"
 license=('OSMC-PL')
-groups=(openmodelica)
+arch=('x86_64')
+depends=('java-environment' 'lapack' 'openscenegraph' 'omniorb' 'libcurl-gnutls'
+         'lpsolve' 'boost-libs' 'qt5-webkit' 'qt5-xmlpatterns' 'qt5-svg' 'qt5-tools'
+         'expat')
+makedepends=('gcc-fortran' 'cmake' 'git')
+source=("${pkgname}::git+${_giturl}#tag=v${pkgver}")
+sha256sums=('SKIP')
+
+prepare() {
+        cd "${pkgname}"
+        git remote set-url origin ${_giturl}
+        git submodule update --force --init --recursive
+        # OMCompiler: Dont try to install translations
+        git cherry-pick 2a39a402d9604a1ce353b0a12574fed5d320be0e
+        # Fix build with cmake >= 3.20
+        git cherry-pick 4f3a50974f0f916efd716809699f18d47f1dbe34
+}
 
-depends=('openmodelica-omc' 'openmodelica-omlibraries' 'openmodelica-qwt' 'openmodelica-omplot' 'openmodelica-omedit' 'openmodelica-omnotebook' 'openmodelica-omshell')
+build() {
+        cd "${pkgname}"
+        autoreconf -fi
+        ./configure --prefix=/usr
+        make
+}
 
-conflicts=('openmodelica-dev' 'openmodelica-git' 'openmodelica-dev-omc' 'openmodelica-dev-omlibraries' 'openmodelica-dev-qwt' 'openmodelica-dev-omplot' 'openmodelica-dev-omedit' 'openmodelica-dev-omnotebook' 'openmodelica-dev-omshell')
+package() {
+        cd "${pkgname}"
+        make install DESTDIR=${pkgdir}
+}
\ No newline at end of file