[Pkg-chromium-commit] chromium-browser/chromium-browser.experimental: 663 Define GOOGLE_PROTOBUF_NO_RTTI to fix FTBFS when compiling against system

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.experimental
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.experimental
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 663
Revision Id: iuculano at debian.org-20100721105106-slv00phdh33seo04
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : Define GOOGLE_PROTOBUF_NO_RTTI to fix FTBFS when compiling against system
protobuf


--------------------------------------------------------
  ** Modified :
        - debian/changelog
        - debian/patches/protobuf.patch

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2010-07-21 08:46:14 +0000
+++ b/debian/changelog	2010-07-21 10:51:06 +0000
@@ -8,8 +8,10 @@
   * set disable_sse2=1
   * Switch back to ffmpeg system libs
   * Install DumpRenderTree_resources
+  * Define GOOGLE_PROTOBUF_NO_RTTI to fix FTBFS when compiling against system
+    protobuf
 
- -- Giuseppe Iuculano <iuculano at debian.org>  Wed, 21 Jul 2010 10:43:06 +0200
+ -- Giuseppe Iuculano <iuculano at debian.org>  Wed, 21 Jul 2010 10:50:54 +0200
 
 chromium-browser (5.0.375.99~r51029-4) unstable; urgency=low
 

=== modified file 'debian/patches/protobuf.patch'
--- a/debian/patches/protobuf.patch	2010-07-18 19:59:50 +0000
+++ b/debian/patches/protobuf.patch	2010-07-21 10:51:06 +0000
@@ -1,7 +1,15 @@
 Do not embedd protobuf
 --- a/src/chrome/chrome_browser.gypi
 +++ b/src/chrome/chrome_browser.gypi
-@@ -3441,16 +3441,14 @@
+@@ -45,6 +45,7 @@
+       ],
+       'defines': [
+         '<@(nacl_defines)',
++        'GOOGLE_PROTOBUF_NO_RTTI',
+       ],
+       'direct_dependent_settings': {
+         'defines': [
+@@ -3441,16 +3442,14 @@
                  ['exclude', '^browser/notifications/balloon_collection_linux.cc'],
                ],
                'dependencies': [
@@ -20,7 +28,7 @@
                      'browser/metrics/system_metrics.proto',
                    ],
                    'outputs': [
-@@ -3458,10 +3456,10 @@
+@@ -3458,10 +3457,10 @@
                      '<(INTERMEDIATE_DIR)/chrome/browser/metrics/system_metrics.pb.h',
                    ],
                    'dependencies': [
@@ -33,7 +41,7 @@
                      'browser/metrics/system_metrics.proto',
                      '--cpp_out=<(INTERMEDIATE_DIR)/chrome',
                    ],
-@@ -3545,7 +3543,7 @@
+@@ -3545,7 +3544,7 @@
            'rule_name': 'genproto',
            'extension': 'proto',
            'inputs': [
@@ -42,7 +50,7 @@
            ],
            'variables': {
              # The protoc compiler requires a proto_path argument with the
-@@ -3558,7 +3556,7 @@
+@@ -3558,7 +3557,7 @@
              '<(protoc_out_dir)/chrome/<(rule_input_relpath)/<(RULE_INPUT_ROOT).pb.cc',
            ],
            'action': [
@@ -51,7 +59,7 @@
              '--proto_path=./<(rule_input_relpath)',
              './<(rule_input_relpath)/<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
              '--cpp_out=<(protoc_out_dir)/chrome/<(rule_input_relpath)',
-@@ -3567,8 +3565,7 @@
+@@ -3567,8 +3566,7 @@
          },
        ],
        'dependencies': [
@@ -61,7 +69,7 @@
        ],
        'direct_dependent_settings': {
          'include_dirs': [
-@@ -3576,7 +3573,7 @@
+@@ -3576,7 +3574,7 @@
          ]
        },
        'export_dependent_settings': [