aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2017-09-27 05:34:36 +0000
committerTimo Teräs <timo.teras@iki.fi>2017-09-27 05:34:36 +0000
commit37ff3e70d3f653be74f5033f19ab41a2ed1106b3 (patch)
treecfa2e1bf37f327e65da6b3657461b9ed73a21c31
parent674c89f70139703f1b5b0f767c0bdd40c217416e (diff)
community/python2-tkinter: upgrade to 2.7.14
-rw-r--r--community/python2-tkinter/APKBUILD29
1 files changed, 13 insertions, 16 deletions
diff --git a/community/python2-tkinter/APKBUILD b/community/python2-tkinter/APKBUILD
index 226a430e6be..ba44f12ed7e 100644
--- a/community/python2-tkinter/APKBUILD
+++ b/community/python2-tkinter/APKBUILD
@@ -4,9 +4,9 @@
# a cyclic dependency: python -> tk -> libx11 -> libxcb -> xcb-proto -> python
pkgname=python2-tkinter
-pkgver=2.7.13
+pkgver=2.7.14
_verbase=${pkgver%.*}
-pkgrel=2
+pkgrel=0
pkgdesc="A graphical user interface for the Python"
url="https://wiki.python.org/moin/TkInter"
arch="all"
@@ -30,11 +30,11 @@ prepare() {
return 1
fi
fi
- default_prepare || return 1
+ default_prepare
cd "$builddir"
# Make sure we use system libs
- rm -rf Modules/expat Modules/_ctypes/libffi* Modules/zlib || return 1
+ rm -rf Modules/expat Modules/_ctypes/libffi* Modules/zlib
}
build() {
@@ -50,9 +50,8 @@ build() {
--with-system-ffi \
--with-system-expat \
--with-system-zlib \
- --enable-unicode=ucs4 \
- || return 1
- make || return 1
+ --enable-unicode=ucs4
+ make
}
package() {
@@ -62,25 +61,25 @@ package() {
|| return 1
mkdir -p "$pkgdir"/usr/lib/python${_verbase}/lib-dynload \
- "$pkgdir"/usr/bin || return 1
+ "$pkgdir"/usr/bin
for lib in idlelib lib-tk; do
mv "$builddir"/tmpinstall/usr/lib/python${_verbase}/$lib \
- "$pkgdir"/usr/lib/python${_verbase}/ || return 1
+ "$pkgdir"/usr/lib/python${_verbase}/
done
mv "$builddir"/tmpinstall/usr/lib/python${_verbase}/lib-dynload/_tkinter.so \
- "$pkgdir"/usr/lib/python${_verbase}/lib-dynload/ || return 1
+ "$pkgdir"/usr/lib/python${_verbase}/lib-dynload/
mv "$builddir"/tmpinstall/usr/bin/idle \
- "$pkgdir"/usr/bin/idle${_verbase} || return 1
+ "$pkgdir"/usr/bin/idle${_verbase}
}
_mv_files() {
local i
for i in "$@"; do
mkdir -p "$subpkgdir"/${i%/*}
- mv "$pkgdir"/$i "$subpkgdir"/$i || return 1
+ mv "$pkgdir"/$i "$subpkgdir"/$i
done
}
@@ -88,7 +87,7 @@ tests() {
pkgdesc="The test modules from the main python package for tkinter"
replaces="python-tests python2-tests"
cd "$pkgdir"
- _mv_files usr/lib/python*/*/test || return 1
+ _mv_files usr/lib/python*/*/test
}
_idle() {
@@ -98,6 +97,4 @@ _idle() {
_mv_files usr/bin
}
-md5sums="53b43534153bb2a0363f08bae8b9d990 Python-2.7.13.tar.xz"
-sha256sums="35d543986882f78261f97787fd3e06274bfa6df29fac9b4a94f73930ff98f731 Python-2.7.13.tar.xz"
-sha512sums="f37c9a28ce129d01e63c84d7db627a06402854578f62d17927334ea21ede318e04bbf66e890e3f47c85333e6b19f6e5581fb3f3e27efd24be27017d1b6529c4b Python-2.7.13.tar.xz"
+sha512sums="78310b0be6388ffa15f29a80afb9ab3c03a572cb094e9da00cfe391afadb51696e41f592eb658d6a31a2f422fdac8a55214a382cbb8cfb43d4a127d5b35ea7f9 Python-2.7.14.tar.xz"