summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2009-08-21 17:41:18 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2009-08-21 17:41:18 +0000
commitaf226c891ef6b0f9905756b7ec975ce7e0b5f33f (patch)
treef412ad4b0cceb10cc1f522f599538637a21f658e /dev-libs/protobuf/files
parentThis should really fix bug 279824, all tests passed here. (diff)
downloadgentoo-2-af226c891ef6b0f9905756b7ec975ce7e0b5f33f.tar.gz
gentoo-2-af226c891ef6b0f9905756b7ec975ce7e0b5f33f.tar.bz2
gentoo-2-af226c891ef6b0f9905756b7ec975ce7e0b5f33f.zip
Version bump.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/protobuf/files')
-rw-r--r--dev-libs/protobuf/files/protobuf-2.2.0-decoder_test_64bit_fix.patch17
-rw-r--r--dev-libs/protobuf/files/protobuf-2.2.0-fix-emacs-byte-compile.patch15
2 files changed, 32 insertions, 0 deletions
diff --git a/dev-libs/protobuf/files/protobuf-2.2.0-decoder_test_64bit_fix.patch b/dev-libs/protobuf/files/protobuf-2.2.0-decoder_test_64bit_fix.patch
new file mode 100644
index 000000000000..5a88a119e538
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-2.2.0-decoder_test_64bit_fix.patch
@@ -0,0 +1,17 @@
+diff -Naurp protobuf-2.0.3-orig/python/google/protobuf/internal/decoder_test.py protobuf-2.0.3/python/google/protobuf/internal/decoder_test.py
+--- protobuf-2.0.3-orig/python/google/protobuf/internal/decoder_test.py 2008-12-05 19:07:15.000000000 +0100
++++ protobuf-2.0.3/python/google/protobuf/internal/decoder_test.py 2008-12-06 22:11:48.000000000 +0100
+@@ -106,6 +106,13 @@ class DecoderTest(unittest.TestCase):
+ self.mox.ReplayAll()
+ result = decoder_method(d)
+ self.assertEqual(expected_result, result)
++ # HACK: Convert all ints to longs so that different behavior
++ # between 32-bit and 64-bit systems does not impact the result
++ # of the test.
++ if isinstance(result, int):
++ result = long(result)
++ if isinstance(expected_result, int):
++ expected_result = long(expected_result)
+ self.assert_(isinstance(result, type(expected_result)))
+ self.mox.VerifyAll()
+ self.mox.ResetAll()
diff --git a/dev-libs/protobuf/files/protobuf-2.2.0-fix-emacs-byte-compile.patch b/dev-libs/protobuf/files/protobuf-2.2.0-fix-emacs-byte-compile.patch
new file mode 100644
index 000000000000..8a2381a47083
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-2.2.0-fix-emacs-byte-compile.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/271007
+Fix error with byte-compilation in Emacs.
+
+--- protobuf-2.1.0-orig/editors/protobuf-mode.el 2009-05-13 22:36:40.000000000 +0200
++++ protobuf-2.1.0/editors/protobuf-mode.el 2009-05-24 13:37:04.000000000 +0200
+@@ -71,7 +71,8 @@
+
+ ;; This mode does not inherit properties from other modes. So, we do not use
+ ;; the usual `c-add-language' function.
+-(put 'protobuf-mode 'c-mode-prefix "protobuf-")
++(eval-and-compile
++ (put 'protobuf-mode 'c-mode-prefix "protobuf-"))
+
+ ;; The following code uses of the `c-lang-defconst' macro define syntactic
+ ;; features of protocol buffer language. Refer to the documentation in the