summaryrefslogtreecommitdiff
path: root/package/python-protobuf
diff options
context:
space:
mode:
authorJan Heylen <heyleke@gmail.com>2016-10-20 19:13:29 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-10-22 15:58:48 +0200
commitf6428eacf70dd931c106215606d0e77bca09d497 (patch)
tree2f4769dd08f1df9256ce30757569b0964f7743b1 /package/python-protobuf
parent0603b9ea3eff9e11aba2b7408215e03d9247b977 (diff)
protobuf: bump to version 3.0.0
It also changes the python-protobuf.hash file to be a symbolic link to ../protobuf/protobuf.hash so that both hash files don't have to be updated when protobuf is bumped. In addition, the 0001-disable-unneeded-build-dependencies.patch patch from package/python-protobuf/ is removed because it has been merged upstream. Signed-off-by: Jan Heylen <heyleke@gmail.com> [Thomas: fix the build of python-protobuf.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/python-protobuf')
-rw-r--r--package/python-protobuf/0001-disable-unneeded-build-dependencies.patch37
l---------[-rw-r--r--]package/python-protobuf/python-protobuf.hash3
2 files changed, 1 insertions, 39 deletions
diff --git a/package/python-protobuf/0001-disable-unneeded-build-dependencies.patch b/package/python-protobuf/0001-disable-unneeded-build-dependencies.patch
deleted file mode 100644
index 3f0eabd23..000000000
--- a/package/python-protobuf/0001-disable-unneeded-build-dependencies.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7e7db7225e227905acabfa2149152ece21c93e70 Mon Sep 17 00:00:00 2001
-From: Steven Noonan <steven@uplinklabs.net>
-Date: Sun, 8 Nov 2015 09:03:00 -0800
-Subject: [PATCH] python-protobuf: don't require google-apputils
-
-This dependency is totally superfluous for successfully building/running
-python-protobuf. It's only "required" at build time and is not staged into the
-install directory, but it isn't even really required for a successful build.
-
-Signed-off-by: Steven Noonan <steven@uplinklabs.net>
----
- python/setup.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/python/setup.py b/python/setup.py
-index 2450a77..db6f497 100755
---- a/python/setup.py
-+++ b/python/setup.py
-@@ -160,7 +160,6 @@ if __name__ == '__main__':
- packages = [ 'google' ],
- namespace_packages = [ 'google' ],
- test_suite = 'setup.MakeTestSuite',
-- google_test_dir = "google/protobuf/internal",
- # Must list modules explicitly so that we don't install tests.
- py_modules = [
- 'google.protobuf.internal.api_implementation',
-@@ -189,7 +188,6 @@ if __name__ == '__main__':
- 'google.protobuf.text_format'],
- cmdclass = { 'clean': clean, 'build_py': build_py },
- install_requires = ['setuptools'],
-- setup_requires = ['google-apputils'],
- ext_modules = ext_module_list,
- url = 'https://developers.google.com/protocol-buffers/',
- maintainer = maintainer_email,
---
-2.6.2
-
diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash
index ab4bf5bf2..57a40ce5b 100644..120000
--- a/package/python-protobuf/python-protobuf.hash
+++ b/package/python-protobuf/python-protobuf.hash
@@ -1,2 +1 @@
-# locally computed
-sha256 2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1 protobuf-v2.6.1.tar.gz
+../protobuf/protobuf.hash \ No newline at end of file