[arch-commits] Commit in python-matplotlib/trunk (PKGBUILD python-matplotlib-tk.patch)
Stéphane Gaudreault
stephane at nymeria.archlinux.org
Wed Mar 27 01:37:30 UTC 2013
Date: Wednesday, March 27, 2013 @ 02:37:30
Author: stephane
Revision: 87091
upgpkg: python-matplotlib 1.2.1-1
upstream update
Modified:
python-matplotlib/trunk/PKGBUILD
Deleted:
python-matplotlib/trunk/python-matplotlib-tk.patch
----------------------------+
PKGBUILD | 16 ++++------------
python-matplotlib-tk.patch | 35 -----------------------------------
2 files changed, 4 insertions(+), 47 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-26 23:07:30 UTC (rev 87090)
+++ PKGBUILD 2013-03-27 01:37:30 UTC (rev 87091)
@@ -6,8 +6,8 @@
pkgbase=python-matplotlib
pkgname=('python2-matplotlib' 'python-matplotlib')
-pkgver=1.2.0
-pkgrel=8
+pkgver=1.2.1
+pkgrel=1
pkgdesc="A python plotting library, making publication quality plots"
arch=('i686' 'x86_64')
url='http://matplotlib.org'
@@ -20,16 +20,12 @@
'tk: used by the TkAgg backend'
'ghostscript: usetex dependencies'
'texlive-bin: usetex dependencies')
-source=("https://github.com/downloads/matplotlib/matplotlib/matplotlib-${pkgver}.tar.gz"
- python-matplotlib-tk.patch)
-sha1sums=('1d0c319b2bc545f1a7002f56768e5730fe573518'
- '6f27ff74a7752700758d081d3235a61a89b8ea95')
+source=("http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-${pkgver}/matplotlib-${pkgver}.tar.gz")
+sha1sums=('82fc44d0047a713c1b0b1b4ea2503e6a41c57f98')
build() {
cd "${srcdir}"/matplotlib-${pkgver}
- patch -Np1 -i ../python-matplotlib-tk.patch
-
# use system python-six
rm lib/six.py
@@ -37,10 +33,6 @@
rm -r lib/matplotlib/pyparsing_py{2,3}.py
sed -i -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' lib/matplotlib/{mathtext,fontconfig_pattern}.py
- # For numpy 1.7
- sed -i '/include/s/numpy\/arrayobject.h/numpy\/oldnumeric.h/g' \
- src/*.{c,cpp,h} lib/matplotlib/delaunay/*.{cpp,h} lib/matplotlib/tri/*.h
-
cd ..
cp -a matplotlib-${pkgver} matplotlib-${pkgver}-py3
Deleted: python-matplotlib-tk.patch
===================================================================
--- python-matplotlib-tk.patch 2013-03-26 23:07:30 UTC (rev 87090)
+++ python-matplotlib-tk.patch 2013-03-27 01:37:30 UTC (rev 87091)
@@ -1,35 +0,0 @@
-diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py
---- matplotlib-1.2.0/setupext.py.orig 2012-11-23 14:50:48.954715965 -0200
-+++ matplotlib-1.2.0/setupext.py 2012-11-23 14:55:53.731727636 -0200
-@@ -898,12 +898,12 @@ def parse_tcl_config(tcl_lib_dir, tk_lib
-
- tcl_poss = [tcl_lib_dir,
- os.path.normpath(os.path.join(tcl_lib_dir, '..')),
-- "/usr/lib/tcl"+str(Tkinter.TclVersion),
-- "/usr/lib"]
-+ "@@libdir@@/tcl"+str(Tkinter.TclVersion),
-+ "@@lib@@"]
- tk_poss = [tk_lib_dir,
- os.path.normpath(os.path.join(tk_lib_dir, '..')),
-- "/usr/lib/tk"+str(Tkinter.TkVersion),
-- "/usr/lib"]
-+ "@@libdir@@/tk"+str(Tkinter.TkVersion),
-+ "@@libdir@@"]
- for ptcl, ptk in zip(tcl_poss, tk_poss):
- tcl_config = os.path.join(ptcl, "tclConfig.sh")
- tk_config = os.path.join(ptk, "tkConfig.sh")
-@@ -974,10 +974,10 @@ def guess_tcl_config(tcl_lib_dir, tk_lib
- return tcl_lib, tcl_inc, 'tcl' + tk_ver, tk_lib, tk_inc, 'tk' + tk_ver
-
- def hardcoded_tcl_config():
-- tcl_inc = "/usr/local/include"
-- tk_inc = "/usr/local/include"
-- tcl_lib = "/usr/local/lib"
-- tk_lib = "/usr/local/lib"
-+ tcl_inc = "/usr/include"
-+ tk_inc = "/usr/include"
-+ tcl_lib = "@@libdir@@"
-+ tk_lib = "@@libdir@@"
- return tcl_lib, tcl_inc, 'tcl', tk_lib, tk_inc, 'tk'
-
- def add_tk_flags(module):
More information about the arch-commits
mailing list