Re: [PATCH] chromium: fix build with glib >= 2.35

["Eric Bénard" <eric@eukrea.com>]

Le Fri,  3 May 2013 12:03:52 +0200,
Andreas Müller <schnitzeltony@googlemail.com> a écrit :

> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  ...ser_main_loop.cc-fix-build-with-glib-2.35.patch |   42 ++++++++++++++++++++
>  recipes-browser/chromium/chromium_24.0.1312.52.bb  |    3 +-
>  2 files changed, 44 insertions(+), 1 deletions(-)
>  create mode 100644 recipes-browser/chromium/chromium-24.0.1312.52/0001-browser_main_loop.cc-fix-build-with-glib-2.35.patch
> 
> diff --git a/recipes-browser/chromium/chromium-24.0.1312.52/0001-browser_main_loop.cc-fix-build-with-glib-2.35.patch b/recipes-browser/chromium/chromium-24.0.1312.52/0001-browser_main_loop.cc-fix-build-with-glib-2.35.patch
> new file mode 100644
> index 0000000..cdf8051
> --- /dev/null
> +++ b/recipes-browser/chromium/chromium-24.0.1312.52/0001-browser_main_loop.cc-fix-build-with-glib-2.35.patch
> @@ -0,0 +1,42 @@
> +From eb0c0c982322c0e366c1c854475ceda6342dd55a Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> +Date: Thu, 2 May 2013 15:12:24 +0200
> +Subject: [PATCH] browser_main_loop.cc: fix build with glib > 2.35
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Applied [1]
> +
> +[1] http://code.ohloh.net/file?fid=pYuYekcDZUhiAoN5uY-KdIaKFTI&cid=0W4KUpSYxGo&s=&browser=Default#L0
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> +---
> + content/browser/browser_main_loop.cc |    5 +++++
> + 1 files changed, 5 insertions(+), 0 deletions(-)
> +
> +diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
> +index ad4b0c6..86deea3 100644
> +--- a/content/browser/browser_main_loop.cc
> ++++ b/content/browser/browser_main_loop.cc
> +@@ -687,12 +687,17 @@ void BrowserMainLoop::InitializeToolkit() {
> +   // TODO(stevenjb): Move platform specific code into platform specific Parts
> +   // (Need to add InitializeToolkit stage to BrowserParts).
> + #if defined(OS_LINUX) || defined(OS_OPENBSD)
> ++  // g_type_init will be deprecated in 2.36. 2.35 is the development
> ++  // version for 2.36, hence do not call g_type_init starting 2.35.
> ++  // http://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-init
> ++#if !GLIB_CHECK_VERSION(2, 35, 0)
> +   // Glib type system initialization. Needed at least for gconf,
> +   // used in net/proxy/proxy_config_service_linux.cc. Most likely
> +   // this is superfluous as gtk_init() ought to do this. It's
> +   // definitely harmless, so retained as a reminder of this
> +   // requirement for gconf.
> +   g_type_init();
> ++#endif
> + 
> + #if !defined(USE_AURA)
> +   gfx::GtkInitFromCommandLine(parsed_command_line_);
> +-- 
> +1.7.6.5
> +
> diff --git a/recipes-browser/chromium/chromium_24.0.1312.52.bb b/recipes-browser/chromium/chromium_24.0.1312.52.bb
> index 2827cc1..a9a2d28 100644
> --- a/recipes-browser/chromium/chromium_24.0.1312.52.bb
> +++ b/recipes-browser/chromium/chromium_24.0.1312.52.bb
> @@ -11,9 +11,10 @@ SRC_URI = "http://commondatastorage.googleapis.com/chromium-browser-official/${P
>          file://ui-gl-no-narrowing.patch \
>          file://google-chrome \
>          file://google-chrome.desktop \
> +        file://0001-browser_main_loop.cc-fix-build-with-glib-2.35.patch \
>  "
>  
> -PR = "r1"
> +PR = "r2"
>  
>  # include.gypi exists only for armv6 and armv7a and there isn't something like COMPATIBLE_ARCH afaik
>  COMPATIBLE_MACHINE = "(-)"

pushed to master.

Thanks !

Eric