google-gears-svn/arch64-r3423.patch

   1 Index: gears/localserver/common/localserver_db.h
   2 ===================================================================
   3 --- gears/localserver/common/localserver_db.h   (révision 3407)
   4 +++ gears/localserver/common/localserver_db.h   (copie de travail)
   5 @@ -27,6 +27,8 @@
   6  #define GEARS_LOCALSERVER_COMMON_LOCALSERVER_DB_H__
   7
   8  #include <vector>
   9 +#include <cstdio>
  10 +
  11  #include "gears/base/common/common.h"
  12  #include "gears/base/common/name_value_table.h"
  13  #include "gears/base/common/sqlite_wrapper.h"
  14 Index: gears/tools/config.mk
  15 ===================================================================
  16 --- gears/tools/config.mk       (révision 3407)
  17 +++ gears/tools/config.mk       (copie de travail)
  18 @@ -96,7 +96,7 @@
  19  # Set default build mode
  20  #   dbg = debug build
  21  #   opt = release build
  22 -MODE = dbg
  23 +MODE = opt
  24
  25  # Set default OS architecture
  26  #   OSX and Symbian builds will override this value (see rules.mk).
  27 @@ -235,8 +235,9 @@
  28  endif
  29  endif
  30  endif
  31 -GECKO_BIN = $(GECKO_SDK)/gecko_sdk/bin
  32 -GECKO_LIB = $(GECKO_SDK)/gecko_sdk/lib
  33 +
  34 +GECKO_BIN = /usr/lib/xulrunner-devel-1.9.2/bin/
  35 +GECKO_LIB = /usr/lib/xulrunner-devel-1.9.2/lib/
  36  # GECKO_SDK gets defined below (different for each OS).
  37
  38  $(BROWSER)_CPPFLAGS += -DBROWSER_$(BROWSER)=1
  39 Index: gears/geolocation/backoff_manager.cc
  40 ===================================================================
  41 --- gears/geolocation/backoff_manager.cc        (révision 3407)
  42 +++ gears/geolocation/backoff_manager.cc        (copie de travail)
  43 @@ -26,6 +26,7 @@
  44  #include "gears/geolocation/backoff_manager.h"
  45
  46  #include <assert.h>
  47 +#include <cstdlib>
  48
  49  // The baseline minimum period between network requests.
  50  static const int kBaselineMinimumRequestInterval = 1000 * 5;  // 5 seconds
  51 Index: gears/base/firefox/install.rdf.m4
  52 ===================================================================
  53 --- gears/base/firefox/install.rdf.m4   (révision 3407)
  54 +++ gears/base/firefox/install.rdf.m4   (copie de travail)
  55 @@ -79,13 +79,9 @@
  56  |^,PRODUCT_OS,^|wince|^,^|m4_dnl
  57      <!-- WE DON'T CURRENTLY BUILD FOR WINCE FIREFOX. -->
  58  |^,PRODUCT_OS,^|linux|^,^|m4_dnl
  59 -m4_ifelse(PRODUCT_ARCH,^|x86_64|^,^|m4_dnl
  60 -    <em:targetPlatform>Linux_x86_64-gcc3</em:targetPlatform>
  61 -|^,^|m4_dnl // PRODUCT_ARCH else...
  62 -    <em:targetPlatform>Linux_x86-gcc3</em:targetPlatform>
  63 -    <!-- Ubuntu Edgy Eft requires "linux-gnu" for the OS_TARGET prefix. -->
  64 -    <em:targetPlatform>linux-gnu_x86-gcc3</em:targetPlatform>
  65 -|^)m4_dnl // PRODUCT_ARCH end
  66 +    m4_format(`<em:targetPlatform>Linux_%s-gcc3</em:targetPlatform>', PRODUCT_ARCH)
  67 +       <!-- Ubuntu Edgy Eft requires "linux-gnu" for the OS_TARGET prefix. -->
  68 +       m4_format(`<em:targetPlatform>linux-gnu_%s-gcc3</em:targetPlatform>', PRODUCT_ARCH)
  69  |^,PRODUCT_OS,^|osx|^,^|m4_dnl
  70      <em:targetPlatform>Darwin</em:targetPlatform>
  71  |^)
  72 Index: gears/base/common/string_utils.h
  73 ===================================================================
  74 --- gears/base/common/string_utils.h    (révision 3407)
  75 +++ gears/base/common/string_utils.h    (copie de travail)
  76 @@ -29,6 +29,7 @@
  77  #include <algorithm>
  78  #include <assert.h>
  79  #include <cctype>
  80 +#include <climits>
  81  #include <string>
  82  #include <vector>
  83  #include "gears/base/common/string16.h" // for char16
  84 Index: gears/base/common/string16.h
  85 ===================================================================
  86 --- gears/base/common/string16.h        (révision 3407)
  87 +++ gears/base/common/string16.h        (copie de travail)
  88 @@ -46,6 +46,7 @@
  89  #define GEARS_BASE_COMMON_STRING16_H__
  90
  91  #include <string>
  92 +#include <cstring>
  93  #include "gears/base/common/basictypes.h"
  94
  95  // Need to cast literals (Linux, OSX) and SQLite void* retvals (all platforms)
  96 Index: gears/base/common/http_utils.cc
  97 ===================================================================
  98 --- gears/base/common/http_utils.cc     (révision 3407)
  99 +++ gears/base/common/http_utils.cc     (copie de travail)
 100 @@ -25,6 +25,7 @@
 101  //
 102  // This file is branched from /google3/webutil/http/httputils.cc
 103
 104 +#include <cstdlib>
 105  #include <iterator>
 106  #include <vector>
 107  #include "gears/base/common/http_utils.h"
 108 Index: gears/base/common/basictypes.h
 109 ===================================================================
 110 --- gears/base/common/basictypes.h      (révision 3407)
 111 +++ gears/base/common/basictypes.h      (copie de travail)
 112 @@ -27,7 +27,7 @@
 113  #define GEARS_BASE_COMMON_BASICTYPES_H__
 114
 115  #include <stddef.h>  // for NULL, size_t
 116 -
 117 +#include <stdint.h>  // for intptr_t
 118  #ifdef _MSC_VER
 119  #include <float.h>  // for _isnan() on VC++
 120  #define isnan(x) _isnan(x)  // VC++ uses _isnan() instead of isnan()
 121 Index: third_party/jsoncpp/json_reader.cc
 122 ===================================================================
 123 --- third_party/jsoncpp/json_reader.cc  (révision 3407)
 124 +++ third_party/jsoncpp/json_reader.cc  (copie de travail)
 125 @@ -1,5 +1,6 @@
 126  #include "third_party/jsoncpp/reader.h"
 127  #include "third_party/jsoncpp/value.h"
 128 +#include <cstring>
 129  #include <utility>
 130  #include <stdio.h>
 131  #include <assert.h>
 132 Index: third_party/jsoncpp/json_value.cc
 133 ===================================================================
 134 --- third_party/jsoncpp/json_value.cc   (révision 3407)
 135 +++ third_party/jsoncpp/json_value.cc   (copie de travail)
 136 @@ -1,5 +1,6 @@
 137  #include "third_party/jsoncpp/value.h"
 138  #include "third_party/jsoncpp/writer.h"
 139 +#include <cstring>
 140  #include <utility>
 141  #include "assert.h"
 142  #ifdef JSON_USE_CPPTL
 143 Index: third_party/jsoncpp/json_writer.cc
 144 ===================================================================
 145 --- third_party/jsoncpp/json_writer.cc  (révision 3407)
 146 +++ third_party/jsoncpp/json_writer.cc  (copie de travail)
 147 @@ -1,4 +1,5 @@
 148  #include "third_party/jsoncpp/writer.h"
 149 +#include <cstring>
 150  #include <utility>
 151  #include <assert.h>
 152  #include <stdio.h>
 153 Index: third_party/googleurl/src/url_parse.cc
 154 ===================================================================
 155 --- third_party/googleurl/src/url_parse.cc      (révision 3407)
 156 +++ third_party/googleurl/src/url_parse.cc      (copie de travail)
 157 @@ -33,7 +33,7 @@
 158   * the terms of any one of the MPL, the GPL or the LGPL.
 159   *
 160   * ***** END LICENSE BLOCK ***** */
 161 -
 162 +#include <cstdlib>
 163  #include "googleurl/src/url_parse.h"
 164
 165  #include "base/logging.h"
 166 Index: gears/desktop/desktop.cc
 167 ===================================================================
 168 --- gears/desktop/desktop.cc    (révision 3408)
 169 +++ gears/desktop/desktop.cc    (copie de travail)
 170 @@ -216,14 +216,14 @@
 171    }
 172
 173    // Resolve the icon urls
 174 -  if (!shortcut_info->icon16x16.url.empty() &&
 175 -      !ResolveUrl(&shortcut_info->icon16x16.url, &error_) ||
 176 -      !shortcut_info->icon32x32.url.empty() &&
 177 -      !ResolveUrl(&shortcut_info->icon32x32.url, &error_) ||
 178 -      !shortcut_info->icon48x48.url.empty() &&
 179 -      !ResolveUrl(&shortcut_info->icon48x48.url, &error_) ||
 180 -      !shortcut_info->icon128x128.url.empty() &&
 181 -      !ResolveUrl(&shortcut_info->icon128x128.url, &error_)) {
 182 +  if ((!shortcut_info->icon16x16.url.empty() &&
 183 +      !ResolveUrl(&shortcut_info->icon16x16.url, &error_)) ||
 184 +      (!shortcut_info->icon32x32.url.empty() &&
 185 +      !ResolveUrl(&shortcut_info->icon32x32.url, &error_)) ||
 186 +      (!shortcut_info->icon48x48.url.empty() &&
 187 +      !ResolveUrl(&shortcut_info->icon48x48.url, &error_)) ||
 188 +      (!shortcut_info->icon128x128.url.empty() &&
 189 +      !ResolveUrl(&shortcut_info->icon128x128.url, &error_))) {
 190      return false;
 191    }
 192
 193 Index: gears/cctests/test.cc
 194 ===================================================================
 195 --- gears/cctests/test.cc       (révision 3408)
 196 +++ gears/cctests/test.cc       (copie de travail)
 197 @@ -700,15 +700,15 @@
 198
 199    bool ok = false;
 200    JsParamType t = context->GetArgumentType(1);
 201 -  if (type == STRING16(L"bool") && t == JSPARAM_BOOL ||
 202 -      type == STRING16(L"int") && t == JSPARAM_INT ||
 203 -      type == STRING16(L"double") && t == JSPARAM_DOUBLE ||
 204 -      type == STRING16(L"string") && t == JSPARAM_STRING16 ||
 205 -      type == STRING16(L"null") && t == JSPARAM_NULL ||
 206 -      type == STRING16(L"undefined") && t == JSPARAM_UNDEFINED ||
 207 -      type == STRING16(L"array") && t == JSPARAM_ARRAY ||
 208 -      type == STRING16(L"function") && t == JSPARAM_FUNCTION ||
 209 -      type == STRING16(L"object") && t == JSPARAM_OBJECT) {
 210 +  if ((type == STRING16(L"bool") && t == JSPARAM_BOOL) ||
 211 +      (type == STRING16(L"int") && t == JSPARAM_INT) ||
 212 +      (type == STRING16(L"double") && t == JSPARAM_DOUBLE) ||
 213 +      (type == STRING16(L"string") && t == JSPARAM_STRING16) ||
 214 +      (type == STRING16(L"null") && t == JSPARAM_NULL) ||
 215 +      (type == STRING16(L"undefined") && t == JSPARAM_UNDEFINED) ||
 216 +      (type == STRING16(L"array") && t == JSPARAM_ARRAY) ||
 217 +      (type == STRING16(L"function") && t == JSPARAM_FUNCTION) ||
 218 +      (type == STRING16(L"object") && t == JSPARAM_OBJECT)) {
 219      ok = true;
 220    }
 221    context->SetReturnValue(JSPARAM_BOOL, &ok);
 222 Index: gears/tools/rules.mk
 223 ===================================================================
 224 --- gears/tools/rules.mk        (révision 3423)
 225 +++ gears/tools/rules.mk        (copie de travail)
 226 @@ -1301,8 +1301,8 @@
 227         cp -R $(COMMON_OUTDIR)/genfiles/i18n/* $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/chrome/chromeFiles/locale
 228         cp $(FF36_MODULE_TYPELIB) $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/components
 229         cp $(FF36_MODULE_DLL) $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff36/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
 230 -       cp $(FF31_MODULE_DLL) $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff35/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
 231 -       cp $(FF3_MODULE_DLL) $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff30/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
 232 +       #cp $(FF31_MODULE_DLL) $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff35/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
 233 +       #cp $(FF3_MODULE_DLL) $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff30/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
 234  ifneq ($(ARCH),x86_64)
 235         cp $(FF2_MODULE_DLL) $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff2/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
 236  endif
 237 @@ -1314,9 +1314,9 @@
 238  ifeq ($(MODE),dbg)
 239  ifdef IS_WIN32_OR_WINCE
 240         cp $(FF36_OUTDIR)/$(MODULE).pdb $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff36/$(MODULE).pdb
 241 -       cp $(FF31_OUTDIR)/$(MODULE).pdb $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff35/$(MODULE).pdb
 242 -       cp $(FF3_OUTDIR)/$(MODULE).pdb $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff30/$(MODULE).pdb
 243 -       cp $(FF2_OUTDIR)/$(MODULE).pdb $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff2/$(MODULE).pdb
 244 +       #cp $(FF31_OUTDIR)/$(MODULE).pdb $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff35/$(MODULE).pdb
 245 +       #cp $(FF3_OUTDIR)/$(MODULE).pdb $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff30/$(MODULE).pdb
 246 +       #cp $(FF2_OUTDIR)/$(MODULE).pdb $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff2/$(MODULE).pdb
 247  endif
 248  endif
 249  endif # not LINUX
 250