summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAskhat2019-07-28 11:02:37 +0700
committerAskhat2019-07-28 11:02:37 +0700
commit3f929e3b5b602b41fb49c1b6ffdb4274c8a9905b (patch)
treea6dc47491451968c65816a9d55eaef218ff65f3e
parentf83290af343c75d1c88bd3042f5d21048e7c3ace (diff)
downloadaur-3f929e3b5b602b41fb49c1b6ffdb4274c8a9905b.tar.gz
Added patch to fix compilation with GCC 9
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
2 files changed, 8 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cddb67291e63..c011d97528a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,3 @@
-# Generated by mksrcinfo v8
-# Wed Mar 6 14:18:02 UTC 2019
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.53
@@ -28,7 +26,9 @@ pkgbase = gwyddion
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.53.tar.xz
+ source = http://gwyddion.net/download/2.53/gwyddion-2.53-gcc9-openmp-shared-const.patch
sha256sums = bc7fdea79b180a5c3f4ac18abea103e72ee99eb4d77d7d7f66ee8b72a68b8b80
+ sha256sums = aa5ad7c9557aafbeebc1f0e323bd58aa7746ba008d311740f490763821d993b7
pkgname = gwyddion
diff --git a/PKGBUILD b/PKGBUILD
index 202fc1640abc..932a18a5d6eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,12 +22,16 @@ 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=('bc7fdea79b180a5c3f4ac18abea103e72ee99eb4d77d7d7f66ee8b72a68b8b80')
+source=(http://downloads.sourceforge.net/sourceforge/gwyddion/$pkgname-$pkgver.tar.xz \
+ http://gwyddion.net/download/2.53/gwyddion-2.53-gcc9-openmp-shared-const.patch)
+sha256sums=('bc7fdea79b180a5c3f4ac18abea103e72ee99eb4d77d7d7f66ee8b72a68b8b80'
+ 'aa5ad7c9557aafbeebc1f0e323bd58aa7746ba008d311740f490763821d993b7')
prepare() {
cd $pkgname-$pkgver
+ patch -Np1 -i "${srcdir}/gwyddion-2.53-gcc9-openmp-shared-const.patch"
+
# python2 fix
for file in $(find . -name '*.py' -print); do
sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file