Updated to 3.2.0

3 files changed, 18 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d8ae01fabe5..194f2538c31c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,21 @@
 pkgbase = ovito
 	pkgdesc = Open Visualization Tool
-	pkgver = 3.1.1
+	pkgver = 3.2.0
 	pkgrel = 1
 	url = http://www.ovito.org
 	arch = x86_64
 	license = GPL
 	makedepends = cmake
-	depends = boost
-	depends = qscintilla-qt5
-	depends = muparser
+	makedepends = boost
+	makedepends = qscintilla-qt5
 	depends = fftw
-	depends = openbabel
 	depends = python
 	depends = netcdf
 	depends = ffmpeg
+	depends = qt5-base
 	conflicts = ovito-git
-	source = https://gitlab.com/stuko/ovito/-/archive/v3.1.1/ovito-v3.1.1.tar.bz2
-	source = qwt.patch::https://gitlab.com/stuko/ovito/-/commit/c659ff9f610cd3c0fc786b0075a8ab3c718895de.diff
-	sha256sums = 9c29590f038b79c2b8dcd7a46f5d18138ac52a696e2e310f3f8831717bce63f9
-	sha256sums = 5cd22fda001601889cd6dc6529ba38736040179e10c1b04a52147aae7e1d84eb
+	source = https://gitlab.com/stuko/ovito/-/archive/v3.2.0/ovito-v3.2.0.tar.bz2
+	sha256sums = 71ab6037e76c49aa14e87ba5f4e8ae285a2852a4a742cada8ac59d780135f837
 
 pkgname = ovito
 
diff --git a/9.patch b/9.patch
deleted file mode 100644
index e75a1502143b..000000000000
--- a/9.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake
-index ff7f0021afccd7c4d181360fc6f68ebb6bec9817..7124576b244caf9e0db540d1934bbe4b5737cf65 100644
---- a/cmake/FindQScintilla.cmake
-+++ b/cmake/FindQScintilla.cmake
-@@ -4,7 +4,7 @@
- #  QScintilla_LIBRARIES - libraries needed
- 
- FIND_PATH(QSCINTILLA_INCLUDE_DIR NAMES Qsci/qsciscintilla.h PATH_SUFFIXES qt5 qt)
--FIND_LIBRARY(QSCINTILLA_LIBRARY NAMES qsciscintilla qt5scintilla2 qscintilla2)
-+FIND_LIBRARY(QSCINTILLA_LIBRARY NAMES qsciscintilla qt5scintilla2 qscintilla2_qt5 qscintilla2)
- 
- SET(QScintilla_INCLUDE_DIRS ${QSCINTILLA_INCLUDE_DIR})
- SET(QScintilla_LIBRARIES ${QSCINTILLA_LIBRARY})
-diff --git a/src/core/reference/PropertyField.h b/src/core/reference/PropertyField.h
-index 5d77d9cb6f207985aff82b536b98afcf08ee4098..5021d1ae77c63eb39ecdb36c5bf791aa5523960d 100755
---- a/src/core/reference/PropertyField.h
-+++ b/src/core/reference/PropertyField.h
-@@ -159,10 +159,12 @@ private:
- 	// This undo class records a change to the property value.
- 	class PropertyChangeOperation : public UndoableOperation {
- 	public:
--		PropertyChangeOperation(PropertyField& field) : _field(field), _owner(field.owner() != field.owner()->dataset() ? field.owner() : nullptr) {
-+		PropertyChangeOperation(PropertyField& field) : _field(field) {
- 			// Make a copy of the current property value.
-+			_owner = field.owner() != dynamic_cast<Ovito::RefMaker*>(field.owner()->dataset()) ? field.owner() : nullptr;
- 			_oldValue = field;
- 		}
-+
- 		/// Restores the old property value.
- 		virtual void undo() override {
- 			// Swap old value and current property value.
- 
diff --git a/PKGBUILD b/PKGBUILD
index 382ee3f30b40..93f816ff65f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,37 +5,30 @@
 # Contributor:  Jan Oliver Oelerich <janoliver[at]oelerich[dot]org>
 
 pkgname=ovito
-pkgver=3.1.1
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="Open Visualization Tool"
 url="http://www.ovito.org"
 arch=('x86_64')
 license=('GPL')
-depends=('boost' 'qscintilla-qt5' 'muparser' 'fftw' 'openbabel' 'python' 'netcdf'
-         'ffmpeg')
-makedepends=('cmake')
+depends=('fftw' 'python' 'netcdf' 'ffmpeg' 'qt5-base')
+makedepends=('cmake' 'boost' 'qscintilla-qt5')
 conflicts=("$pkgname-git")
-source=("https://gitlab.com/stuko/$pkgname/-/archive/v$pkgver/$pkgname-v$pkgver.tar.bz2"
-        "qwt.patch::https://gitlab.com/stuko/ovito/-/commit/c659ff9f610cd3c0fc786b0075a8ab3c718895de.diff")
-sha256sums=('9c29590f038b79c2b8dcd7a46f5d18138ac52a696e2e310f3f8831717bce63f9'
-            '5cd22fda001601889cd6dc6529ba38736040179e10c1b04a52147aae7e1d84eb')
+source=("https://gitlab.com/stuko/$pkgname/-/archive/v$pkgver/$pkgname-v$pkgver.tar.bz2")
+sha256sums=('71ab6037e76c49aa14e87ba5f4e8ae285a2852a4a742cada8ac59d780135f837')
 
 prepare() {
-    cd "$srcdir/$pkgname-v$pkgver"
-    mkdir $srcdir/build
-    patch -p1 < ../qwt.patch
+  mkdir "$srcdir/build"
 }
 
 build() {
-    cd "$srcdir/build"
-    cmake ../$pkgname-v$pkgver \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DOVITO_BUILD_PLUGIN_OPENBABELPLUGIN=ON \
-        -DOPENBABEL_INCLUDE_DIR=/usr/include/openbabel3
-    make
+  cd "$srcdir/build"
+  cmake ../$pkgname-v$pkgver \
+      -DCMAKE_INSTALL_PREFIX=/usr
+  make
 }
 
 package() {
-    cd "$srcdir/build"
-    make DESTDIR="$pkgdir" install
+  cd "$srcdir/build"
+  make DESTDIR="$pkgdir" install
 }