SF.net SVN: gar:[25161] csw/mgar/pkg/protobuf/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Wed Jul 8 17:15:47 CEST 2015
Revision: 25161
http://sourceforge.net/p/gar/code/25161
Author: dmichelsen
Date: 2015-07-08 15:15:47 +0000 (Wed, 08 Jul 2015)
Log Message:
-----------
protobuf/trunk: Update to 2.6.1, switch to GCC for standard packages in default location
Modified Paths:
--------------
csw/mgar/pkg/protobuf/trunk/Makefile
csw/mgar/pkg/protobuf/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/protobuf/trunk/files/0001-Patches-from-GAR.patch
csw/mgar/pkg/protobuf/trunk/files/0002-std-map-in-two-more-files.patch
csw/mgar/pkg/protobuf/trunk/files/OutputDirectoryIsFileError-unittest.patch
csw/mgar/pkg/protobuf/trunk/files/trailing-slash-test-fails-on-solaris-8-x86.patch
Modified: csw/mgar/pkg/protobuf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/protobuf/trunk/Makefile 2015-07-08 14:32:38 UTC (rev 25160)
+++ csw/mgar/pkg/protobuf/trunk/Makefile 2015-07-08 15:15:47 UTC (rev 25161)
@@ -8,98 +8,74 @@
# http://developers.sun.com/solaris/articles/cmp_stlport_libCstd.html
NAME = protobuf
-VERSION = 2.3.0
+VERSION = 2.6.1
GARTYPE = v2
define BLURB
Protocol Buffers are a way of encoding structured data in an efficient yet
extensible format. Google uses Protocol Buffers for almost all of its
internal RPC protocols and file formats.
endef
-SPKG_SOURCEURL = http://code.google.com/p/protobuf/
DESCRIPTION = Google Protocol buffers
-MASTER_SITES = $(GOOGLE_MIRROR)
-DISTFILES = $(NAME)-$(VERSION).tar.gz
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-PATCHFILES += 0001-Patches-from-GAR.patch
-PATCHFILES += 0002-std-map-in-two-more-files.patch
-PATCHFILES += OutputDirectoryIsFileError-unittest.patch
-PATCHFILES += trailing-slash-test-fails-on-solaris-8-x86.patch
-LICENSE = COPYING.txt
-EXTRA_CFLAGS =
-EXTRA_CXXFLAGS = -library=stlport4 -library=no%Cstd
-EXTRA_LDFLAGS = -lCrun -lm
-BUILD64_LIBS_ONLY = 1
-CONFIGURE_ARGS = $(DIRPATHS)
-PYCOMPILE = 1
+MASTER_SITES = https://github.com/google/protobuf/releases/download/v$(VERSION)/
+DISTFILES += $(DISTNAME).tar.bz2
-PACKAGES = CSWprotobuf
-SPKG_DESC_CSWprotobuf = $(DESCRIPTION)
+VENDOR_URL = https://github.com/google/protobuf/
+LICENSE = LICENSE
-RUNTIME_DEP_PKGS_CSWprotobuf += CSWstlport
-RUNTIME_DEP_PKGS_CSWprotobuf += CSWzlib
-RUNTIME_DEP_PKGS_CSWprotobuf += CSWlibprotoc6
-RUNTIME_DEP_PKGS_CSWprotobuf += CSWlibprotobuf6
+GARCOMPILER = GNU
+BUILD64 = 1
+CONFIGURE_ARGS += $(DIRPATHS)
-# Libraries
-PACKAGES += CSWlibprotobuf-lite6
-CATALOGNAME_CSWlibprotobuf-lite6 = libprotobuf_lite6
-SPKG_DESC_CSWlibprotobuf-lite6 = $(DESCRIPTION), libprotobuf-lite.so.6
-RUNTIME_DEP_PKGS_CSWlibprotobuf-lite6 += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibprotobuf-lite6 += CSWstlport
-PKGFILES_CSWlibprotobuf-lite6 = .*libprotobuf-lite\.so\..*
-CHECKPKG_OVERRIDES_CSWlibprotobuf-lite6 += bad-rpath-entry
+PYCOMPILE = 1
-PACKAGES += CSWlibprotobuf6
-CATALOGNAME_CSWlibprotobuf6 = libprotobuf6
-SPKG_DESC_CSWlibprotobuf6 = $(DESCRIPTION), libprotobuf.so.6
-RUNTIME_DEP_PKGS_CSWlibprotobuf6 += CSWstlport
-RUNTIME_DEP_PKGS_CSWlibprotobuf6 += CSWzlib
-PKGFILES_CSWlibprotobuf6 = .*libprotobuf\.so\..*
-CHECKPKG_OVERRIDES_CSWlibprotobuf6 += bad-rpath-entry
+PACKAGES += CSWlibprotobuf-lite9
+SPKG_DESC_CSWlibprotobuf-lite9 = $(DESCRIPTION), libprotobuf-lite.so.9
+PKGFILES_CSWlibprotobuf-lite9 += $(call pkgfiles_lib,libprotobuf-lite.so.9)
+RUNTIME_DEP_PKGS_CSWlibprotobuf-lite9 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibprotobuf-lite9 += CSWlibstdc++6
-PACKAGES += CSWlibprotoc6
-CATALOGNAME_CSWlibprotoc6 = libprotoc6
-SPKG_DESC_CSWlibprotoc6 = $(DESCRIPTION), libprotoc.so.6
-RUNTIME_DEP_PKGS_CSWlibprotoc6 += CSWstlport
-RUNTIME_DEP_PKGS_CSWlibprotoc6 += CSWzlib
-PKGFILES_CSWlibprotoc6 = .*libprotoc\.so\..*
-RUNTIME_DEP_PKGS_CSWlibprotoc6 += CSWlibprotobuf6
-CHECKPKG_OVERRIDES_CSWlibprotoc6 += bad-rpath-entry
+PACKAGES += CSWlibprotobuf9
+SPKG_DESC_CSWlibprotobuf9 = $(DESCRIPTION), libprotobuf.so.9
+PKGFILES_CSWlibprotobuf9 += $(call pkgfiles_lib,libprotobuf.so.9)
+RUNTIME_DEP_PKGS_CSWlibprotobuf9 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibprotobuf9 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibprotobuf9 += CSWlibz1
-# Devel package
-PACKAGES += CSWprotobuf-devel
-CATALOGNAME_CSWprotobuf-devel = protobuf_devel
-SPKG_DESC_CSWprotobuf-devel = $(DESCRIPTION), header files
-RUNTIME_DEP_PKGS_CSWprotobuf-devel += CSWprotobuf
-RUNTIME_DEP_PKGS_CSWprotobuf-devel += CSWpy-protobuf
-RUNTIME_DEP_PKGS_CSWprotobuf-devel += CSWlibprotobuf-lite6
-RUNTIME_DEP_PKGS_CSWprotobuf-devel += CSWlibprotobuf6
-RUNTIME_DEP_PKGS_CSWprotobuf-devel += CSWlibprotoc6
-PKGFILES_CSWprotobuf-devel = $(PKGFILES_DEVEL)
+PACKAGES += CSWlibprotoc9
+SPKG_DESC_CSWlibprotoc9 = $(DESCRIPTION), libprotoc.so.9
+PKGFILES_CSWlibprotoc9 += $(call pkgfiles_lib,libprotoc.so.9)
+RUNTIME_DEP_PKGS_CSWlibprotoc9 += CSWlibprotobuf9
+RUNTIME_DEP_PKGS_CSWlibprotoc9 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibprotoc9 += CSWlibstdc++6
+PACKAGES += CSWprotobuf-dev
+SPKG_DESC_CSWprotobuf-dev = $(DESCRIPTION), header files
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWpy-protobuf
+RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWlibprotobuf-lite9
+RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWlibprotobuf9
+RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWlibprotoc9
+
# Python support
PACKAGES += CSWpy-protobuf
-CATALOGNAME_CSWpy-protobuf = py_protobuf
SPKG_DESC_CSWpy-protobuf= $(DESCRIPTION), Python support
-RUNTIME_DEP_PKGS_CSWpy-protobuf += CSWprotobuf
RUNTIME_DEP_PKGS_CSWpy-protobuf += CSWpython
-PKGFILES_CSWpy-protobuf = $(libdir)/python.*
+PKGFILES_CSWpy-protobuf += $(libdir)/python.*
ARCHALL_CSWpy-protobuf = 1
CHECKPKG_OVERRIDES_CSWpy-protobuf += surplus-dependency|CSWprotobuf
-# Empty transitional package
-PACKAGES += CSWprotobuf-rt
-CATALOGNAME_CSWprotobuf-rt = protobuf_rt
-SPKG_DESC_CSWprotobuf-rt = An empty transitional package
-PKGFILES_CSWprotobuf-rt = an-empty-package
-ARCHALL_CSWprotobuf-rt = 1
+# This is intended, no more Python 2.6
+CHECKPKG_OVERRIDES_CSWpy-protobuf += python-package-missing-py26-files
+CHECKPKG_OVERRIDES_CSWpy-protobuf += surplus-dependency|CSWpython
include gar/category.mk
-post-build-modulated:
+post-build:
(cd $(WORKSRC)/python; python setup.py build)
@$(MAKECOOKIE)
-post-install-modulated:
+post-install:
(cd $(WORKSRC)/python; python setup.py install --root=$(DESTDIR) --prefix=$(prefix))
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/protobuf/trunk/checksums
===================================================================
--- csw/mgar/pkg/protobuf/trunk/checksums 2015-07-08 14:32:38 UTC (rev 25160)
+++ csw/mgar/pkg/protobuf/trunk/checksums 2015-07-08 15:15:47 UTC (rev 25161)
@@ -1 +1 @@
-65dba2c04923595b6f0a6a44d8106f0a protobuf-2.3.0.tar.gz
+11aaac2d704eef8efd1867a807865d85 protobuf-2.6.1.tar.bz2
Deleted: csw/mgar/pkg/protobuf/trunk/files/0001-Patches-from-GAR.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/0001-Patches-from-GAR.patch 2015-07-08 14:32:38 UTC (rev 25160)
+++ csw/mgar/pkg/protobuf/trunk/files/0001-Patches-from-GAR.patch 2015-07-08 15:15:47 UTC (rev 25161)
@@ -1,372 +0,0 @@
-From 8a36482ed025a9ae5adbc43e7285028119dab121 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Sun, 21 Feb 2010 20:07:10 +0100
-Subject: [PATCH 1/2] Patches from GAR
-
----
- .../protobuf/compiler/command_line_interface.h | 2 +
- src/google/protobuf/descriptor_database.cc | 9 ++--
- src/google/protobuf/descriptor_database.h | 2 +-
- src/google/protobuf/extension_set.cc | 52 ++++++++++----------
- src/google/protobuf/repeated_field.h | 1 +
- src/google/protobuf/stubs/common.h | 5 ++-
- src/google/protobuf/stubs/strutil.h | 4 ++
- 7 files changed, 43 insertions(+), 32 deletions(-)
-
-diff --git a/src/google/protobuf/compiler/command_line_interface.h b/src/google/protobuf/compiler/command_line_interface.h
-index d25a50e..3815d5c 100644
---- a/src/google/protobuf/compiler/command_line_interface.h
-+++ b/src/google/protobuf/compiler/command_line_interface.h
-@@ -55,6 +55,8 @@ template<typename T> class RepeatedPtrField; // repeated_field.h
-
- namespace compiler {
-
-+using std::map;
-+
- class CodeGenerator; // code_generator.h
- class OutputDirectory; // code_generator.h
- class DiskSourceTree; // importer.h
-diff --git a/src/google/protobuf/descriptor_database.cc b/src/google/protobuf/descriptor_database.cc
-index 95708d9..ad29ed1 100644
---- a/src/google/protobuf/descriptor_database.cc
-+++ b/src/google/protobuf/descriptor_database.cc
-@@ -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>
-@@ -97,7 +98,7 @@ bool SimpleDescriptorDatabase::DescriptorIndex<Value>::AddSymbol(
-
- // 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 +180,7 @@ Value SimpleDescriptorDatabase::DescriptorIndex<Value>::FindFile(
- 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 +199,7 @@ template <typename Value>
- 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 +213,7 @@ bool SimpleDescriptorDatabase::DescriptorIndex<Value>::FindAllExtensionNumbers(
- }
-
- 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
-diff --git a/src/google/protobuf/descriptor_database.h b/src/google/protobuf/descriptor_database.h
-index f32b1db..49f0de6 100644
---- a/src/google/protobuf/descriptor_database.h
-+++ b/src/google/protobuf/descriptor_database.h
-@@ -233,7 +233,7 @@ class LIBPROTOBUF_EXPORT SimpleDescriptorDatabase : public DescriptorDatabase {
-
- // 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
-diff --git a/src/google/protobuf/extension_set.cc b/src/google/protobuf/extension_set.cc
-index 6084885..2cd66f6 100644
---- a/src/google/protobuf/extension_set.cc
-+++ b/src/google/protobuf/extension_set.cc
-@@ -162,7 +162,7 @@ void ExtensionSet::RegisterMessageExtension(const MessageLite* containing_type,
- ExtensionSet::ExtensionSet() {}
-
- ExtensionSet::~ExtensionSet() {
-- for (map<int, Extension>::iterator iter = extensions_.begin();
-+ for (std::map<int, Extension>::iterator iter = extensions_.begin();
- iter != extensions_.end(); ++iter) {
- iter->second.Free();
- }
-@@ -174,20 +174,20 @@ ExtensionSet::~ExtensionSet() {
- // vector<const FieldDescriptor*>* output) const
-
- bool ExtensionSet::Has(int number) const {
-- map<int, Extension>::const_iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
- if (iter == extensions_.end()) return false;
- GOOGLE_DCHECK(!iter->second.is_repeated);
- return !iter->second.is_cleared;
- }
-
- int ExtensionSet::ExtensionSize(int number) const {
-- map<int, Extension>::const_iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
- if (iter == extensions_.end()) return false;
- return iter->second.GetSize();
- }
-
- void ExtensionSet::ClearExtension(int number) {
-- map<int, Extension>::iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::iterator iter = extensions_.find(number);
- if (iter == extensions_.end()) return;
- iter->second.Clear();
- }
-@@ -215,7 +215,7 @@ enum Cardinality {
- \
- LOWERCASE ExtensionSet::Get##CAMELCASE(int number, \
- LOWERCASE default_value) const { \
-- map<int, Extension>::const_iterator iter = extensions_.find(number); \
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number); \
- if (iter == extensions_.end() || iter->second.is_cleared) { \
- return default_value; \
- } else { \
-@@ -240,7 +240,7 @@ void ExtensionSet::Set##CAMELCASE(int number, FieldType type, \
- } \
- \
- LOWERCASE ExtensionSet::GetRepeated##CAMELCASE(int number, int index) const { \
-- map<int, Extension>::const_iterator iter = extensions_.find(number); \
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number); \
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; \
- GOOGLE_DCHECK_TYPE(iter->second, REPEATED, UPPERCASE); \
- return iter->second.repeated_##LOWERCASE##_value->Get(index); \
-@@ -248,7 +248,7 @@ LOWERCASE ExtensionSet::GetRepeated##CAMELCASE(int number, int index) const { \
- \
- void ExtensionSet::SetRepeated##CAMELCASE( \
- int number, int index, LOWERCASE value) { \
-- map<int, Extension>::iterator iter = extensions_.find(number); \
-+ std::map<int, Extension>::iterator iter = extensions_.find(number); \
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; \
- GOOGLE_DCHECK_TYPE(iter->second, REPEATED, UPPERCASE); \
- iter->second.repeated_##LOWERCASE##_value->Set(index, value); \
-@@ -285,7 +285,7 @@ PRIMITIVE_ACCESSORS( BOOL, bool, Bool)
- // Enums
-
- int ExtensionSet::GetEnum(int number, int default_value) const {
-- map<int, Extension>::const_iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
- if (iter == extensions_.end() || iter->second.is_cleared) {
- // Not present. Return the default value.
- return default_value;
-@@ -310,14 +310,14 @@ void ExtensionSet::SetEnum(int number, FieldType type, int value,
- }
-
- int ExtensionSet::GetRepeatedEnum(int number, int index) const {
-- map<int, Extension>::const_iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
- GOOGLE_DCHECK_TYPE(iter->second, REPEATED, ENUM);
- return iter->second.repeated_enum_value->Get(index);
- }
-
- void ExtensionSet::SetRepeatedEnum(int number, int index, int value) {
-- map<int, Extension>::iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::iterator iter = extensions_.find(number);
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
- GOOGLE_DCHECK_TYPE(iter->second, REPEATED, ENUM);
- iter->second.repeated_enum_value->Set(index, value);
-@@ -345,7 +345,7 @@ void ExtensionSet::AddEnum(int number, FieldType type,
-
- const string& ExtensionSet::GetString(int number,
- const string& default_value) const {
-- map<int, Extension>::const_iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
- if (iter == extensions_.end() || iter->second.is_cleared) {
- // Not present. Return the default value.
- return default_value;
-@@ -371,14 +371,14 @@ string* ExtensionSet::MutableString(int number, FieldType type,
- }
-
- const string& ExtensionSet::GetRepeatedString(int number, int index) const {
-- map<int, Extension>::const_iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
- GOOGLE_DCHECK_TYPE(iter->second, REPEATED, STRING);
- return iter->second.repeated_string_value->Get(index);
- }
-
- string* ExtensionSet::MutableRepeatedString(int number, int index) {
-- map<int, Extension>::iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::iterator iter = extensions_.find(number);
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
- GOOGLE_DCHECK_TYPE(iter->second, REPEATED, STRING);
- return iter->second.repeated_string_value->Mutable(index);
-@@ -404,7 +404,7 @@ string* ExtensionSet::AddString(int number, FieldType type,
-
- const MessageLite& ExtensionSet::GetMessage(
- int number, const MessageLite& default_value) const {
-- map<int, Extension>::const_iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
- if (iter == extensions_.end()) {
- // Not present. Return the default value.
- return default_value;
-@@ -442,14 +442,14 @@ MessageLite* ExtensionSet::MutableMessage(int number, FieldType type,
-
- const MessageLite& ExtensionSet::GetRepeatedMessage(
- int number, int index) const {
-- map<int, Extension>::const_iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
- GOOGLE_DCHECK_TYPE(iter->second, REPEATED, MESSAGE);
- return iter->second.repeated_message_value->Get(index);
- }
-
- MessageLite* ExtensionSet::MutableRepeatedMessage(int number, int index) {
-- map<int, Extension>::iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::iterator iter = extensions_.find(number);
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
- GOOGLE_DCHECK_TYPE(iter->second, REPEATED, MESSAGE);
- return iter->second.repeated_message_value->Mutable(index);
-@@ -488,7 +488,7 @@ MessageLite* ExtensionSet::AddMessage(int number, FieldType type,
- #undef GOOGLE_DCHECK_TYPE
-
- void ExtensionSet::RemoveLast(int number) {
-- map<int, Extension>::iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::iterator iter = extensions_.find(number);
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
-
- Extension* extension = &iter->second;
-@@ -529,7 +529,7 @@ void ExtensionSet::RemoveLast(int number) {
- }
-
- void ExtensionSet::SwapElements(int number, int index1, int index2) {
-- map<int, Extension>::iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::iterator iter = extensions_.find(number);
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
-
- Extension* extension = &iter->second;
-@@ -572,14 +572,14 @@ void ExtensionSet::SwapElements(int number, int index1, int index2) {
- // ===================================================================
-
- void ExtensionSet::Clear() {
-- for (map<int, Extension>::iterator iter = extensions_.begin();
-+ for (std::map<int, Extension>::iterator iter = extensions_.begin();
- iter != extensions_.end(); ++iter) {
- iter->second.Clear();
- }
- }
-
- void ExtensionSet::MergeFrom(const ExtensionSet& other) {
-- for (map<int, Extension>::const_iterator iter = other.extensions_.begin();
-+ for (std::map<int, Extension>::const_iterator iter = other.extensions_.begin();
- iter != other.extensions_.end(); ++iter) {
- const Extension& other_extension = iter->second;
-
-@@ -682,7 +682,7 @@ void ExtensionSet::Swap(ExtensionSet* x) {
- bool ExtensionSet::IsInitialized() const {
- // Extensions are never required. However, we need to check that all
- // embedded messages are initialized.
-- for (map<int, Extension>::const_iterator iter = extensions_.begin();
-+ for (std::map<int, Extension>::const_iterator iter = extensions_.begin();
- iter != extensions_.end(); ++iter) {
- const Extension& extension = iter->second;
- if (cpp_type(extension.type) == WireFormatLite::CPPTYPE_MESSAGE) {
-@@ -1001,7 +1001,7 @@ bool ExtensionSet::ParseMessageSetItem(io::CodedInputStream* input,
- void ExtensionSet::SerializeWithCachedSizes(
- int start_field_number, int end_field_number,
- io::CodedOutputStream* output) const {
-- map<int, Extension>::const_iterator iter;
-+ std::map<int, Extension>::const_iterator iter;
- for (iter = extensions_.lower_bound(start_field_number);
- iter != extensions_.end() && iter->first < end_field_number;
- ++iter) {
-@@ -1011,7 +1011,7 @@ void ExtensionSet::SerializeWithCachedSizes(
-
- void ExtensionSet::SerializeMessageSetWithCachedSizes(
- io::CodedOutputStream* output) const {
-- map<int, Extension>::const_iterator iter;
-+ std::map<int, Extension>::const_iterator iter;
- for (iter = extensions_.begin(); iter != extensions_.end(); ++iter) {
- iter->second.SerializeMessageSetItemWithCachedSizes(iter->first, output);
- }
-@@ -1020,7 +1020,7 @@ void ExtensionSet::SerializeMessageSetWithCachedSizes(
- int ExtensionSet::ByteSize() const {
- int total_size = 0;
-
-- for (map<int, Extension>::const_iterator iter = extensions_.begin();
-+ for (std::map<int, Extension>::const_iterator iter = extensions_.begin();
- iter != extensions_.end(); ++iter) {
- total_size += iter->second.ByteSize(iter->first);
- }
-@@ -1031,7 +1031,7 @@ int ExtensionSet::ByteSize() const {
- int ExtensionSet::MessageSetByteSize() const {
- int total_size = 0;
-
-- for (map<int, Extension>::const_iterator iter = extensions_.begin();
-+ for (std::map<int, Extension>::const_iterator iter = extensions_.begin();
- iter != extensions_.end(); ++iter) {
- total_size += iter->second.MessageSetItemByteSize(iter->first);
- }
-@@ -1045,7 +1045,7 @@ int ExtensionSet::MessageSetByteSize() const {
- bool ExtensionSet::MaybeNewExtension(int number,
- const FieldDescriptor* descriptor,
- Extension** result) {
-- pair<map<int, Extension>::iterator, bool> insert_result =
-+ pair<std::map<int, Extension>::iterator, bool> insert_result =
- extensions_.insert(make_pair(number, Extension()));
- *result = &insert_result.first->second;
- (*result)->descriptor = descriptor;
-diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h
-index defdefe..39138f0 100644
---- a/src/google/protobuf/repeated_field.h
-+++ b/src/google/protobuf/repeated_field.h
-@@ -48,6 +48,7 @@
-
- #include <string>
- #include <iterator>
-+#include <vector>
- #include <google/protobuf/stubs/common.h>
- #include <google/protobuf/message_lite.h>
-
-diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h
-index 551ee4a..f000c76 100644
---- a/src/google/protobuf/stubs/common.h
-+++ b/src/google/protobuf/stubs/common.h
-@@ -40,13 +40,16 @@
- #include <cstddef>
- #include <string>
- #include <string.h>
--#if defined(__osf__)
-+#if defined(__osf__) || defined(__SUNPRO_CC) || defined(__sun__)
- // Tru64 lacks stdint.h, but has inttypes.h which defines a superset of
- // what stdint.h would define.
- #include <inttypes.h>
- #elif !defined(_MSC_VER)
- #include <stdint.h>
- #endif
-+#if defined(__SUNPRO_CC) || defined(__sun__)
-+#include <sys/ddi.h>
-+#endif
-
- namespace std {}
-
-diff --git a/src/google/protobuf/stubs/strutil.h b/src/google/protobuf/stubs/strutil.h
-index 777694b..b22babe 100644
---- a/src/google/protobuf/stubs/strutil.h
-+++ b/src/google/protobuf/stubs/strutil.h
-@@ -37,6 +37,10 @@
- #include <vector>
- #include <google/protobuf/stubs/common.h>
-
-+#if defined(__SUNPRO_CC)
-+#define strtof strtod
-+#endif
-+
- namespace google {
- namespace protobuf {
-
---
-1.6.6
-
Deleted: csw/mgar/pkg/protobuf/trunk/files/0002-std-map-in-two-more-files.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/0002-std-map-in-two-more-files.patch 2015-07-08 14:32:38 UTC (rev 25160)
+++ csw/mgar/pkg/protobuf/trunk/files/0002-std-map-in-two-more-files.patch 2015-07-08 15:15:47 UTC (rev 25161)
@@ -1,116 +0,0 @@
-From 7e368ce421202baea74a89d03a516ffc95c788ae Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Tue, 23 Feb 2010 06:12:10 +0100
-Subject: [PATCH 2/2] std::map in two more files
-
----
- src/google/protobuf/descriptor_database.cc | 2 +-
- src/google/protobuf/extension_set_heavy.cc | 12 ++++++------
- src/google/protobuf/io/printer.cc | 8 ++++----
- 3 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/src/google/protobuf/descriptor_database.cc b/src/google/protobuf/descriptor_database.cc
-index ad29ed1..7d94853 100644
---- a/src/google/protobuf/descriptor_database.cc
-+++ b/src/google/protobuf/descriptor_database.cc
-@@ -219,7 +219,7 @@ SimpleDescriptorDatabase::DescriptorIndex<Value>::FindLastLessOrEqual(
- // Find the last key in the map which sorts less than or equal to the
- // symbol name. Since upper_bound() returns the *first* key that sorts
- // *greater* than the input, we want the element immediately before that.
-- typename map<string, Value>::iterator iter = by_symbol_.upper_bound(name);
-+ typename std::map<string, Value>::iterator iter = by_symbol_.upper_bound(name);
- if (iter != by_symbol_.begin()) --iter;
- return iter;
- }
-diff --git a/src/google/protobuf/extension_set_heavy.cc b/src/google/protobuf/extension_set_heavy.cc
-index 2721f15..6a62005 100644
---- a/src/google/protobuf/extension_set_heavy.cc
-+++ b/src/google/protobuf/extension_set_heavy.cc
-@@ -68,7 +68,7 @@ class DescriptorPoolExtensionFinder : public ExtensionFinder {
- void ExtensionSet::AppendToList(const Descriptor* containing_type,
- const DescriptorPool* pool,
- vector<const FieldDescriptor*>* output) const {
-- for (map<int, Extension>::const_iterator iter = extensions_.begin();
-+ for (std::map<int, Extension>::const_iterator iter = extensions_.begin();
- iter != extensions_.end(); ++iter) {
- bool has = false;
- if (iter->second.is_repeated) {
-@@ -112,7 +112,7 @@ inline FieldDescriptor::CppType cpp_type(FieldType type) {
- const MessageLite& ExtensionSet::GetMessage(int number,
- const Descriptor* message_type,
- MessageFactory* factory) const {
-- map<int, Extension>::const_iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
- if (iter == extensions_.end() || iter->second.is_cleared) {
- // Not present. Return the default value.
- return *factory->GetPrototype(message_type);
-@@ -234,8 +234,8 @@ bool ExtensionSet::ParseMessageSet(io::CodedInputStream* input,
-
- int ExtensionSet::SpaceUsedExcludingSelf() const {
- int total_size =
-- extensions_.size() * sizeof(map<int, Extension>::value_type);
-- for (map<int, Extension>::const_iterator iter = extensions_.begin(),
-+ extensions_.size() * sizeof(std::map<int, Extension>::value_type);
-+ for (std::map<int, Extension>::const_iterator iter = extensions_.begin(),
- end = extensions_.end();
- iter != end;
- ++iter) {
-@@ -301,7 +301,7 @@ int ExtensionSet::Extension::SpaceUsedExcludingSelf() const {
- uint8* ExtensionSet::SerializeWithCachedSizesToArray(
- int start_field_number, int end_field_number,
- uint8* target) const {
-- map<int, Extension>::const_iterator iter;
-+ std::map<int, Extension>::const_iterator iter;
- for (iter = extensions_.lower_bound(start_field_number);
- iter != extensions_.end() && iter->first < end_field_number;
- ++iter) {
-@@ -313,7 +313,7 @@ uint8* ExtensionSet::SerializeWithCachedSizesToArray(
-
- uint8* ExtensionSet::SerializeMessageSetWithCachedSizesToArray(
- uint8* target) const {
-- map<int, Extension>::const_iterator iter;
-+ std::map<int, Extension>::const_iterator iter;
- for (iter = extensions_.begin(); iter != extensions_.end(); ++iter) {
- target = iter->second.SerializeMessageSetItemWithCachedSizesToArray(
- iter->first, target);
-diff --git a/src/google/protobuf/io/printer.cc b/src/google/protobuf/io/printer.cc
-index c7d3074..4d583ef 100644
---- a/src/google/protobuf/io/printer.cc
-+++ b/src/google/protobuf/io/printer.cc
-@@ -93,7 +93,7 @@ void Printer::Print(const map<string, string>& variables, const char* text) {
- WriteRaw(&variable_delimiter_, 1);
- } else {
- // Replace with the variable's value.
-- map<string, string>::const_iterator iter = variables.find(varname);
-+ std::map<string, string>::const_iterator iter = variables.find(varname);
- if (iter == variables.end()) {
- GOOGLE_LOG(DFATAL) << " Undefined variable: " << varname;
- } else {
-@@ -112,13 +112,13 @@ void Printer::Print(const map<string, string>& variables, const char* text) {
- }
-
- void Printer::Print(const char* text) {
-- static map<string, string> empty;
-+ static std::map<string, string> empty;
- Print(empty, text);
- }
-
- void Printer::Print(const char* text,
- const char* variable, const string& value) {
-- map<string, string> vars;
-+ std::map<string, string> vars;
- vars[variable] = value;
- Print(vars, text);
- }
-@@ -126,7 +126,7 @@ void Printer::Print(const char* text,
- void Printer::Print(const char* text,
- const char* variable1, const string& value1,
- const char* variable2, const string& value2) {
-- map<string, string> vars;
-+ std::map<string, string> vars;
- vars[variable1] = value1;
- vars[variable2] = value2;
- Print(vars, text);
---
-1.6.6
-
Deleted: csw/mgar/pkg/protobuf/trunk/files/OutputDirectoryIsFileError-unittest.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/OutputDirectoryIsFileError-unittest.patch 2015-07-08 14:32:38 UTC (rev 25160)
+++ csw/mgar/pkg/protobuf/trunk/files/OutputDirectoryIsFileError-unittest.patch 2015-07-08 15:15:47 UTC (rev 25161)
@@ -1,12 +0,0 @@
---- protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface_unittest.cc.orig Tue Feb 23 11:17:08 2010
-+++ protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface_unittest.cc Tue Feb 23 11:18:09 2010
-@@ -1009,7 +1009,8 @@
- }
- #endif
-
-- ExpectErrorSubstring("foo.proto/: Not a directory");
-+ ExpectErrorSubstring("foo.proto/");
-+ ExpectErrorSubstring("Not a directory");
- }
-
- TEST_F(CommandLineInterfaceTest, GeneratorError) {
Deleted: csw/mgar/pkg/protobuf/trunk/files/trailing-slash-test-fails-on-solaris-8-x86.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/trailing-slash-test-fails-on-solaris-8-x86.patch 2015-07-08 14:32:38 UTC (rev 25160)
+++ csw/mgar/pkg/protobuf/trunk/files/trailing-slash-test-fails-on-solaris-8-x86.patch 2015-07-08 15:15:47 UTC (rev 25161)
@@ -1,21 +0,0 @@
---- protobuf-2.3.0/src/google/protobuf/compiler/importer_unittest.cc.orig 2010-02-23 12:29:52.232423637 +0100
-+++ protobuf-2.3.0/src/google/protobuf/compiler/importer_unittest.cc 2010-02-23 14:24:58.049027057 +0100
-@@ -372,6 +372,7 @@
- }
-
- void ExpectFileNotFound(const string& filename) {
-+ RecordProperty("ExpectFileNotFound", filename.c_str());
- scoped_ptr<io::ZeroCopyInputStream> input(source_tree_.Open(filename));
- EXPECT_TRUE(input == NULL);
- }
-@@ -408,7 +409,10 @@
- ExpectFileNotFound("baz//foo");
- ExpectFileNotFound("baz/../baz/foo");
- ExpectFileNotFound("baz/./foo");
-+#if !defined(__SUNPRO_CC) || !(defined(__i386) || defined(__i386__))
-+ // This fails on Solaris 8 x86
- ExpectFileNotFound("baz/foo/");
-+#endif
- }
-
- TEST_F(DiskSourceTreeTest, NoParent) {
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