Updated to 2.59

3 files changed, 8 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d1a2111ecc4..b553bd13f87f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gwyddion
 	pkgdesc = A data visualization and processing tool for scanning probe miscroscopy (SPM, i.e. AFM, STM, MFM, SNOM/NSOM, ...) and profilometry, useful also for general image and 2D data analysis
-	pkgver = 2.59
+	pkgver = 2.60
 	pkgrel = 1
 	url = http://gwyddion.net/
 	arch = i686
@@ -22,10 +22,9 @@ pkgbase = gwyddion
 	optdepends = libwebp: WebP format support for the image export
 	optdepends = libzip: import of APE DAX, NanoObserver, NanoScanTech, OpenGPS and Sensofar PLUX data files
 	optdepends = cfitsio: import of Flexible Image Transport System (FITS) files
+	optdepends = openexr: import and export of OpenEXR HDR images
 	optdepends = hdf5: import of Ergo data files
-	source = https://downloads.sourceforge.net/sourceforge/gwyddion/gwyddion-2.59.tar.xz
-	source = gwyddion-2.58-disable-openexr.patch
-	sha256sums = 00f30e25e66dff3a7c26f5e084a6799501512963bfe13543391a24f2a0201019
-	sha256sums = 5096afc6030ef2c39635ce33dec2af1c25b62865710a1aa91006d11ac1607bc4
+	source = https://downloads.sourceforge.net/sourceforge/gwyddion/gwyddion-2.60.tar.xz
+	sha256sums = dfc3c86ab7653b30eb54a5af57802242579c4d89b061e82dcd1c9aef5dc0bbf6
 
 pkgname = gwyddion
diff --git a/PKGBUILD b/PKGBUILD
index 238f93b28d55..6f9bb9d73a4d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 
 pkgname=gwyddion
-pkgver=2.59
+pkgver=2.60
 pkgrel=1
 pkgdesc="A data visualization and processing tool for scanning probe miscroscopy (SPM, i.e. AFM, STM, MFM, SNOM/NSOM, ...) and profilometry, useful also for general image and 2D data analysis"
 url="http://gwyddion.net/"
@@ -19,17 +19,11 @@ optdepends=('libxml2: import of SPML and APE DAX data files'
             'libwebp: WebP format support for the image export'
             'libzip: import of APE DAX, NanoObserver, NanoScanTech, OpenGPS and Sensofar PLUX data files'
             'cfitsio: import of Flexible Image Transport System (FITS) files'
-#            'openexr: import and export of OpenEXR HDR images'
+            'openexr: import and export of OpenEXR HDR images'
             'hdf5: import of Ergo data files')
-source=(https://downloads.sourceforge.net/sourceforge/gwyddion/$pkgname-$pkgver.tar.xz gwyddion-2.58-disable-openexr.patch)
-sha256sums=('00f30e25e66dff3a7c26f5e084a6799501512963bfe13543391a24f2a0201019'
-            '5096afc6030ef2c39635ce33dec2af1c25b62865710a1aa91006d11ac1607bc4')
+source=(https://downloads.sourceforge.net/sourceforge/gwyddion/$pkgname-$pkgver.tar.xz)
+sha256sums=('dfc3c86ab7653b30eb54a5af57802242579c4d89b061e82dcd1c9aef5dc0bbf6')
 
-prepare() {
-   cd $pkgname-$pkgver
-
-  patch -Np2 -i "${srcdir}/gwyddion-2.58-disable-openexr.patch"
-}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/gwyddion-2.58-disable-openexr.patch b/gwyddion-2.58-disable-openexr.patch
deleted file mode 100644
index a840617e6d71..000000000000
--- a/gwyddion-2.58-disable-openexr.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur src/gwyddion-2.58/modules/file/hdrimage.cc src_/gwyddion-2.58/modules/file/hdrimage.cc
---- src/gwyddion-2.58/modules/file/hdrimage.cc	2020-08-26 20:06:48.000000000 +0700
-+++ src_/gwyddion-2.58/modules/file/hdrimage.cc	2021-05-20 12:24:34.621284332 +0700
-@@ -40,6 +40,8 @@
- #include <glib/gstdio.h>
- #include <gtk/gtk.h>
- 
-+#undef HAVE_EXR
-+
- #ifdef HAVE_PNG
- #include <png.h>
- #endif