chromium: update to 22.0.1229.96; disable nacl for now.

This commit is contained in:
Juan RP 2012-11-05 22:21:25 +01:00
parent dbe659f282
commit 5a33f475ff
6 changed files with 74 additions and 642 deletions

View file

@ -35,10 +35,15 @@ libstdc++.so.6
libgcc_s.so.1 libgcc_s.so.1
libc.so.6 libc.so.6
libXfixes.so.3 libXfixes.so.3
ld-linux-x86-64.so.2
libXcomposite.so.1
libcups.so.2 libcups.so.2
libgcrypt.so.11 libgcrypt.so.11
libFLAC.so.8 libFLAC.so.8
libudev.so.1 libudev.so.1
libatk-1.0.so.0 libatk-1.0.so.0
libgio-2.0.so.0
libicui18n.so.49
libicuuc.so.49
libv8.so
libxml2.so.2
libxslt.so.1
libusb-1.0.so.0

View file

@ -1,554 +0,0 @@
diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y
index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644
--- chromium-21.0.1180.79/third_party/WebKit/Source/WebCore/css/CSSGrammar.y
+++ chromium-21.0.1180.79/third_party/WebKit/Source/WebCore/css/CSSGrammar.y
@@ -53,14 +53,13 @@ using namespace HTMLNames;
#define YYMAXDEPTH 10000
#define YYDEBUG 0
-// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x
-#define YYPARSE_PARAM parser
-#define YYLEX_PARAM parser
-
%}
%pure_parser
+%parse-param { CSSParser* parser }
+%lex-param { CSSParser* parser }
+
%union {
bool boolean;
char character;
@@ -89,7 +88,7 @@ using namespace HTMLNames;
%{
-static inline int cssyyerror(const char*)
+static inline int cssyyerror(void*, const char*)
{
return 1;
}
diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644
--- chromium-21.0.1180.79/third_party/WebKit/Source/WebCore/css/CSSParser.cpp
+++ chromium-21.0.1180.79/third_party/WebKit/Source/WebCore/css/CSSParser.cpp
@@ -114,7 +114,7 @@
extern int cssyydebug;
#endif
-extern int cssyyparse(void* parser);
+extern int cssyyparse(WebCore::CSSParser*);
using namespace std;
using namespace WTF;
diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y
index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644
--- chromium-21.0.1180.79/third_party/WebKit/Source/WebCore/xml/XPathGrammar.y
+++ chromium-21.0.1180.79/third_party/WebKit/Source/WebCore/xml/XPathGrammar.y
@@ -34,6 +34,7 @@
#include "XPathParser.h"
#include "XPathPath.h"
#include "XPathPredicate.h"
+#include "XPathStep.h"
#include "XPathVariableReference.h"
#include <wtf/FastMalloc.h>
@@ -44,8 +45,6 @@
#define YYLTYPE_IS_TRIVIAL 1
#define YYDEBUG 0
#define YYMAXDEPTH 10000
-#define YYPARSE_PARAM parserParameter
-#define PARSER static_cast<Parser*>(parserParameter)
using namespace WebCore;
using namespace XPath;
@@ -53,6 +52,7 @@ using namespace XPath;
%}
%pure_parser
+%parse-param { WebCore::XPath::Parser* parser }
%union
{
@@ -71,7 +71,7 @@ using namespace XPath;
%{
static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
-static void xpathyyerror(const char*) { }
+static void xpathyyerror(void*, const char*) { }
%}
@@ -118,7 +118,7 @@ static void xpathyyerror(const char*) { }
Expr:
OrExpr
{
- PARSER->m_topExpr = $1;
+ parser->m_topExpr = $1;
}
;
@@ -138,7 +138,7 @@ AbsoluteLocationPath:
'/'
{
$$ = new LocationPath;
- PARSER->registerParseNode($$);
+ parser->registerParseNode($$);
}
|
'/' RelativeLocationPath
@@ -150,7 +150,7 @@ AbsoluteLocationPath:
{
$$ = $2;
$$->insertFirstStep($1);
- PARSER->unregisterParseNode($1);
+ parser->unregisterParseNode($1);
}
;
@@ -159,22 +159,22 @@ RelativeLocationPath:
{
$$ = new LocationPath;
$$->appendStep($1);
- PARSER->unregisterParseNode($1);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->registerParseNode($$);
}
|
RelativeLocationPath '/' Step
{
$$->appendStep($3);
- PARSER->unregisterParseNode($3);
+ parser->unregisterParseNode($3);
}
|
RelativeLocationPath DescendantOrSelf Step
{
$$->appendStep($2);
$$->appendStep($3);
- PARSER->unregisterParseNode($2);
- PARSER->unregisterParseNode($3);
+ parser->unregisterParseNode($2);
+ parser->unregisterParseNode($3);
}
;
@@ -183,58 +183,58 @@ Step:
{
if ($2) {
$$ = new Step(Step::ChildAxis, *$1, *$2);
- PARSER->deletePredicateVector($2);
+ parser->deletePredicateVector($2);
} else
$$ = new Step(Step::ChildAxis, *$1);
- PARSER->deleteNodeTest($1);
- PARSER->registerParseNode($$);
+ parser->deleteNodeTest($1);
+ parser->registerParseNode($$);
}
|
NAMETEST OptionalPredicateList
{
String localName;
String namespaceURI;
- if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
- PARSER->m_gotNamespaceError = true;
+ if (!parser->expandQName(*$1, localName, namespaceURI)) {
+ parser->m_gotNamespaceError = true;
YYABORT;
}
if ($2) {
$$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
- PARSER->deletePredicateVector($2);
+ parser->deletePredicateVector($2);
} else
$$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
AxisSpecifier NodeTest OptionalPredicateList
{
if ($3) {
$$ = new Step($1, *$2, *$3);
- PARSER->deletePredicateVector($3);
+ parser->deletePredicateVector($3);
} else
$$ = new Step($1, *$2);
- PARSER->deleteNodeTest($2);
- PARSER->registerParseNode($$);
+ parser->deleteNodeTest($2);
+ parser->registerParseNode($$);
}
|
AxisSpecifier NAMETEST OptionalPredicateList
{
String localName;
String namespaceURI;
- if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
- PARSER->m_gotNamespaceError = true;
+ if (!parser->expandQName(*$2, localName, namespaceURI)) {
+ parser->m_gotNamespaceError = true;
YYABORT;
}
if ($3) {
$$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
- PARSER->deletePredicateVector($3);
+ parser->deletePredicateVector($3);
} else
$$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
- PARSER->deleteString($2);
- PARSER->registerParseNode($$);
+ parser->deleteString($2);
+ parser->registerParseNode($$);
}
|
AbbreviatedStep
@@ -259,23 +259,23 @@ NodeTest:
else if (*$1 == "comment")
$$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
- PARSER->deleteString($1);
- PARSER->registerNodeTest($$);
+ parser->deleteString($1);
+ parser->registerNodeTest($$);
}
|
PI '(' ')'
{
$$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
- PARSER->deleteString($1);
- PARSER->registerNodeTest($$);
+ parser->deleteString($1);
+ parser->registerNodeTest($$);
}
|
PI '(' LITERAL ')'
{
$$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
- PARSER->deleteString($1);
- PARSER->deleteString($3);
- PARSER->registerNodeTest($$);
+ parser->deleteString($1);
+ parser->deleteString($3);
+ parser->registerNodeTest($$);
}
;
@@ -293,14 +293,14 @@ PredicateList:
{
$$ = new Vector<Predicate*>;
$$->append(new Predicate($1));
- PARSER->unregisterParseNode($1);
- PARSER->registerPredicateVector($$);
+ parser->unregisterParseNode($1);
+ parser->registerPredicateVector($$);
}
|
PredicateList Predicate
{
$$->append(new Predicate($2));
- PARSER->unregisterParseNode($2);
+ parser->unregisterParseNode($2);
}
;
@@ -315,7 +315,7 @@ DescendantOrSelf:
SLASHSLASH
{
$$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
- PARSER->registerParseNode($$);
+ parser->registerParseNode($$);
}
;
@@ -323,13 +323,13 @@ AbbreviatedStep:
'.'
{
$$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
- PARSER->registerParseNode($$);
+ parser->registerParseNode($$);
}
|
DOTDOT
{
$$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
- PARSER->registerParseNode($$);
+ parser->registerParseNode($$);
}
;
@@ -337,8 +337,8 @@ PrimaryExpr:
VARIABLEREFERENCE
{
$$ = new VariableReference(*$1);
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
'(' Expr ')'
@@ -349,15 +349,15 @@ PrimaryExpr:
LITERAL
{
$$ = new StringExpression(*$1);
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
NUMBER
{
$$ = new Number($1->toDouble());
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
FunctionCall
@@ -369,8 +369,8 @@ FunctionCall:
$$ = createFunction(*$1);
if (!$$)
YYABORT;
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
FUNCTIONNAME '(' ArgumentList ')'
@@ -378,9 +378,9 @@ FunctionCall:
$$ = createFunction(*$1, *$3);
if (!$$)
YYABORT;
- PARSER->deleteString($1);
- PARSER->deleteExpressionVector($3);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->deleteExpressionVector($3);
+ parser->registerParseNode($$);
}
;
@@ -389,14 +389,14 @@ ArgumentList:
{
$$ = new Vector<Expression*>;
$$->append($1);
- PARSER->unregisterParseNode($1);
- PARSER->registerExpressionVector($$);
+ parser->unregisterParseNode($1);
+ parser->registerExpressionVector($$);
}
|
ArgumentList ',' Argument
{
$$->append($3);
- PARSER->unregisterParseNode($3);
+ parser->unregisterParseNode($3);
}
;
@@ -412,9 +412,9 @@ UnionExpr:
$$ = new Union;
$$->addSubExpression($1);
$$->addSubExpression($3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -430,9 +430,9 @@ PathExpr:
{
$3->setAbsolute(true);
$$ = new Path(static_cast<Filter*>($1), $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
|
FilterExpr DescendantOrSelf RelativeLocationPath
@@ -440,10 +440,10 @@ PathExpr:
$3->insertFirstStep($2);
$3->setAbsolute(true);
$$ = new Path(static_cast<Filter*>($1), $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($2);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($2);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -453,9 +453,9 @@ FilterExpr:
PrimaryExpr PredicateList
{
$$ = new Filter($1, *$2);
- PARSER->unregisterParseNode($1);
- PARSER->deletePredicateVector($2);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->deletePredicateVector($2);
+ parser->registerParseNode($$);
}
;
@@ -465,9 +465,9 @@ OrExpr:
OrExpr OR AndExpr
{
$$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -477,9 +477,9 @@ AndExpr:
AndExpr AND EqualityExpr
{
$$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -489,9 +489,9 @@ EqualityExpr:
EqualityExpr EQOP RelationalExpr
{
$$ = new EqTestOp($2, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -501,9 +501,9 @@ RelationalExpr:
RelationalExpr RELOP AdditiveExpr
{
$$ = new EqTestOp($2, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -513,17 +513,17 @@ AdditiveExpr:
AdditiveExpr PLUS MultiplicativeExpr
{
$$ = new NumericOp(NumericOp::OP_Add, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
|
AdditiveExpr MINUS MultiplicativeExpr
{
$$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -533,9 +533,9 @@ MultiplicativeExpr:
MultiplicativeExpr MULOP UnaryExpr
{
$$ = new NumericOp($2, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -546,8 +546,8 @@ UnaryExpr:
{
$$ = new Negative;
$$->addSubExpression($2);
- PARSER->unregisterParseNode($2);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($2);
+ parser->registerParseNode($$);
}
;
diff --git a/Source/WebCore/xml/XPathParser.cpp b/Source/WebCore/xml/XPathParser.cpp
index 62d8ee37fd6ebb74a580a00c59beb6cd40c5a8b7..b5e6a9237593b4aaa2a243f2ff9d86e57f930a97 100644
--- chromium-21.0.1180.79/third_party/WebKit/Source/WebCore/xml/XPathParser.cpp
+++ chromium-21.0.1180.79/third_party/WebKit/Source/WebCore/xml/XPathParser.cpp
@@ -32,24 +32,21 @@
#include "XPathEvaluator.h"
#include "XPathException.h"
#include "XPathNSResolver.h"
+#include "XPathPath.h"
#include "XPathStep.h"
#include <wtf/StdLibExtras.h>
#include <wtf/text/StringHash.h>
-int xpathyyparse(void*);
-
+using namespace WebCore;
using namespace WTF;
using namespace Unicode;
+using namespace XPath;
-namespace WebCore {
-namespace XPath {
-
-class LocationPath;
-
-#include "XPathGrammar.h"
+extern int xpathyyparse(WebCore::XPath::Parser*);
+#include "XPathGrammar.h"
Parser* Parser::currentParser = 0;
-
+
enum XMLCat { NameStart, NameCont, NotPartOfName };
typedef HashMap<String, Step::Axis> AxisNamesMap;
@@ -630,5 +627,3 @@ void Parser::deleteNodeTest(Step::NodeTest* t)
delete t;
}
-}
-}

View file

@ -1,6 +1,5 @@
diff -upr chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h --- chromium-22.0.1229.96/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-10 10:48:31.000000000 +0300
--- chromium-21.0.1180.79/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-10 10:48:31.000000000 +0300 +++ chromium-22.0.1229.96/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-11 23:44:11.000000000 +0300
+++ chromium-21.0.1180.79/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-11 23:44:11.000000000 +0300
@@ -243,14 +243,13 @@ struct kernel_rusage { @@ -243,14 +243,13 @@ struct kernel_rusage {
long ru_nivcsw; long ru_nivcsw;
}; };

View file

@ -1,27 +0,0 @@
Index: chrome/browser/extensions/lazy_background_task_queue.cc
diff --git a/chrome/browser/extensions/lazy_background_task_queue.cc b/chrome/browser/extensions/lazy_background_task_queue.cc
index b98d44626be848a3a2db04c60ac4cb11ea981243..49bc2229325ce5ba975de4d76347a388a598e86d 100644
--- chromium-21.0.1180.79/chrome/browser/extensions/lazy_background_task_queue.cc
+++ chromium-21.0.1180.79/chrome/browser/extensions/lazy_background_task_queue.cc
@@ -115,14 +115,16 @@ void LazyBackgroundTaskQueue::ProcessPendingTasks(
return;
}
- PendingTasksList* tasks = map_it->second.get();
- for (PendingTasksList::const_iterator it = tasks->begin();
- it != tasks->end(); ++it) {
+ // Swap the pending tasks to a temporary, to avoid problems if the task
+ // list is modified during processing.
+ PendingTasksList tasks;
+ tasks.swap(*map_it->second);
+ for (PendingTasksList::const_iterator it = tasks.begin();
+ it != tasks.end(); ++it) {
it->Run(host);
}
- tasks->clear();
- pending_tasks_.erase(map_it);
+ pending_tasks_.erase(key);
// Balance the keepalive in AddPendingTask. Note we don't do this on a
// failure to load, because the keepalive count is reset in that case.

View file

@ -1,11 +0,0 @@
--- chromium-21.0.1180.79/ppapi/ppapi_untrusted.gyp.orig 2012-06-12 10:20:16.000000000 +0200
+++ chromium-21.0.1180.79/ppapi/ppapi_untrusted.gyp 2012-06-12 10:20:52.000000000 +0200
@@ -80,7 +80,7 @@
],
},
'conditions': [
- ['target_arch!="arm"', {
+ ['target_arch!="arm" and disable_glibc==0', {
'variables': {
'build_glibc': 1,
# NOTE: Use /lib, not /lib64 here; it is a symbolic link which

View file

@ -1,76 +1,96 @@
# Template file for 'chromium' # Template file for 'chromium'
#
# Disable NaCL for now, broken with glibc-2.16.
#_build_nacl=1
pkgname=chromium pkgname=chromium
version=21.0.1180.79 version=22.0.1229.96
_naclsdkver=20.0.1132.47 patch_args="-Np0"
patch_args="-lNp0"
revision=1 revision=1
wrksrc=$pkgname
create_wrksrc=yes
create_srcdir=yes
build_wrksrc=${pkgname}-${version}
depends="desktop-file-utils hicolor-icon-theme"
makedepends="pkg-config which unzip yasm flex gperf perl python
libudev-devel>=138 libpng-devel>=1.5.10 libgcrypt-devel libelf-devel
mit-krb5-devel libXrender-devel libXScrnSaver-devel libXcomposite-devel
libX11-devel libXi-devel gtk+-devel libevent-devel nss-devel alsa-lib-devel
dbus-glib-devel libXdamage-devel libXtst-devel pam-devel libgnome-keyring-devel
libvpx-devel speex-devel libwebp-devel>=0.2.0 pulseaudio-devel cups-devel
hunspell-devel libflac-devel subversion"
if [ "$XBPS_MACHINE" = "x86_64" ]; then
makedepends="${makedepends} gcc-multilib"
fi
short_desc="Google's attempt at creating a safer, faster, and more stable browser" short_desc="Google's attempt at creating a safer, faster, and more stable browser"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.chromium.org/" homepage="http://www.chromium.org/"
license="BSD" license="BSD"
_url_base="http://commondatastorage.googleapis.com" _url_base="http://commondatastorage.googleapis.com"
distfiles=" distfiles="${_url_base}/chromium-browser-official/${pkgname}-${version}.tar.bz2"
${_url_base}/chromium-browser-official/$pkgname-$version.tar.bz2 checksum="dd13a35710e4d756c352e2f36b7936cebd34cbb26b5a1fba352432859a8a46c5"
${_url_base}/nativeclient-mirror/nacl/nacl_sdk/${_naclsdkver}/naclsdk_linux.bz2"
checksum=" if [ -n "${_build_nacl}" ]; then
880971f3958fc586be5ed8ddaa3a8308731c1ae84c3623d9c5fe0ab057bc4ccb distfiles="${distfiles} ${_url_base}/nacl/nacl_sdk/${version}/naclsdk_linux.tar.bz2"
ac371e9e8312f01856e892b29c788acfa03cbb79aaabe0b5a3ae0cd2f8399a91" checksum="${checksum} 85d0a9e2903a1d82b40c5e5a54350df6a5171eb1831f42e1f0e22f3a42e3ca13"
fi
long_desc=" long_desc="
Chromium is an open-source browser project that aims to build a safer, Chromium is an open-source browser project that aims to build a safer,
faster, and more stable way for all Internet users to experience the web. faster, and more stable way for all Internet users to experience the web.
Chromium serves as a base for Google Chrome, which is Chromium rebranded Chromium serves as a base for Google Chrome, which is Chromium rebranded
(name and logo) with very few additions such as usage tracking and an (name and logo) with very few additions such as usage tracking and an
auto-updater system. auto-updater system."
This package contains the Chromium browser." wrksrc=${pkgname}
create_wrksrc=yes
create_srcdir=yes
build_wrksrc=${pkgname}-${version}
depends="desktop-file-utils hicolor-icon-theme"
makedepends="pkg-config which unzip yasm bison25 flex gperf perl python
libudev-devel>=138 libpng-devel>=1.5.10 libgcrypt-devel elfutils-devel
mit-krb5-devel libXrender-devel libXScrnSaver-devel libXcomposite-devel
libX11-devel libXi-devel gtk+-devel libevent-devel nss-devel alsa-lib-devel
dbus-glib-devel libXdamage-devel libXtst-devel pam-devel libgnome-keyring-devel
libvpx-devel speex-devel libwebp-devel>=0.2.0 pulseaudio-devel cups-devel
hunspell-devel libflac-devel icu-devel libxslt-devel libusb-devel v8-devel
subversion"
if [ "$XBPS_MACHINE" = "x86_64" ]; then
makedepends="${makedepends} gcc-multilib"
fi
pre_configure() { pre_configure() {
# http://code.google.com/p/chromium/issues/detail?id=109527 # http://code.google.com/p/chromium/issues/detail?id=109527
sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc
# Unpack nacl, its a POSIX tar archive compressed with bzip2. if [ -n "${_build_nacl}" ]; then
if [ "${XBPS_MACHINE}" != "i686" ]; then ln -s ${wrksrc}/pepper_${version%%.*}/toolchain/linux_x86_newlib \
tar xf ${wrksrc}/naclsdk_linux -C ${wrksrc}
ln -s ${wrksrc}/pepper_${_naclsdkver%%.*}/toolchain/linux_x86_newlib \
native_client/toolchain/linux_x86_newlib native_client/toolchain/linux_x86_newlib
fi fi
} }
do_configure() { do_configure() {
if [ "${XBPS_MACHINE}" = "i686" ]; then if [ -z "${_build_nacl}" ]; then
_nacl="-Ddisable_nacl=1" _nacl="-Ddisable_nacl=1"
fi fi
build/gyp_chromium -f make build/all.gyp --depth=. \ build/gyp_chromium -f make build/all.gyp --depth=. \
-Dwerror= -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ -Dwerror= \
-Drelease_extra_cflags="$CFLAGS" -Dlinux_use_gold_binary=0 \ -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
-Dlinux_use_gold_flags=0 -Dffmpeg_branding=Chrome \ -Drelease_extra_cflags="$CFLAGS" \
-Dproprietary_codecs=1 -Duse_system_libjpeg=1 \ -Dlinux_use_gold_binary=0 \
-Duse_system_libxml=0 -Duse_system_bzip2=1 \ -Dlinux_use_gold_flags=0 \
-Duse_system_zlib=1 -Duse_system_libpng=1 \ -Dffmpeg_branding=Chrome \
-Duse_system_ffmpeg=0 -Duse_system_yasm=1 \ -Dproprietary_codecs=1 \
-Duse_system_libevent=1 -Duse_system_ssl=0 \ -Duse_system_libjpeg=1 \
-Duse_system_xdg_utils=1 -Duse_system_vpx=1 \ -Duse_system_bzip2=1 \
-Duse_system_speex=1 -Duse_system_libwebp=1 \ -Duse_system_flac=1 \
-Duse_hunspell=1 -Duse_system_flac=1 \ -Duse_system_icu=1 \
-Duse_gconf=0 -Ddisable_glibc=1 ${_nacl} -Duse_system_libevent=1 \
-Duse_system_libjpeg=1 \
-Duse_system_libpng=1 \
-Duse_system_libusb=1 \
-Duse_system_libwebp=1 \
-Duse_system_libxml=1 \
-Duse_system_speex=1 \
-Duse_system_v8=1 \
-Duse_system_xdg_utils=1 \
-Duse_system_yasm=1 \
-Duse_system_vpx=1 \
-Duse_system_xdg_utils=1 \
-Duse_system_nss=1 \
-Duse_system_ssl=0 \
-Duse_system_sqlite=0 \
-Duse_gconf=0 \
-Dlinux_use_tcmalloc=0 \ # causes issues with nvidia blob
-Dlinux_link_gsettings=1 \ # avoid dlopen
${_nacl} # disabled for now; broken
} }
do_build() { do_build() {
@ -83,7 +103,7 @@ do_install() {
cp out/Release/{*.pak,libffmpegsumo.so} ${DESTDIR}/usr/lib/chromium cp out/Release/{*.pak,libffmpegsumo.so} ${DESTDIR}/usr/lib/chromium
if [ "${XBPS_MACHINE}" != "i686" ]; then if [ -n "${_build_nacl}" ]; then
cp out/Release/{nacl_helper{,_bootstrap}} \ cp out/Release/{nacl_helper{,_bootstrap}} \
out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \ out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \
${DESTDIR}/usr/lib/chromium ${DESTDIR}/usr/lib/chromium