Update to 1.18.0

2 files changed, 6 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5d4f15d4de02..e70e95489c08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openmodelica
 	pkgdesc = Open-source Modelica-based modeling and simulation environment
-	pkgver = 1.17.0
-	pkgrel = 3
+	pkgver = 1.18.0
+	pkgrel = 1
 	url = https://www.openmodelica.org
 	arch = x86_64
 	license = OSMC-PL
@@ -21,7 +21,7 @@ pkgbase = openmodelica
 	depends = qt5-tools
 	depends = expat
 	depends = antlr4-runtime
-	source = openmodelica::git+https://github.com/OpenModelica/OpenModelica.git#tag=v1.17.0
+	source = openmodelica::git+https://github.com/OpenModelica/OpenModelica.git#tag=v1.18.0
 	sha256sums = SKIP
 
 pkgname = openmodelica
diff --git a/PKGBUILD b/PKGBUILD
index bc6451399459..4b5d48ff47de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=openmodelica
-pkgver=1.17.0
-pkgrel=3
+pkgver=1.18.0
+pkgrel=1
 pkgdesc="Open-source Modelica-based modeling and simulation environment"
 url="https://www.openmodelica.org"
 _giturl="https://github.com/OpenModelica/OpenModelica.git"
@@ -17,10 +17,6 @@ prepare() {
         cd "${pkgname}"
         git remote set-url origin ${_giturl}
         git submodule update --force --init --recursive
-        # OMCompiler: Dont try to install translations
-        git cherry-pick -n 2a39a402d9604a1ce353b0a12574fed5d320be0e
-        # Fix build with cmake >= 3.20
-        git cherry-pick -n 4f3a50974f0f916efd716809699f18d47f1dbe34
 }
 
 build() {
@@ -28,7 +24,7 @@ build() {
         # See https://github.com/OpenModelica/OpenModelica/issues/7619
         export CXXFLAGS=-std=c++14
         autoreconf -fi
-        ./configure --prefix=/usr
+        ./configure --prefix=/usr --without-omc
         make
 }