automatic version update by autodist [release 31.0.1650.63-1mamba;Thu Dec 05 2013]
This commit is contained in:
parent
b362488589
commit
6f6bc1247c
@ -1,2 +1,4 @@
|
||||
# chromium
|
||||
|
||||
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.
|
||||
|
||||
|
12
chromium-15.0.868.1-drop_sse2.patch
Normal file
12
chromium-15.0.868.1-drop_sse2.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -Nru chromium-15.0.868.1.orig/build/common.gypi chromium-15.0.868.1/build/common.gypi
|
||||
--- chromium-15.0.868.1.orig/build/common.gypi 2011-09-02 11:28:24.000000000 +0200
|
||||
+++ chromium-15.0.868.1/build/common.gypi 2011-10-27 15:24:43.455427127 +0200
|
||||
@@ -155,7 +155,7 @@
|
||||
'sysroot%': '',
|
||||
|
||||
# On Linux, we build with sse2 for Chromium builds.
|
||||
- 'disable_sse2%': 0,
|
||||
+ 'disable_sse2%': 1,
|
||||
|
||||
# Use libjpeg-turbo as the JPEG codec used by Chromium.
|
||||
'use_libjpeg_turbo%': 1,
|
20
chromium-15.0.868.1-gyp-fix-build.patch
Normal file
20
chromium-15.0.868.1-gyp-fix-build.patch
Normal file
@ -0,0 +1,20 @@
|
||||
--- chromium-15.0.868.1/chrome.orig/nacl.gypi 2011-09-03 12:31:57.372898877 +0200
|
||||
+++ chromium-15.0.868.1/chrome/nacl.gypi 2011-09-03 12:31:26.474260873 +0200
|
||||
@@ -111,7 +111,7 @@
|
||||
'action_name': 'nacl_irt',
|
||||
'message': 'Building NaCl IRT',
|
||||
'inputs': [
|
||||
- '<!@(<(irt_inputs_cmd) --platform=x86-32)',
|
||||
+ #'<!@(<(irt_inputs_cmd) --platform=x86-32)',
|
||||
],
|
||||
'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_32.nexe'],
|
||||
'action': [
|
||||
@@ -127,7 +127,7 @@
|
||||
'action_name': 'nacl_irt',
|
||||
'message': 'Building NaCl IRT',
|
||||
'inputs': [
|
||||
- '<!@(<(irt_inputs_cmd) --platform=x86-64)',
|
||||
+ #'<!@(<(irt_inputs_cmd) --platform=x86-64)',
|
||||
],
|
||||
'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_64.nexe'],
|
||||
'action': [
|
24
chromium-19.0.1084.2-libavformat-0.8.patch
Normal file
24
chromium-19.0.1084.2-libavformat-0.8.patch
Normal file
@ -0,0 +1,24 @@
|
||||
diff -ru chromium-19.0.1084.2.patched/media/ffmpeg/file_protocol.cc chromium-19.0.1084.2/media/ffmpeg/file_protocol.cc
|
||||
--- chromium-19.0.1084.2.patched/media/ffmpeg/file_protocol.cc 2012-04-05 15:38:33.771296613 +0200
|
||||
+++ chromium-19.0.1084.2/media/ffmpeg/file_protocol.cc 2012-03-29 03:41:49.000000000 +0200
|
||||
@@ -74,7 +78,7 @@
|
||||
URLProtocol kFFmpegFileProtocol = {
|
||||
"file",
|
||||
&OpenContext,
|
||||
- NULL, // url_open2
|
||||
+// NULL, // url_open2
|
||||
&ReadContext,
|
||||
&WriteContext,
|
||||
&SeekContext,
|
||||
diff -ru chromium-19.0.1084.2.patched/media/filters/ffmpeg_glue.cc chromium-19.0.1084.2/media/filters/ffmpeg_glue.cc
|
||||
--- chromium-19.0.1084.2.patched/media/filters/ffmpeg_glue.cc 2012-04-05 15:39:31.017541846 +0200
|
||||
+++ chromium-19.0.1084.2/media/filters/ffmpeg_glue.cc 2012-03-29 03:41:49.000000000 +0200
|
||||
@@ -114,7 +118,7 @@
|
||||
static URLProtocol kFFmpegURLProtocol = {
|
||||
kProtocol,
|
||||
&OpenContext,
|
||||
- NULL, // url_open2
|
||||
+// NULL, // url_open2
|
||||
&ReadContext,
|
||||
&WriteContext,
|
||||
&SeekContext,
|
26
chromium-20.0.1132.43-fix_sqlite_history_Segfault_1.patch
Normal file
26
chromium-20.0.1132.43-fix_sqlite_history_Segfault_1.patch
Normal file
@ -0,0 +1,26 @@
|
||||
--- trunk/src/third_party/sqlite/amalgamation/sqlite3.c 2012/06/12 18:07:00 141686
|
||||
+++ trunk/src/third_party/sqlite/amalgamation/sqlite3.c 2012/06/12 18:13:09 141687
|
||||
@@ -119149,13 +119149,13 @@
|
||||
Fts3SegReader **ppReader /* OUT: SegReader for pending-terms */
|
||||
){
|
||||
Fts3SegReader *pReader = 0; /* Fts3SegReader object to return */
|
||||
+ Fts3HashElem *pE; /* Iterator variable */
|
||||
Fts3HashElem **aElem = 0; /* Array of term hash entries to scan */
|
||||
int nElem = 0; /* Size of array at aElem */
|
||||
int rc = SQLITE_OK; /* Return Code */
|
||||
|
||||
if( isPrefix ){
|
||||
int nAlloc = 0; /* Size of allocated array at aElem */
|
||||
- Fts3HashElem *pE = 0; /* Iterator variable */
|
||||
|
||||
for(pE=fts3HashFirst(&p->pendingTerms); pE; pE=fts3HashNext(pE)){
|
||||
char *zKey = (char *)fts3HashKey(pE);
|
||||
@@ -119187,7 +119187,7 @@
|
||||
}
|
||||
|
||||
}else{
|
||||
- Fts3HashElem *pE = fts3HashFindElem(&p->pendingTerms, zTerm, nTerm);
|
||||
+ pE = fts3HashFindElem(&p->pendingTerms, zTerm, nTerm);
|
||||
if( pE ){
|
||||
aElem = &pE;
|
||||
nElem = 1;
|
26
chromium-20.0.1132.43-fix_sqlite_history_Segfault_2.patch
Normal file
26
chromium-20.0.1132.43-fix_sqlite_history_Segfault_2.patch
Normal file
@ -0,0 +1,26 @@
|
||||
--- trunk/src/third_party/sqlite/src/ext/fts3/fts3_write.c 2012/06/12 18:07:00 141686
|
||||
+++ trunk/src/third_party/sqlite/src/ext/fts3/fts3_write.c 2012/06/12 18:13:09 141687
|
||||
@@ -1238,13 +1238,13 @@
|
||||
Fts3SegReader **ppReader /* OUT: SegReader for pending-terms */
|
||||
){
|
||||
Fts3SegReader *pReader = 0; /* Fts3SegReader object to return */
|
||||
+ Fts3HashElem *pE; /* Iterator variable */
|
||||
Fts3HashElem **aElem = 0; /* Array of term hash entries to scan */
|
||||
int nElem = 0; /* Size of array at aElem */
|
||||
int rc = SQLITE_OK; /* Return Code */
|
||||
|
||||
if( isPrefix ){
|
||||
int nAlloc = 0; /* Size of allocated array at aElem */
|
||||
- Fts3HashElem *pE = 0; /* Iterator variable */
|
||||
|
||||
for(pE=fts3HashFirst(&p->pendingTerms); pE; pE=fts3HashNext(pE)){
|
||||
char *zKey = (char *)fts3HashKey(pE);
|
||||
@@ -1276,7 +1276,7 @@
|
||||
}
|
||||
|
||||
}else{
|
||||
- Fts3HashElem *pE = fts3HashFindElem(&p->pendingTerms, zTerm, nTerm);
|
||||
+ pE = fts3HashFindElem(&p->pendingTerms, zTerm, nTerm);
|
||||
if( pE ){
|
||||
aElem = &pE;
|
||||
nElem = 1;
|
56
chromium-20.0.1132.43-gcc-4.7.patch
Normal file
56
chromium-20.0.1132.43-gcc-4.7.patch
Normal file
@ -0,0 +1,56 @@
|
||||
Index: seccompsandbox/library.h
|
||||
===================================================================
|
||||
diff --git a/trunk/src/seccompsandbox/library.h b/trunk/src/seccompsandbox/library.h
|
||||
--- a/trunk/src/seccompsandbox/library.h (revision 179)
|
||||
+++ b/trunk/src/seccompsandbox/library.h (working copy)
|
||||
@@ -12,6 +12,7 @@
|
||||
#include <string>
|
||||
#include <string.h>
|
||||
#include <sys/mman.h>
|
||||
+#include <sys/types.h>
|
||||
|
||||
#include "maps.h"
|
||||
|
||||
Index: ipc/ipc_platform_file.cc
|
||||
===================================================================
|
||||
diff --git a/trunk/src/ipc/ipc_platform_file.cc b/trunk/src/ipc/ipc_platform_file.cc
|
||||
--- a/trunk/src/ipc/ipc_platform_file.cc (revision 132784)
|
||||
+++ b/trunk/src/ipc/ipc_platform_file.cc (working copy)
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "ipc/ipc_platform_file.h"
|
||||
|
||||
-#if defined(OS_ANDROID)
|
||||
+#if defined(OS_ANDROID) || defined(OS_POSIX)
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
Index: base/message_pump_libevent.cc
|
||||
===================================================================
|
||||
diff --git a/trunk/src/base/message_pump_libevent.cc b/trunk/src/base/message_pump_libevent.cc
|
||||
--- a/trunk/src/base/message_pump_libevent.cc (revision 132784)
|
||||
+++ b/trunk/src/base/message_pump_libevent.cc (working copy)
|
||||
@@ -6,6 +6,9 @@
|
||||
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
+#if defined(OS_POSIX)
|
||||
+#include <unistd.h>
|
||||
+#endif
|
||||
|
||||
#include "base/auto_reset.h"
|
||||
#include "base/compiler_specific.h"
|
||||
Index: chrome/browser/policy/policy_path_parser_linux.cc
|
||||
===================================================================
|
||||
diff --git a/trunk/src/chrome/browser/policy/policy_path_parser_linux.cc b/trunk/src/chrome/browser/policy/policy_path_parser_linux.cc
|
||||
--- a/trunk/src/chrome/browser/policy/policy_path_parser_linux.cc (revision 132784)
|
||||
+++ b/trunk/src/chrome/browser/policy/policy_path_parser_linux.cc (working copy)
|
||||
@@ -3,6 +3,8 @@
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include <pwd.h>
|
||||
+#include <sys/types.h>
|
||||
+#include <unistd.h>
|
||||
|
||||
#include "chrome/browser/policy/policy_path_parser.h"
|
||||
|
554
chromium-20.0.1132.59-webkit-bison-2.6.patch
Normal file
554
chromium-20.0.1132.59-webkit-bison-2.6.patch
Normal file
@ -0,0 +1,554 @@
|
||||
diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y
|
||||
index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644
|
||||
--- a/Source/WebCore/css/CSSGrammar.y
|
||||
+++ b/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
|
||||
--- a/Source/WebCore/css/CSSParser.cpp
|
||||
+++ b/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
|
||||
--- a/Source/WebCore/xml/XPathGrammar.y
|
||||
+++ b/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
|
||||
--- a/Source/WebCore/xml/XPathParser.cpp
|
||||
+++ b/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;
|
||||
}
|
||||
|
||||
-}
|
||||
-}
|
11
chromium-21.0.1168.0-gcc-4.7.patch
Normal file
11
chromium-21.0.1168.0-gcc-4.7.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- chromium-21.0.1168.0/chrome/browser/memory_details_linux.cc.orig 2012-08-29 21:25:27.973193469 +0200
|
||||
+++ chromium-21.0.1168.0/chrome/browser/memory_details_linux.cc 2012-08-29 21:25:54.506900944 +0200
|
||||
@@ -3,7 +3,7 @@
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "chrome/browser/memory_details.h"
|
||||
-
|
||||
+#include <unistd.h>
|
||||
#include <map>
|
||||
#include <set>
|
||||
|
18
chromium-23.0.1271.94-DefaultUsesSystemTheme_KDE.patch
Normal file
18
chromium-23.0.1271.94-DefaultUsesSystemTheme_KDE.patch
Normal file
@ -0,0 +1,18 @@
|
||||
diff -Nru chromium-23.0.1271.94.orig/chrome/browser/ui/gtk/gtk_theme_service.cc chromium-23.0.1271.94/chrome/browser/ui/gtk/gtk_theme_service.cc
|
||||
--- chromium-23.0.1271.94.orig/chrome/browser/ui/gtk/gtk_theme_service.cc 2012-11-21 09:02:30.000000000 +0100
|
||||
+++ chromium-23.0.1271.94/chrome/browser/ui/gtk/gtk_theme_service.cc 2012-11-24 14:29:20.162246291 +0100
|
||||
@@ -615,12 +615,12 @@
|
||||
scoped_ptr<base::Environment> env(base::Environment::Create());
|
||||
|
||||
switch (base::nix::GetDesktopEnvironment(env.get())) {
|
||||
+ case base::nix::DESKTOP_ENVIRONMENT_KDE3:
|
||||
+ case base::nix::DESKTOP_ENVIRONMENT_KDE4:
|
||||
case base::nix::DESKTOP_ENVIRONMENT_GNOME:
|
||||
case base::nix::DESKTOP_ENVIRONMENT_UNITY:
|
||||
case base::nix::DESKTOP_ENVIRONMENT_XFCE:
|
||||
return true;
|
||||
- case base::nix::DESKTOP_ENVIRONMENT_KDE3:
|
||||
- case base::nix::DESKTOP_ENVIRONMENT_KDE4:
|
||||
case base::nix::DESKTOP_ENVIRONMENT_OTHER:
|
||||
return false;
|
||||
}
|
35
chromium-24.0.1285.1-glibc-2.16.patch
Normal file
35
chromium-24.0.1285.1-glibc-2.16.patch
Normal file
@ -0,0 +1,35 @@
|
||||
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-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-10 10:48:31.000000000 +0300
|
||||
+++ chromium-20.0.1132.57/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 {
|
||||
long ru_nivcsw;
|
||||
};
|
||||
|
||||
-struct siginfo;
|
||||
#if defined(__i386__) || defined(__arm__) || defined(__PPC__)
|
||||
|
||||
/* include/asm-{arm,i386,mips,ppc}/signal.h */
|
||||
struct kernel_old_sigaction {
|
||||
union {
|
||||
void (*sa_handler_)(int);
|
||||
- void (*sa_sigaction_)(int, struct siginfo *, void *);
|
||||
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
|
||||
};
|
||||
unsigned long sa_mask;
|
||||
unsigned long sa_flags;
|
||||
@@ -287,13 +286,13 @@ struct kernel_sigaction {
|
||||
unsigned long sa_flags;
|
||||
union {
|
||||
void (*sa_handler_)(int);
|
||||
- void (*sa_sigaction_)(int, struct siginfo *, void *);
|
||||
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
|
||||
};
|
||||
struct kernel_sigset_t sa_mask;
|
||||
#else
|
||||
union {
|
||||
void (*sa_handler_)(int);
|
||||
- void (*sa_sigaction_)(int, struct siginfo *, void *);
|
||||
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
|
||||
};
|
||||
unsigned long sa_flags;
|
||||
void (*sa_restorer)(void);
|
11
chromium-24.0.1312.70-arm-gcc-4.5.3.patch
Normal file
11
chromium-24.0.1312.70-arm-gcc-4.5.3.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- chromium-24.0.1312.70/media/filters/decrypting_audio_decoder.cc.orig 2013-02-18 17:15:21.657687025 +0100
|
||||
+++ chromium-24.0.1312.70/media/filters/decrypting_audio_decoder.cc 2013-02-18 17:17:18.375879916 +0100
|
||||
@@ -30,7 +30,7 @@
|
||||
// Out of sync of 100ms would be pretty noticeable and we should keep any
|
||||
// drift below that.
|
||||
const int64 kOutOfSyncThresholdInMicroseconds = 100000;
|
||||
- return std::abs(timestamp_1.InMicroseconds() - timestamp_2.InMicroseconds()) >
|
||||
+ return std::abs((long int)(timestamp_1.InMicroseconds() - timestamp_2.InMicroseconds())) >
|
||||
kOutOfSyncThresholdInMicroseconds;
|
||||
}
|
||||
|
21
chromium-26.0.1410.49-speech_dispatcher.patch
Normal file
21
chromium-26.0.1410.49-speech_dispatcher.patch
Normal file
@ -0,0 +1,21 @@
|
||||
--- chromium-26.0.1410.49/build/linux/system.gyp.orig 2013-04-02 04:43:16.280176535 +0200
|
||||
+++ chromium-26.0.1410.49/build/linux/system.gyp 2013-04-02 04:54:14.653591574 +0200
|
||||
@@ -460,6 +460,9 @@
|
||||
'../../base/base.gyp:base',
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
+ 'cflags': [
|
||||
+ '<!@(<(pkg-config) --cflags speech-dispatcher)',
|
||||
+ ],
|
||||
'include_dirs': [
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
],
|
||||
@@ -494,7 +497,7 @@
|
||||
'--name', 'LibSpeechdLoader',
|
||||
'--output-h', '<(output_h)',
|
||||
'--output-cc', '<(output_cc)',
|
||||
- '--header', '<libspeechd.h>',
|
||||
+ '--header', '<speech-dispatcher/libspeechd.h>',
|
||||
'--link-directly=<(linux_link_libspeechd)',
|
||||
'spd_open',
|
||||
'spd_say',
|
10
chromium-26.0.1410.63-arm-sysroot.patch
Normal file
10
chromium-26.0.1410.63-arm-sysroot.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- a/build/common.gypi 2013-01-09 07:02:00.000000000 -0700
|
||||
+++ b/build/common.gypi 2013-01-11 20:09:13.380197474 -0700
|
||||
@@ -594,7 +594,7 @@
|
||||
'linux_use_gold_flags%': 0,
|
||||
# sysroot needs to be an absolute path otherwise it generates
|
||||
# incorrect results when passed to pkg-config
|
||||
- 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot',
|
||||
+ #'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot',
|
||||
}], # OS=="linux" and target_arch=="arm" and chromeos==0
|
||||
],
|
10
chromium-67069-gcc45.patch
Normal file
10
chromium-67069-gcc45.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- chromium.orig/src/breakpad/src/tools/linux/md2core/minidump-2-core.cc
|
||||
+++ chromium/src/breakpad/src/tools/linux/md2core/minidump-2-core.cc
|
||||
@@ -43,6 +43,7 @@
|
||||
#include <sys/mman.h>
|
||||
#include <sys/user.h>
|
||||
#include <unistd.h>
|
||||
+#include <sys/stat.h>
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
19
chromium-master_preferences
Normal file
19
chromium-master_preferences
Normal file
@ -0,0 +1,19 @@
|
||||
{
|
||||
"homepage" : "http://www.openmamba.org",
|
||||
"homepage_is_newtabpage" : true,
|
||||
"distribution": {
|
||||
"skip_first_run_ui": false,
|
||||
"create_all_shortcuts": true,
|
||||
"import_history": false,
|
||||
"import_bookmarks": false,
|
||||
"import_home_page": false,
|
||||
"import_search_engine": false,
|
||||
"do_not_launch_chrome": false,
|
||||
"oem_bubble": false
|
||||
},
|
||||
"first_run_tabs": [
|
||||
"http://www.openmamba.org",
|
||||
"http://welcome_page",
|
||||
"http://new_tab_page"
|
||||
]
|
||||
}
|
11
chromium-r78967-allow_continue_build.patch
Normal file
11
chromium-r78967-allow_continue_build.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- chromium-r78967/tools/gyp/pylib/gyp/generator/make.py.orig 2011-03-26 18:24:40.599711053 +0100
|
||||
+++ chromium-r78967/tools/gyp/pylib/gyp/generator/make.py 2011-03-26 18:25:12.518328105 +0100
|
||||
@@ -249,7 +249,7 @@
|
||||
# so we can check their command lines.
|
||||
# $? -- new prerequisites
|
||||
# $| -- order-only dependencies
|
||||
-prereq_changed = $(filter-out $|,$?)
|
||||
+prereq_changed = $(filter-out FORCE_DO_CMD $|,$?)
|
||||
|
||||
# do_cmd: run a command via the above cmd_foo names, if necessary.
|
||||
# Should always run for a given target to handle command-line changes.
|
469
chromium.spec
Normal file
469
chromium.spec
Normal file
@ -0,0 +1,469 @@
|
||||
Name: chromium
|
||||
Epoch: 3
|
||||
Version: 31.0.1650.63
|
||||
Release: 1mamba
|
||||
Summary: An open-source browser project that aims to build a safer, faster, and more stable way to experience the web
|
||||
Group: Graphical Desktop/Applications/Internet
|
||||
Vendor: openmamba
|
||||
Distribution: openmamba
|
||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: http://www.chromium.org
|
||||
# Note:
|
||||
# we usually package the stable release. you may find the latest version number here: http://googlechromereleases.blogspot.it/"
|
||||
# Find latest release starting here:
|
||||
# http://gsdview.appspot.com/chromium-browser-official/?marker=chromium-21.0.1168.0.tar.bz
|
||||
Source: http://gsdview.appspot.com/chromium-browser-official/chromium-%{version}.tar.xz
|
||||
Source1: %{name}-master_preferences
|
||||
Patch0: %{name}-67069-gcc45.patch
|
||||
Patch1: %{name}-r78967-allow_continue_build.patch
|
||||
Patch2: %{name}-23.0.1271.94-DefaultUsesSystemTheme_KDE.patch
|
||||
Patch3: %{name}-15.0.868.1-gyp-fix-build.patch
|
||||
Patch4: %{name}-15.0.868.1-drop_sse2.patch
|
||||
Patch5: %{name}-19.0.1084.2-libavformat-0.8.patch
|
||||
Patch6: %{name}-20.0.1132.43-gcc-4.7.patch
|
||||
Patch7: %{name}-20.0.1132.43-fix_sqlite_history_Segfault_1.patch
|
||||
Patch8: %{name}-20.0.1132.43-fix_sqlite_history_Segfault_2.patch
|
||||
Patch9: %{name}-20.0.1132.59-webkit-bison-2.6.patch
|
||||
Patch10: chromium-21.0.1168.0-gcc-4.7.patch
|
||||
Patch11: chromium-24.0.1285.1-glibc-2.16.patch
|
||||
Patch12: chromium-24.0.1312.70-arm-gcc-4.5.3.patch
|
||||
Patch13: chromium-26.0.1410.49-speech_dispatcher.patch
|
||||
Patch14: chromium-26.0.1410.63-arm-sysroot.patch
|
||||
License: BSD
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: GConf-devel
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: libalsa-devel
|
||||
BuildRequires: libatk-devel
|
||||
BuildRequires: libbzip2-devel
|
||||
BuildRequires: libcairo-devel
|
||||
BuildRequires: libcups-devel
|
||||
BuildRequires: libdbus-devel
|
||||
BuildRequires: libevent-devel
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: libflac-devel
|
||||
BuildRequires: libfontconfig-devel
|
||||
BuildRequires: libfreetype-devel
|
||||
BuildRequires: libgcc
|
||||
BuildRequires: libgcrypt-devel
|
||||
BuildRequires: libgdk-pixbuf-devel
|
||||
BuildRequires: libglib-devel
|
||||
BuildRequires: libgtk2-devel
|
||||
BuildRequires: libnspr-devel
|
||||
BuildRequires: libnss-devel
|
||||
BuildRequires: libpango-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libspeex-devel
|
||||
BuildRequires: libstdc++6-devel
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libXcomposite-devel
|
||||
BuildRequires: libXext-devel
|
||||
BuildRequires: libXfixes-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: libXrender-devel
|
||||
BuildRequires: libXScrnSaver-devel
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: udev-devel
|
||||
BuildRequires: xdg-utils
|
||||
## AUTOBUILDREQ-END
|
||||
BuildRequires: libpthread-stubs-devel
|
||||
BuildRequires: libgnome-keyring-devel
|
||||
BuildRequires: gperf
|
||||
BuildRequires: flex
|
||||
BuildRequires: bison
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: yasm
|
||||
BuildRequires: libdbus-glib-devel
|
||||
BuildRequires: libXi-devel
|
||||
BuildRequires: libXxf86vm-devel
|
||||
BuildRequires: libXdamage-devel
|
||||
BuildRequires: libkrb5-devel
|
||||
BuildRequires: libe2fs-devel
|
||||
BuildRequires: speech-dispatcher-devel >= 0.8-2mamba
|
||||
BuildRequires: python-markupsafe
|
||||
Requires(post): %{__install_info}
|
||||
Requires: xdg-utils
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
|
||||
# latest releases code version visible here: http://src.chromium.org/viewvc/chrome/releases/
|
||||
# create release tarball with: (requires gclient from depot_tools)
|
||||
# gclient config http://src.chromium.org/svn/releases/%{majver}
|
||||
# gclient sync --force
|
||||
# python src/tools/export_tarball/export_tarball.py --remove-nonessential-files chromium-%{version}
|
||||
|
||||
%debug_package
|
||||
|
||||
%description
|
||||
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.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
# -D -T
|
||||
#:<< ___EOF
|
||||
#mv home/chrome-svn/tarball/chromium/src/* .
|
||||
#rm -rf home
|
||||
%patch0 -p2
|
||||
#%patch1 -p1
|
||||
#%patch2 -p1
|
||||
#%patch3 -p1
|
||||
%patch4 -p1
|
||||
#%patch5 -p1
|
||||
#%patch6 -p3
|
||||
#%patch7 -p2
|
||||
#%patch8 -p2
|
||||
#cd third_party/WebKit
|
||||
#%patch9 -p1
|
||||
#cd ../../
|
||||
#%patch10 -p1
|
||||
#%patch11 -p1
|
||||
%if "%{_distrib_codename}" == "milestone2-build10"
|
||||
%ifarch arm
|
||||
%patch12 -p1
|
||||
%endif
|
||||
%endif
|
||||
#%patch13 -p1
|
||||
%patch14 -p1
|
||||
|
||||
%build
|
||||
#:<< ___EOF
|
||||
ln -sf %{_bindir}/ld.gold third_party/gold/ld.gold
|
||||
ln -sf %{_bindir}/ld.bfd third_party/gold/ld.bfd
|
||||
%ifarch x86_64
|
||||
ln -sf %{_bindir}/ld.gold third_party/gold/gold64
|
||||
%else
|
||||
ln -sf %{_bindir}/ld.gold third_party/gold/gold32
|
||||
%endif
|
||||
%ifarch arm
|
||||
#export GYP_DEFINES="$GYP_DEFINES target_arch=arm disable_nacl=1 linux_use_tcmalloc=0 armv7=1 arm_neon=0 arm_thumb=1 arm_fpu=vfpv3-d16"
|
||||
export GYP_DEFINES="$GYP_DEFINES target_arch=arm linux_use_tcmalloc=0 armv7=1 arm_neon=0 arm_thumb=1 arm_fpu=vfp"
|
||||
export ARMIFY="-march=armv7-a -mtune=cortex-a9 -mfloat-abi=softfp -mfpu=vfp -msoft-float"
|
||||
export BACKTRACE="-funwind-tables -rdynamic"
|
||||
export CC="%{_build}-gcc $BACKTRACE $ARMIFY -B%{_bindir}/ld.gold"
|
||||
export CXX="%{_build}-g++ $BACKTRACE $ARMIFY -B%{_bindir}/ld.gold"
|
||||
%else
|
||||
export GYP_DEFINES="linux_use_gold_binary=1 linux_use_gold_flags=0"
|
||||
%endif
|
||||
export GYP_GENERATORS=make
|
||||
./build/gyp_chromium -Dwerror= --depth . \
|
||||
-Dlinux_sandbox_path=/opt/chromium/chrome-sandbox \
|
||||
-Ddisable_nacl=1 \
|
||||
-Duse_system_xdg_utils=1 \
|
||||
-Duse_system_zlib=0 \
|
||||
-Duse_system_libpng=1 \
|
||||
-Duse_system_bzip2=1 \
|
||||
-Duse_system_libbz2=1 \
|
||||
-Duse_system_libjpeg=0 \
|
||||
-Duse_system_libxml=1 \
|
||||
-Duse_system_libxslt=1 \
|
||||
-Duse_system_libevent=1 \
|
||||
-Duse_system_yasm=1 \
|
||||
-Duse_system_flac=1 \
|
||||
-Duse_system_speex=1 \
|
||||
-Duse_system_vpx=1 \
|
||||
-Dsystem_libdir=%{_lib} \
|
||||
-Dffmpeg_branding=Chromium \
|
||||
-Dremove_webcore_debug_symbols=1 \
|
||||
-Dlinux_fpic=1 \
|
||||
-Ddisable_sse2=1 \
|
||||
-Drelease_extra_cflags=-fPIC \
|
||||
-Dno_strict_aliasing=1 \
|
||||
%ifarch arm
|
||||
-Denable_webrtc=0 \
|
||||
%endif
|
||||
%ifnarch arm
|
||||
-Duse_proprietary_codecs=1
|
||||
%endif
|
||||
|
||||
# -Duse_system_zlib=0: see http://code.google.com/p/chromium/issues/detail?id=143623
|
||||
|
||||
# -Duse_system_ffmpeg=1 \
|
||||
# -Duse_system_libjpeg=1 currently requires libjpeg-turbo >= 1.1.90
|
||||
# -Duse_system_ssl=1 \
|
||||
# -Duse_system_sqlite=1
|
||||
# -Duse_system_icu=1 \
|
||||
|
||||
#___EOF
|
||||
|
||||
%make BUILDTYPE=Release chrome V=1
|
||||
|
||||
# Build the required SUID SANDBOX helper
|
||||
%make BUILDTYPE=Release chrome_sandbox V=1
|
||||
|
||||
%install
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
#cd src
|
||||
install -d -m0755 %{buildroot}/opt/chromium/ %{buildroot}%{_bindir}
|
||||
install -m0755 out/Release/chrome %{buildroot}/opt/chromium/
|
||||
install -m0755 out/Release/chrome_sandbox %{buildroot}/opt/chromium/chrome-sandbox
|
||||
cp out/Release/*.pak %{buildroot}/opt/chromium/
|
||||
install -m0755 chrome/tools/build/linux/chrome-wrapper %{buildroot}/opt/chromium/
|
||||
#install -m0755 out/Release/ffmpegsumo_nolink %{buildroot}/opt/chromium/
|
||||
install -m0644 out/Release/libffmpegsumo.so %{buildroot}/opt/chromium/
|
||||
install -m0755 third_party/xdg-utils/scripts/xdg-settings %{buildroot}/opt/chromium/xdg-settings
|
||||
#%ifnarch arm
|
||||
#install -m0755 out/Release/gen* %{buildroot}/opt/chromium/
|
||||
#install -m0755 out/Release/re2c %{buildroot}/opt/chromium/
|
||||
#install -m0755 out/Release/yasm %{buildroot}/opt/chromium/
|
||||
##install -m0755 out/Release/ncdecode* %{buildroot}/opt/chromium/
|
||||
#%endif
|
||||
install -m0755 out/Release/protoc %{buildroot}/opt/chromium/
|
||||
install -m0644 out/Release/resources.pak %{buildroot}/opt/chromium/
|
||||
install -D -m0644 out/Release/chrome.1 %{buildroot}%{_mandir}/man1/chrome.1
|
||||
install -D -m0644 chrome/app/theme/chromium/product_logo_48.png %{buildroot}%{_datadir}/pixmaps/chrome.png
|
||||
cp -a out/Release/locales %{buildroot}/opt/chromium/
|
||||
|
||||
ln -s /opt/chromium/chrome-wrapper %{buildroot}%{_bindir}/chromium
|
||||
ln -s /opt/chromium/chrome-wrapper %{buildroot}%{_bindir}/chrome
|
||||
|
||||
mkdir -p %{buildroot}%{_datadir}/applications
|
||||
cat > %{buildroot}%{_datadir}/applications/chromium-devel.desktop << EOF
|
||||
[Desktop Entry]
|
||||
Name=Chromium Browser
|
||||
Name[it]=Browser Chromium
|
||||
GenericName=Web Browser
|
||||
GenericName[it]=Browser Web
|
||||
Comment=An open-source browser to help move the web forward
|
||||
Comment[it]=Un browser open source pensato per un web più moderno
|
||||
Exec=chromium --password-store=detect --ignore-gpu-blacklist %u
|
||||
Type=Application
|
||||
Terminal=0
|
||||
Icon=%{_datadir}/pixmaps/chrome.png
|
||||
Categories=Network;
|
||||
MimeType=text/html;
|
||||
X-KDE-StartupNotify=true
|
||||
EOF
|
||||
|
||||
cat > %{buildroot}%{_datadir}/applications/chromium-accelerated.desktop << EOF
|
||||
[Desktop Entry]
|
||||
Name=Chromium Browser (not GPU accelerated)
|
||||
Name[it]=Browser Chromium (senza accelerazioni GPU)
|
||||
GenericName=Web Browser
|
||||
GenericName[it]=Browser Web
|
||||
Comment=An open-source browser to help move the web forward
|
||||
Comment[it]=Un browser open source pensato per un web più moderno
|
||||
Exec=chromium --password-store=detect %u
|
||||
Type=Application
|
||||
Terminal=0
|
||||
Icon=/usr/share/pixmaps/chrome.png
|
||||
Categories=Network;
|
||||
MimeType=text/html;
|
||||
X-KDE-StartupNotify=true
|
||||
EOF
|
||||
|
||||
# install master_preferences file for first run and homepage customization
|
||||
install -m0644 %{SOURCE1} %{buildroot}/opt/chromium/master_preferences
|
||||
|
||||
#%find_lang %{name}
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
if [ $1 -ge 1 ]; then
|
||||
[ -e %{_kde4_bindir}/kickoffcfg ] && \
|
||||
%{_kde4_bindir}/kickoffcfg --add-favorite %{_datadir}/applications/chromium-devel.desktop
|
||||
fi
|
||||
:
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
if [ $1 -eq 0 ]; then
|
||||
[ -e %{_kde4_bindir}/kickoffcfg ] && \
|
||||
%{_kde4_bindir}/kickoffcfg --del-favorite %{_datadir}/applications/chromium-devel.desktop
|
||||
fi
|
||||
:
|
||||
|
||||
%clean
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/chromium
|
||||
%{_bindir}/chrome
|
||||
%{_datadir}/applications/chromium-devel.desktop
|
||||
%{_datadir}/applications/chromium-accelerated.desktop
|
||||
%{_datadir}/pixmaps/chrome.png
|
||||
%dir /opt/chromium
|
||||
/opt/chromium/chrome
|
||||
/opt/chromium/*.pak
|
||||
/opt/chromium/chrome-wrapper
|
||||
%attr(4755,root,root) /opt/chromium/chrome-sandbox
|
||||
#/opt/chromium/ffmpegsumo_nolink
|
||||
/opt/chromium/libffmpegsumo.so
|
||||
/opt/chromium/master_preferences
|
||||
/opt/chromium/xdg-settings
|
||||
#%ifnarch arm
|
||||
#/opt/chromium/ncdecode*
|
||||
#%endif
|
||||
/opt/chromium/protoc
|
||||
#%ifnarch arm
|
||||
#/opt/chromium/gen*
|
||||
#/opt/chromium/re2c
|
||||
#/opt/chromium/yasm
|
||||
#%endif
|
||||
/opt/chromium/locales
|
||||
#/opt/chromium/resources
|
||||
%{_mandir}/man1/chrome.1*
|
||||
|
||||
%changelog
|
||||
* Thu Dec 05 2013 Automatic Build System <autodist@mambasoft.it> 31.0.1650.63-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sat Nov 16 2013 Automatic Build System <autodist@mambasoft.it> 31.0.1650.57-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Fri Nov 15 2013 Automatic Build System <autodist@mambasoft.it> 31.0.1650.48-2mamba
|
||||
- previous release was build with a bad rpm release
|
||||
|
||||
* Thu Nov 14 2013 Automatic Build System <autodist@mambasoft.it> 31.0.1650.48-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Mon Oct 28 2013 Automatic Build System <autodist@mambasoft.it> 30.0.1599.114-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Fri Oct 04 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 30.0.1599.66-2mamba
|
||||
- install chrome_sandbox as chrome-sandbox as required since this version
|
||||
|
||||
* Thu Oct 03 2013 Automatic Build System <autodist@mambasoft.it> 30.0.1599.66-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Thu Sep 19 2013 Automatic Build System <autodist@mambasoft.it> 29.0.1547.76-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Tue Sep 10 2013 Automatic Build System <autodist@mambasoft.it> 29.0.1547.65-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Fri Aug 02 2013 Automatic Build System <autodist@mambasoft.it> 28.0.1500.95-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sat Jul 20 2013 Automatic Build System <autodist@mambasoft.it> 28.0.1500.71-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Thu Jun 20 2013 Automatic Build System <autodist@mambasoft.it> 28.0.1500.52-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Wed Jun 19 2013 Automatic Build System <autodist@mambasoft.it> 28.0.1500.45-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Wed May 22 2013 Automatic Build System <autodist@mambasoft.it> 27.0.1453.93-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Wed Apr 10 2013 Automatic Build System <autodist@mambasoft.it> 26.0.1410.63-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Wed Mar 27 2013 Automatic Build System <autodist@mambasoft.it> 26.0.1410.49-1mamba
|
||||
- update to 26.0.1410.49
|
||||
|
||||
* Fri Feb 22 2013 Automatic Build System <autodist@mambasoft.it> 25.0.1364.97-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Wed Feb 13 2013 Automatic Build System <autodist@mambasoft.it> 24.0.1312.70-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Fri Feb 08 2013 Automatic Build System <autodist@mambasoft.it> 24.0.1312.69-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sat Feb 02 2013 Automatic Build System <autodist@mambasoft.it> 24.0.1312.57-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Thu Jan 24 2013 Automatic Build System <autodist@mambasoft.it> 24.0.1312.56-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Fri Jan 11 2013 Automatic Build System <autodist@mambasoft.it> 24.0.1312.52-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sat Dec 15 2012 Automatic Build System <autodist@mambasoft.it> 23.0.1271.97-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sun Dec 02 2012 Automatic Build System <autodist@mambasoft.it> 23.0.1271.95-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Fri Nov 23 2012 Automatic Build System <autodist@mambasoft.it> 23.0.1271.94-1mamba
|
||||
- update to 23.0.1271.94
|
||||
|
||||
* Mon Oct 15 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 21.0.1180.92-1mamba
|
||||
- update to 21.0.1180.92
|
||||
|
||||
* Mon Aug 27 2012 Automatic Build System <autodist@mambasoft.it> 21.0.1168.0-1mamba
|
||||
- update to 21.0.1168.0
|
||||
|
||||
* Sat Aug 18 2012 Automatic Build System <autodist@mambasoft.it> 20.0.1132.59-1mamba
|
||||
- update to 20.0.1132.59
|
||||
|
||||
* Sat Jun 30 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 20.0.1132.43-2mamba
|
||||
- applied sqlite patches to prevent crash in history (http://code.google.com/p/chromium/issues/detail?id=122525)
|
||||
- also provide /usr/bin/chrome symlink for session manager to find it at login
|
||||
|
||||
* Mon Jun 25 2012 Automatic Build System <autodist@mambasoft.it> 20.0.1132.43-1mamba
|
||||
- update to 20.0.1132.43
|
||||
|
||||
* Wed Jun 06 2012 Automatic Build System <autodist@mambasoft.it> 20.0.1132.27-1mamba
|
||||
- update to 20.0.1132.27
|
||||
|
||||
* Fri May 18 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 20.0.1132.12-1mamba
|
||||
- update to 20.0.1132.12
|
||||
|
||||
* Fri May 18 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 21.0.1141.0-1mamba
|
||||
- update to 21.0.1141.0
|
||||
|
||||
* Tue Apr 10 2012 Automatic Build System <autodist@mambasoft.it> 20.0.1096.1-1mamba
|
||||
- update to 20.0.1096.1
|
||||
|
||||
* Thu Mar 29 2012 Automatic Build System <autodist@mambasoft.it> 19.0.1084.2-1mamba
|
||||
- update to 19.0.1084.2
|
||||
|
||||
* Sat Jan 07 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 18.0.998.0-2mamba
|
||||
- added various experimental build options
|
||||
- enabled sandbox
|
||||
|
||||
* Fri Jan 06 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 18.0.998.0-1mamba
|
||||
- update to 18.0.998.0
|
||||
|
||||
* Fri Jan 06 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 18.0.997.0-1mamba
|
||||
- update to 18.0.997.0
|
||||
|
||||
* Wed Nov 09 2011 Silvan Calarco <silvan.calarco@mambasoft.it> 17.0.932.0-1mamba
|
||||
- update to 17.0.932.0
|
||||
|
||||
* Mon Oct 31 2011 Silvan Calarco <silvan.calarco@mambasoft.it> 15.0.868.1-3mamba
|
||||
- install xdg-settings script to enable default browser setting functionality using system xdg-utils
|
||||
- add missing semicolon to MimeType in .desktop files for XDG standard compliance
|
||||
|
||||
* Thu Oct 27 2011 Silvan Calarco <silvan.calarco@mambasoft.it> 15.0.868.1-2mamba
|
||||
- added patch to drop sse2 support to work with CPU which do not support it (see http://code.google.com/p/chromium/issues/detail?id=9007)
|
||||
|
||||
* Sat Sep 03 2011 Silvan Calarco <silvan.calarco@mambasoft.it> 15.0.868.1-1mamba
|
||||
- update to 15.0.868.1
|
||||
|
||||
* Sat Jul 16 2011 Silvan Calarco <silvan.calarco@mambasoft.it> r92735-1mamba
|
||||
- update to r92735
|
||||
|
||||
* Mon Jul 04 2011 Silvan Calarco <silvan.calarco@mambasoft.it> r91189-1mamba
|
||||
- update to r91189
|
||||
|
||||
* Wed Jun 01 2011 Silvan Calarco <silvan.calarco@mambasoft.it> r87437-1mamba
|
||||
- update to r87437
|
||||
- configure as kickoff menu favorite
|
||||
|
||||
* Tue Mar 29 2011 Silvan Calarco <silvan.calarco@mambasoft.it> r79660-1mamba
|
||||
- update to r79660
|
||||
- desktop file: add --password-store=detect
|
||||
- set arm_fpu=vfpv3-d16 for arm target
|
||||
- use default system theme (GTK+) with KDE (added patch)
|
||||
|
||||
* Tue Mar 22 2011 Silvan Calarco <silvan.calarco@mambasoft.it> r78967-1mamba
|
||||
- update to r78967
|
||||
|
||||
* Wed Mar 16 2011 Silvan Calarco <silvan.calarco@mambasoft.it> r78333-1mamba
|
||||
- update to r78333
|
||||
|
||||
* Mon Jan 31 2011 Silvan Calarco <silvan.calarco@mambasoft.it> r73127-1mamba
|
||||
- update to r73127
|
||||
|
||||
* Sat Nov 27 2010 Silvan Calarco <silvan.calarco@mambasoft.it> 9.0.594.0-1mamba
|
||||
- update to 9.0.594.0
|
||||
|
||||
* Fri Nov 26 2010 Silvan Calarco <silvan.calarco@mambasoft.it> 67069-2mamba
|
||||
- install xdg support files and other tools
|
||||
- launch via chrome-wrapper to start with right environment
|
||||
|
||||
* Thu Nov 25 2010 Silvan Calarco <silvan.calarco@mambasoft.it> 67069-1mamba
|
||||
- package created by autospec
|
Loading…
Reference in New Issue
Block a user