Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (f810ba6ed540086cc50dedb428b3ed9c269fb36b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (f810ba6ed540086cc50dedb428b3ed9c269fb36b)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (f810ba6ed540086cc50dedb428b3ed9c269fb36b)
  • Date: Sun, 5 Aug 2012 07:17:01 -0500
GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

ChangeLog | 3
dev/null |binary
devel/bison/DETAILS | 2
devel/bison/HISTORY | 3
devel/flex/DETAILS | 4
devel/flex/HISTORY | 3
disk/e2fsprogs/DETAILS | 2
disk/e2fsprogs/HISTORY | 3
disk/fuse/DETAILS | 5
disk/fuse/HISTORY | 6
disk/fuse/PRE_BUILD | 3
disk/fuse/init.patch | 12
disk/fuse/unlock.patch | 71 -----
http/webkitgtk/DETAILS | 10
http/webkitgtk/HISTORY | 5
http/webkitgtk/PRE_BUILD | 1
http/webkitgtk/bison-2.6.patch | 515
++++++++++++++++++++++++++++++++++++++++
http/webkitgtk3/DETAILS | 6
http/webkitgtk3/HISTORY | 5
http/webkitgtk3/PRE_BUILD | 1
http/webkitgtk3/bison-2.6.patch | 515
++++++++++++++++++++++++++++++++++++++++
net/ferm/DEPENDS | 4
net/ferm/DETAILS | 5
net/ferm/HISTORY | 4
net/ferm/ferm-2.1.1.tar.gz.sig |binary
net/ferm/ferm-2.1.tar.gz.sig | 0
net/samba/HISTORY | 4
net/samba/PRE_BUILD | 3
net/samba/cups16.patch.gz |binary
perl-cpan/config-param/DETAILS | 4
perl-cpan/config-param/HISTORY | 3
printer/cups-filters/DEPENDS | 2
printer/cups-filters/HISTORY | 3
python-pypi/keepnote/DEPENDS | 1
python-pypi/keepnote/DETAILS | 13 +
python-pypi/keepnote/HISTORY | 2
smgl/castfs/DETAILS | 2
smgl/castfs/HISTORY | 7
smgl/castfs/PRE_BUILD | 3
smgl/castfs/TRIGGERS | 2
smgl/castfs/argc.patch | 30 ++
video/miro/DETAILS | 4
video/miro/HISTORY | 4
video/miro/PRE_BUILD | 4
video/miro/ffmpeg.patch | 63 ++++
45 files changed, 1236 insertions(+), 106 deletions(-)

New commits:
commit 97a7df774a4796df05c6992d6eb0805cbc8b585e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

castfs: fixes crashing when running without arguments, see #395

commit 734076c6c8cc0517acd0bf35995c64ebedca9154
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

castfs: fixed TRIGGERS

commit 382a264886735197a83dcf8c700e541a77dd2c04
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

fuse: => 2.9.1

commit 882d3feb5323ca0243512b9b51d9a108febf5378
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

samba: fixed build with cups 1.6

commit ccea06934d1bcdbc4882bd190e4249221e565981
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ferm: => 2.1.1

commit cfb0718292d8df6f6f6aafa747f54d342429f4b7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

cups-filters: fixed build when poppler doesn't conform required options

commit fa27969f23adc3daba71920634d699b1d34f1875
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

python-pypi/keepnote: new spell, note taking application

commit 777f3989364163c87113b40c0ade6820eff13701
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

miro 5.0.2

commit 5fa1e633ccb1b22b6c42eac6a224e5485107e4fe
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

e2fsprogs 1.42.5

commit e3f911dd1a79e0eab597796a2795892222aa4c0c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

webkitgtk3 1.8.2, SECURITY_PATCH=2

commit 284317a959437e3ed1f6696c6acec5c163d4d32b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

webkitgtk 1.8.2, SECURITY_PATCH=6

commit 5cb7c32b3692703df3dd76845237fa5f7520aa50
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

flex 2.5.37

commit 3fa48e24da8bfe376cc7b001cd3ec6493fb3fbbc
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

bison 2.6.2

commit 8fdc02800a14a68fc89137a505180a757deaa92c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

config-param: bump to 3.000009

diff --git a/ChangeLog b/ChangeLog
index 867e53c..94350c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-08-04 Ladislav Hagara <hgr AT vabo.cz>
+ * python-pypi/keepnote: new spell, note taking application
+
2012-06-22 Treeve Jelbert <treeve AT sourcemage.org>
* printer/cups-filters: new spell
extra stuff for cups
diff --git a/devel/bison/DETAILS b/devel/bison/DETAILS
index 681b1e8..8b0524f 100755
--- a/devel/bison/DETAILS
+++ b/devel/bison/DETAILS
@@ -1,5 +1,5 @@
SPELL=bison
- VERSION=2.6
+ VERSION=2.6.2
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 b00e612..d5d81f1 100644
--- a/devel/bison/HISTORY
+++ b/devel/bison/HISTORY
@@ -1,3 +1,6 @@
+2012-08-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.6.2
+
2012-07-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.6

diff --git a/devel/flex/DETAILS b/devel/flex/DETAILS
index 54bfc06..8a07322 100755
--- a/devel/flex/DETAILS
+++ b/devel/flex/DETAILS
@@ -1,6 +1,6 @@
SPELL=flex
- VERSION=2.5.36
-
SOURCE_HASH=sha512:28e12711e55631f14edad713caa50eebb2a707e1b0a80e75600722b894de8602c81f2f884a7cc838c98e5b476a40d50cb9e71f2fa887944a13c9f0ef6ab7bba7
+ VERSION=2.5.37
+
SOURCE_HASH=sha512:1f34285953a7f058e6a2dddc305fc82cfcaaa451d6d7777da17bf9cccbe4a08e480c8c28951fa5d2920e7c7adc40ccd0e51191b363c9a3c4137db5ded1cbbc2a
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/flex/$SOURCE
diff --git a/devel/flex/HISTORY b/devel/flex/HISTORY
index c02487f..59e5cab 100644
--- a/devel/flex/HISTORY
+++ b/devel/flex/HISTORY
@@ -1,3 +1,6 @@
+2012-08-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.5.37
+
2012-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.5.36

diff --git a/disk/e2fsprogs/DETAILS b/disk/e2fsprogs/DETAILS
index d441a98..10b26a3 100755
--- a/disk/e2fsprogs/DETAILS
+++ b/disk/e2fsprogs/DETAILS
@@ -1,5 +1,5 @@
SPELL=e2fsprogs
- VERSION=1.42.4
+ VERSION=1.42.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/e2fsprogs/HISTORY b/disk/e2fsprogs/HISTORY
index e5aaac8..4c43936 100644
--- a/disk/e2fsprogs/HISTORY
+++ b/disk/e2fsprogs/HISTORY
@@ -1,3 +1,6 @@
+2012-08-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.42.5
+
2012-06-13 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.42.4

diff --git a/disk/fuse/DETAILS b/disk/fuse/DETAILS
index c9ece06..6f3dee8 100755
--- a/disk/fuse/DETAILS
+++ b/disk/fuse/DETAILS
@@ -1,8 +1,7 @@
SPELL=fuse
if [ "$FUSE_BRANCH" != "scm" ]; then
- VERSION=2.9.0
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:bee17f24299b96af956fa2620d3d6764ac742197fd5e5b168f495d8b046d9954ccf7fbbdadc0087f52cf341cc90a31bd0404108403eb6dcabed5508c5f2d1918
+ VERSION=2.9.1
+
SOURCE_HASH=sha512:6675810ba92b9f8dd289eec9c4eb45fe371e6a7f7c0c5c7a2533d813353fcbbcb78e20eb61a92057a985a556eacc67e4e6a9d5d06513028e1c2c19ab7fe59ffc
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index 86811ba..85d3042 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,9 @@
+2012-08-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.9.1
+ * init.patch: updated
+ * unlock.patch: removed, finally fixed in upstream vcs with
+ (3c4c063a2fd5cc6e9ce2b5db82e2a0dfa59b2e40)
+
2012-07-23 Pol Vinogradov <vin.public AT gmail.com>
* PRE_BUILD: unlock.patch now applies to stable branch only

diff --git a/disk/fuse/PRE_BUILD b/disk/fuse/PRE_BUILD
index dc1471d..0545e39 100755
--- a/disk/fuse/PRE_BUILD
+++ b/disk/fuse/PRE_BUILD
@@ -6,9 +6,6 @@ cd "$SOURCE_DIRECTORY" &&
sed -i "/sched/s|<|<linux/|" util/fusermount.c &&

if [ "$FUSE_BRANCH" != "scm" ]; then
- # part of revert of official commit 3743f3fe
- # that brakes our castfs staging system
- patch -p1 < "$SPELL_DIRECTORY/unlock.patch"
# prevent installing fuse initscript into the wrong place
patch -p0 < "$SPELL_DIRECTORY/init.patch"
else
diff --git a/disk/fuse/init.patch b/disk/fuse/init.patch
index 5f3b3b2..7846a18 100644
--- a/disk/fuse/init.patch
+++ b/disk/fuse/init.patch
@@ -1,10 +1,10 @@
---- util/Makefile.in.orig 2010-09-28 13:23:54.000000000 +0400
-+++ util/Makefile.in 2011-05-14 22:35:20.612452475 +0400
-@@ -593,8 +593,6 @@
+--- util/Makefile.in.orig 2012-07-19 16:53:28.000000000 +0400
++++ util/Makefile.in 2012-08-05 15:32:53.820922057 +0400
+@@ -650,8 +650,6 @@
install-exec-local:
- $(mkdir_p) $(DESTDIR)$(MOUNT_FUSE_PATH)
- $(INSTALL_PROGRAM) $(srcdir)/mount.fuse
$(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
-- $(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
+ $(MKDIR_P) $(DESTDIR)$(MOUNT_FUSE_PATH)
+ $(INSTALL_PROGRAM) $(builddir)/mount.fuse
$(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+- $(MKDIR_P) $(DESTDIR)$(INIT_D_PATH)
- $(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
@if test -x /usr/sbin/update-rc.d; then \
echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 .
|| true"; \
diff --git a/disk/fuse/unlock.patch b/disk/fuse/unlock.patch
deleted file mode 100644
index 44ea382..0000000
--- a/disk/fuse/unlock.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-reverted:
---- b/lib/fuse.c
-+++ a/lib/fuse.c
-@@ -495,26 +495,6 @@
- }
- }
-
--static void release_tickets(struct fuse *f, fuse_ino_t nodeid,
-- struct node *wnode, int ticket)
--{
-- struct node *node;
--
-- if (wnode) {
-- if (wnode->ticket != ticket)
-- return;
--
-- wnode->ticket = 0;
-- }
--
-- for (node = get_node(f, nodeid);
-- node->nodeid != FUSE_ROOT_ID; node = node->parent) {
-- if (node->ticket != ticket)
-- return;
-- node->ticket = 0;
-- }
--}
--
- static int try_get_path(struct fuse *f, fuse_ino_t nodeid, const char *name,
- char **path, struct node **wnodep, int ticket)
- {
-@@ -527,10 +507,9 @@
-
- *path = NULL;
-
-- err = -ENOMEM;
- buf = malloc(bufsize);
- if (buf == NULL)
-+ return -ENOMEM;
-- goto out_err;
-
- s = buf + bufsize - 1;
- *s = '\0';
-@@ -598,10 +577,6 @@
- out_free:
- free(buf);
-
-- out_err:
-- if (ticket && err != -EAGAIN)
-- release_tickets(f, nodeid, wnode, ticket);
--
- return err;
- }
-
-@@ -736,14 +711,9 @@
- err = try_get_path(f, nodeid1, name1, path1, wnode1, ticket);
- if (!err) {
- err = try_get_path(f, nodeid2, name2, path2, wnode2, ticket);
-+ if (err)
-+ unlock_path(f, nodeid1, wnode1 ? *wnode1 : NULL, NULL,
-+ ticket);
-- if (err) {
-- struct node *wn1 = wnode1 ? *wnode1 : NULL;
--
-- unlock_path(f, nodeid1, wn1, NULL, ticket);
-- free(path1);
-- if (ticket && err != -EAGAIN)
-- release_tickets(f, nodeid1, wn1, ticket);
-- }
- }
- return err;
- }
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index c13f78d..1124e4e 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,19 +1,19 @@
SPELL=webkitgtk
if [[ $WEBKITGTK_NIGHT == "y" ]]; then
- VERSION=1.8.1
+ VERSION=1.8.2
SOURCE=webkit-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:67d9eaedfc18805ae7694bb56e74538726e2f1bc653363adcd941e0394c54c72c55c31aedd3b65b8798cc0e19ab69e0fe8c3ad0a313dec02c505214f48f5ffff
+
SOURCE_HASH=sha512:a6ecb8bd3c4221842038885e37108e797b20a37012bc8f60e89e2f823a9e45e977565638e3c93ddad8b1b756e903d2455d6dce8911f106044efe46a7de7c4d3a
SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
else
- VERSION=1.8.1
+ VERSION=1.8.2
SOURCE=webkit-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:67d9eaedfc18805ae7694bb56e74538726e2f1bc653363adcd941e0394c54c72c55c31aedd3b65b8798cc0e19ab69e0fe8c3ad0a313dec02c505214f48f5ffff
+
SOURCE_HASH=sha512:a6ecb8bd3c4221842038885e37108e797b20a37012bc8f60e89e2f823a9e45e977565638e3c93ddad8b1b756e903d2455d6dce8911f106044efe46a7de7c4d3a
SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
fi
WEB_SITE=http://webkitgtk.org/
- SECURITY_PATCH=5
+ SECURITY_PATCH=6
GATHER_DOCS=off
LICENSE[0]=GPL
ENTERED=20071208
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 774407e..3f7971b 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,8 @@
+2012-08-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.2, SECURITY_PATCH=6
+ * PRE_BUILD, bison-2.6.patch: upstream patch added
+ http://trac.webkit.org/changeset/124099
+
2012-04-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.1, SECURITY_PATCH=5
* PRE_BUILD, disable-geo.patch: patch removed
diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
index cdd362a..6f1c302 100755
--- a/http/webkitgtk/PRE_BUILD
+++ b/http/webkitgtk/PRE_BUILD
@@ -1,5 +1,6 @@
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
new file mode 100644
index 0000000..95898ad
--- /dev/null
+++ b/http/webkitgtk/bison-2.6.patch
@@ -0,0 +1,515 @@
+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 396dc02..4c039b1 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,11 +1,11 @@
SPELL=webkitgtk3
- VERSION=1.8.1
+ VERSION=1.8.2
SOURCE=webkit-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:67d9eaedfc18805ae7694bb56e74538726e2f1bc653363adcd941e0394c54c72c55c31aedd3b65b8798cc0e19ab69e0fe8c3ad0a313dec02c505214f48f5ffff
+
SOURCE_HASH=sha512:a6ecb8bd3c4221842038885e37108e797b20a37012bc8f60e89e2f823a9e45e977565638e3c93ddad8b1b756e903d2455d6dce8911f106044efe46a7de7c4d3a
SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
WEB_SITE=http://webkitgtk.org/
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
GATHER_DOCS=off
LICENSE[0]=GPL
ENTERED=20101017
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index fb486a7..1b2fa01 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,8 @@
+2012-08-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.2, SECURITY_PATCH=2
+ * PRE_BUILD, bison-2.6.patch: upstream patch added
+ http://trac.webkit.org/changeset/124099
+
2012-05-10 Arjan Bouter <abouter AT sourcemage.org>
* PRE_BUILD, opengl-headers.patch, gtk-doc.patch: apply
webkitgtk patches to webkitgtk3
diff --git a/http/webkitgtk3/PRE_BUILD b/http/webkitgtk3/PRE_BUILD
index cdd362a..6f1c302 100755
--- a/http/webkitgtk3/PRE_BUILD
+++ b/http/webkitgtk3/PRE_BUILD
@@ -1,5 +1,6 @@
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
new file mode 100644
index 0000000..95898ad
--- /dev/null
+++ b/http/webkitgtk3/bison-2.6.patch
@@ -0,0 +1,515 @@
+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/net/ferm/DEPENDS b/net/ferm/DEPENDS
index 71c5d27..a47a141 100755
--- a/net/ferm/DEPENDS
+++ b/net/ferm/DEPENDS
@@ -1,2 +1,2 @@
-depends perl &&
-depends iptables
+runtime_depends perl &&
+runtime_depends iptables
diff --git a/net/ferm/DETAILS b/net/ferm/DETAILS
index 04534a7..773041b 100755
--- a/net/ferm/DETAILS
+++ b/net/ferm/DETAILS
@@ -1,7 +1,8 @@
SPELL=ferm
- VERSION=2.1
+ VERSION=2.1.1
+ BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://ferm.foo-projects.org/download/${VERSION}/$SOURCE
+ SOURCE_URL[0]=http://ferm.foo-projects.org/download/${BRANCH}/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://ferm.foo-projects.org/
diff --git a/net/ferm/HISTORY b/net/ferm/HISTORY
index ec59a0d..70cf197 100644
--- a/net/ferm/HISTORY
+++ b/net/ferm/HISTORY
@@ -1,3 +1,7 @@
+2012-08-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.1.1; use BRANCH
+ * DEPENDS: depends -> runtime_depends
+
2011-07-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.1

diff --git a/net/ferm/ferm-2.1.1.tar.gz.sig b/net/ferm/ferm-2.1.1.tar.gz.sig
new file mode 100644
index 0000000..8395f68
Binary files /dev/null and b/net/ferm/ferm-2.1.1.tar.gz.sig differ
diff --git a/net/ferm/ferm-2.1.tar.gz.sig b/net/ferm/ferm-2.1.tar.gz.sig
deleted file mode 100644
index e303f75..0000000
Binary files a/net/ferm/ferm-2.1.tar.gz.sig and /dev/null differ
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index e11d37b..32986c4 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,7 @@
+2012-08-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * cups16.patch.gz: added, to fix build with cups 1.6
+ * PRE_BUILD: apply the patch
+
2012-07-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* init.d/samba: fixed bug about start/stop for a long time when
running
diff --git a/net/samba/PRE_BUILD b/net/samba/PRE_BUILD
index 633d405..39dfe86 100755
--- a/net/samba/PRE_BUILD
+++ b/net/samba/PRE_BUILD
@@ -1,6 +1,9 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+if is_depends_enabled $SPELL cups; then
+ zcat "$SPELL_DIRECTORY/cups16.patch" | patch -p1
+fi &&

#sedit 's!libsmbclient.*\$(LIBDIR)!&/..!' source/Makefile.in &&

diff --git a/net/samba/cups16.patch.gz b/net/samba/cups16.patch.gz
new file mode 100644
index 0000000..5953412
Binary files /dev/null and b/net/samba/cups16.patch.gz differ
diff --git a/perl-cpan/config-param/DETAILS b/perl-cpan/config-param/DETAILS
index 85a690e..86ac54b 100755
--- a/perl-cpan/config-param/DETAILS
+++ b/perl-cpan/config-param/DETAILS
@@ -1,8 +1,8 @@
SPELL=config-param
- VERSION=3.000005
+ VERSION=3.000009
SOURCE="Config-Param-${VERSION}.tar.gz"
SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/T/TH/THORGIS/${SOURCE}
-
SOURCE_HASH=sha512:c0f757e59ad2f1a3dfb7e3a924c67a07ca34adf1ecf55ac9faea2a9621e176c7d094adbf907c6162e7bc8bb5a2d637540c2ef35acd4c4d013d02236fd5b92452
+
SOURCE_HASH=sha512:fb1dcf9a1f97af77ac99171cabb39b9c36a177ce34681907983783170969e54722732831849fd7f8c6ae56ee6a2288759291233555bd802cd3a2a9ddac15041a
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Config-Param-${VERSION}"
WEB_SITE="http://search.cpan.org/~thorgis/Config-Param/";
LICENSE[0]=ART
diff --git a/perl-cpan/config-param/HISTORY b/perl-cpan/config-param/HISTORY
index e2a9305..318aad0 100644
--- a/perl-cpan/config-param/HISTORY
+++ b/perl-cpan/config-param/HISTORY
@@ -1,3 +1,6 @@
+2012-08-04 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: Bump to 3.000009
+
2012-07-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 3.000005
diff --git a/printer/cups-filters/DEPENDS b/printer/cups-filters/DEPENDS
index 2fdfbb4..bb90580 100755
--- a/printer/cups-filters/DEPENDS
+++ b/printer/cups-filters/DEPENDS
@@ -2,7 +2,7 @@ depends -sub CXX gcc &&
depends zlib &&
depends pkgconfig &&
depends ghostscript &&
-depends poppler &&
+depends -sub XPDF_HEADERS poppler &&
depends lcms2 &&
depends freetype2 &&
depends fontconfig &&
diff --git a/printer/cups-filters/HISTORY b/printer/cups-filters/HISTORY
index bc27516..74ed833 100644
--- a/printer/cups-filters/HISTORY
+++ b/printer/cups-filters/HISTORY
@@ -1,3 +1,6 @@
+2012-08-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: requires poppler built with xpdf headers
+
2012-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: runtime_depends bc

diff --git a/python-pypi/keepnote/DEPENDS b/python-pypi/keepnote/DEPENDS
new file mode 100755
index 0000000..40618e7
--- /dev/null
+++ b/python-pypi/keepnote/DEPENDS
@@ -0,0 +1 @@
+depends pygtk2
diff --git a/python-pypi/keepnote/DETAILS b/python-pypi/keepnote/DETAILS
new file mode 100755
index 0000000..e8b9227
--- /dev/null
+++ b/python-pypi/keepnote/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=keepnote
+ VERSION=0.7.8
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL=http://keepnote.org/download/$SOURCE
+
SOURCE_HASH=sha512:676998b412425e1677b703024ed27daf93d742fd26e0a8e8d4016fd31048d0e7b70283941a94a2461a46fe76463495b49483e9cda2020dbee73970a88291c778
+ WEB_SITE=http://keepnote.org/
+ ENTERED=20120804
+ LICENSE[0]=GPL
+ SHORT="cross-platform note taking application"
+cat << EOF
+KeepNote is a cross-platform note taking application.
+EOF
diff --git a/python-pypi/keepnote/HISTORY b/python-pypi/keepnote/HISTORY
new file mode 100644
index 0000000..0774bff
--- /dev/null
+++ b/python-pypi/keepnote/HISTORY
@@ -0,0 +1,2 @@
+2012-08-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: spell created, version 0.7.8
diff --git a/smgl/castfs/DETAILS b/smgl/castfs/DETAILS
index 57caacd..5ddd3bb 100755
--- a/smgl/castfs/DETAILS
+++ b/smgl/castfs/DETAILS
@@ -14,6 +14,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-git
FORCE_DOWNLOAD=1
else
VERSION=0.6.1
+ PATCHLEVEL=4
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE2=${SOURCE}.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
@@ -27,7 +28,6 @@ fi
LICENSE[0]=GPL
KEYWORDS="filesystems smgl"
SHORT="Fuse filesystem used for staging packages."
- PATCHLEVEL=3
cat << EOF
castfs is a fuse filesystem written in C and is used for capturing
filesystem
calls for your root filesystem and staging any modifications or additions to
diff --git a/smgl/castfs/HISTORY b/smgl/castfs/HISTORY
index abe8701..6c0c4df 100644
--- a/smgl/castfs/HISTORY
+++ b/smgl/castfs/HISTORY
@@ -1,3 +1,10 @@
+2012-08-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: register new triggers (PATCHLEVEL+=1)
+ * TRIGGERS: corrected static build check
+ * PRE_BUILD: apply the patch
+ * argc.patch: added, to prevent crashing when ran without arguments
+ (fixes #395)
+
2012-06-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: added -lpthread to LDFLAGS to prevent link error

diff --git a/smgl/castfs/PRE_BUILD b/smgl/castfs/PRE_BUILD
index 946a46c..20c1e58 100755
--- a/smgl/castfs/PRE_BUILD
+++ b/smgl/castfs/PRE_BUILD
@@ -1,4 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+
+patch -p0 < "$SPELL_DIRECTORY/argc.patch" &&
+
# disable the xattr functions until they get fixed #14479
sed -i 's,setxattr,,' configure
diff --git a/smgl/castfs/TRIGGERS b/smgl/castfs/TRIGGERS
index 1324f64..6af29bb 100755
--- a/smgl/castfs/TRIGGERS
+++ b/smgl/castfs/TRIGGERS
@@ -1,3 +1,3 @@
-if [[ $STATIC_FUSE == y ]]; then
+if list_find "$STATIC_FUSE" "--enable-static-fuse"; then
on_cast fuse cast_self
fi
diff --git a/smgl/castfs/argc.patch b/smgl/castfs/argc.patch
new file mode 100644
index 0000000..a70bc69
--- /dev/null
+++ b/smgl/castfs/argc.patch
@@ -0,0 +1,30 @@
+--- src/castfs.c.orig 2010-03-30 09:07:57.000000000 +0400
++++ src/castfs.c 2012-08-05 16:05:34.667167115 +0400
+@@ -724,6 +724,13 @@
+ char *new_argv[argc], *logptr, *dbgptr, deflog[]="/tmp/castfs.log";
+ int new_argc = 0;
+
++ /* Currently, need: `castfs mnt-dir -o stage=stage-dir` */
++ if (argc < 4) {
++fprintf(stderr, "castfs: argc wrong\n");
++ usage();
++ exit(-1);
++ }
++
+ /* get environmental vars and open fd's for log file */
+ umask(0);
+
+@@ -760,13 +767,6 @@
+ dbglvl = dbgdef; // Toggle the needed bits.
+ }
+
+- /* Currently, need: `castfs mnt-dir -o stage=stage-dir` */
+- if (argc < 4) {
+-fprintf(stderr, "castfs: argc wrong\n");
+- usage();
+- exit(-1);
+- }
+-
+ /* dump some nice header information in the log file */
+ cast_log(CAST_DBG_MAIN, "main\n");
+ cast_log(CAST_DBG_MAIN, "logfile %s fd %d\n",
getenv("CASTFS_LOGFILE"),
diff --git a/video/miro/DETAILS b/video/miro/DETAILS
index a98dc86..e2bf905 100755
--- a/video/miro/DETAILS
+++ b/video/miro/DETAILS
@@ -1,9 +1,9 @@
SPELL=miro
- VERSION=5.0.1
+ VERSION=5.0.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ftp.osuosl.org/pub/pculture.org/miro/src/$SOURCE
-
SOURCE_HASH=sha512:fbfa5588470cddd3caaa8553ec1fbf5f09d063ed2d16ec40a183a822c34aa680a79879d7b9c252a0d5663b78ad0d74d851b71381985f42cb0359938c7d6a6902
+
SOURCE_HASH=sha512:0f0f1ba8be4ba5131ec63db50e540d7570840a25570588f01ab5c2176d7df46769d5b985f8a719abd680ac7b50d4bd6020da2416c186884fd825c53dd6ddb9fb
WEB_SITE=http://www.getmiro.com/
ENTERED=20090804
LICENSE[0]=GPL
diff --git a/video/miro/HISTORY b/video/miro/HISTORY
index 613c489..53e8262 100644
--- a/video/miro/HISTORY
+++ b/video/miro/HISTORY
@@ -1,3 +1,7 @@
+2012-08-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 5.0.2
+ * PRE_BUILD, ffmpeg.patch: patch from Arch added
+
2012-06-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.0.1, SOURCE_DIRECTORY updated

diff --git a/video/miro/PRE_BUILD b/video/miro/PRE_BUILD
new file mode 100755
index 0000000..1d3cb75
--- /dev/null
+++ b/video/miro/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/ffmpeg.patch"
diff --git a/video/miro/ffmpeg.patch b/video/miro/ffmpeg.patch
new file mode 100644
index 0000000..8362308
--- /dev/null
+++ b/video/miro/ffmpeg.patch
@@ -0,0 +1,63 @@
+--- miro-5.0.1/linux/miro-segmenter.c~ 2012-07-06 14:33:24.618082171 +0000
++++ miro-5.0.1/linux/miro-segmenter.c 2012-07-06 15:10:19.564146117 +0000
+@@ -156,7 +156,7 @@
+ exit(1);
+ }
+
+- ret = av_open_input_file(&ic, input, ifmt, 0, NULL);
++ ret = avformat_open_input(&ic, input, ifmt, 0);
+ if (ret != 0) {
+ fprintf(stderr, "Could not open input file, make sure it is an
mpegts file: %d\n", ret);
+ exit(1);
+@@ -215,12 +215,7 @@
+ }
+ }
+
+- if (av_set_parameters(oc, NULL) < 0) {
+- fprintf(stderr, "Invalid output format parameters\n");
+- exit(1);
+- }
+-
+- dump_format(oc, 0, input, 1);
++ av_dump_format(oc, 0, input, 1);
+
+ if (video_st) {
+ codec = avcodec_find_decoder(video_st->codec->codec_id);
+@@ -233,12 +228,12 @@
+ }
+ }
+
+- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
++ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
+ fprintf(stderr, "Could not open '%s'\n", output_filename);
+ exit(1);
+ }
+
+- if (av_write_header(oc)) {
++ if (avformat_write_header(oc, NULL)) {
+ fprintf(stderr, "Could not write mpegts header to first output
file\n");
+
+ exit(1);
+@@ -274,10 +269,10 @@
+ }
+
+ if (segment_time - prev_segment_time >= segment_duration) {
+- put_flush_packet(oc->pb);
+- url_fclose(oc->pb);
++ avio_flush(oc->pb);
++ avio_close(oc->pb);
+
+- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
++ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
+ fprintf(stderr, "Could not open '%s'\n", output_filename);
+ break;
+ }
+@@ -307,7 +302,7 @@
+ av_freep(&oc->streams[i]);
+ }
+
+- url_fclose(oc->pb);
++ avio_close(oc->pb);
+ av_free(oc);
+
+ /* End-of-transcode marker. */


  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (f810ba6ed540086cc50dedb428b3ed9c269fb36b), Vlad Glagolev, 08/05/2012

Archive powered by MHonArc 2.6.24.

Top of Page