From f7418ff87df36b9bc9c77378b938edfc2eb4cddd Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Sat, 22 Dec 2012 13:10:12 +0100 Subject: [PATCH 1/4] qt4: updated to 4.8.4 --- qt4/.footprint | 152 ++++++++++++++++++++++++------------------------- qt4/.md5sum | 2 +- qt4/Pkgfile | 2 +- 3 files changed, 78 insertions(+), 78 deletions(-) diff --git a/qt4/.footprint b/qt4/.footprint index 11abd8c1d..0447e6023 100644 --- a/qt4/.footprint +++ b/qt4/.footprint @@ -3099,104 +3099,104 @@ drwxr-xr-x root/root usr/share/qt4/include/QtXmlPatterns/ drwxr-xr-x root/root usr/share/qt4/lib/ -rw-r--r-- root/root usr/share/qt4/lib/libQt3Support.la -rw-r--r-- root/root usr/share/qt4/lib/libQt3Support.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQt3Support.so -> libQt3Support.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQt3Support.so.4 -> libQt3Support.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQt3Support.so.4.8 -> libQt3Support.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQt3Support.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQt3Support.so -> libQt3Support.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQt3Support.so.4 -> libQt3Support.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQt3Support.so.4.8 -> libQt3Support.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQt3Support.so.4.8.4 -rw-r--r-- root/root usr/share/qt4/lib/libQtCLucene.la -rw-r--r-- root/root usr/share/qt4/lib/libQtCLucene.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQtCLucene.so -> libQtCLucene.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtCLucene.so.4 -> libQtCLucene.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtCLucene.so.4.8 -> libQtCLucene.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQtCLucene.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtCLucene.so -> libQtCLucene.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtCLucene.so.4 -> libQtCLucene.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtCLucene.so.4.8 -> libQtCLucene.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQtCLucene.so.4.8.4 -rw-r--r-- root/root usr/share/qt4/lib/libQtCore.la -rw-r--r-- root/root usr/share/qt4/lib/libQtCore.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQtCore.so -> libQtCore.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtCore.so.4 -> libQtCore.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtCore.so.4.8 -> libQtCore.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQtCore.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtCore.so -> libQtCore.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtCore.so.4 -> libQtCore.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtCore.so.4.8 -> libQtCore.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQtCore.so.4.8.4 -rw-r--r-- root/root usr/share/qt4/lib/libQtDBus.la -rw-r--r-- root/root usr/share/qt4/lib/libQtDBus.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQtDBus.so -> libQtDBus.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtDBus.so.4 -> libQtDBus.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtDBus.so.4.8 -> libQtDBus.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQtDBus.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtDBus.so -> libQtDBus.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtDBus.so.4 -> libQtDBus.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtDBus.so.4.8 -> libQtDBus.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQtDBus.so.4.8.4 -rw-r--r-- root/root usr/share/qt4/lib/libQtDeclarative.la -rw-r--r-- root/root usr/share/qt4/lib/libQtDeclarative.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQtDeclarative.so -> libQtDeclarative.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtDeclarative.so.4 -> libQtDeclarative.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtDeclarative.so.4.8 -> libQtDeclarative.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQtDeclarative.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtDeclarative.so -> libQtDeclarative.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtDeclarative.so.4 -> libQtDeclarative.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtDeclarative.so.4.8 -> libQtDeclarative.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQtDeclarative.so.4.8.4 -rw-r--r-- root/root usr/share/qt4/lib/libQtDesigner.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQtDesigner.so -> libQtDesigner.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtDesigner.so.4 -> libQtDesigner.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtDesigner.so.4.8 -> libQtDesigner.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQtDesigner.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtDesigner.so -> libQtDesigner.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtDesigner.so.4 -> libQtDesigner.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtDesigner.so.4.8 -> libQtDesigner.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQtDesigner.so.4.8.4 -rw-r--r-- root/root usr/share/qt4/lib/libQtDesignerComponents.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQtDesignerComponents.so -> libQtDesignerComponents.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtDesignerComponents.so.4 -> libQtDesignerComponents.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtDesignerComponents.so.4.8 -> libQtDesignerComponents.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQtDesignerComponents.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtDesignerComponents.so -> libQtDesignerComponents.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtDesignerComponents.so.4 -> libQtDesignerComponents.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtDesignerComponents.so.4.8 -> libQtDesignerComponents.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQtDesignerComponents.so.4.8.4 -rw-r--r-- root/root usr/share/qt4/lib/libQtGui.la -rw-r--r-- root/root usr/share/qt4/lib/libQtGui.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQtGui.so -> libQtGui.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtGui.so.4 -> libQtGui.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtGui.so.4.8 -> libQtGui.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQtGui.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtGui.so -> libQtGui.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtGui.so.4 -> libQtGui.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtGui.so.4.8 -> libQtGui.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQtGui.so.4.8.4 -rw-r--r-- root/root usr/share/qt4/lib/libQtHelp.la -rw-r--r-- root/root usr/share/qt4/lib/libQtHelp.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQtHelp.so -> libQtHelp.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtHelp.so.4 -> libQtHelp.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtHelp.so.4.8 -> libQtHelp.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQtHelp.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtHelp.so -> libQtHelp.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtHelp.so.4 -> libQtHelp.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtHelp.so.4.8 -> libQtHelp.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQtHelp.so.4.8.4 -rw-r--r-- root/root usr/share/qt4/lib/libQtMultimedia.la -rw-r--r-- root/root usr/share/qt4/lib/libQtMultimedia.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQtMultimedia.so -> libQtMultimedia.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtMultimedia.so.4 -> libQtMultimedia.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtMultimedia.so.4.8 -> libQtMultimedia.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQtMultimedia.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtMultimedia.so -> libQtMultimedia.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtMultimedia.so.4 -> libQtMultimedia.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtMultimedia.so.4.8 -> libQtMultimedia.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQtMultimedia.so.4.8.4 -rw-r--r-- root/root usr/share/qt4/lib/libQtNetwork.la -rw-r--r-- root/root usr/share/qt4/lib/libQtNetwork.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQtNetwork.so -> libQtNetwork.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtNetwork.so.4 -> libQtNetwork.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtNetwork.so.4.8 -> libQtNetwork.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQtNetwork.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtNetwork.so -> libQtNetwork.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtNetwork.so.4 -> libQtNetwork.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtNetwork.so.4.8 -> libQtNetwork.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQtNetwork.so.4.8.4 -rw-r--r-- root/root usr/share/qt4/lib/libQtOpenGL.la -rw-r--r-- root/root usr/share/qt4/lib/libQtOpenGL.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQtOpenGL.so -> libQtOpenGL.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtOpenGL.so.4 -> libQtOpenGL.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtOpenGL.so.4.8 -> libQtOpenGL.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQtOpenGL.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtOpenGL.so -> libQtOpenGL.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtOpenGL.so.4 -> libQtOpenGL.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtOpenGL.so.4.8 -> libQtOpenGL.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQtOpenGL.so.4.8.4 -rw-r--r-- root/root usr/share/qt4/lib/libQtScript.la -rw-r--r-- root/root usr/share/qt4/lib/libQtScript.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQtScript.so -> libQtScript.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtScript.so.4 -> libQtScript.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtScript.so.4.8 -> libQtScript.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQtScript.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtScript.so -> libQtScript.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtScript.so.4 -> libQtScript.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtScript.so.4.8 -> libQtScript.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQtScript.so.4.8.4 -rw-r--r-- root/root usr/share/qt4/lib/libQtScriptTools.la -rw-r--r-- root/root usr/share/qt4/lib/libQtScriptTools.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQtScriptTools.so -> libQtScriptTools.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtScriptTools.so.4 -> libQtScriptTools.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtScriptTools.so.4.8 -> libQtScriptTools.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQtScriptTools.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtScriptTools.so -> libQtScriptTools.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtScriptTools.so.4 -> libQtScriptTools.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtScriptTools.so.4.8 -> libQtScriptTools.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQtScriptTools.so.4.8.4 -rw-r--r-- root/root usr/share/qt4/lib/libQtSql.la -rw-r--r-- root/root usr/share/qt4/lib/libQtSql.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQtSql.so -> libQtSql.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtSql.so.4 -> libQtSql.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtSql.so.4.8 -> libQtSql.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQtSql.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtSql.so -> libQtSql.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtSql.so.4 -> libQtSql.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtSql.so.4.8 -> libQtSql.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQtSql.so.4.8.4 -rw-r--r-- root/root usr/share/qt4/lib/libQtSvg.la -rw-r--r-- root/root usr/share/qt4/lib/libQtSvg.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQtSvg.so -> libQtSvg.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtSvg.so.4 -> libQtSvg.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtSvg.so.4.8 -> libQtSvg.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQtSvg.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtSvg.so -> libQtSvg.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtSvg.so.4 -> libQtSvg.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtSvg.so.4.8 -> libQtSvg.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQtSvg.so.4.8.4 -rw-r--r-- root/root usr/share/qt4/lib/libQtTest.la -rw-r--r-- root/root usr/share/qt4/lib/libQtTest.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQtTest.so -> libQtTest.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtTest.so.4 -> libQtTest.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtTest.so.4.8 -> libQtTest.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQtTest.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtTest.so -> libQtTest.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtTest.so.4 -> libQtTest.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtTest.so.4.8 -> libQtTest.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQtTest.so.4.8.4 -rw-r--r-- root/root usr/share/qt4/lib/libQtUiTools.a -rw-r--r-- root/root usr/share/qt4/lib/libQtUiTools.prl -rw-r--r-- root/root usr/share/qt4/lib/libQtWebKit.la @@ -3207,16 +3207,16 @@ lrwxrwxrwx root/root usr/share/qt4/lib/libQtWebKit.so.4.9 -> libQtWebKit.so.4.9. -rwxr-xr-x root/root usr/share/qt4/lib/libQtWebKit.so.4.9.3 -rw-r--r-- root/root usr/share/qt4/lib/libQtXml.la -rw-r--r-- root/root usr/share/qt4/lib/libQtXml.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQtXml.so -> libQtXml.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtXml.so.4 -> libQtXml.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtXml.so.4.8 -> libQtXml.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQtXml.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtXml.so -> libQtXml.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtXml.so.4 -> libQtXml.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtXml.so.4.8 -> libQtXml.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQtXml.so.4.8.4 -rw-r--r-- root/root usr/share/qt4/lib/libQtXmlPatterns.la -rw-r--r-- root/root usr/share/qt4/lib/libQtXmlPatterns.prl -lrwxrwxrwx root/root usr/share/qt4/lib/libQtXmlPatterns.so -> libQtXmlPatterns.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtXmlPatterns.so.4 -> libQtXmlPatterns.so.4.8.3 -lrwxrwxrwx root/root usr/share/qt4/lib/libQtXmlPatterns.so.4.8 -> libQtXmlPatterns.so.4.8.3 --rwxr-xr-x root/root usr/share/qt4/lib/libQtXmlPatterns.so.4.8.3 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtXmlPatterns.so -> libQtXmlPatterns.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtXmlPatterns.so.4 -> libQtXmlPatterns.so.4.8.4 +lrwxrwxrwx root/root usr/share/qt4/lib/libQtXmlPatterns.so.4.8 -> libQtXmlPatterns.so.4.8.4 +-rwxr-xr-x root/root usr/share/qt4/lib/libQtXmlPatterns.so.4.8.4 drwxr-xr-x root/root usr/share/qt4/mkspecs/ drwxr-xr-x root/root usr/share/qt4/mkspecs/common/ drwxr-xr-x root/root usr/share/qt4/mkspecs/common/aix/ diff --git a/qt4/.md5sum b/qt4/.md5sum index 958d3aea2..a5bf5bf5c 100644 --- a/qt4/.md5sum +++ b/qt4/.md5sum @@ -1 +1 @@ -a663b6c875f8d7caa8ac9c30e4a4ec3b qt-everywhere-opensource-src-4.8.3.tar.gz +89c5ecba180cae74c66260ac732dc5cb qt-everywhere-opensource-src-4.8.4.tar.gz diff --git a/qt4/Pkgfile b/qt4/Pkgfile index 86ff4df81..da4c2a048 100644 --- a/qt4/Pkgfile +++ b/qt4/Pkgfile @@ -5,7 +5,7 @@ # Depends on: fontconfig glib libmng libpng mesa3d xorg-libxcursor xorg-libxi xorg-libxinerama xorg-libxrandr dbus name=qt4 -version=4.8.3 +version=4.8.4 release=1 source=(http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-$version.tar.gz) From 4c1f6b1f8286b01233c3e554ae2cd9e037bf88ae Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Sat, 22 Dec 2012 13:23:38 +0100 Subject: [PATCH 2/4] chromium: updated to 23.0.1271.97 - switched system_zlib flag to 0 (http://code.google.com/p/chromium/issues/detail?id=143623) - removed old bison patch --- chromium/.footprint | 33 ++- chromium/.md5sum | 3 +- chromium/Pkgfile | 13 +- chromium/bison.patch | 554 ------------------------------------------- 4 files changed, 26 insertions(+), 577 deletions(-) delete mode 100644 chromium/bison.patch diff --git a/chromium/.footprint b/chromium/.footprint index 05d953449..5217261b5 100644 --- a/chromium/.footprint +++ b/chromium/.footprint @@ -4,6 +4,7 @@ drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/chromium/ -rw-r--r-- root/root usr/lib/chromium/chrome.pak +-rw-r--r-- root/root usr/lib/chromium/chrome_100_percent.pak -rwxr-xr-x root/root usr/lib/chromium/chromium -r-sr-xr-x root/root usr/lib/chromium/chromium-sandbox -rw-r--r-- root/root usr/lib/chromium/content_resources.pak @@ -16,7 +17,10 @@ drwxr-xr-x root/root usr/lib/chromium/resources/extension/ drwxr-xr-x root/root usr/lib/chromium/resources/extension/demo/ -rw-r--r-- root/root usr/lib/chromium/resources/extension/demo/library.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/AuditsPanel.js +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/CodeMirrorTextEditor.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/DevTools.js +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/ElementsPanel.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/HeapSnapshotWorker.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/applicationCache.png @@ -63,6 +67,7 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/indexedDBIndex.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/indexedDBObjectStore.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/localStorage.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/namedFlowOverflow.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/navigatorShowHideButton.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneAddButtons.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneBottomGrow.png @@ -80,6 +85,9 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/profilesSilhouette.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/programCounterBorder.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/radioDot.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/regionEmpty.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/regionFit.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/regionOverset.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceCSSIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceDocumentIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceDocumentIconSmall.png @@ -114,17 +122,8 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/spinnerInactiveSelected.gif -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/splitviewDimple.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/splitviewDividerBackground.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarBackground.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarBackgroundChromium.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarBottomBackground.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarBottomBackgroundChromium.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarButtonGlyphs.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarButtons.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarButtonsChromium.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarMenuButton.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarMenuButtonChromium.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarMenuButtonSelected.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarMenuButtonSelectedChromium.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarButtonGlyphs2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarResizerHorizontal.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarResizerVertical.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/successGreenDot.png @@ -167,8 +166,17 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/warningMediumIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/warningOrangeDot.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/warningsErrors.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/NetworkPanel.js +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/ProfilesPanel.js +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/ResourcesPanel.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/ScriptFormatterWorker.js +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/ScriptsPanel.js +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/TimelinePanel.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/auditsPanel.css +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/breadcrumbList.css +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/cmdevtools.css +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/codemirror.css +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/cssNamedFlows.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/dataGrid.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/devTools.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/devtools.html @@ -191,11 +199,10 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/scriptsPanel.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/splitView.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/tabbedPane.css +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/textEditor.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/textPrompt.css --rw-r--r-- root/root usr/lib/chromium/resources/inspector/textViewer.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/timelinePanel.css --rw-r--r-- root/root usr/lib/chromium/theme_resources_standard.pak --rw-r--r-- root/root usr/lib/chromium/ui_resources_standard.pak +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/webGLProfiler.css drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/chromium.1.gz diff --git a/chromium/.md5sum b/chromium/.md5sum index ce80f6880..4e7d77376 100644 --- a/chromium/.md5sum +++ b/chromium/.md5sum @@ -1,4 +1,3 @@ -dab90271e918f48ed215648521d5a8a0 bison.patch -2ee0e7ca8ec685d4031625bc005f4f45 chromium-21.0.1180.92.tar.bz2 +595a39542de132a1132ac5a716d01f03 chromium-23.0.1271.97.tar.bz2 64968626706b07721983ac59fb3babbf chromium.sh d1a2b0663cbf38ebc71cc75073a39b43 use-siginfo_t.patch diff --git a/chromium/Pkgfile b/chromium/Pkgfile index 4dbaa3c7a..2632ed54b 100644 --- a/chromium/Pkgfile +++ b/chromium/Pkgfile @@ -5,17 +5,14 @@ # Depends on: dbus-glib gtk libevent nss xorg-libxscrnsaver xorg-libxtst libgcrypt xorg-libxdamage yasm xorg-libxt alsa-lib krb5 name=chromium -version=21.0.1180.92 -release=2 -source=(http://gsdview.appspot.com/chromium-browser-official/$name-$version.tar.bz2 \ - $name.sh bison.patch use-siginfo_t.patch) +version=23.0.1271.97 +release=1 +source=(http://commondatastorage.googleapis.com/chromium-browser-official/$name-$version.tar.bz2 \ + $name.sh use-siginfo_t.patch) build() { cd $name-$version - # https://bugs.webkit.org/show_bug.cgi?id=92264 - patch -d ./third_party/WebKit -p1 -i $SRC/bison.patch - # fix building issues patch -p1 -i $SRC/use-siginfo_t.patch @@ -37,7 +34,7 @@ build() { -Duse_system_libxslt=1 \ -Duse_system_libxml=1 \ -Duse_system_bzip2=1 \ - -Duse_system_zlib=1 \ + -Duse_system_zlib=0 \ -Duse_system_libpng=1 \ -Duse_system_ffmpeg=0 \ -Duse_system_yasm=1 \ diff --git a/chromium/bison.patch b/chromium/bison.patch deleted file mode 100644 index 7649f8bb5..000000000 --- a/chromium/bison.patch +++ /dev/null @@ -1,554 +0,0 @@ -diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y -index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644 ---- a/Source/WebCore/css/CSSGrammar.y -+++ b/Source/WebCore/css/CSSGrammar.y -@@ -53,14 +53,13 @@ using namespace HTMLNames; - #define YYMAXDEPTH 10000 - #define YYDEBUG 0 - --// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x --#define YYPARSE_PARAM parser --#define YYLEX_PARAM parser -- - %} - - %pure_parser - -+%parse-param { CSSParser* parser } -+%lex-param { CSSParser* parser } -+ - %union { - bool boolean; - char character; -@@ -89,7 +88,7 @@ using namespace HTMLNames; - - %{ - --static inline int cssyyerror(const char*) -+static inline int cssyyerror(void*, const char*) - { - return 1; - } -diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp -index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644 ---- a/Source/WebCore/css/CSSParser.cpp -+++ b/Source/WebCore/css/CSSParser.cpp -@@ -114,7 +114,7 @@ - extern int cssyydebug; - #endif - --extern int cssyyparse(void* parser); -+extern int cssyyparse(WebCore::CSSParser*); - - using namespace std; - using namespace WTF; -diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y -index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644 ---- a/Source/WebCore/xml/XPathGrammar.y -+++ b/Source/WebCore/xml/XPathGrammar.y -@@ -34,6 +34,7 @@ - #include "XPathParser.h" - #include "XPathPath.h" - #include "XPathPredicate.h" -+#include "XPathStep.h" - #include "XPathVariableReference.h" - #include - -@@ -44,8 +45,6 @@ - #define YYLTYPE_IS_TRIVIAL 1 - #define YYDEBUG 0 - #define YYMAXDEPTH 10000 --#define YYPARSE_PARAM parserParameter --#define PARSER static_cast(parserParameter) - - using namespace WebCore; - using namespace XPath; -@@ -53,6 +52,7 @@ using namespace XPath; - %} - - %pure_parser -+%parse-param { WebCore::XPath::Parser* parser } - - %union - { -@@ -71,7 +71,7 @@ using namespace XPath; - %{ - - static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } --static void xpathyyerror(const char*) { } -+static void xpathyyerror(void*, const char*) { } - - %} - -@@ -118,7 +118,7 @@ static void xpathyyerror(const char*) { } - Expr: - OrExpr - { -- PARSER->m_topExpr = $1; -+ parser->m_topExpr = $1; - } - ; - -@@ -138,7 +138,7 @@ AbsoluteLocationPath: - '/' - { - $$ = new LocationPath; -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - | - '/' RelativeLocationPath -@@ -150,7 +150,7 @@ AbsoluteLocationPath: - { - $$ = $2; - $$->insertFirstStep($1); -- PARSER->unregisterParseNode($1); -+ parser->unregisterParseNode($1); - } - ; - -@@ -159,22 +159,22 @@ RelativeLocationPath: - { - $$ = new LocationPath; - $$->appendStep($1); -- PARSER->unregisterParseNode($1); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->registerParseNode($$); - } - | - RelativeLocationPath '/' Step - { - $$->appendStep($3); -- PARSER->unregisterParseNode($3); -+ parser->unregisterParseNode($3); - } - | - RelativeLocationPath DescendantOrSelf Step - { - $$->appendStep($2); - $$->appendStep($3); -- PARSER->unregisterParseNode($2); -- PARSER->unregisterParseNode($3); -+ parser->unregisterParseNode($2); -+ parser->unregisterParseNode($3); - } - ; - -@@ -183,58 +183,58 @@ Step: - { - if ($2) { - $$ = new Step(Step::ChildAxis, *$1, *$2); -- PARSER->deletePredicateVector($2); -+ parser->deletePredicateVector($2); - } else - $$ = new Step(Step::ChildAxis, *$1); -- PARSER->deleteNodeTest($1); -- PARSER->registerParseNode($$); -+ parser->deleteNodeTest($1); -+ parser->registerParseNode($$); - } - | - NAMETEST OptionalPredicateList - { - String localName; - String namespaceURI; -- if (!PARSER->expandQName(*$1, localName, namespaceURI)) { -- PARSER->m_gotNamespaceError = true; -+ if (!parser->expandQName(*$1, localName, namespaceURI)) { -+ parser->m_gotNamespaceError = true; - YYABORT; - } - - if ($2) { - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); -- PARSER->deletePredicateVector($2); -+ parser->deletePredicateVector($2); - } else - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - AxisSpecifier NodeTest OptionalPredicateList - { - if ($3) { - $$ = new Step($1, *$2, *$3); -- PARSER->deletePredicateVector($3); -+ parser->deletePredicateVector($3); - } else - $$ = new Step($1, *$2); -- PARSER->deleteNodeTest($2); -- PARSER->registerParseNode($$); -+ parser->deleteNodeTest($2); -+ parser->registerParseNode($$); - } - | - AxisSpecifier NAMETEST OptionalPredicateList - { - String localName; - String namespaceURI; -- if (!PARSER->expandQName(*$2, localName, namespaceURI)) { -- PARSER->m_gotNamespaceError = true; -+ if (!parser->expandQName(*$2, localName, namespaceURI)) { -+ parser->m_gotNamespaceError = true; - YYABORT; - } - - if ($3) { - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); -- PARSER->deletePredicateVector($3); -+ parser->deletePredicateVector($3); - } else - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); -- PARSER->deleteString($2); -- PARSER->registerParseNode($$); -+ parser->deleteString($2); -+ parser->registerParseNode($$); - } - | - AbbreviatedStep -@@ -259,23 +259,23 @@ NodeTest: - else if (*$1 == "comment") - $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); - -- PARSER->deleteString($1); -- PARSER->registerNodeTest($$); -+ parser->deleteString($1); -+ parser->registerNodeTest($$); - } - | - PI '(' ')' - { - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); -- PARSER->deleteString($1); -- PARSER->registerNodeTest($$); -+ parser->deleteString($1); -+ parser->registerNodeTest($$); - } - | - PI '(' LITERAL ')' - { - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); -- PARSER->deleteString($1); -- PARSER->deleteString($3); -- PARSER->registerNodeTest($$); -+ parser->deleteString($1); -+ parser->deleteString($3); -+ parser->registerNodeTest($$); - } - ; - -@@ -293,14 +293,14 @@ PredicateList: - { - $$ = new Vector; - $$->append(new Predicate($1)); -- PARSER->unregisterParseNode($1); -- PARSER->registerPredicateVector($$); -+ parser->unregisterParseNode($1); -+ parser->registerPredicateVector($$); - } - | - PredicateList Predicate - { - $$->append(new Predicate($2)); -- PARSER->unregisterParseNode($2); -+ parser->unregisterParseNode($2); - } - ; - -@@ -315,7 +315,7 @@ DescendantOrSelf: - SLASHSLASH - { - $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - ; - -@@ -323,13 +323,13 @@ AbbreviatedStep: - '.' - { - $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - | - DOTDOT - { - $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - ; - -@@ -337,8 +337,8 @@ PrimaryExpr: - VARIABLEREFERENCE - { - $$ = new VariableReference(*$1); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - '(' Expr ')' -@@ -349,15 +349,15 @@ PrimaryExpr: - LITERAL - { - $$ = new StringExpression(*$1); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - NUMBER - { - $$ = new Number($1->toDouble()); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - FunctionCall -@@ -369,8 +369,8 @@ FunctionCall: - $$ = createFunction(*$1); - if (!$$) - YYABORT; -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - FUNCTIONNAME '(' ArgumentList ')' -@@ -378,9 +378,9 @@ FunctionCall: - $$ = createFunction(*$1, *$3); - if (!$$) - YYABORT; -- PARSER->deleteString($1); -- PARSER->deleteExpressionVector($3); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->deleteExpressionVector($3); -+ parser->registerParseNode($$); - } - ; - -@@ -389,14 +389,14 @@ ArgumentList: - { - $$ = new Vector; - $$->append($1); -- PARSER->unregisterParseNode($1); -- PARSER->registerExpressionVector($$); -+ parser->unregisterParseNode($1); -+ parser->registerExpressionVector($$); - } - | - ArgumentList ',' Argument - { - $$->append($3); -- PARSER->unregisterParseNode($3); -+ parser->unregisterParseNode($3); - } - ; - -@@ -412,9 +412,9 @@ UnionExpr: - $$ = new Union; - $$->addSubExpression($1); - $$->addSubExpression($3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -430,9 +430,9 @@ PathExpr: - { - $3->setAbsolute(true); - $$ = new Path(static_cast($1), $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - | - FilterExpr DescendantOrSelf RelativeLocationPath -@@ -440,10 +440,10 @@ PathExpr: - $3->insertFirstStep($2); - $3->setAbsolute(true); - $$ = new Path(static_cast($1), $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($2); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($2); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -453,9 +453,9 @@ FilterExpr: - PrimaryExpr PredicateList - { - $$ = new Filter($1, *$2); -- PARSER->unregisterParseNode($1); -- PARSER->deletePredicateVector($2); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->deletePredicateVector($2); -+ parser->registerParseNode($$); - } - ; - -@@ -465,9 +465,9 @@ OrExpr: - OrExpr OR AndExpr - { - $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -477,9 +477,9 @@ AndExpr: - AndExpr AND EqualityExpr - { - $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -489,9 +489,9 @@ EqualityExpr: - EqualityExpr EQOP RelationalExpr - { - $$ = new EqTestOp($2, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -501,9 +501,9 @@ RelationalExpr: - RelationalExpr RELOP AdditiveExpr - { - $$ = new EqTestOp($2, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -513,17 +513,17 @@ AdditiveExpr: - AdditiveExpr PLUS MultiplicativeExpr - { - $$ = new NumericOp(NumericOp::OP_Add, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - | - AdditiveExpr MINUS MultiplicativeExpr - { - $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -533,9 +533,9 @@ MultiplicativeExpr: - MultiplicativeExpr MULOP UnaryExpr - { - $$ = new NumericOp($2, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -546,8 +546,8 @@ UnaryExpr: - { - $$ = new Negative; - $$->addSubExpression($2); -- PARSER->unregisterParseNode($2); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($2); -+ parser->registerParseNode($$); - } - ; - -diff --git a/Source/WebCore/xml/XPathParser.cpp b/Source/WebCore/xml/XPathParser.cpp -index 62d8ee37fd6ebb74a580a00c59beb6cd40c5a8b7..b5e6a9237593b4aaa2a243f2ff9d86e57f930a97 100644 ---- a/Source/WebCore/xml/XPathParser.cpp -+++ b/Source/WebCore/xml/XPathParser.cpp -@@ -32,24 +32,21 @@ - #include "XPathEvaluator.h" - #include "XPathException.h" - #include "XPathNSResolver.h" -+#include "XPathPath.h" - #include "XPathStep.h" - #include - #include - --int xpathyyparse(void*); -- -+using namespace WebCore; - using namespace WTF; - using namespace Unicode; -+using namespace XPath; - --namespace WebCore { --namespace XPath { -- --class LocationPath; -- --#include "XPathGrammar.h" -+extern int xpathyyparse(WebCore::XPath::Parser*); -+#include "XPathGrammar.h" - - Parser* Parser::currentParser = 0; -- -+ - enum XMLCat { NameStart, NameCont, NotPartOfName }; - - typedef HashMap AxisNamesMap; -@@ -630,5 +627,3 @@ void Parser::deleteNodeTest(Step::NodeTest* t) - delete t; - } - --} --} From 737374e72d555957e74d80005f00befa0342e1e2 Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sun, 23 Dec 2012 22:55:48 +1100 Subject: [PATCH 3/4] wine: 1.5.19 -> 1.5.20 --- wine/.footprint | 26 ++++++++++++++++++++++++++ wine/.md5sum | 2 +- wine/Pkgfile | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/wine/.footprint b/wine/.footprint index ffc214477..8b89efa47 100644 --- a/wine/.footprint +++ b/wine/.footprint @@ -707,6 +707,8 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/ -rw-r--r-- root/root usr/include/wine/windows/winuser.rh -rw-r--r-- root/root usr/include/wine/windows/winver.h -rw-r--r-- root/root usr/include/wine/windows/wmistr.h +-rw-r--r-- root/root usr/include/wine/windows/wmiutils.h +-rw-r--r-- root/root usr/include/wine/windows/wmiutils.idl -rw-r--r-- root/root usr/include/wine/windows/wmsbuffer.h -rw-r--r-- root/root usr/include/wine/windows/wmsbuffer.idl -rw-r--r-- root/root usr/include/wine/windows/wmsdkidl.h @@ -749,6 +751,17 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/advapi32.dll.so -rwxr-xr-x root/root usr/lib/wine/advpack.dll.so -rwxr-xr-x root/root usr/lib/wine/amstream.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-winrt-error-l1-1-0.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-downlevel-advapi32-l1-1-0.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-downlevel-advapi32-l2-1-0.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-downlevel-normaliz-l1-1-0.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-downlevel-ole32-l1-1-0.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-downlevel-shell32-l1-1-0.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-downlevel-shlwapi-l1-1-0.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-downlevel-shlwapi-l2-1-0.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-downlevel-user32-l1-1-0.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-downlevel-version-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/apphelp.dll.so -rwxr-xr-x root/root usr/lib/wine/appwiz.cpl.so -rwxr-xr-x root/root usr/lib/wine/aspnet_regiis.exe.so @@ -794,6 +807,7 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/ctl3dv2.dll16.so -rwxr-xr-x root/root usr/lib/wine/d3d10.dll.so -rwxr-xr-x root/root usr/lib/wine/d3d10core.dll.so +-rwxr-xr-x root/root usr/lib/wine/d3d11.dll.so -rwxr-xr-x root/root usr/lib/wine/d3d8.dll.so -rwxr-xr-x root/root usr/lib/wine/d3d9.dll.so -rwxr-xr-x root/root usr/lib/wine/d3dcompiler_33.dll.so @@ -893,6 +907,17 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rw-r--r-- root/root usr/lib/wine/fakedlls/advapi32.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/advpack.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/amstream.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-0.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-downlevel-advapi32-l1-1-0.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-downlevel-advapi32-l2-1-0.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-downlevel-normaliz-l1-1-0.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-downlevel-ole32-l1-1-0.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-downlevel-shell32-l1-1-0.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-downlevel-shlwapi-l1-1-0.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-downlevel-shlwapi-l2-1-0.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-downlevel-user32-l1-1-0.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-downlevel-version-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/apphelp.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/appwiz.cpl -rw-r--r-- root/root usr/lib/wine/fakedlls/aspnet_regiis.exe @@ -938,6 +963,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rw-r--r-- root/root usr/lib/wine/fakedlls/ctl3dv2.dll16 -rw-r--r-- root/root usr/lib/wine/fakedlls/d3d10.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/d3d10core.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/d3d11.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/d3d8.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/d3d9.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/d3dcompiler_33.dll diff --git a/wine/.md5sum b/wine/.md5sum index 55f949054..f36aab437 100644 --- a/wine/.md5sum +++ b/wine/.md5sum @@ -1,3 +1,3 @@ -713ad4e383abf4288c48c3cf9743a503 wine-1.5.19.tar.bz2 +ea1c3ec9935d1da1b0f50552d540c242 wine-1.5.20.tar.bz2 a79eb547bcb562aea5c7096bc97fff11 wine-mono-0.0.8.msi c2f19f07e399d8b9d75a14f37fdddca7 wine_gecko-1.8-x86.msi diff --git a/wine/Pkgfile b/wine/Pkgfile index e41b82fdf..e58ef86ed 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -5,7 +5,7 @@ # Depends on: fontconfig fontforge freeglut gnutls lcms mpg123 openal xorg-libxcomposite xorg-libxcursor xorg-libxinerama xorg-libxrandr xorg-libxxf86dga prelink name=wine -version=1.5.19 +version=1.5.20 release=1 source=(http://downloads.sourceforge.net/wine/$name-$version.tar.bz2 http://downloads.sourceforge.net/wine/wine_gecko-1.8-x86.msi From bda084ae59b66a351ea253f19ec2f723b55f6ffc Mon Sep 17 00:00:00 2001 From: Juergen Daubert Date: Sun, 23 Dec 2012 17:13:22 +0100 Subject: [PATCH 4/4] mysql: update to 5.5.29 --- mysql/.md5sum | 2 +- mysql/Pkgfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql/.md5sum b/mysql/.md5sum index dbe61a1c7..4b92a1bc2 100644 --- a/mysql/.md5sum +++ b/mysql/.md5sum @@ -1,3 +1,3 @@ 6de62cde6cc212b5cd1f87e0df848b1d my.cnf -da8ddb3d00e6e159153d2444360f52a8 mysql-5.5.28.tar.gz +e6b9f9cb82e990bd8f0474df7462904e mysql-5.5.29.tar.gz 642a596f13ebd7e459c5ff2fd382f06b mysqld diff --git a/mysql/Pkgfile b/mysql/Pkgfile index cc5043c47..c00ebbcac 100644 --- a/mysql/Pkgfile +++ b/mysql/Pkgfile @@ -4,7 +4,7 @@ # Depends on: tcp_wrappers ncurses zlib openssl cmake libaio name=mysql -version=5.5.28 +version=5.5.29 release=1 source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.5/$name-$version.tar.gz \ my.cnf mysqld)