Update to 2.65

3 files changed, 26 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ee93e15883e0..cd5711ffe406 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.64
+	pkgver = 2.65
 	pkgrel = 1
 	url = http://gwyddion.net/
 	arch = i686
@@ -24,7 +24,9 @@ pkgbase = gwyddion
 	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.64.tar.xz
-	sha256sums = 1432f85c31c7e96605e3b3ac9e1c6933bb3b61a76eb620838dc24a085f19942c
+	source = https://downloads.sourceforge.net/sourceforge/gwyddion/gwyddion-2.65.tar.xz
+	source = gwyddion-no-jxl.patch
+	sha256sums = 9115fb0a83c963c62460da1d7b9834382c9698bfb9b0cf29b829a4f591369ea3
+	sha256sums = b479ffe00737e45fe61ae757b3a8c62f707e8ae4efbe28b20aa0da84bb5f8c1b
 
 pkgname = gwyddion
diff --git a/PKGBUILD b/PKGBUILD
index 798b535e14d0..907f2da71169 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 
 pkgname=gwyddion
-pkgver=2.64
+pkgver=2.65
 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/"
@@ -21,8 +21,14 @@ optdepends=('libxml2: import of SPML and APE DAX data files'
             'cfitsio: import of Flexible Image Transport System (FITS) files'
             '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)
-sha256sums=('1432f85c31c7e96605e3b3ac9e1c6933bb3b61a76eb620838dc24a085f19942c')
+source=(https://downloads.sourceforge.net/sourceforge/gwyddion/$pkgname-$pkgver.tar.xz
+        gwyddion-no-jxl.patch)
+sha256sums=('9115fb0a83c963c62460da1d7b9834382c9698bfb9b0cf29b829a4f591369ea3'
+            'b479ffe00737e45fe61ae757b3a8c62f707e8ae4efbe28b20aa0da84bb5f8c1b')
+
+prepare() {
+  patch -Np0 -i "gwyddion-no-jxl.patch"
+}
 
 
 build() {
diff --git a/gwyddion-no-jxl.patch b/gwyddion-no-jxl.patch
new file mode 100644
index 000000000000..90cc50e4141d
--- /dev/null
+++ b/gwyddion-no-jxl.patch
@@ -0,0 +1,12 @@
+diff -Naru gwyddion-2.65/modules/file/imgexport.c gwyddion-2.65-no-jxl/modules/file/imgexport.c
+--- gwyddion-2.65/modules/file/imgexport.c	2023-10-24 16:15:48.000000000 +0700
++++ gwyddion-2.65-no-jxl/modules/file/imgexport.c	2024-02-08 06:30:45.811600959 +0700
+@@ -68,6 +68,8 @@
+ #include <webp/encode.h>
+ #endif
+ 
++#undef HAVE_JXL
++
+ #ifdef HAVE_JXL
+ #include <jxl/encode.h>
+ #endif