[csw-devel] SF.net SVN: gar:[8713] csw/mgar/pkg/protobuf/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Sun Feb 21 09:54:47 CET 2010
Revision: 8713
http://gar.svn.sourceforge.net/gar/?rev=8713&view=rev
Author: wahwah
Date: 2010-02-21 08:54:47 +0000 (Sun, 21 Feb 2010)
Log Message:
-----------
protobuf: More patches, still doesn't build, http://code.google.com/p/protobuf/issues/detail?id=166
Modified Paths:
--------------
csw/mgar/pkg/protobuf/trunk/Makefile
csw/mgar/pkg/protobuf/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/protobuf/trunk/files/std-map-again.patch
csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again-include-map.patch
csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again.patch
csw/mgar/pkg/protobuf/trunk/files/strtof.patch
csw/mgar/pkg/protobuf/trunk/files/vector-in-repeated_field.h.patch
Modified: csw/mgar/pkg/protobuf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/protobuf/trunk/Makefile 2010-02-21 00:25:15 UTC (rev 8712)
+++ csw/mgar/pkg/protobuf/trunk/Makefile 2010-02-21 08:54:47 UTC (rev 8713)
@@ -2,6 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+# Still doesn't build, I've filed a bug:
+# http://code.google.com/p/protobuf/issues/detail?id=166
+
GARNAME = protobuf
GARVERSION = 2.3.0
CATEGORIES = lib
@@ -20,6 +23,11 @@
PATCHFILES += std-map-in-google-protobuf-extension_set.cc.patch
PATCHFILES += stdint-gcc.patch
PATCHFILES += std-map-2.patch
+PATCHFILES += vector-in-repeated_field.h.patch
+PATCHFILES += strtof.patch
+PATCHFILES += std-map-again.patch
+PATCHFILES += std-map-yet-again.patch
+PATCHFILES += std-map-yet-again-include-map.patch
LICENSE = COPYING.txt
CONFIGURE_ARGS = $(DIRPATHS)
GARCOMPILER = SOS12
Modified: csw/mgar/pkg/protobuf/trunk/checksums
===================================================================
--- csw/mgar/pkg/protobuf/trunk/checksums 2010-02-21 00:25:15 UTC (rev 8712)
+++ csw/mgar/pkg/protobuf/trunk/checksums 2010-02-21 08:54:47 UTC (rev 8713)
@@ -1,5 +1,10 @@
65dba2c04923595b6f0a6a44d8106f0a protobuf-2.3.0.tar.gz
ca4082250f24ec40fbce6993bcfb87cd std-map-2.patch
+0b2f1b0bd5747aefe412af51b7434294 std-map-again.patch
603e491e286232a90cf9b378317db9f2 std-map-in-google-protobuf-extension_set.cc.patch
+e02c84596b8b4a03d5a160469edc8187 std-map-yet-again-include-map.patch
+20dee4f5aa23962864d55423fcbc63aa std-map-yet-again.patch
2c16ccb4bd7120f71d557d2cb9841c42 stdint-and-ddi.patch
d57e96bdf15bb207ba7df46d83b1a6bd stdint-gcc.patch
+c22e22af396037fd24f8c5e276b31d98 strtof.patch
+d2919404a19d4dd38d4e4378014b4518 vector-in-repeated_field.h.patch
Added: csw/mgar/pkg/protobuf/trunk/files/std-map-again.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/std-map-again.patch (rev 0)
+++ csw/mgar/pkg/protobuf/trunk/files/std-map-again.patch 2010-02-21 08:54:47 UTC (rev 8713)
@@ -0,0 +1,11 @@
+--- protobuf-2.3.0/src/google/protobuf/descriptor_database.h.orig 2010-02-20 23:33:10.978002985 +0100
++++ protobuf-2.3.0/src/google/protobuf/descriptor_database.h 2010-02-20 23:33:21.265334100 +0100
+@@ -233,7 +233,7 @@
+
+ // Find the last entry in the by_symbol_ map whose key is less than or
+ // equal to the given name.
+- typename map<string, Value>::iterator FindLastLessOrEqual(
++ typename std::map<string, Value>::iterator FindLastLessOrEqual(
+ const string& name);
+
+ // True if either the arguments are equal or super_symbol identifies a
Added: csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again-include-map.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again-include-map.patch (rev 0)
+++ csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again-include-map.patch 2010-02-21 08:54:47 UTC (rev 8713)
@@ -0,0 +1,10 @@
+--- protobuf-2.3.0/src/google/protobuf/descriptor_database.cc.orig 2010-02-20 23:39:07.835347049 +0100
++++ protobuf-2.3.0/src/google/protobuf/descriptor_database.cc 2010-02-20 23:43:55.328201640 +0100
+@@ -35,6 +35,7 @@
+ #include <google/protobuf/descriptor_database.h>
+
+ #include <set>
++#include <map>
+
+ #include <google/protobuf/descriptor.pb.h>
+ #include <google/protobuf/wire_format_lite_inl.h>
Added: csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again.patch (rev 0)
+++ csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again.patch 2010-02-21 08:54:47 UTC (rev 8713)
@@ -0,0 +1,38 @@
+--- protobuf-2.3.0/src/google/protobuf/descriptor_database.cc.orig 2010-02-20 23:39:07.835347049 +0100
++++ protobuf-2.3.0/src/google/protobuf/descriptor_database.cc 2010-02-20 23:39:49.843758591 +0100
+@@ -97,7 +97,7 @@
+
+ // Try to look up the symbol to make sure a super-symbol doesn't already
+ // exist.
+- typename map<string, Value>::iterator iter = FindLastLessOrEqual(name);
++ typename std::map<string, Value>::iterator iter = FindLastLessOrEqual(name);
+
+ if (iter == by_symbol_.end()) {
+ // Apparently the map is currently empty. Just insert and be done with it.
+@@ -179,7 +179,7 @@
+ template <typename Value>
+ Value SimpleDescriptorDatabase::DescriptorIndex<Value>::FindSymbol(
+ const string& name) {
+- typename map<string, Value>::iterator iter = FindLastLessOrEqual(name);
++ typename std::map<string, Value>::iterator iter = FindLastLessOrEqual(name);
+
+ return (iter != by_symbol_.end() && IsSubSymbol(iter->first, name)) ?
+ iter->second : Value();
+@@ -198,7 +198,7 @@
+ bool SimpleDescriptorDatabase::DescriptorIndex<Value>::FindAllExtensionNumbers(
+ const string& containing_type,
+ vector<int>* output) {
+- typename map<pair<string, int>, Value >::const_iterator it =
++ typename std::map<pair<string, int>, Value >::const_iterator it =
+ by_extension_.lower_bound(make_pair(containing_type, 0));
+ bool success = false;
+
+@@ -212,7 +212,7 @@
+ }
+
+ template <typename Value>
+-typename map<string, Value>::iterator
++typename std::map<string, Value>::iterator
+ SimpleDescriptorDatabase::DescriptorIndex<Value>::FindLastLessOrEqual(
+ const string& name) {
+ // Find the last key in the map which sorts less than or equal to the
Added: csw/mgar/pkg/protobuf/trunk/files/strtof.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/strtof.patch (rev 0)
+++ csw/mgar/pkg/protobuf/trunk/files/strtof.patch 2010-02-21 08:54:47 UTC (rev 8713)
@@ -0,0 +1,13 @@
+--- protobuf-2.3.0/src/google/protobuf/stubs/strutil.h.orig 2010-02-20 23:30:45.020320818 +0100
++++ protobuf-2.3.0/src/google/protobuf/stubs/strutil.h 2010-02-20 23:31:46.345602745 +0100
+@@ -37,6 +37,10 @@
+ #include <vector>
+ #include <google/protobuf/stubs/common.h>
+
++#if defined(__SUNPRO_CC)
++#define strtof strtod
++#endif
++
+ namespace google {
+ namespace protobuf {
+
Added: csw/mgar/pkg/protobuf/trunk/files/vector-in-repeated_field.h.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/vector-in-repeated_field.h.patch (rev 0)
+++ csw/mgar/pkg/protobuf/trunk/files/vector-in-repeated_field.h.patch 2010-02-21 08:54:47 UTC (rev 8713)
@@ -0,0 +1,10 @@
+--- protobuf-2.3.0/src/google/protobuf/repeated_field.h.orig 2010-02-20 23:27:43.399507660 +0100
++++ protobuf-2.3.0/src/google/protobuf/repeated_field.h 2010-02-20 23:27:56.747055871 +0100
+@@ -48,6 +48,7 @@
+
+ #include <string>
+ #include <iterator>
++#include <vector>
+ #include <google/protobuf/stubs/common.h>
+ #include <google/protobuf/message_lite.h>
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list