[oe] [meta-browser][PATCH] Chromium : update to version 33
Prabhu Sundararaj
prabhu.sundararaj at freescale.com
Sat Dec 14 23:29:59 UTC 2013
Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj at freescale.com>
---
.../chromium-29.0.1518.2/armv6/include.gypi | 8 -
.../chromium-29.0.1518.2/armv6/oe-defaults.gypi | 15 --
.../chromium-29.0.1518.2/armv7a/include.gypi | 9 -
.../chromium-29.0.1518.2/armv7a/oe-defaults.gypi | 15 --
.../chromium/chromium-29.0.1518.2/google-chrome | 7 -
.../chromium-29.0.1518.2/google-chrome.desktop | 222 ---------------------
.../chromium-29.0.1518.2/i586/include.gypi | 5 -
.../chromium-29.0.1518.2/i586/oe-defaults.gypi | 15 --
.../uninitialised-warning.patch | 90 ---------
.../chromium/chromium-29.0.1518.2/unistd-2.patch | 27 ---
.../chromium-29.0.1518.2/x86-64/include.gypi | 5 -
.../chromium-29.0.1518.2/x86-64/oe-defaults.gypi | 15 --
recipes-browser/chromium/chromium_29.0.1518.2.bb | 66 +-----
13 files changed, 6 insertions(+), 493 deletions(-)
delete mode 100644 recipes-browser/chromium/chromium-29.0.1518.2/armv6/include.gypi
delete mode 100644 recipes-browser/chromium/chromium-29.0.1518.2/armv6/oe-defaults.gypi
delete mode 100644 recipes-browser/chromium/chromium-29.0.1518.2/armv7a/include.gypi
delete mode 100644 recipes-browser/chromium/chromium-29.0.1518.2/armv7a/oe-defaults.gypi
delete mode 100644 recipes-browser/chromium/chromium-29.0.1518.2/google-chrome
delete mode 100644 recipes-browser/chromium/chromium-29.0.1518.2/google-chrome.desktop
delete mode 100644 recipes-browser/chromium/chromium-29.0.1518.2/i586/include.gypi
delete mode 100644 recipes-browser/chromium/chromium-29.0.1518.2/i586/oe-defaults.gypi
delete mode 100644 recipes-browser/chromium/chromium-29.0.1518.2/uninitialised-warning.patch
delete mode 100644 recipes-browser/chromium/chromium-29.0.1518.2/unistd-2.patch
delete mode 100644 recipes-browser/chromium/chromium-29.0.1518.2/x86-64/include.gypi
delete mode 100644 recipes-browser/chromium/chromium-29.0.1518.2/x86-64/oe-defaults.gypi
diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/armv6/include.gypi b/recipes-browser/chromium/chromium-29.0.1518.2/armv6/include.gypi
deleted file mode 100644
index 2c88271..0000000
--- a/recipes-browser/chromium/chromium-29.0.1518.2/armv6/include.gypi
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- 'variables': {
- # Configure for armv6 compilation
- 'target_arch': 'arm',
- 'armv7': 0,
- 'arm_neon': 0,
- }
-}
diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/armv6/oe-defaults.gypi b/recipes-browser/chromium/chromium-29.0.1518.2/armv6/oe-defaults.gypi
deleted file mode 100644
index 27e1cfe..0000000
--- a/recipes-browser/chromium/chromium-29.0.1518.2/armv6/oe-defaults.gypi
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- 'variables': {
- 'use_system_bzip2': 1,
- 'disable_nacl': 1,
- 'proprietary_codecs': 1,
- 'v8_use_snapshot': 1,
- 'use_system_ffmpeg': 0,
- 'linux_use_tcmalloc': 0,
- 'linux_link_kerberos': 0,
- 'use_kerberos': 0,
- 'use_cups': 0,
- 'use_gnome_keyring': 0,
- 'linux_link_gnome_keyring': 0
- },
-}
diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/armv7a/include.gypi b/recipes-browser/chromium/chromium-29.0.1518.2/armv7a/include.gypi
deleted file mode 100644
index 316cf48..0000000
--- a/recipes-browser/chromium/chromium-29.0.1518.2/armv7a/include.gypi
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- 'variables': {
- # Configure for armv7 compilation
- 'target_arch': 'arm',
- 'armv7': 1,
- 'arm_thumb': 1,
- 'arm_neon': 1,
- },
-}
diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/armv7a/oe-defaults.gypi b/recipes-browser/chromium/chromium-29.0.1518.2/armv7a/oe-defaults.gypi
deleted file mode 100644
index 27e1cfe..0000000
--- a/recipes-browser/chromium/chromium-29.0.1518.2/armv7a/oe-defaults.gypi
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- 'variables': {
- 'use_system_bzip2': 1,
- 'disable_nacl': 1,
- 'proprietary_codecs': 1,
- 'v8_use_snapshot': 1,
- 'use_system_ffmpeg': 0,
- 'linux_use_tcmalloc': 0,
- 'linux_link_kerberos': 0,
- 'use_kerberos': 0,
- 'use_cups': 0,
- 'use_gnome_keyring': 0,
- 'linux_link_gnome_keyring': 0
- },
-}
diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/google-chrome b/recipes-browser/chromium/chromium-29.0.1518.2/google-chrome
deleted file mode 100644
index 2d17772..0000000
--- a/recipes-browser/chromium/chromium-29.0.1518.2/google-chrome
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ "${USER}" = "root" ] ; then
- /usr/bin/chrome/chrome --user-data-dir=${HOME}/.chromium/ $@
-else
- /usr/bin/chrome/chrome $@
-fi
diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/google-chrome.desktop b/recipes-browser/chromium/chromium-29.0.1518.2/google-chrome.desktop
deleted file mode 100644
index 76a2533..0000000
--- a/recipes-browser/chromium/chromium-29.0.1518.2/google-chrome.desktop
+++ /dev/null
@@ -1,222 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Chromium
-# Only KDE 4 seems to use GenericName, so we reuse the KDE strings.
-# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413.
-GenericName=Web Browser
-GenericName[ar]=????? ??????
-GenericName[bg]=??? ???????
-GenericName[ca]=Navegador web
-GenericName[cs]=WWW prohlÞe?
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=?????????? ?????
-GenericName[en_GB]=Web Browser
-GenericName[es]=Navegador web
-GenericName[et]=Veebibrauser
-GenericName[fi]=WWW-selain
-GenericName[fr]=Navigateur Web
-GenericName[gu]=??? ???????
-GenericName[he]=????? ???????
-GenericName[hi]=??? ????????
-GenericName[hu]=Webböngész?
-GenericName[it]=Browser Web
-GenericName[ja]=???????
-GenericName[kn]=??? ??????
-GenericName[ko]=? ????
-GenericName[lt]=Žiniatinklio naršykl?
-GenericName[lv]=T?mek?a p?rl?ks
-GenericName[ml]=???? ????????
-GenericName[mr]=??? ???????
-GenericName[nb]=Nettleser
-GenericName[nl]=Webbrowser
-GenericName[pl]=Przegl?darka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador da Internet
-GenericName[ro]=Navigator de Internet
-GenericName[ru]=???-???????
-GenericName[sl]=Spletni brskalnik
-GenericName[sv]=Webbläsare
-GenericName[ta]=???? ?????
-GenericName[th]=???????????????
-GenericName[tr]=Web Taray?c?
-GenericName[uk]=????????? ?????
-GenericName[zh_CN]=?????
-GenericName[zh_HK]=?????
-GenericName[zh_TW]=?????
-# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1.
-GenericName[bn]=???? ????????
-GenericName[fil]=Web Browser
-GenericName[hr]=Web preglednik
-GenericName[id]=Browser Web
-GenericName[or]=????? ???????
-GenericName[sk]=WWW prehliada?
-GenericName[sr]=???????? ??????????
-GenericName[te]=????? ???????
-GenericName[vi]=B? duy?t Web
-# Gnome and KDE 3 uses Comment.
-Comment=Access the Internet
-Comment[ar]=?????? ??? ????????
-Comment[bg]=?????? ?? ????????
-Comment[bn]=??????????? ????????? ????
-Comment[ca]=Accedeix a Internet
-Comment[cs]=P?Ãstup k internetu
-Comment[da]=FÃ¥ adgang til internettet
-Comment[de]=Internetzugriff
-Comment[el]=???????? ??? ?????????
-Comment[en_GB]=Access the Internet
-Comment[es]=Accede a Internet.
-Comment[et]=Pääs Internetti
-Comment[fi]=Käytä internetiä
-Comment[fil]=I-access ang Internet
-Comment[fr]=Accéder à Internet
-Comment[gu]=??????? ?????? ???
-Comment[he]=???? ?? ????????
-Comment[hi]=??????? ?? ????? ??????? ????
-Comment[hr]=Pristup Internetu
-Comment[hu]=Internetelérés
-Comment[id]=Akses Internet
-Comment[it]=Accesso a Internet
-Comment[ja]=????????????
-Comment[kn]=????????? ????? ?????????
-Comment[ko]=??? ??
-Comment[lt]=Interneto prieiga
-Comment[lv]=Piek??t internetam
-Comment[ml]=?????????????? ??????? ???????
-Comment[mr]=???????????? ?????? ???
-Comment[nb]=GÃ¥ til Internett
-Comment[nl]=Verbinding maken met internet
-Comment[or]=?????????? ?????? ??????
-Comment[pl]=Skorzystaj z internetu
-Comment[pt]=Aceder à Internet
-Comment[pt_BR]=Acessar a internet
-Comment[ro]=Accesa?i Internetul
-Comment[ru]=?????? ? ????????
-Comment[sk]=PrÃstup do siete Internet
-Comment[sl]=Dostop do interneta
-Comment[sr]=?????????? ?????????
-Comment[sv]=Gå ut på Internet
-Comment[ta]=???????? ????????
-Comment[te]=???????????? ??????? ????????
-Comment[th]=???????????????????
-Comment[tr]=?nternet'e eri?in
-Comment[uk]=?????? ?? ?????????
-Comment[vi]=Truy c?p Internet
-Comment[zh_CN]=?????
-Comment[zh_HK]=???????
-Comment[zh_TW]=???????
-Exec=/usr/bin/google-chrome %U
-Terminal=false
-Icon=/usr/bin/chrome/product_logo_48.png
-Type=Application
-Categories=Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml_xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
-X-Ayatana-Desktop-Shortcuts=NewWindow;NewIncognito
-
-[NewWindow Shortcut Group]
-Name=New Window
-Name[am]=??? ????
-Name[ar]=????? ?????
-Name[bg]=??? ????????
-Name[bn]=???? ??????
-Name[ca]=Finestra nova
-Name[cs]=Nové okno
-Name[da]=Nyt vindue
-Name[de]=Neues Fenster
-Name[el]=??? ????????
-Name[en_GB]=New Window
-Name[es]=Nueva ventana
-Name[et]=Uus aken
-Name[fa]=????? ????
-Name[fi]=Uusi ikkuna
-Name[fil]=New Window
-Name[fr]=Nouvelle fenêtre
-Name[gu]=??? ?????
-Name[hi]=?? ?????
-Name[hr]=Novi prozor
-Name[hu]=Új ablak
-Name[id]=Jendela Baru
-Name[it]=Nuova finestra
-Name[iw]=???? ???
-Name[ja]=???????
-Name[kn]=??? ?????
-Name[ko]=? ?
-Name[lt]=Naujas langas
-Name[lv]=Jauns logs
-Name[ml]=????? ???????
-Name[mr]=???? ?????
-Name[nl]=Nieuw venster
-Name[no]=Nytt vindu
-Name[pl]=Nowe okno
-Name[pt]=Nova janela
-Name[pt_BR]=Nova janela
-Name[ro]=Fereastr? nou?
-Name[ru]=????? ????
-Name[sk]=Nové okno
-Name[sl]=Novo okno
-Name[sr]=???? ??????
-Name[sv]=Nytt fönster
-Name[sw]=Dirisha Jipya
-Name[ta]=????? ??????
-Name[te]=??????? ?????
-Name[th]=????????????
-Name[tr]=Yeni Pencere
-Name[uk]=???? ?????
-Name[vi]=C?a s? M?i
-Name[zh_CN]=????
-Name[zh_TW]=????
-Exec=/usr/bin/google-chrome
-TargetEnvironment=Unity
-
-[NewIncognito Shortcut Group]
-Name=New Incognito Window
-Name[ar]=????? ????? ?????? ???????
-Name[bg]=??? ???????? „?????????“
-Name[bn]=???? ???????? ??????
-Name[ca]=Finestra d'incògnit nova
-Name[cs]=Nové anonymnà okno
-Name[da]=Nyt inkognitovindue
-Name[de]=Neues Inkognito-Fenster
-Name[el]=??? ???????? ??? ??????? ?????????
-Name[en_GB]=New Incognito window
-Name[es]=Nueva ventana de incógnito
-Name[et]=Uus inkognito aken
-Name[fa]=????? ???? ???? ??????
-Name[fi]=Uusi incognito-ikkuna
-Name[fil]=Bagong Incognito window
-Name[fr]=Nouvelle fenêtre de navigation privée
-Name[gu]=??? ???? ?????
-Name[hi]=?? ????? ?????
-Name[hr]=Novi anoniman prozor
-Name[hu]=Új Inkognitóablak
-Name[id]=Jendela Penyamaran baru
-Name[it]=Nuova finestra di navigazione in incognito
-Name[iw]=???? ??? ?????? ????
-Name[ja]=????????? ?????
-Name[kn]=??? ?????? ?????
-Name[ko]=? ??? ?
-Name[lt]=Naujas inkognito langas
-Name[lv]=Jauns inkognito rež?ma logs
-Name[ml]=????? ??? ????????? ???????
-Name[mr]=???? ????? ?????
-Name[nl]=Nieuw incognitovenster
-Name[no]=Nytt inkognitovindu
-Name[pl]=Nowe okno incognito
-Name[pt]=Nova janela de navegação anónima
-Name[pt_BR]=Nova janela anônima
-Name[ro]=Fereastr? nou? incognito
-Name[ru]=????? ???? ? ?????? ?????????
-Name[sk]=Nové okno inkognito
-Name[sl]=Novo okno brez beleženja zgodovine
-Name[sr]=???? ?????? ?? ?????????? ??? ??????????
-Name[sv]=Nytt inkognitofönster
-Name[ta]=????? ????????? ??????
-Name[te]=??????? ?????? ?????
-Name[th]=???????????????????????????
-Name[tr]=Yeni Gizli pencere
-Name[uk]=???? ????? ? ?????? ?????????? ?????????
-Name[vi]=C?a s? ?n danh m?i
-Name[zh_CN]=??????
-Name[zh_TW]=???????
-Exec=/usr/bin/google-chrome --incognito
-TargetEnvironment=Unity
diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/i586/include.gypi b/recipes-browser/chromium/chromium-29.0.1518.2/i586/include.gypi
deleted file mode 100644
index 69f3a08..0000000
--- a/recipes-browser/chromium/chromium-29.0.1518.2/i586/include.gypi
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- 'variables': {
- 'target_arch': 'ia32',
- }
-}
diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/i586/oe-defaults.gypi b/recipes-browser/chromium/chromium-29.0.1518.2/i586/oe-defaults.gypi
deleted file mode 100644
index 0a6e8e8..0000000
--- a/recipes-browser/chromium/chromium-29.0.1518.2/i586/oe-defaults.gypi
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- 'variables': {
- 'use_system_bzip2': 1,
- 'disable_nacl': 1,
- 'proprietary_codecs': 0,
- 'v8_use_snapshot': 1,
- 'use_system_ffmpeg': 0,
- 'linux_use_tcmalloc': 1,
- 'linux_link_kerberos': 0,
- 'use_kerberos': 0,
- 'use_cups': 0,
- 'use_gnome_keyring': 0,
- 'linux_link_gnome_keyring': 0,
- },
-}
diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/uninitialised-warning.patch b/recipes-browser/chromium/chromium-29.0.1518.2/uninitialised-warning.patch
deleted file mode 100644
index fac12bb..0000000
--- a/recipes-browser/chromium/chromium-29.0.1518.2/uninitialised-warning.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Make gcc 4.8 happy. It complains about uninitialized symbols
-
-| ../../webkit/glue/webclipboard_impl.cc: In member function 'virtual uint64 webkit_glue::WebClipboardImpl::sequenceNumber(WebKit::WebClipboard::Buffer)':
-| ../../webkit/glue/webclipboard_impl.cc:80:48: error: 'buffer_type' may be used uninitialized in this function [-Werror=maybe-uninitialized]
-| return client_->GetSequenceNumber(buffer_type);
-| ^
-| ../../webkit/glue/webclipboard_impl.cc: In member function 'virtual WebKit::WebVector<WebKit::WebString> webkit_glue::WebClipboardImpl::readAvailableTypes(WebKit::WebClipboard::Buffer, bool*)':
-| ../../webkit/glue/webclipboard_impl.cc:118:73: error: 'buffer_type' may be used uninitialized in this function [-Werror=maybe-uninitialized]
-| client_->ReadAvailableTypes(buffer_type, &types, contains_filenames);
-| ^
-| ../../webkit/glue/webclipboard_impl.cc: In member function 'virtual WebKit::WebData webkit_glue::WebClipboardImpl::readImage(WebKit::WebClipboard::Buffer)':
-| ../../webkit/glue/webclipboard_impl.cc:169:45: error: 'buffer_type' may be used uninitialized in this function [-Werror=maybe-uninitialized]
-| client_->ReadImage(buffer_type, &png_data);
-| ^
-| ../../webkit/glue/webclipboard_impl.cc: In member function 'virtual WebKit::WebString webkit_glue::WebClipboardImpl::readCustomData(WebKit::WebClipboard::Buffer, const WebKit::WebString&)':
-| ../../webkit/glue/webclipboard_impl.cc:180:52: error: 'buffer_type' may be used uninitialized in this function [-Werror=maybe-uninitialized]
-| client_->ReadCustomData(buffer_type, type, &data);
-| ^
-| ../../webkit/glue/webclipboard_impl.cc: In member function 'virtual WebKit::WebString webkit_glue::WebClipboardImpl::readHTML(WebKit::WebClipboard::Buffer, WebKit::WebURL*, unsigned int*, unsigned int*)':
-| ../../webkit/glue/webclipboard_impl.cc:158:56: error: 'buffer_type' may be used uninitialized in this function [-Werror=maybe-uninitialized]
-| static_cast<uint32*>(fragment_end));
-| ^
-| ../../webkit/glue/webclipboard_impl.cc: In member function 'virtual WebKit::WebString webkit_glue::WebClipboardImpl::readPlainText(WebKit::WebClipboard::Buffer)':
-| ../../webkit/glue/webclipboard_impl.cc:136:3: error: 'buffer_type' may be used uninitialized in this function [-Werror=maybe-uninitialized]
-| if (client_->IsFormatAvailable(ui::Clipboard::GetPlainTextFormatType(),
-| ^
-| cc1plus: all warnings being treated as errors
-
-
-Signed-off-by: Khem Raj <raj.khem at gmail.com>
-
-Upstream-Status: Unknown
-Index: chromium-29.0.1518.2/webkit/glue/webclipboard_impl.cc
-===================================================================
---- chromium-29.0.1518.2.orig/webkit/glue/webclipboard_impl.cc
-+++ chromium-29.0.1518.2/webkit/glue/webclipboard_impl.cc
-@@ -73,7 +73,7 @@ uint64 WebClipboardImpl::getSequenceNumb
- }
-
- uint64 WebClipboardImpl::sequenceNumber(Buffer buffer) {
-- ui::Clipboard::Buffer buffer_type;
-+ ui::Clipboard::Buffer buffer_type = ui::Clipboard::BUFFER_STANDARD;
- if (!ConvertBufferType(buffer, &buffer_type))
- return 0;
-
-@@ -112,7 +112,7 @@ bool WebClipboardImpl::isFormatAvailable
-
- WebVector<WebString> WebClipboardImpl::readAvailableTypes(
- Buffer buffer, bool* contains_filenames) {
-- ui::Clipboard::Buffer buffer_type;
-+ ui::Clipboard::Buffer buffer_type = ui::Clipboard::BUFFER_STANDARD;
- std::vector<base::string16> types;
- if (ConvertBufferType(buffer, &buffer_type)) {
- client_->ReadAvailableTypes(buffer_type, &types, contains_filenames);
-@@ -121,7 +121,7 @@ WebVector<WebString> WebClipboardImpl::r
- }
-
- WebString WebClipboardImpl::readPlainText(Buffer buffer) {
-- ui::Clipboard::Buffer buffer_type;
-+ ui::Clipboard::Buffer buffer_type = ui::Clipboard::BUFFER_STANDARD;
- if (!ConvertBufferType(buffer, &buffer_type))
- return WebString();
-
-@@ -147,7 +147,7 @@ WebString WebClipboardImpl::readPlainTex
- WebString WebClipboardImpl::readHTML(Buffer buffer, WebURL* source_url,
- unsigned* fragment_start,
- unsigned* fragment_end) {
-- ui::Clipboard::Buffer buffer_type;
-+ ui::Clipboard::Buffer buffer_type = ui::Clipboard::BUFFER_STANDARD;
- if (!ConvertBufferType(buffer, &buffer_type))
- return WebString();
-
-@@ -161,7 +161,7 @@ WebString WebClipboardImpl::readHTML(Buf
- }
-
- WebData WebClipboardImpl::readImage(Buffer buffer) {
-- ui::Clipboard::Buffer buffer_type;
-+ ui::Clipboard::Buffer buffer_type = ui::Clipboard::BUFFER_STANDARD;
- if (!ConvertBufferType(buffer, &buffer_type))
- return WebData();
-
-@@ -172,7 +172,7 @@ WebData WebClipboardImpl::readImage(Buff
-
- WebString WebClipboardImpl::readCustomData(Buffer buffer,
- const WebString& type) {
-- ui::Clipboard::Buffer buffer_type;
-+ ui::Clipboard::Buffer buffer_type = ui::Clipboard::BUFFER_STANDARD;
- if (!ConvertBufferType(buffer, &buffer_type))
- return WebString();
-
diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/unistd-2.patch b/recipes-browser/chromium/chromium-29.0.1518.2/unistd-2.patch
deleted file mode 100644
index 6b5018b..0000000
--- a/recipes-browser/chromium/chromium-29.0.1518.2/unistd-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/chrome/browser/memory_details_linux.cc b/chrome/browser/memory_details_linux.cc
-index bee24ce..299f237 100644
---- a/chrome/browser/memory_details_linux.cc
-+++ b/chrome/browser/memory_details_linux.cc
-@@ -7,6 +7,10 @@
- #include <map>
- #include <set>
-
-+#if defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-+
- #include "base/bind.h"
- #include "base/process_util.h"
- #include "base/string_util.h"
-diff --git a/ipc/ipc_channel.h b/ipc/ipc_channel.h
-index 14c375b..345f9eb 100644
---- a/ipc/ipc_channel.h
-+++ b/ipc/ipc_channel.h
-@@ -10,6 +10,7 @@
-
- #if defined(OS_POSIX)
- #include <sys/types.h>
-+#include <unistd.h>
- #endif
-
- #include "base/compiler_specific.h"
diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/x86-64/include.gypi b/recipes-browser/chromium/chromium-29.0.1518.2/x86-64/include.gypi
deleted file mode 100644
index c2e2a7d..0000000
--- a/recipes-browser/chromium/chromium-29.0.1518.2/x86-64/include.gypi
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- 'variables': {
- 'target_arch': 'x64',
- }
-}
diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/x86-64/oe-defaults.gypi b/recipes-browser/chromium/chromium-29.0.1518.2/x86-64/oe-defaults.gypi
deleted file mode 100644
index 0a6e8e8..0000000
--- a/recipes-browser/chromium/chromium-29.0.1518.2/x86-64/oe-defaults.gypi
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- 'variables': {
- 'use_system_bzip2': 1,
- 'disable_nacl': 1,
- 'proprietary_codecs': 0,
- 'v8_use_snapshot': 1,
- 'use_system_ffmpeg': 0,
- 'linux_use_tcmalloc': 1,
- 'linux_link_kerberos': 0,
- 'use_kerberos': 0,
- 'use_cups': 0,
- 'use_gnome_keyring': 0,
- 'linux_link_gnome_keyring': 0,
- },
-}
diff --git a/recipes-browser/chromium/chromium_29.0.1518.2.bb b/recipes-browser/chromium/chromium_29.0.1518.2.bb
index c8e8aa9..185b679 100644
--- a/recipes-browser/chromium/chromium_29.0.1518.2.bb
+++ b/recipes-browser/chromium/chromium_29.0.1518.2.bb
@@ -1,72 +1,18 @@
DESCRIPTION = "Chromium browser"
+
+include chromium.inc
+
+
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d2d164565cc10f298390174d9cb6d18d"
-DEPENDS = "xz-native pciutils pulseaudio xextproto cairo nss gtk+ zlib-native libav libxi libgnome-keyring libxss cups ninja-native gconf"
-SRC_URI = "\
- http://gsdview.appspot.com/chromium-browser-official/${P}.tar.xz \
- file://include.gypi \
- file://oe-defaults.gypi \
+
+SRC_URI += "\
file://unistd-2.patch \
- file://google-chrome \
- file://google-chrome.desktop \
file://uninitialised-warning.patch \
"
SRC_URI[md5sum] = "2480c3fd109ef000575629acb8a906ca"
SRC_URI[sha256sum] = "7f08624f7d9bd120de0043da7ee09985ae6b6990d22d8c1b1f7c66fd4ed681a1"
-# include.gypi exists only for armv6 and armv7a and there isn't something like COMPATIBLE_ARCH afaik
-COMPATIBLE_MACHINE = "(-)"
-COMPATIBLE_MACHINE_i586 = "(.*)"
-COMPATIBLE_MACHINE_x86-64 = "(.*)"
-COMPATIBLE_MACHINE_armv6 = "(.*)"
-COMPATIBLE_MACHINE_armv7a = "(.*)"
-
-inherit gettext
-
-EXTRA_OEGYP = " \
- ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '', '-Dlinux_use_gold_binary=0', d)} \
- ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '', '-Dlinux_use_gold_flags=0', d)} \
- -I ${WORKDIR}/oe-defaults.gypi \
- -I ${WORKDIR}/include.gypi \
- -f ninja \
-"
ARMFPABI_armv7a = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'arm_float_abi=hard', 'arm_float_abi=softfp', d)}"
export GYP_DEFINES="${ARMFPABI} release_extra_cflags='-Wno-error=unused-local-typedefs' sysroot=''"
-do_configure() {
- cd ${S}
- # replace LD with CXX, to workaround a possible gyp issue?
- LD="${CXX}" export LD
- CC="${CC}" export CC
- CXX="${CXX}" export CXX
- CC_host="gcc" export CC_host
- CXX_host="g++" export CXX_host
- build/gyp_chromium --depth=. ${EXTRA_OEGYP}
-}
-
-do_compile() {
- # build with ninja
- ninja -C ${S}/out/Release chrome
-}
-
-do_install() {
- install -d ${D}${bindir}
- install -m 0755 ${WORKDIR}/google-chrome ${D}${bindir}/
-
- install -d ${D}${datadir}/applications
- install -m 0644 ${WORKDIR}/google-chrome.desktop ${D}${datadir}/applications/
-
- install -d ${D}${bindir}/chrome/
- install -m 0755 ${S}/out/Release/chrome ${D}${bindir}/chrome/chrome
- install -m 0644 ${S}/out/Release/chrome.pak ${D}${bindir}/chrome/
- install -m 0644 ${S}/out/Release/resources.pak ${D}${bindir}/chrome/
- install -m 0644 ${S}/out/Release/chrome_100_percent.pak ${D}${bindir}/chrome/
- install -m 0644 ${S}/out/Release/product_logo_48.png ${D}${bindir}/chrome/
- install -m 0755 ${S}/out/Release/libffmpegsumo.so ${D}${bindir}/chrome/
-
- install -d ${D}${bindir}/chrome/locales/
- install -m 0644 ${S}/out/Release/locales/en-US.pak ${D}${bindir}/chrome/locales
-}
-
-FILES_${PN} = "${bindir}/chrome/ ${bindir}/google-chrome ${datadir}/applications"
-FILES_${PN}-dbg = "${bindir}/chrome/.debug/"
--
1.8.1.2
More information about the Openembedded-devel
mailing list