ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

get rid of old webkit and webkit_gtk2 packages

Browse Source
This commit is contained in:
宋文武 2014-03-30 09:02:07 +08:00
parent 59124ddf95
commit d14b9e9850
11 changed files with 5 additions and 801 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

515
pkgs/development/libraries/webkit/bison26.patch
View File

@ -1,515 +0,0 @@
Index: /trunk/Source/WebCore/ChangeLog
===================================================================
--- /trunk/Source/WebCore/ChangeLog (revision 124098)
+++ /trunk/Source/WebCore/ChangeLog (revision 124099)
@@ -1,2 +1,27 @@
+2012-07-30 Alexis Menard <alexis.menard@openbossa.org>
+
+ Build fix with newer bison 2.6.
+ https://bugs.webkit.org/show_bug.cgi?id=92264
+
+ Reviewed by Adam Barth.
+
+ As stated in http://www.gnu.org/software/bison/manual/html_node/Table-of-Symbols.html
+ YYLEX_PARAM and YYPARSE_PARAM are depecreated since version 1.875. So far all Mac OS
+ version I had access to as well as recent Linux runs at least version 2.3 so it's safe
+ to use the replacement of these deprecated macros in favor of %lex-param and %parse-param.
+ As announced http://lists.gnu.org/archive/html/info-gnu/2012-07/msg00011.html with the release
+ of version 2.6 YYLEX_PARAM and YYPARSE_PARAM are not supported anymore.
+
+ No new tests : build fix and the patch should not trigger any regressions
+
+ * css/CSSGrammar.y:
+ * css/CSSParser.cpp:
+ * xml/XPathGrammar.y: Refactored a bit to not use an intermediate PARSER define.
+ * xml/XPathParser.cpp: bison 2.6 declare xpathyyparse in the .h file now, i.e. XPathGrammar.h
+ therefore including this file within the namespace {} declarations leads to xpathyyparse being
+ defined part of WebCore::XPath namespaces but the actual implementation of xpathyyparse is in XPathGrammar.cpp
+ (generated) and not implemented within the WebCore::XPath so it lead to linking issues. Last, XPathGrammar.h needs
+ to be included after the other includes as it uses some XPath types. It breaks the style but CSSParser.cpp is doing the same.
+
2012-07-30 Sadrul Habib Chowdhury <sadrul@chromium.org>
Index: /trunk/Source/WebCore/css/CSSParser.cpp
===================================================================
--- /trunk/Source/WebCore/css/CSSParser.cpp (revision 124098)
+++ /trunk/Source/WebCore/css/CSSParser.cpp (revision 124099)
@@ -115,5 +115,5 @@
#endif
-extern int cssyyparse(void* parser);
+extern int cssyyparse(WebCore::CSSParser*);
using namespace std;
Index: /trunk/Source/WebCore/css/CSSGrammar.y
===================================================================
--- /trunk/Source/WebCore/css/CSSGrammar.y (revision 124098)
+++ /trunk/Source/WebCore/css/CSSGrammar.y (revision 124099)
@@ -54,11 +54,10 @@
#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 {
@@ -90,5 +89,5 @@
%{
-static inline int cssyyerror(const char*)
+static inline int cssyyerror(void*, const char*)
{
return 1;
Index: /trunk/Source/WebCore/xml/XPathParser.cpp
===================================================================
--- /trunk/Source/WebCore/xml/XPathParser.cpp (revision 124098)
+++ /trunk/Source/WebCore/xml/XPathParser.cpp (revision 124099)
@@ -33,22 +33,19 @@
#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;
-
-namespace WebCore {
-namespace XPath {
-
-class LocationPath;
-
-#include "XPathGrammar.h"
+using namespace XPath;
+
+extern int xpathyyparse(WebCore::XPath::Parser*);
+#include "XPathGrammar.h"
Parser* Parser::currentParser = 0;
-
+
enum XMLCat { NameStart, NameCont, NotPartOfName };
@@ -631,4 +628,2 @@
}
-}
-}
Index: /trunk/Source/WebCore/xml/XPathGrammar.y
===================================================================
--- /trunk/Source/WebCore/xml/XPathGrammar.y (revision 124098)
+++ /trunk/Source/WebCore/xml/XPathGrammar.y (revision 124099)
@@ -35,4 +35,5 @@
#include "XPathPath.h"
#include "XPathPredicate.h"
+#include "XPathStep.h"
#include "XPathVariableReference.h"
#include <wtf/FastMalloc.h>
@@ -45,6 +46,4 @@
#define YYDEBUG 0
#define YYMAXDEPTH 10000
-#define YYPARSE_PARAM parserParameter
-#define PARSER static_cast<Parser*>(parserParameter)
using namespace WebCore;
@@ -54,4 +53,5 @@
%pure_parser
+%parse-param { WebCore::XPath::Parser* parser }
%union
@@ -72,5 +72,5 @@
static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
-static void xpathyyerror(const char*) { }
+static void xpathyyerror(void*, const char*) { }
%}
@@ -119,5 +119,5 @@
OrExpr
{
- PARSER->m_topExpr = $1;
+ parser->m_topExpr = $1;
}
;
@@ -139,5 +139,5 @@
{
$$ = new LocationPath;
- PARSER->registerParseNode($$);
+ parser->registerParseNode($$);
}
|
@@ -151,5 +151,5 @@
$$ = $2;
$$->insertFirstStep($1);
- PARSER->unregisterParseNode($1);
+ parser->unregisterParseNode($1);
}
;
@@ -160,6 +160,6 @@
$$ = new LocationPath;
$$->appendStep($1);
- PARSER->unregisterParseNode($1);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->registerParseNode($$);
}
|
@@ -167,5 +167,5 @@
{
$$->appendStep($3);
- PARSER->unregisterParseNode($3);
+ parser->unregisterParseNode($3);
}
|
@@ -174,6 +174,6 @@
$$->appendStep($2);
$$->appendStep($3);
- PARSER->unregisterParseNode($2);
- PARSER->unregisterParseNode($3);
+ parser->unregisterParseNode($2);
+ parser->unregisterParseNode($3);
}
;
@@ -184,9 +184,9 @@
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($$);
}
|
@@ -195,6 +195,6 @@
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;
}
@@ -202,9 +202,9 @@
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($$);
}
|
@@ -213,9 +213,9 @@
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($$);
}
|
@@ -224,6 +224,6 @@
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;
}
@@ -231,9 +231,9 @@
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($$);
}
|
@@ -260,6 +260,6 @@
$$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
- PARSER->deleteString($1);
- PARSER->registerNodeTest($$);
+ parser->deleteString($1);
+ parser->registerNodeTest($$);
}
|
@@ -267,6 +267,6 @@
{
$$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
- PARSER->deleteString($1);
- PARSER->registerNodeTest($$);
+ parser->deleteString($1);
+ parser->registerNodeTest($$);
}
|
@@ -274,7 +274,7 @@
{
$$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
- PARSER->deleteString($1);
- PARSER->deleteString($3);
- PARSER->registerNodeTest($$);
+ parser->deleteString($1);
+ parser->deleteString($3);
+ parser->registerNodeTest($$);
}
;
@@ -294,6 +294,6 @@
$$ = new Vector<Predicate*>;
$$->append(new Predicate($1));
- PARSER->unregisterParseNode($1);
- PARSER->registerPredicateVector($$);
+ parser->unregisterParseNode($1);
+ parser->registerPredicateVector($$);
}
|
@@ -301,5 +301,5 @@
{
$$->append(new Predicate($2));
- PARSER->unregisterParseNode($2);
+ parser->unregisterParseNode($2);
}
;
@@ -316,5 +316,5 @@
{
$$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
- PARSER->registerParseNode($$);
+ parser->registerParseNode($$);
}
;
@@ -324,5 +324,5 @@
{
$$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
- PARSER->registerParseNode($$);
+ parser->registerParseNode($$);
}
|
@@ -330,5 +330,5 @@
{
$$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
- PARSER->registerParseNode($$);
+ parser->registerParseNode($$);
}
;
@@ -338,6 +338,6 @@
{
$$ = new VariableReference(*$1);
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
@@ -350,6 +350,6 @@
{
$$ = new StringExpression(*$1);
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
@@ -357,6 +357,6 @@
{
$$ = new Number($1->toDouble());
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
@@ -370,6 +370,6 @@
if (!$$)
YYABORT;
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
@@ -379,7 +379,7 @@
if (!$$)
YYABORT;
- PARSER->deleteString($1);
- PARSER->deleteExpressionVector($3);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->deleteExpressionVector($3);
+ parser->registerParseNode($$);
}
;
@@ -390,6 +390,6 @@
$$ = new Vector<Expression*>;
$$->append($1);
- PARSER->unregisterParseNode($1);
- PARSER->registerExpressionVector($$);
+ parser->unregisterParseNode($1);
+ parser->registerExpressionVector($$);
}
|
@@ -397,5 +397,5 @@
{
$$->append($3);
- PARSER->unregisterParseNode($3);
+ parser->unregisterParseNode($3);
}
;
@@ -413,7 +413,7 @@
$$->addSubExpression($1);
$$->addSubExpression($3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -431,7 +431,7 @@
$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($$);
}
|
@@ -441,8 +441,8 @@
$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($$);
}
;
@@ -454,7 +454,7 @@
{
$$ = new Filter($1, *$2);
- PARSER->unregisterParseNode($1);
- PARSER->deletePredicateVector($2);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->deletePredicateVector($2);
+ parser->registerParseNode($$);
}
;
@@ -466,7 +466,7 @@
{
$$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -478,7 +478,7 @@
{
$$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -490,7 +490,7 @@
{
$$ = new EqTestOp($2, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -502,7 +502,7 @@
{
$$ = new EqTestOp($2, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -514,7 +514,7 @@
{
$$ = new NumericOp(NumericOp::OP_Add, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
|
@@ -522,7 +522,7 @@
{
$$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -534,7 +534,7 @@
{
$$ = new NumericOp($2, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -547,6 +547,6 @@
$$ = new Negative;
$$->addSubExpression($2);
- PARSER->unregisterParseNode($2);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($2);
+ parser->registerParseNode($$);
}
;

106
pkgs/development/libraries/webkit/default.nix
View File

@ -1,106 +0,0 @@
args : with args;
let
s = import ./src-for-default.nix; # 1.8.3 needs newer gtk3, wait for x-updates
version = lib.attrByPath ["version"] s.version args;
in
rec {
src = fetchurl {
url = s.url;
sha256 = s.hash;
};
buildInputs = with xlibs; [
pkgconfig libtool intltool autoconf automake gperf bison flex
gtk3 gtk2 glib atk cairo pango fontconfig freetype libsoup gtkdoc
libjpeg libpng libtiff libxml2 libxslt sqlite icu curl
which libproxy geoclue enchant python ruby perl
mesa libXt libXrender renderproto libXcomposite compositeproto
libXdamage damageproto kbproto
];
propagatedBuildInputs = [
gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good
];
configureFlags = [
# "--enable-3D-transforms" # no longer recognized
"--enable-web-sockets"
"--enable-web-timing"
# https://bugs.webkit.org/show_bug.cgi?id=55294
"--enable-image-resizer"
"--enable-geolocation"
# Not implemented?
# "--enable-web-audio"
"--enable-mathml"
#"--enable-wml"
# https://bugs.webkit.org/show_bug.cgi?id=45110
#"--enable-indexed-database"
# Doesn't work in release...
#"--enable-xhtmlmp"
# "--enable-input-speech"
#"--enable-file-writer" # no longer recognized
"--enable-blob"
# https://bugs.webkit.org/show_bug.cgi?id=59430
# "--enable-directory-upload"
# https://bugs.webkit.org/show_bug.cgi?id=58443
# "--enable-file-system"
"--enable-dependency-tracking" # to fix parallel building
];
# instead of enableParallelBuilding = true;
makeFlags = "-j$NIX_BUILD_CORES";
/* doConfigure should be specified separately */
phaseNames = ["doPatch" "fixConfigure" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".")
"doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
patches = [ ./bison26.patch ]; # http://trac.webkit.org/changeset/124099
patchFlags = "-p2";
#doCheck = true; # tests still have problems
doReplaceUsrBin = fullDepEntry (''
for i in $(find . -name '*.pl') $(find . -name '*.pm'); do
sed -e 's@/usr/bin/gcc@gcc@' -i $i
done
'') ["minInit" "doUnpack"];
doAddPrograms = fullDepEntry (''
mkdir -p $out/bin
for i in Programs/.libs/* Programs/*; do
cp $i $out/bin/webkit-program-$(basename $i) || true
done
'') ["minInit" "doMake" "defEnsureDir"];
paranoidFixComments = fullDepEntry (''
sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h')
'') ["minInit" "doUnpack"];
# See http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2012-April/022893.html
fixConfigure = fullDepEntry (''
sed -i -e 's/=GSTREAMER_0_10_REQUIRED_VERSION/=\$GSTREAMER_0_10_REQUIRED_VERSION/' \
-e 's/=GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION/=\$GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION/' \
configure{,.ac}
'') ["minInit" "doUnpack"];
name = s.name;
meta = {
description = "WebKit - a fast and correct HTML renderer";
maintainers = [stdenv.lib.maintainers.raskin];
};
passthru = {
inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg libsoup;
};
}

109
pkgs/development/libraries/webkit/gtk2.nix
View File

@ -1,109 +0,0 @@
args : with args;
let
s = import ./src-for-gtk2.nix;
version = lib.attrByPath ["version"] s.version args;
in
rec {
src = fetchurl {
url = s.url;
sha256 = s.hash;
};
buildInputs = with xlibs; [
pkgconfig libtool intltool autoconf automake gperf bison flex
gtk2 glib atk cairo pango fontconfig freetype libsoup gtkdoc
libjpeg libpng libtiff libxml2 libxslt sqlite icu curl
which libproxy geoclue enchant python ruby perl
mesa libXt libXrender renderproto libXcomposite compositeproto
libXdamage damageproto kbproto
];
propagatedBuildInputs = [
gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good
];
configureFlags = [
"--with-gtk=2.0"
# "--enable-3D-transforms" # no longer recognized
"--enable-web-sockets"
"--enable-web-timing"
# https://bugs.webkit.org/show_bug.cgi?id=55294
"--enable-image-resizer"
"--enable-geolocation"
# Not implemented?
# "--enable-web-audio"
"--enable-mathml"
#"--enable-wml"
# https://bugs.webkit.org/show_bug.cgi?id=45110
#"--enable-indexed-database"
# Doesn't work in release...
#"--enable-xhtmlmp"
# "--enable-input-speech"
#"--enable-file-writer" # no longer recognized
"--enable-blob"
# https://bugs.webkit.org/show_bug.cgi?id=59430
# "--enable-directory-upload"
# https://bugs.webkit.org/show_bug.cgi?id=58443
# "--enable-file-system"
"--enable-dependency-tracking" # to fix parallel building
];
# instead of enableParallelBuilding = true;
makeFlags = "-j$NIX_BUILD_CORES";
/* doConfigure should be specified separately */
phaseNames = ["doPatch" "fixConfigure" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".")
"doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
patches = [ ./bison26.patch ]; # http://trac.webkit.org/changeset/124099
patchFlags = "-p2";
#doCheck = true; # tests still have problems
doReplaceUsrBin = fullDepEntry (''
for i in $(find . -name '*.pl') $(find . -name '*.pm'); do
sed -e 's@/usr/bin/gcc@gcc@' -i $i
done
'') ["minInit" "doUnpack"];
doAddPrograms = fullDepEntry (''
mkdir -p $out/bin
for i in Programs/.libs/* Programs/*; do
cp $i $out/bin/webkit-program-$(basename $i) || true
done
'') ["minInit" "doMake" "defEnsureDir"];
paranoidFixComments = fullDepEntry (''
sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h')
'') ["minInit" "doUnpack"];
# See http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2012-April/022893.html
fixConfigure = fullDepEntry (''
sed -i -e 's/=GSTREAMER_0_10_REQUIRED_VERSION/=\$GSTREAMER_0_10_REQUIRED_VERSION/' \
-e 's/=GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION/=\$GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION/' \
configure{,.ac}
'') ["minInit" "doUnpack"];
name = s.name;
meta = {
description = "WebKit - a fast and correct HTML renderer";
maintainers = [stdenv.lib.maintainers.raskin];
};
passthru = {
inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg libsoup;
};
}

10
pkgs/development/libraries/webkit/src-for-default.nix
View File

@ -1,10 +0,0 @@
rec {
version="1.8.1";
name="webkit-1.8.1";
hash="0a1v3v8dp2cl332qr51j4fpl0rwpgxbf29hn3zdim9hcniv6l4ls";
url="http://webkitgtk.org/releases/webkit-1.8.1.tar.xz";
advertisedUrl="http://webkitgtk.org/releases/webkit-1.8.1.tar.xz";
}

10
pkgs/development/libraries/webkit/src-for-gtk2.nix
View File

@ -1,10 +0,0 @@
rec {
version="1.8.1";
name="webkit-1.8.1";
hash="0a1v3v8dp2cl332qr51j4fpl0rwpgxbf29hn3zdim9hcniv6l4ls";
url="http://webkitgtk.org/releases/webkit-1.8.1.tar.xz";
advertisedUrl="http://webkitgtk.org/releases/webkit-1.8.1.tar.xz";
}

9
pkgs/development/libraries/webkit/src-for-svn.nix
View File

@ -1,9 +0,0 @@
rec {
version="r86499";
name="webkit-r86499";
hash="04sfwri81x2d9y3z0v7rhrr40vn0bxcbnhb8a0gymqkwa1ngpzmp";
url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r86499.tar.bz2";
advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r86499.tar.bz2";
}

6
pkgs/development/libraries/webkit/src-info-for-default.nix
View File

@ -1,6 +0,0 @@
{
downloadPage = "http://webkitgtk.org/?page=download";
versionExtractorSedScript = "s/.*-([.0-9]+)[.].*/\\1/";
versionReferenceCreator = "s/-([.0-9.]+)[.]/-\${version}./";
baseName = "webkit";
}

6
pkgs/development/libraries/webkit/src-info-for-svn.nix
View File

@ -1,6 +0,0 @@
{
downloadPage = "http://nightly.webkit.org/";
versionExtractorSedScript = "s/.*-(r[0-9]+)[.].*/\\1/";
versionReferenceCreator = "s/-(r[0-9.]+)[.]/-\${version}./";
baseName = "webkit";
}

32
pkgs/top-level/all-packages.nix
View File

@ -5909,28 +5909,7 @@ let
wayland = callPackage ../development/libraries/wayland { };
webkit =
builderDefsPackage ../development/libraries/webkit {
inherit gtk2; # for plugins etc. even with gtk3, see Gentoo ebuild
inherit gtk3 glib atk cairo pango fontconfig freetype;
inherit (gnome) gtkdoc libsoup;
inherit pkgconfig libtool intltool autoconf automake gperf flex
libjpeg libpng libtiff libxml2 libxslt sqlite icu curl
which libproxy geoclue enchant python ruby perl mesa xlibs;
inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good;
bison = bison2;
};
webkit_gtk2 =
builderDefsPackage ../development/libraries/webkit/gtk2.nix {
inherit gtk2 glib atk cairo pango fontconfig freetype;
inherit (gnome) gtkdoc libsoup;
inherit pkgconfig libtool intltool autoconf automake gperf flex
libjpeg libpng libtiff libxml2 libxslt sqlite icu curl
which libproxy geoclue enchant python ruby perl mesa xlibs;
inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good;
bison = bison2;
};
webkit = webkitgtk;
webkitgtk = callPackage ../development/libraries/webkitgtk {
harfbuzz = harfbuzz.override {
@ -9064,8 +9043,7 @@ let
});
surf = callPackage ../applications/misc/surf {
libsoup = gnome.libsoup;
webkit = webkit_gtk2;
webkit = webkitgtk2;
};
svk = perlPackages.SVK;
@ -10612,8 +10590,7 @@ let
vimPlugins = callPackage ../misc/vim-plugins { };
vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 {
inherit (gnome) libsoup;
webkit = webkit_gtk2;
webkit = webkitgtk2;
};
vimprobable2Wrapper = wrapFirefox
@ -10621,8 +10598,7 @@ let
};
vimb = callPackage ../applications/networking/browsers/vimb {
inherit (gnome) libsoup;
webkit = webkit_gtk2;
webkit = webkitgtk2;
};
vimbWrapper = wrapFirefox {

2
pkgs/top-level/python-packages.nix
View File

@ -5848,7 +5848,7 @@ rec {
};
buildInputs = with pkgs; [
pkgconfig python gtk2 pygtk libxml2 libxslt libsoup webkit_gtk2 icu
pkgconfig python gtk2 pygtk libxml2 libxslt libsoup webkitgtk2 icu
];
meta = {

1
pkgs/top-level/release-python.nix
View File

@ -1724,7 +1724,6 @@ let
wavesurfer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
wdfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
webkit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
webkit_gtk2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
weechat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
welkin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
wesnoth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };