summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorb00rt00s2017-02-06 19:23:29 +0100
committerb00rt00s2017-02-06 19:23:29 +0100
commit2a0031343a843accc29af42b6c8ca9cd49f80e1a (patch)
tree2453a6b8f0619838a28cabb9b1d7499f01140a47
parent08e1d5ff3b8444abe4111196960a4d85aa43dbd8 (diff)
downloadaur-2a0031343a843accc29af42b6c8ca9cd49f80e1a.tar.gz
updated
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD36
-rw-r--r--wxversion.patch13
3 files changed, 23 insertions, 36 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 713a86c2705..2b943c645d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,26 @@
# Generated by mksrcinfo v8
-# nie lip 31 11:14:05 UTC 2016
+# pon lut 6 18:22:59 UTC 2017
pkgbase = gsas2-svn
pkgdesc = General Structure Analysis System II - refinement for powder diffraction patterns
- pkgver = 2401
+ pkgver = 2692
pkgrel = 1
url = https://subversion.xor.aps.anl.gov/trac/pyGSAS
arch = i686
arch = x86_64
license = unknown
makedepends = subversion
- makedepends = scons
- makedepends = gcc-fortran
depends = python2
depends = python2-scipy
depends = python2-matplotlib
- depends = wxpython2.8
+ depends = wxpython
depends = python2-opengl
depends = python2-numpy
source = gsas2::svn+https://subversion.xor.aps.anl.gov/pyGSAS/trunk/
source = GSASII.desktop
source = rungsas2
- source = wxversion.patch
md5sums = SKIP
md5sums = e9d06aed1866e65ce8259cfd5a31e1ce
md5sums = c114904d9eb6130abfb83e3d23adf005
- md5sums = 9d61d13f5f9674c101359bac2f6f590d
pkgname = gsas2-svn
diff --git a/PKGBUILD b/PKGBUILD
index 8a897723006..125aa0a80ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,22 @@
pkgname=gsas2-svn
_pkgname=gsas2
-pkgver=2401
+pkgver=2692
pkgrel=1
pkgdesc="General Structure Analysis System II - refinement for powder diffraction patterns"
arch=(i686 x86_64)
url="https://subversion.xor.aps.anl.gov/trac/pyGSAS"
license=(unknown)
-depends=(python2 python2-scipy python2-matplotlib wxpython2.8 python2-opengl python2-numpy)
+depends=(python2 python2-scipy python2-matplotlib wxpython python2-opengl python2-numpy)
[ "${CARCH}" = "x86_64" ] && depends=("${depends[@]}")
-makedepends=(subversion scons gcc-fortran)
+makedepends=(subversion)
source=("${_pkgname}::svn+https://subversion.xor.aps.anl.gov/pyGSAS/trunk/"
"GSASII.desktop"
- "rungsas2"
- "wxversion.patch")
+ "rungsas2")
md5sums=('SKIP'
'e9d06aed1866e65ce8259cfd5a31e1ce'
- 'c114904d9eb6130abfb83e3d23adf005'
- '9d61d13f5f9674c101359bac2f6f590d')
+ 'c114904d9eb6130abfb83e3d23adf005')
pkgver() {
cd "${SRCDEST}/${_pkgname}"
@@ -29,11 +27,7 @@ pkgver() {
build()
{
- #Build Fortran components using scons
- cd "$srcdir/gsas2/fsource"
- sed -i 's/f2py/f2py2/g' SConstruct
- sed -i 's/python/python2/g' SConstruct
- scons
+ msg "Nothing to do in build()"
}
package()
@@ -41,6 +35,20 @@ package()
mkdir -p "$pkgdir/opt/${_pkgname}"
mkdir -p "$pkgdir/usr/share/licenses/${_pkgname}/"
mkdir -p "$pkgdir/usr/share/applications/"
+
+ #remove unecessary libraries for other platforms
+ ( cd $srcdir/${_pkgname}
+
+ [ "${CARCH}" == "i686" ] && rm -rf binlinux64-2.7
+ [ "${CARCH}" == "x86_64" ] && rm -rf binlinux2.7
+
+ for _dir in {binmac,binwin}{,64-}2.7-bak; do
+ rm -rf ${_dir}
+ done
+
+ #already in depends
+ rm -rf PyOpenGL-3.0.2a5.zip
+ )
#Install gsas-2 files:
cp -a $srcdir/${_pkgname}/* $pkgdir/opt/${_pkgname}
@@ -57,8 +65,4 @@ package()
#Linking executable
( cd "$pkgdir/usr/bin"
ln -s ../../opt/${_pkgname}/gsas2 gsas2 )
-
- #Patching for proper wx version'
- ( cd $pkgdir/opt/gsas2
- patch -p0 < $srcdir/wxversion.patch )
}
diff --git a/wxversion.patch b/wxversion.patch
deleted file mode 100644
index f334479ffa8..00000000000
--- a/wxversion.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-*** GSASII.py 2014-04-23 14:50:53.990248150 +0000
---- GSASII-new.py 2014-04-23 14:50:36.393581085 +0000
-***************
-*** 27,32 ****
---- 27,34 ----
- import inspect
- import numpy as np
- import scipy as sp
-+ import wxversion
-+ wxversion.select('2.8')
- import wx
- import matplotlib as mpl
- try: