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>
This commit is contained in:
Jan Heylen
2016-10-20 19:13:29 +02:00
committed by Thomas Petazzoni
parent 0603b9ea3e
commit f6428eacf7
6 changed files with 5 additions and 104 deletions

View File

@@ -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

View File

@@ -1,2 +0,0 @@
# locally computed
sha256 2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1 protobuf-v2.6.1.tar.gz

View File

@@ -0,0 +1 @@
../protobuf/protobuf.hash