Ticket #44804: protobuf.diff

File protobuf.diff, 8.9 KB (added by adfernandes (Andrew Fernandes), 10 years ago)

update all protobuf ports

  • devel/protobuf-c/Portfile

     
    11# $Id$
    22
    33PortSystem 1.0
     4PortGroup       github 1.0
    45
    56name            protobuf-c
    6 version         0.15
     7version         1.1.0
    78categories      devel
    89license         Apache-2
    910maintainers     landonf openmaintainer
    … …  
    1718        version 1.0 is released.
    1819
    1920
    20 homepage        http://code.google.com/p/protobuf-c/
    21 master_sites    googlecode
     21homepage        https://github.com/protobuf-c/protobuf-c
     22master_sites    https://github.com/protobuf-c/protobuf-c/releases/download/v${version}
    2223
    23 checksums           md5    73ff0c8df50d2eee75269ad8f8c07dc8 \
    24                     sha1   4fbd93f492c52154713de1951c0a2133ddd43abb \
    25                     rmd160 50319bba2b173aafb96dd1fe70550d378e69f871
     24checksums       sha1    20bfcf3663ae56b125a5bfc3b4dca8c7f0ef1e48 \
     25                sha256  9a973fc04aac003f9cf2b5a90ac4b8fa294cacb4e3f0796d3b5a789a5ad46c07
    2626
    2727platforms       darwin
    2828

  • devel/protobuf-cpp/Portfile

     
    22# $Id$
    33
    44PortSystem 1.0
     5PortGroup  github 1.0
    56
    67name            protobuf-cpp
    7 version         2.5.0
     8version         2.6.1
    89categories      devel
    910maintainers     blair
    1011license         BSD
    … …  
    2728                logical record of information, containing a series of \
    2829                name-value pairs.
    2930
    30 homepage        http://code.google.com/p/protobuf/
    31 master_sites    googlecode:protobuf
     31homepage        https://github.com/google/protobuf
     32master_sites    https://github.com/google/protobuf/releases/download/v${version}
     33distfiles       protobuf-${version}.tar.bz2
     34worksrcdir      protobuf-${version}
    3235
    33 distname        protobuf-${version}
    3436use_bzip2       yes
    35 checksums       sha1   62c10dcdac4b69cc8c6bb19f73db40c264cb2726 \
    36                 sha256 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677
     37checksums       sha1    6421ee86d8fb4e39f21f56991daa892a3e8d314b \
     38                sha256  ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910
    3739
    3840platforms       darwin
    3941
    … …  
    4749
    4850        xinstall -d -m 755 ${docdir}
    4951
    50         foreach f {CHANGES.txt CONTRIBUTORS.txt COPYING.txt INSTALL.txt README.txt examples} {
     52        foreach f {CHANGES.txt CONTRIBUTORS.txt LICENSE INSTALL.txt README.md examples editors} {
    5153                file copy ${worksrcpath}/${f} ${docdir}
    5254        }
    5355}

  • devel/protobuf-java/Portfile

     
    11# $Id$
    22
    33PortSystem      1.0
     4PortGroup       github 1.0
    45
    56name            protobuf-java
    6 version         2.5.0
     7version         2.6.1
    78categories      devel
    89maintainers     blair
    910license         BSD
    … …  
    2627                logical record of information, containing a series of \
    2728                name-value pairs.
    2829
    29 homepage        http://code.google.com/p/protobuf/
    30 master_sites    googlecode:protobuf
     30homepage        https://github.com/google/protobuf
     31master_sites    https://github.com/google/protobuf/releases/download/v${version}
     32distfiles       protobuf-${version}.tar.bz2
     33worksrcdir      protobuf-${version}
    3134
    32 distname        protobuf-${version}
    33 dist_subdir     protobuf-cpp
    3435use_bzip2       yes
    35 checksums       sha1   62c10dcdac4b69cc8c6bb19f73db40c264cb2726 \
    36                 sha256 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677
     36checksums       sha1    6421ee86d8fb4e39f21f56991daa892a3e8d314b \
     37                sha256  ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910
    3738
    3839platforms       darwin
    3940
    40 depends_lib     port:protobuf-cpp
     41depends_lib     port:zlib port:protobuf-cpp
    4142depends_build   port:apache-ant
    4243
    4344worksrcdir      ${worksrcdir}/java

  • python/py-protobuf/Portfile

     
    22
    33PortSystem      1.0
    44PortGroup       python 1.0
     5PortGroup       github 1.0
    56
    67name            py-protobuf
    7 version         2.5.0
     8version         2.6.1
    89revision        1
    910categories-append   devel
    1011maintainers     blair
    … …  
    2829                logical record of information, containing a series of \
    2930                name-value pairs.
    3031
    31 homepage        http://code.google.com/p/protobuf/
    32 master_sites    googlecode:protobuf
     32homepage        https://github.com/google/protobuf
     33master_sites    https://github.com/google/protobuf/releases/download/v${version}
     34distfiles       protobuf-${version}.tar.bz2
     35worksrcdir      protobuf-${version}
    3336
    34 distname        protobuf-${version}
    35 dist_subdir     protobuf-cpp
    3637use_bzip2       yes
    37 checksums       sha1   62c10dcdac4b69cc8c6bb19f73db40c264cb2726 \
    38                 sha256 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677
     38checksums       sha1    6421ee86d8fb4e39f21f56991daa892a3e8d314b \
     39                sha256  ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910
    3940
    4041platforms       darwin
    4142
    … …  
    4748
    4849    worksrcdir      ${worksrcdir}/python
    4950
    50     patchfiles      patch-python-except-clause-compatibility.diff
    51 
    52     # PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp is disabled until
    53     # this bug [1] is fixed.  Better to ensure that the Python
    54     # protobuf bindings slowly and properly encode and decode data
    55     # then quickly fail ;)
    56     #
    57     # [1] http://code.google.com/p/protobuf/issues/detail?id=503
    58 
    59     # build.env       PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
    60     build.cmd-append    build_ext -I${prefix}/include
    61 
    62     # destroot.env    PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
     51    destroot.cmd-append    --cpp_implementation
    6352
    6453    test.run        yes
    65     # test.env        PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
    6654    test.cmd        "${python.bin} setup.py"
    67     test.target     test
     55    test.target     test --cpp_implementation
    6856}

  • python/py-protobuf/files/patch-python-except-clause-compatibility.diff

     
    1 diff -ru ../../protobuf-2.5.0.orig/python/google/protobuf/descriptor_pool.py ./google/protobuf/descriptor_pool.py
    2 --- ../../protobuf-2.5.0.orig/python/google/protobuf/descriptor_pool.py 2013-02-26 09:56:33.000000000 -0800
    3 +++ ./google/protobuf/descriptor_pool.py        2013-04-17 16:11:05.000000000 -0700
    4 @@ -104,7 +104,7 @@
    5  
    6      try:
    7        file_proto = self._internal_db.FindFileByName(file_name)
    8 -    except KeyError as error:
    9 +    except KeyError, error:
    10        if self._descriptor_db:
    11          file_proto = self._descriptor_db.FindFileByName(file_name)
    12        else:
    13 @@ -128,7 +128,7 @@
    14  
    15      try:
    16        file_proto = self._internal_db.FindFileContainingSymbol(symbol)
    17 -    except KeyError as error:
    18 +    except KeyError, error:
    19        if self._descriptor_db:
    20          file_proto = self._descriptor_db.FindFileContainingSymbol(symbol)
    21        else:
    22 diff -ru ../../protobuf-2.5.0.orig/python/google/protobuf/internal/reflection_test.py ./google/protobuf/internal/reflection_test.py
    23 --- ../../protobuf-2.5.0.orig/python/google/protobuf/internal/reflection_test.py        2013-02-26 09:56:33.000000000 -0800
    24 +++ ./google/protobuf/internal/reflection_test.py       2013-04-17 16:10:38.000000000 -0700
    25 @@ -1650,7 +1650,7 @@
    26      unicode_decode_failed = False
    27      try:
    28        message2.MergeFromString(bytes)
    29 -    except UnicodeDecodeError as e:
    30 +    except UnicodeDecodeError:
    31        unicode_decode_failed = True
    32      string_field = message2.str
    33      self.assertTrue(unicode_decode_failed or type(string_field) == str)
    34 @@ -2361,7 +2361,7 @@
    35      """This method checks if the excpetion type and message are as expected."""
    36      try:
    37        callable_obj()
    38 -    except exc_class as ex:
    39 +    except exc_class, ex:
    40        # Check if the exception message is the right one.
    41        self.assertEqual(exception, str(ex))
    42        return
    43 diff -ru ../../protobuf-2.5.0.orig/python/google/protobuf/internal/text_format_test.py ./google/protobuf/internal/text_format_test.py
    44 --- ../../protobuf-2.5.0.orig/python/google/protobuf/internal/text_format_test.py       2013-02-26 09:56:33.000000000 -0800
    45 +++ ./google/protobuf/internal/text_format_test.py      2013-04-17 16:11:19.000000000 -0700
    46 @@ -458,7 +458,7 @@
    47  
    48      try:
    49        func(*args, **kwargs)
    50 -    except e_class as expr:
    51 +    except e_class, expr:
    52        if str(expr) != e:
    53          msg = '%s raised, but with wrong message: "%s" instead of "%s"'
    54          raise self.failureException(msg % (exc_name,