mirror of
https://github.com/archr-linux/Arch-R.git
synced 2026-03-31 14:41:55 -07:00
Merge pull request #2725 from MilhouseVH/le90_Python2-2.7.15
Python2: update to Python2-2.7.15, bump Python-related packages
This commit is contained in:
Lukas Rusak
GitHub
@@ -22,7 +22,7 @@ PKG_SHA256="6940718dfc3eff4258203ad5021090933e5c04707d5ca8cc9e73c94a7894ea9f"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="MIT"
|
||||
PKG_SITE="http://pathlib.readthedocs.org"
|
||||
PKG_URL="https://pypi.python.org/packages/source/p/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_HOST="Python3:host"
|
||||
PKG_SECTION="python/devel"
|
||||
PKG_SHORTDESC="This module offers a set of classes featuring all the common operations on paths in an easy, object-oriented way"
|
||||
|
||||
@@ -17,12 +17,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pygobject"
|
||||
PKG_VERSION="2.28.6"
|
||||
PKG_SHA256="e4bfe017fa845940184c82a4d8949db3414cb29dfc84815fb763697dc85bdcee"
|
||||
PKG_VERSION="2.28.7"
|
||||
PKG_SHA256="bb9d25a3442ca7511385a7c01b057492095c263784ef31231ffe589d83a96a5a"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPL"
|
||||
PKG_SITE="http://www.pygtk.org/"
|
||||
PKG_URL="http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_URL="http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS_TARGET="toolchain Python2 glib libffi"
|
||||
PKG_SECTION="python/devel"
|
||||
PKG_SHORTDESC="pygobject: The Python bindings for GObject"
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="setuptools"
|
||||
PKG_VERSION="32.1.2"
|
||||
PKG_SHA256="7589316802e7716e5250cd0a188bb4b77ea9338aa275dc01500732ee25140c3b"
|
||||
PKG_VERSION="39.2.0"
|
||||
PKG_SHA256="ca8119dd5c2764a7d290518817de0b880d23d790913fcd797c02ad2aa39b8c41"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="https://pypi.python.org/pypi/setuptools"
|
||||
PKG_SITE="https://pypi.org/project/setuptools"
|
||||
PKG_URL="https://github.com/pypa/setuptools/archive/v$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_HOST="Python2:host"
|
||||
PKG_SECTION="python/devel"
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="Pillow"
|
||||
PKG_VERSION="3.2.0"
|
||||
PKG_SHA256="64b0a057210c480aea99406c9391180cd866fc0fd8f0b53367e3af21b195784a"
|
||||
PKG_VERSION="5.1.0"
|
||||
PKG_SHA256="cee9bc75bff455d317b6947081df0824a8f118de2786dc3d74a3503fd631f4ef"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_SITE="http://www.pythonware.com/products/pil/"
|
||||
|
||||
@@ -1,93 +1,13 @@
|
||||
diff -Naur Pillow-3.1.0/setup.py Pillow-3.1.0.patch/setup.py
|
||||
--- Pillow-3.1.0/setup.py 2016-01-04 11:07:30.000000000 +0100
|
||||
+++ Pillow-3.1.0.patch/setup.py 2016-01-11 02:05:31.504822915 +0100
|
||||
@@ -236,65 +236,10 @@
|
||||
_add_directory(include_dirs, "/usr/X11/include")
|
||||
|
||||
elif sys.platform.startswith("linux"):
|
||||
- arch_tp = (plat.processor(), plat.architecture()[0])
|
||||
- if arch_tp == ("x86_64", "32bit"):
|
||||
- # 32-bit build on 64-bit machine.
|
||||
- _add_directory(library_dirs, "/usr/lib/i386-linux-gnu")
|
||||
- else:
|
||||
- for platform_ in arch_tp:
|
||||
-
|
||||
- if not platform_:
|
||||
- continue
|
||||
-
|
||||
- if platform_ in ["x86_64", "64bit"]:
|
||||
- _add_directory(library_dirs, "/lib64")
|
||||
- _add_directory(library_dirs, "/usr/lib64")
|
||||
- _add_directory(library_dirs,
|
||||
- "/usr/lib/x86_64-linux-gnu")
|
||||
- break
|
||||
- elif platform_ in ["i386", "i686", "32bit"]:
|
||||
- _add_directory(library_dirs, "/usr/lib/i386-linux-gnu")
|
||||
- break
|
||||
- elif platform_ in ["aarch64"]:
|
||||
- _add_directory(library_dirs, "/usr/lib64")
|
||||
- _add_directory(library_dirs,
|
||||
- "/usr/lib/aarch64-linux-gnu")
|
||||
- break
|
||||
- elif platform_ in ["arm", "armv7l"]:
|
||||
- _add_directory(library_dirs,
|
||||
- "/usr/lib/arm-linux-gnueabi")
|
||||
- break
|
||||
- elif platform_ in ["ppc64"]:
|
||||
- _add_directory(library_dirs, "/usr/lib64")
|
||||
- _add_directory(library_dirs,
|
||||
- "/usr/lib/ppc64-linux-gnu")
|
||||
- _add_directory(library_dirs,
|
||||
- "/usr/lib/powerpc64-linux-gnu")
|
||||
- break
|
||||
- elif platform_ in ["ppc"]:
|
||||
- _add_directory(library_dirs, "/usr/lib/ppc-linux-gnu")
|
||||
- _add_directory(library_dirs,
|
||||
- "/usr/lib/powerpc-linux-gnu")
|
||||
- break
|
||||
- elif platform_ in ["s390x"]:
|
||||
- _add_directory(library_dirs, "/usr/lib64")
|
||||
- _add_directory(library_dirs,
|
||||
- "/usr/lib/s390x-linux-gnu")
|
||||
- break
|
||||
- elif platform_ in ["s390"]:
|
||||
- _add_directory(library_dirs, "/usr/lib/s390-linux-gnu")
|
||||
- break
|
||||
- else:
|
||||
- raise ValueError(
|
||||
- "Unable to identify Linux platform: `%s`" % platform_)
|
||||
-
|
||||
- # XXX Kludge. Above /\ we brute force support multiarch. Here we
|
||||
- # try Barry's more general approach. Afterward, something should
|
||||
- # work ;-)
|
||||
- self.add_multiarch_paths()
|
||||
+ pass
|
||||
|
||||
elif sys.platform.startswith("gnu"):
|
||||
- self.add_multiarch_paths()
|
||||
+ pass
|
||||
|
||||
elif sys.platform.startswith("freebsd"):
|
||||
_add_directory(library_dirs, "/usr/local/lib")
|
||||
@@ -345,21 +289,6 @@
|
||||
else:
|
||||
TCL_ROOT = None
|
||||
|
||||
- # add standard directories
|
||||
-
|
||||
- # look for tcl specific subdirectory (e.g debian)
|
||||
- if _tkinter:
|
||||
- tcl_dir = "/usr/include/tcl" + TCL_VERSION
|
||||
- if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
|
||||
- _add_directory(include_dirs, tcl_dir)
|
||||
-
|
||||
- # standard locations
|
||||
- _add_directory(library_dirs, "/usr/local/lib")
|
||||
- _add_directory(include_dirs, "/usr/local/include")
|
||||
-
|
||||
- _add_directory(library_dirs, "/usr/lib")
|
||||
- _add_directory(include_dirs, "/usr/include")
|
||||
-
|
||||
# on Windows, look for the OpenJPEG libraries in the location that
|
||||
# the official installer puts them
|
||||
if sys.platform == "win32":
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 4a0ad86c5..c07e1a938 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -194,7 +194,7 @@ class pil_build_ext(build_ext):
|
||||
]
|
||||
|
||||
def initialize_options(self):
|
||||
- self.disable_platform_guessing = None
|
||||
+ self.disable_platform_guessing = True
|
||||
build_ext.initialize_options(self)
|
||||
for x in self.feature:
|
||||
setattr(self, 'disable_%s' % x, None)
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pycryptodome"
|
||||
PKG_VERSION="3.4.5"
|
||||
PKG_SHA256="be84544eadc2bb71d4ace39e4984ed2990111f053f24267a07afb4b4e1e5428f"
|
||||
PKG_VERSION="3.6.1"
|
||||
PKG_SHA256="15013007e393d0cc0e69f4329a47c4c8597b7f3d02c12c03f805405542f70c71"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_SITE="https://pypi.python.org/pypi/pycryptodome"
|
||||
PKG_SITE="https://pypi.org/project/pycryptodome"
|
||||
PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
|
||||
PKG_SECTION="python/security"
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="dbus-python"
|
||||
PKG_VERSION="1.2.4"
|
||||
PKG_SHA256="e2f1d6871f74fba23652e51d10873e54f71adab0525833c19bad9e99b1b2f9cc"
|
||||
PKG_VERSION="1.2.8"
|
||||
PKG_SHA256="abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://freedesktop.org/wiki/Software/dbus"
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="simplejson"
|
||||
PKG_VERSION="3.10.0"
|
||||
PKG_SHA256="953be622e88323c6f43fad61ffd05bebe73b9fd9863a46d68b052d2aa7d71ce2"
|
||||
PKG_VERSION="3.15.0"
|
||||
PKG_SHA256="ad332f65d9551ceffc132d0a683f4ffd12e4bc7538681100190d577ced3473fb"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://pypi.python.org/pypi/simplejson"
|
||||
PKG_SITE="http://pypi.org/project/simplejson"
|
||||
PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
|
||||
PKG_SECTION="python/system"
|
||||
|
||||
Reference in New Issue
Block a user