sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (d3d86651b3036441bc30aaa32a7dcd5ae02bc5a1)
- From: Eric Sandall <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (d3d86651b3036441bc30aaa32a7dcd5ae02bc5a1)
- Date: Wed, 12 Dec 2012 17:01:21 -0600
GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:
audio-creation/gmorgan/DETAILS | 6
audio-creation/gmorgan/HISTORY | 3
database/tdb/DETAILS | 1
database/tdb/HISTORY | 3
devel/b43-tools/DETAILS | 4
devel/b43-tools/HISTORY | 3
devel/bison/DETAILS | 2
devel/bison/HISTORY | 3
graphics/darktable/DETAILS | 4
graphics/darktable/HISTORY | 3
http/webkitgtk/BUILD | 2
http/webkitgtk/DETAILS | 18
http/webkitgtk/HISTORY | 5
http/webkitgtk/PRE_BUILD | 1
http/webkitgtk/bison-2.6.patch | 515
----------
http/webkitgtk3/DETAILS | 10
http/webkitgtk3/HISTORY | 4
http/webkitgtk3/PRE_BUILD | 1
http/webkitgtk3/bison-2.6.patch | 515
----------
kernels/linux/HISTORY | 4
kernels/linux/info/patches/maintenance_patches_3/patch-3.6.10 | 5
kernels/linux/latest.defaults | 2
python-pypi/decorator/DETAILS | 4
python-pypi/decorator/HISTORY | 3
science/fraqtive/BUILD | 4
science/fraqtive/DETAILS | 4
science/fraqtive/HISTORY | 4
utils/syslog-ng/DETAILS | 4
utils/syslog-ng/HISTORY | 3
utils/xen/DETAILS | 1
utils/xen/HISTORY | 5
utils/xen/init.d/xendomains | 15
32 files changed, 93 insertions(+), 1068 deletions(-)
New commits:
commit f7fc0af65591c87eef43a0155ce57993d8995916
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
devel/bison: version 2.7
commit fc79232d28a85c049729276da4af4a64151dbec0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics/darktable: version 1.1.1
commit e4a94e66a457abe4ac74a5016a92cdf71d6aff01
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
fraqtive 0.4.6
commit 7670ca8163d001463a7cb9d1304718fe8eb57edd
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
tdb: added FTP mirror
commit 7857975cd757a3cd4b5e09ec88e2fbaa95903864
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>
b43-tools: Prometheus summon failure - changed website to git.bues.ch
commit 0f6a441ae3e2db76a60cd9322dca07b528f1e8e4
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>
gmorgan -> 0.57 (Prometheus barfs on old version)
commit b6c9153c8f9eeb9ae900cdad51cc6380ed92cbaa
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xen: corrected detection of running domUs after instant poweroff/reboot
commit 2d9a0d2157823113f1d4b68551374e8f15b3fb5d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
webkitgtk3 1.10.2, SECURITY_PATCH=4
commit 0159a58e053d74a7bb2cd16d70f99906e3ac4481
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
syslog-ng: => 3.3.7
commit 490aec0bfd482fd867963ad943d64a3c8e9884f2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
decorator: => 3.4.0
commit c518318a38b792bdfd7b8e233b23a5c6b0a3de39
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
webkitgtk 1.10.2, SECURITY_PATCH=8
commit 27a232f56ce4b774c100dd778ce295c2b33542bb
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
linux 3.6.10
diff --git a/audio-creation/gmorgan/DETAILS b/audio-creation/gmorgan/DETAILS
index c2068e2..74ceea4 100755
--- a/audio-creation/gmorgan/DETAILS
+++ b/audio-creation/gmorgan/DETAILS
@@ -1,9 +1,9 @@
SPELL=gmorgan
- VERSION=0.25
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=0.57
+ SOURCE=$SPELL'_'$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:d3a24ccad6a18e748ff99fc56f64029f2beb73d335bde9fd9fdb9724618d628248972136594710d3ddd3de6b7c9d7eb42e6ddad10c0bbcfc9654daf50a21404c
+
SOURCE_HASH=sha512:9270232549e6e40efa54f2f9a13ebfd76135084c2cdd04fd6b9982e0e7c4adeeeeed431cb3ccf51754af04c12964b191d4ba3991f50f2f81813d0e6a7a09d197
WEB_SITE=http://gmorgan.sourceforge.net/
ENTERED=20031209
LICENSE[0]=GPL
diff --git a/audio-creation/gmorgan/HISTORY b/audio-creation/gmorgan/HISTORY
index ae66dea..97e65d3 100644
--- a/audio-creation/gmorgan/HISTORY
+++ b/audio-creation/gmorgan/HISTORY
@@ -1,3 +1,6 @@
+2012-12-11 Tommy Boatman <tboatman AT sourcemage.org>
+ * DETAILS: Update to 0.57 to fix Prometheus failure
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/database/tdb/DETAILS b/database/tdb/DETAILS
index e25543a..ed67f15 100755
--- a/database/tdb/DETAILS
+++ b/database/tdb/DETAILS
@@ -3,6 +3,7 @@
SOURCE=$SPELL-$VERSION.tar.gz
# SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://samba.org/ftp/$SPELL/$SOURCE
+ SOURCE_URL[1]=ftp://ftp.samba.org/pub/$SPELL/$SOURCE
# SOURCE2_URL[0]=$SOURCE_URL.asc
# SOURCE_GPG=jelmer.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE_HASH=sha512:fba47db71d0a28eb38cac44a7aa5796d9ee54ab7a9fff3b5a88f9c305cbfb6580173a2cbe3a3ea3484ff0d366b7bc79be78512183216c484246688de5843d3bc
diff --git a/database/tdb/HISTORY b/database/tdb/HISTORY
index 24cbf9e..6498440 100644
--- a/database/tdb/HISTORY
+++ b/database/tdb/HISTORY
@@ -1,3 +1,6 @@
+2012-12-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: added FTP mirror
+
2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.2.11
diff --git a/devel/b43-tools/DETAILS b/devel/b43-tools/DETAILS
index e0800c4..efd9a05 100755
--- a/devel/b43-tools/DETAILS
+++ b/devel/b43-tools/DETAILS
@@ -5,11 +5,11 @@ else
VERSION=git
fi
SOURCE="${SPELL}.tar.bz2"
- SOURCE_URL[0]=git_http://git.bu3sch.de/${SPELL}.git
+ SOURCE_URL[0]=git://git.bues.ch/${SPELL}.git
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
- WEB_SITE="http://bu3sch.de/gitweb?p=b43-tools.git";
+ WEB_SITE="http://git.bues.ch/gitweb?p=${SPELL}.git;a=summary";
LICENSE[0]=GPL
ENTERED=20100331
SHORT="Development tools for the BCM43xx chip"
diff --git a/devel/b43-tools/HISTORY b/devel/b43-tools/HISTORY
index 6c94ef5..d9466aa 100644
--- a/devel/b43-tools/HISTORY
+++ b/devel/b43-tools/HISTORY
@@ -1,3 +1,6 @@
+2012-12-11 Tommy Boatman <tboatman AT sourcemage.org>
+ * DETAILS: website moved to git.bues.ch
+
2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
* PREPARE, DETAILS: Use prepare_select_branch
diff --git a/devel/bison/DETAILS b/devel/bison/DETAILS
index fc0475b..2ce4792 100755
--- a/devel/bison/DETAILS
+++ b/devel/bison/DETAILS
@@ -1,5 +1,5 @@
SPELL=bison
- VERSION=2.6.5
+ VERSION=2.7
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/bison/HISTORY b/devel/bison/HISTORY
index c7718e2..f68020d 100644
--- a/devel/bison/HISTORY
+++ b/devel/bison/HISTORY
@@ -1,3 +1,6 @@
+2012-12-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.7
+
2012-11-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.6.5
diff --git a/graphics/darktable/DETAILS b/graphics/darktable/DETAILS
index 688efcc..1bcb2bb 100755
--- a/graphics/darktable/DETAILS
+++ b/graphics/darktable/DETAILS
@@ -1,9 +1,9 @@
SPELL=darktable
if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
- VERSION=1.1
+ VERSION=1.1.1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/$(echo
$VERSION|cut -f1 -d.).$(echo $VERSION|cut -f2 -d.)/${SOURCE}
-
SOURCE_HASH=sha512:b0ecbaf3bf598fbe99ee58ff7e84e2d81a3f05647e1d4aaa5f4a5c2610c7c9a841cef6d20e52302edc0ab6fc4f4105d96d6070fcbb79f20a0f23a63d927ab24f
+
SOURCE_HASH=sha512:7a525adce3b6bf97c1c7a4fc1553854fb822f6ef80d4487c5ea919f3d78e5dbe8f0c0c3bb8d01b6a6220e91e1aa5055fcf8deb0adfa771b2c9bb6a900299c297
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
else
if [[ "$DARKTABLE_AUTOUPDATE" == "y" ]]; then
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index 3dc99c5..0adeb24 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,6 @@
+2012-12-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.1.1
+
2012-11-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.1
* PRE_BUILD, rsvg.patch: removed
diff --git a/http/webkitgtk/BUILD b/http/webkitgtk/BUILD
index 659d8ed..719a5d9 100755
--- a/http/webkitgtk/BUILD
+++ b/http/webkitgtk/BUILD
@@ -1,5 +1,5 @@
OPTS="$WEBKIT_SVG $WEBKIT_WEBGL $OPTS" &&
-OPTS="--with-gtk=2.0 $OPTS" &&
+OPTS="--with-gtk=2.0 --disable-webkit2 $OPTS" &&
make_single &&
default_build &&
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index b17f0a1..8dfd95e 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,19 +1,19 @@
SPELL=webkitgtk
if [[ $WEBKITGTK_NIGHT == "y" ]]; then
- VERSION=1.8.3
- SOURCE=webkit-$VERSION.tar.xz
+ VERSION=1.10.2
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:4d400cb0dfbde7eadcce52e7a37d2095ec382b65c6c0d4ea4795410dabad771fac0def50875092634075dc0a80043058d2d2913767e59db3e32cf3e13361803f
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
+
SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
else
- VERSION=1.8.3
- SOURCE=webkit-$VERSION.tar.xz
+ VERSION=1.10.2
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:4d400cb0dfbde7eadcce52e7a37d2095ec382b65c6c0d4ea4795410dabad771fac0def50875092634075dc0a80043058d2d2913767e59db3e32cf3e13361803f
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
+
SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
WEB_SITE=http://webkitgtk.org/
- SECURITY_PATCH=7
+ SECURITY_PATCH=8
GATHER_DOCS=off
LICENSE[0]=GPL
ENTERED=20071208
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 5d54db8..469f88e 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,8 @@
+2012-12-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.10.2, SECURITY_PATCH=8, SOURCE: webkit -> webkitgtk
+ * BUILD: --disable-webkit2 added, WebKit2 requires GTK+ 3.x
+ * PRE_BUILD, bison-2.6.patch: patch removed
+
2012-09-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.3, SECURITY_PATCH=7
diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
index 6f1c302..cdd362a 100755
--- a/http/webkitgtk/PRE_BUILD
+++ b/http/webkitgtk/PRE_BUILD
@@ -1,6 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -p2 < "$SPELL_DIRECTORY/bison-2.6.patch" &&
patch -p0 < "$SPELL_DIRECTORY/gtk-doc.patch" &&
patch -p0 < "$SPELL_DIRECTORY/opengl-headers.patch"
diff --git a/http/webkitgtk/bison-2.6.patch b/http/webkitgtk/bison-2.6.patch
deleted file mode 100644
index 95898ad..0000000
--- a/http/webkitgtk/bison-2.6.patch
+++ /dev/null
@@ -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 AT 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 AT 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($$);
- }
- ;
diff --git a/http/webkitgtk3/DETAILS b/http/webkitgtk3/DETAILS
index 8bb01a1..27a7654 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,11 +1,11 @@
SPELL=webkitgtk3
- VERSION=1.8.3
- SOURCE=webkit-$VERSION.tar.xz
+ VERSION=1.10.2
+ SOURCE=webkitgtk-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:4d400cb0dfbde7eadcce52e7a37d2095ec382b65c6c0d4ea4795410dabad771fac0def50875092634075dc0a80043058d2d2913767e59db3e32cf3e13361803f
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
+
SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkitgtk-$VERSION"
WEB_SITE=http://webkitgtk.org/
- SECURITY_PATCH=3
+ SECURITY_PATCH=4
GATHER_DOCS=off
LICENSE[0]=GPL
ENTERED=20101017
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index f0e5059..7e7b187 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,7 @@
+2012-12-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.10.2, SECURITY_PATCH=4, SOURCE: webkit -> webkitgtk
+ * PRE_BUILD, bison-2.6.patch: patch removed
+
2012-09-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.3, SECURITY_PATCH=3
diff --git a/http/webkitgtk3/PRE_BUILD b/http/webkitgtk3/PRE_BUILD
index 6f1c302..cdd362a 100755
--- a/http/webkitgtk3/PRE_BUILD
+++ b/http/webkitgtk3/PRE_BUILD
@@ -1,6 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -p2 < "$SPELL_DIRECTORY/bison-2.6.patch" &&
patch -p0 < "$SPELL_DIRECTORY/gtk-doc.patch" &&
patch -p0 < "$SPELL_DIRECTORY/opengl-headers.patch"
diff --git a/http/webkitgtk3/bison-2.6.patch b/http/webkitgtk3/bison-2.6.patch
deleted file mode 100644
index 95898ad..0000000
--- a/http/webkitgtk3/bison-2.6.patch
+++ /dev/null
@@ -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 AT 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 AT 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($$);
- }
- ;
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index b2c424c..4f53228 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2012-12-10 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.6.10
+ * info/patches/maintenance_patches_3/patch-3.6.10: added
+
2012-12-07 Vlad Glagolev <stealth AT sourcemage.org>
* info/patches/maintenance_patches_3/patch-3.0.{54,55}: added
* info/patches/maintenance_patches_3/patch-3.2.35: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.10
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.10
new file mode 100755
index 0000000..ac25068
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.10
@@ -0,0 +1,5 @@
+appliedkernels="3.6"
+patchversion="${appliedkernels}.10"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="efc9fb174bdb4af06aec2a6937a8ec0d9f280031"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 619876f..2b0a0da 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.6
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.6.9
+LATEST_maintenance_patches_3=patch-3.6.10
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/python-pypi/decorator/DETAILS b/python-pypi/decorator/DETAILS
index 22baacb..136bd39 100755
--- a/python-pypi/decorator/DETAILS
+++ b/python-pypi/decorator/DETAILS
@@ -1,6 +1,6 @@
SPELL=decorator
- VERSION=3.3.2
-
SOURCE_HASH=sha512:de1832741cd22ce652bf05df0b4903ce0e17ebbe4ee9539aaf95ae5624c47651f2982d4e351e92775486c50cd25e0b98ba6436bab93accb22f4d100a56e08401
+ VERSION=3.4.0
+
SOURCE_HASH=sha512:94ae8ff3bf694b72ad85a04d02ed9b58c42d50341fbc7307a12fc5abcb8042d8f67df80b53e63afd4b692c52fbefec83b80b591cba036deee21e281a5e8ff249
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/d/decorator/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/decorator/HISTORY b/python-pypi/decorator/HISTORY
index d1b0e9a..6c1cb2b 100644
--- a/python-pypi/decorator/HISTORY
+++ b/python-pypi/decorator/HISTORY
@@ -1,3 +1,6 @@
+2012-12-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.4.0
+
2012-02-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.3.2
diff --git a/science/fraqtive/BUILD b/science/fraqtive/BUILD
index 6b4b1c6..eec3de4 100755
--- a/science/fraqtive/BUILD
+++ b/science/fraqtive/BUILD
@@ -1,3 +1 @@
-PATH="$QTDIR/bin/qt4:$PATH" &&
-./configure &&
-make
+qt4_build
diff --git a/science/fraqtive/DETAILS b/science/fraqtive/DETAILS
index 7257e8a..02ee133 100755
--- a/science/fraqtive/DETAILS
+++ b/science/fraqtive/DETAILS
@@ -1,6 +1,6 @@
SPELL=fraqtive
- VERSION=0.4.5
-
SOURCE_HASH=sha512:08cc3967d410047e22e79474e055a8957e02c6e269460cf5bf3cd3df4ac07555fb5ea88c9cbc05a67f4c22a2b6ef96056fd76a9e63082bfaf317ecf96dd3a686
+ VERSION=0.4.6
+
SOURCE_HASH=sha512:6661ce09a03f92b8429fd68893a0eea15a9a6b99932e22d82eca886709a475bf8729110c2e6576f851a6a4f8b3e414c2220fcbfc3ef12c80b2dc923165b19d65
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/science/fraqtive/HISTORY b/science/fraqtive/HISTORY
index 78c750b..16bd790 100644
--- a/science/fraqtive/HISTORY
+++ b/science/fraqtive/HISTORY
@@ -1,3 +1,7 @@
+2012-12-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.4.6
+ * BUILD: qt4_build used
+
2009-12-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, PRE_BUILD, BUILD: spell created, version 0.4.5
diff --git a/utils/syslog-ng/DETAILS b/utils/syslog-ng/DETAILS
index 62a8530..5941532 100755
--- a/utils/syslog-ng/DETAILS
+++ b/utils/syslog-ng/DETAILS
@@ -1,6 +1,6 @@
SPELL=syslog-ng
- VERSION=3.3.6
-
SOURCE_HASH=sha512:ffb8f7a355027fad550be365211324da3e0cceed666965be17119bcb59b7f01b61d48c7665d87f4d00e40522c551db4671a4d1d2d2f56a4211963a8aa5dd35c3
+ VERSION=3.3.7
+
SOURCE_HASH=sha512:e75d88b42c93a1b89465ffb19ac82d309ecda8ab4b92509c6ce6bd26e643a755e53f9c66d3ea154d4328a88de91c80a8ea1933c841cbdd0f9aeed121fc436a94
SOURCE=${SPELL}_${VERSION}.tar.gz
# SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/syslog-ng/HISTORY b/utils/syslog-ng/HISTORY
index f796dd5..e6a1874 100644
--- a/utils/syslog-ng/HISTORY
+++ b/utils/syslog-ng/HISTORY
@@ -1,3 +1,6 @@
+2012-12-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.3.7
+
2012-10-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.3.6
diff --git a/utils/xen/DETAILS b/utils/xen/DETAILS
index 8ce05b5..f48118c 100755
--- a/utils/xen/DETAILS
+++ b/utils/xen/DETAILS
@@ -1,6 +1,7 @@
SPELL=xen
VERSION=4.1.3
SECURITY_PATCH=5
+ PATCHLEVEL=1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index 16bd6aa..65146a9 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,3 +1,8 @@
+2012-12-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * init.d/xendomains: corrected detection of running domUs after
instant
+ poweroff/reboot
+
2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added gnutls optional dependency
diff --git a/utils/xen/init.d/xendomains b/utils/xen/init.d/xendomains
index 75cc264..7a4ff0b 100755
--- a/utils/xen/init.d/xendomains
+++ b/utils/xen/init.d/xendomains
@@ -60,13 +60,22 @@ function is_running()
$CMD list "${1}" >/dev/null 2>&1
}
-start()
+function is_running_doms()
+{
+ $CMD list | tail -n +2 | grep -v -E "^Domain-0[[:space:]]+0" > /dev/null
+}
+
+start()
{
check_userland
if [ -f $LOCKFILE ]; then
- echo -e "XEN: xendomains already running (lockfile exists)"
- exit 0
+ if is_running_doms; then
+ echo -e "XEN: xendomains already running (lockfile exists)"
+ exit 0
+ else
+ rm -f $LOCKFILE
+ fi
fi
if [ $(ls ${XENDOMAINS_AUTO} | wc -l) == 0 ]; then
- [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (d3d86651b3036441bc30aaa32a7dcd5ae02bc5a1), Eric Sandall, 12/12/2012
Archive powered by MHonArc 2.6.24.