summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAskhat2019-11-04 19:59:37 +0700
committerAskhat2019-11-04 19:59:37 +0700
commita7b931b3eafbfcd216f111299a020dd07dbc9ad3 (patch)
tree0964e70b69ee0916460fa1ff507a119958c43fff
parent7391b6f76b666e20e03cda406c18511c40848cf6 (diff)
downloadaur-a7b931b3eafbfcd216f111299a020dd07dbc9ad3.tar.gz
Updated to 2.55
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD9
-rw-r--r--gwyddion-2.55-xml.patch14
3 files changed, 25 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 41ad13c1d845..2ddc2f13638c 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.54
+ pkgver = 2.55
pkgrel = 1
url = http://gwyddion.net/
arch = i686
@@ -25,8 +25,10 @@ pkgbase = gwyddion
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
- source = http://downloads.sourceforge.net/sourceforge/gwyddion/gwyddion-2.54.tar.xz
- sha256sums = 3713e7f25bfab2e210a89accdfb40e199f2a5d908ee29796afcc8c4c1e9b5ecb
+ source = http://downloads.sourceforge.net/sourceforge/gwyddion/gwyddion-2.55.tar.xz
+ source = gwyddion-2.55-xml.patch
+ sha256sums = b1f1fe5ade7d667d005078f25c1b8b1523d18307ac451176ccd7c6b7bffe0050
+ sha256sums = b6e70a95d999e6c9eb419b91695f0e31f43f4248f08e40aa178662e203a5b445
pkgname = gwyddion
diff --git a/PKGBUILD b/PKGBUILD
index cdf2734328e1..42a769296ce1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# http://packages.gentoo.org/package/sci-visualization/gwyddion
pkgname=gwyddion
-pkgver=2.54
+pkgver=2.55
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/"
@@ -22,12 +22,15 @@ optdepends=('libxml2: import of SPML and APE DAX data files'
'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')
-source=(http://downloads.sourceforge.net/sourceforge/gwyddion/$pkgname-$pkgver.tar.xz)
-sha256sums=('3713e7f25bfab2e210a89accdfb40e199f2a5d908ee29796afcc8c4c1e9b5ecb')
+source=(http://downloads.sourceforge.net/sourceforge/gwyddion/$pkgname-$pkgver.tar.xz gwyddion-2.55-xml.patch)
+sha256sums=('b1f1fe5ade7d667d005078f25c1b8b1523d18307ac451176ccd7c6b7bffe0050'
+ 'b6e70a95d999e6c9eb419b91695f0e31f43f4248f08e40aa178662e203a5b445')
prepare() {
cd $pkgname-$pkgver
+ patch -Np2 -i "${srcdir}/gwyddion-2.55-xml.patch"
+
# python2 fix
for file in $(find . -name '*.py' -print); do
sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file
diff --git a/gwyddion-2.55-xml.patch b/gwyddion-2.55-xml.patch
new file mode 100644
index 000000000000..a24b753a7ae7
--- /dev/null
+++ b/gwyddion-2.55-xml.patch
@@ -0,0 +1,14 @@
+diff -Naur ./gwyddion-2.55/data/gwyddion.xml ./gwyddion-2.55-patched/data/gwyddion.xml
+--- ./gwyddion-2.55/data/gwyddion.xml 2019-11-04 16:25:38.000000000 +0700
++++ ./gwyddion-2.55-patched/data/gwyddion.xml 2019-11-04 19:44:02.548355709 +0700
+@@ -55,8 +55,8 @@
+ <comment>Ambios XML profile data</comment>
+ <magic priority="80">
+ <match type="string" offset="0" value="&lt;?xml">
+- <match type="string" offset="40:120" value="<ProfilometerData>">
+- <match type="string" offset="60:140" value="<Header>"/>
++ <match type="string" offset="40:120" value="&lt;ProfilometerData&gt;">
++ <match type="string" offset="60:140" value="&lt;Header&gt;"/>
+ </match>
+ </match>
+ </magic>