[meego-commits] 5895: Changes to Trunk:Testing/chromium
Zhu, Peter J
peter.j.zhu at intel.com
Wed Jul 21 07:58:23 UTC 2010
> -----Original Message-----
> From: meego-commits-bounces at meego.com
> [mailto:meego-commits-bounces at meego.com] On Behalf Of Wei James
> Sent: Wednesday, July 21, 2010 3:48 PM
> To: meego-commits at meego.com
> Subject: [meego-commits] 5895: Changes to Trunk:Testing/chromium
>
> Hi,
> I have made the following changes to chromium in project Trunk:Testing. Please
> review and accept ASAP.
>
> Thank You,
> Wei James
>
> [This message was auto-generated]
>
> ---
>
> Request #5895:
>
> submit: home:xwei1:branches:Trunk:Testing/chromium(r7)(cleanup) ->
> Trunk:Testing/chromium
>
>
> Message:
> fix build error related with gcc 4.5
>
> State: new 2010-07-20T19:42:24 xwei1
> Comment: None
>
>
>
> changes files:
> --------------
> --- chromium.changes
> +++ chromium.changes
> @@ -0,0 +1,3 @@
> +* Wed July 21 Wei James <james.wei at intel.com> - 6.0.417.0
> +- Fix gcc 4.5 NULL converstion error
> +
>
> new:
> ----
> chromium-6.0.467.0-fix_NULL_conversion_errors.patch
> chromium-fix-gcc-4.5-build-errors.patch
This patch is not used at all?
>
> spec files:
> -----------
> --- chromium.spec
> +++ chromium.spec
> @@ -103,7 +103,8 @@
>
> ################# patches from fedora ends
> ###############################
>
> -
> +# Fix gcc4.5 NULL converstion errors
> +Patch28: chromium-fix-gcc-4.5-build-errors.patch
>
> ########### patches to re-org the visibility options in Chromium browser
> build start
>
> @@ -291,7 +292,8 @@
> # Fix yuv_row_posix when compiled with -fPIC
> %patch27 -p1 -b .fix-yrp
>
> -
> +# Fix gcc4.5 NULL converstion errors
> +%patch28 -p1 -b .fix-gcc-4.5
>
>
> #patch to re-org the visibility options in Chromium browser build
>
> other changes:
> --------------
>
> ++++++ chromium-6.0.467.0-fix_NULL_conversion_errors.patch (new)
> --- chromium-6.0.467.0-fix_NULL_conversion_errors.patch
> +++ chromium-6.0.467.0-fix_NULL_conversion_errors.patch
> +diff -up chromium-6.0.467.0/app/gfx/gl/gl_context_linux.cc.BAD
> chromium-6.0.467.0/app/gfx/gl/gl_context_linux.cc
> +--- chromium-6.0.467.0/app/gfx/gl/gl_context_linux.cc.BAD 2010-07-19
> 13:03:30.829383013 -0400
> ++++ chromium-6.0.467.0/app/gfx/gl/gl_context_linux.cc 2010-07-19
> 13:04:28.341383006 -0400
> +@@ -318,7 +318,7 @@ void OSMesaViewGLContext::Destroy() {
> +
> + if (pixmap_) {
> + XFreePixmap(display, pixmap_);
> +- pixmap_ = NULL;
> ++ pixmap_ = 0;
> + }
> +
> + if (window_graphics_context_) {
> +@@ -406,7 +406,7 @@ bool OSMesaViewGLContext::UpdateSize() {
> + }
> + if (pixmap_) {
> + XFreePixmap(display, pixmap_);
> +- pixmap_ = NULL;
> ++ pixmap_ = 0;
> + }
> +
> + // Recreate a pixmap to hold the frame.
> +diff -up chromium-6.0.467.0/chrome/gpu/gpu_channel.cc.BAD
> chromium-6.0.467.0/chrome/gpu/gpu_channel.cc
> +--- chromium-6.0.467.0/chrome/gpu/gpu_channel.cc.BAD 2010-07-19
> 13:38:13.436383010 -0400
> ++++ chromium-6.0.467.0/chrome/gpu/gpu_channel.cc 2010-07-19
> 13:38:35.909383021 -0400
> +@@ -137,7 +137,7 @@ void GpuChannel::OnCreateViewCommandBuff
> +
> + #if defined(ENABLE_GPU)
> +
> +- gfx::PluginWindowHandle handle = NULL;
> ++ gfx::PluginWindowHandle handle = 0;
> + #if defined(OS_WIN)
> + gfx::NativeView view = gfx::NativeViewFromId(view_id);
> +
> +@@ -186,7 +186,7 @@ void GpuChannel::OnCreateOffscreenComman
> +
> + scoped_refptr<GpuCommandBufferStub> stub = new
> GpuCommandBufferStub(
> + this,
> +- NULL,
> ++ 0,
> + parent_stub.get(),
> + size,
> + parent_texture_id,
> +diff -up
> chromium-6.0.467.0/remoting/client/plugin/chromoting_plugin.cc.BAD
> chromium-6.0.467.0/remoting/client/plugin/chromoting_plugin.cc
> +--- chromium-6.0.467.0/remoting/client/plugin/chromoting_plugin.cc.BAD
> 2010-07-19 13:19:08.267383005 -0400
> ++++ chromium-6.0.467.0/remoting/client/plugin/chromoting_plugin.cc
> 2010-07-19 13:19:12.209383016 -0400
> +@@ -30,7 +30,7 @@ ChromotingPlugin::ChromotingPlugin(PP_In
> + const PPB_Instance*
> ppb_instance_funcs)
> + : width_(0),
> + height_(0),
> +- drawing_context_(NULL),
> ++ drawing_context_(0),
> + pp_instance_(pp_instance),
> + ppb_instance_funcs_(ppb_instance_funcs) {
> + }
> +diff -up chromium-6.0.467.0/webkit/glue/plugins/pepper_buffer.cc.BAD
> chromium-6.0.467.0/webkit/glue/plugins/pepper_buffer.cc
> +--- chromium-6.0.467.0/webkit/glue/plugins/pepper_buffer.cc.BAD
> 2010-07-19 13:12:48.323383007 -0400
> ++++ chromium-6.0.467.0/webkit/glue/plugins/pepper_buffer.cc
> 2010-07-19 13:13:00.028383006 -0400
> +@@ -22,11 +22,11 @@ namespace {
> + PP_Resource Create(PP_Module module_id, int32_t size) {
> + PluginModule* module = PluginModule::FromPPModule(module_id);
> + if (!module)
> +- return NULL;
> ++ return 0;
> +
> + scoped_refptr<Buffer> buffer(new Buffer(module));
> + if (!buffer->Init(size))
> +- return NULL;
> ++ return 0;
> + buffer->AddRef(); // AddRef for the caller.
> +
> + return buffer->GetResource();
> +diff -up
> chromium-6.0.467.0/webkit/glue/plugins/pepper_device_context_2d.cc.BAD
> chromium-6.0.467.0/webkit/glue/plugins/pepper_device_context_2d.cc
> +---
> chromium-6.0.467.0/webkit/glue/plugins/pepper_device_context_2d.cc.BAD
> 2010-07-19 13:13:10.989383009 -0400
> ++++ chromium-6.0.467.0/webkit/glue/plugins/pepper_device_context_2d.cc
> 2010-07-19 13:13:26.382383029 -0400
> +@@ -68,11 +68,11 @@ PP_Resource Create(PP_Module module_id,
> + bool is_always_opaque) {
> + PluginModule* module = PluginModule::FromPPModule(module_id);
> + if (!module)
> +- return NULL;
> ++ return 0;
> +
> + scoped_refptr<DeviceContext2D> context(new
> DeviceContext2D(module));
> + if (!context->Init(size->width, size->height, is_always_opaque))
> +- return NULL;
> ++ return 0;
> + context->AddRef(); // AddRef for the caller.
> + return context->GetResource();
> + }
> +diff -up chromium-6.0.467.0/webkit/glue/plugins/pepper_font.cc.BAD
> chromium-6.0.467.0/webkit/glue/plugins/pepper_font.cc
> +--- chromium-6.0.467.0/webkit/glue/plugins/pepper_font.cc.BAD
> 2010-07-19 13:12:31.297383016 -0400
> ++++ chromium-6.0.467.0/webkit/glue/plugins/pepper_font.cc 2010-07-19
> 13:12:40.982383008 -0400
> +@@ -24,14 +24,14 @@ PP_Resource MatchFontWithFallback(PP_Mod
> + #if defined(OS_LINUX)
> + PluginModule* module = PluginModule::FromPPModule(module_id);
> + if (!module)
> +- return NULL;
> ++ return 0;
> +
> + int fd = webkit_glue::MatchFontWithFallback(description->face,
> +
> description->weight >= 700,
> + description->italic,
> +
> description->charset);
> + if (fd == -1)
> +- return NULL;
> ++ return 0;
> +
> + scoped_refptr<Font> font(new Font(module, fd));
> + font->AddRef(); // AddRef for the caller.
> +diff -up chromium-6.0.467.0/webkit/glue/plugins/pepper_image_data.cc.BAD
> chromium-6.0.467.0/webkit/glue/plugins/pepper_image_data.cc
> +--- chromium-6.0.467.0/webkit/glue/plugins/pepper_image_data.cc.BAD
> 2010-07-19 13:14:33.926383018 -0400
> ++++ chromium-6.0.467.0/webkit/glue/plugins/pepper_image_data.cc
> 2010-07-19 13:14:44.719383003 -0400
> +@@ -31,11 +31,11 @@ PP_Resource Create(PP_Module module_id,
> + bool init_to_zero) {
> + PluginModule* module = PluginModule::FromPPModule(module_id);
> + if (!module)
> +- return NULL;
> ++ return 0;
> +
> + scoped_refptr<ImageData> data(new ImageData(module));
> + if (!data->Init(format, size->width, size->height, init_to_zero))
> +- return NULL;
> ++ return 0;
> + data->AddRef(); // AddRef for the caller.
> +
> + return data->GetResource();
> +diff -up chromium-6.0.467.0/webkit/glue/plugins/pepper_scrollbar.cc.BAD
> chromium-6.0.467.0/webkit/glue/plugins/pepper_scrollbar.cc
> +--- chromium-6.0.467.0/webkit/glue/plugins/pepper_scrollbar.cc.BAD
> 2010-07-19 13:16:01.059382980 -0400
> ++++ chromium-6.0.467.0/webkit/glue/plugins/pepper_scrollbar.cc
> 2010-07-19 13:16:07.601383003 -0400
> +@@ -28,7 +28,7 @@ namespace {
> + PP_Resource Create(PP_Instance instance_id, bool vertical) {
> + PluginInstance* instance = PluginInstance::FromPPInstance(instance_id);
> + if (!instance)
> +- return NULL;
> ++ return 0;
> +
> + scoped_refptr<Scrollbar> scrollbar(new Scrollbar(instance, vertical));
> + scrollbar->AddRef(); // AddRef for the caller.
>
> ++++++ chromium-fix-gcc-4.5-build-errors.patch (new)
> --- chromium-fix-gcc-4.5-build-errors.patch
> +++ chromium-fix-gcc-4.5-build-errors.patch
> +diff -Nur
> chromium-6.0.417.0-20100526svn48276/webkit/glue/plugins/pepper_device_c
> ontext_2d.cc
> chromium-fix-gcc-4.5/webkit/glue/plugins/pepper_device_context_2d.cc
> +---
> chromium-6.0.417.0-20100526svn48276/webkit/glue/plugins/pepper_device_c
> ontext_2d.cc 2010-05-26 23:53:34.000000000 +0800
> ++++ chromium-fix-gcc-4.5/webkit/glue/plugins/pepper_device_context_2d.cc
> 2010-07-21 12:47:46.597572869 +0800
> +@@ -61,11 +61,11 @@
> + bool is_always_opaque) {
> + PluginModule* module = PluginModule::FromPPModule(module_id);
> + if (!module)
> +- return NULL;
> ++ return 0;
> +
> + scoped_refptr<DeviceContext2D> context(new
> DeviceContext2D(module));
> + if (!context->Init(width, height, is_always_opaque))
> +- return NULL;
> ++ return 0;
> + context->AddRef(); // AddRef for the caller.
> + return context->GetResource();
> + }
> +diff -Nur
> chromium-6.0.417.0-20100526svn48276/webkit/glue/plugins/pepper_image_d
> ata.cc chromium-fix-gcc-4.5/webkit/glue/plugins/pepper_image_data.cc
> +---
> chromium-6.0.417.0-20100526svn48276/webkit/glue/plugins/pepper_image_d
> ata.cc 2010-05-26 23:53:34.000000000 +0800
> ++++ chromium-fix-gcc-4.5/webkit/glue/plugins/pepper_image_data.cc
> 2010-07-21 12:48:23.250950798 +0800
> +@@ -40,11 +40,11 @@
> + bool init_to_zero) {
> + PluginModule* module = PluginModule::FromPPModule(module_id);
> + if (!module)
> +- return NULL;
> ++ return 0;
> +
> + scoped_refptr<ImageData> data(new ImageData(module));
> + if (!data->Init(format, width, height, init_to_zero))
> +- return NULL;
> ++ return 0;
> + data->AddRef(); // AddRef for the caller.
> +
> + return data->GetResource();
> _______________________________________________
> Meego-commits mailing list
> Meego-commits at meego.com
> http://lists.meego.com/listinfo/meego-commits
More information about the MeeGo-commits
mailing list