diff options
| author | root <root@rshg054.dnsready.net> | 2012-09-18 00:20:21 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-09-18 00:20:21 -0700 |
| commit | 0eb0f7dcc1b8f07ad3f0eb5086eafba8f627967d (patch) | |
| tree | 5e9211b5c62c88d15ad6652e0575105433af04dc | |
| parent | d1d75c37c446dfbe9cbae503300e17f2973dbf44 (diff) | |
Tue Sep 18 00:20:18 PDT 2012
42 files changed, 2709 insertions, 180 deletions
diff --git a/community-testing/qtcreator/PKGBUILD b/community-testing/qtcreator/PKGBUILD new file mode 100644 index 000000000..e0af9d0c7 --- /dev/null +++ b/community-testing/qtcreator/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 76389 2012-09-17 08:13:07Z svenstaro $ +# Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor: Dan Vratil <progdan@progdansoft.com> +# Contributor: thotypous <matiasΘarchlinux-br·org> +# Contributor: delor <bartekpiech gmail com> + +pkgname="qtcreator" +pkgver=2.6.0beta +_pkgver=2.6.0-beta +pkgrel=1 +pkgdesc='Lightweight, cross-platform integrated development environment' +arch=('i686' 'x86_64') +url='http://qt.nokia.com/products/developer-tools' +license=('LGPL') +depends=('qt') +makedepends=('qt-private-headers' 'git') +options=('docs') +optdepends=('qt-doc: for the integrated Qt documentation' + 'gdb: for the debugger' + 'cmake: for cmake project suppport' + 'openssh-askpass: for ssh support' + 'git: for git support' + 'mercurial: for mercurial support' + 'bzr: for bazaar support' + 'valgrind: for analyze support') +install=qtcreator.install +source=("http://origin.releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz" + 'qtcreator.desktop') +md5sums=('ea7c9a94369b6424e98b442a14145bc9' + 'f1f4680b9838ff0b8f4cf11eb850d662') + +build() { + cd ${srcdir} + + [[ -d build ]] && rm -r build + mkdir build && cd build + + qmake ${srcdir}/qt-creator-${_pkgver}-src/qtcreator.pro + make +} + +package() { + cd ${srcdir}/build + + make INSTALL_ROOT="${pkgdir}/usr/" install + + install -Dm644 ${srcdir}/qtcreator.desktop \ + ${pkgdir}/usr/share/applications/qtcreator.desktop + install -Dm644 ${srcdir}/qt-creator-${_pkgver}-src/LGPL_EXCEPTION.TXT \ + ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT +} diff --git a/community-testing/qtcreator/fix-glsl-shit.patch b/community-testing/qtcreator/fix-glsl-shit.patch new file mode 100644 index 000000000..4b5e504e1 --- /dev/null +++ b/community-testing/qtcreator/fix-glsl-shit.patch @@ -0,0 +1,2376 @@ +From e91045469d59c35607faa344bcfba2b2c566da51 Mon Sep 17 00:00:00 2001 +From: Christian Kamm <christian.d.kamm@nokia.com> +Date: Mon, 6 Aug 2012 11:29:55 +0200 +Subject: [PATCH] GLSL: Fix recovery token order to avoid infinite loop. + +The case 'a = b ? ;' recovered with T_NUMBER, T_COMMA, T_NUMBER, ... + +Task-number: QTCREATORBUG-7517 +Change-Id: I3546266b21d11ce08e4af1331be94a78d3b24c19 +Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> +--- + src/libs/glsl/glsl.g | 4 +- + src/libs/glsl/glslparser.cpp | 638 +++++++++++++++++++++--------------------- + src/libs/glsl/glslparser.h | 2 +- + 3 files changed, 322 insertions(+), 322 deletions(-) + +diff --git a/src/libs/glsl/glsl.g b/src/libs/glsl/glsl.g +index 67f564c..3c6ae7c 100644 +--- a/src/libs/glsl/glsl.g ++++ b/src/libs/glsl/glsl.g +@@ -456,7 +456,7 @@ private: + #include <iostream> + #include <cstdio> + #include <cassert> +-#include <QtCore/QDebug> ++#include <QDebug> + + using namespace GLSL; + +@@ -591,7 +591,7 @@ AST *Parser::parse(int startToken) + + static int tks[] = { + T_RIGHT_BRACE, T_RIGHT_PAREN, T_RIGHT_BRACKET, +- T_SEMICOLON, T_COMMA, T_COLON, ++ T_SEMICOLON, T_COLON, T_COMMA, + T_NUMBER, T_TYPE_NAME, T_IDENTIFIER, + T_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET, + T_WHILE, +diff --git a/src/libs/glsl/glslparser.cpp b/src/libs/glsl/glslparser.cpp +index cf4bbe4..d82096b 100644 +--- a/src/libs/glsl/glslparser.cpp ++++ b/src/libs/glsl/glslparser.cpp +@@ -1,5 +1,5 @@ + +-#line 427 "./glsl.g" ++#line 423 "./glsl.g" + + /************************************************************************** + ** +@@ -171,7 +171,7 @@ AST *Parser::parse(int startToken) + + static int tks[] = { + T_RIGHT_BRACE, T_RIGHT_PAREN, T_RIGHT_BRACKET, +- T_SEMICOLON, T_COMMA, T_COLON, ++ T_SEMICOLON, T_COLON, T_COMMA, + T_NUMBER, T_TYPE_NAME, T_IDENTIFIER, + T_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET, + T_WHILE, +@@ -215,137 +215,137 @@ AST *Parser::parse(int startToken) + return 0; + } + +-#line 647 "./glsl.g" ++#line 641 "./glsl.g" + + void Parser::reduce(int ruleno) + { + switch(ruleno) { + +-#line 656 "./glsl.g" ++#line 650 "./glsl.g" + + case 0: { + ast(1) = makeAstNode<IdentifierExpressionAST>(string(1)); + } break; + +-#line 663 "./glsl.g" ++#line 657 "./glsl.g" + + case 1: { + ast(1) = makeAstNode<LiteralExpressionAST>(string(1)); + } break; + +-#line 670 "./glsl.g" ++#line 664 "./glsl.g" + + case 2: { + ast(1) = makeAstNode<LiteralExpressionAST>(_engine->identifier("true", 4)); + } break; + +-#line 677 "./glsl.g" ++#line 671 "./glsl.g" + + case 3: { + ast(1) = makeAstNode<LiteralExpressionAST>(_engine->identifier("false", 5)); + } break; + +-#line 684 "./glsl.g" ++#line 678 "./glsl.g" + + case 4: { + // nothing to do. + } break; + +-#line 691 "./glsl.g" ++#line 685 "./glsl.g" + + case 5: { + ast(1) = ast(2); + } break; + +-#line 698 "./glsl.g" ++#line 692 "./glsl.g" + + case 6: { + // nothing to do. + } break; + +-#line 705 "./glsl.g" ++#line 699 "./glsl.g" + + case 7: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ArrayAccess, expression(1), expression(3)); + } break; + +-#line 712 "./glsl.g" ++#line 706 "./glsl.g" + + case 8: { + // nothing to do. + } break; + +-#line 719 "./glsl.g" ++#line 713 "./glsl.g" + + case 9: { + ast(1) = makeAstNode<MemberAccessExpressionAST>(expression(1), string(3)); + } break; + +-#line 726 "./glsl.g" ++#line 720 "./glsl.g" + + case 10: { + ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PostIncrement, expression(1)); + } break; + +-#line 733 "./glsl.g" ++#line 727 "./glsl.g" + + case 11: { + ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PostDecrement, expression(1)); + } break; + +-#line 740 "./glsl.g" ++#line 734 "./glsl.g" + + case 12: { + // nothing to do. + } break; + +-#line 747 "./glsl.g" ++#line 741 "./glsl.g" + + case 13: { + // nothing to do. + } break; + +-#line 754 "./glsl.g" ++#line 748 "./glsl.g" + + case 14: { + ast(1) = makeAstNode<FunctionCallExpressionAST> + (sym(1).function.id, sym(1).function.arguments); + } break; + +-#line 762 "./glsl.g" ++#line 756 "./glsl.g" + + case 15: { + ast(1) = makeAstNode<FunctionCallExpressionAST> + (expression(1), sym(3).function.id, sym(3).function.arguments); + } break; + +-#line 770 "./glsl.g" ++#line 764 "./glsl.g" + + case 16: { + // nothing to do. + } break; + +-#line 777 "./glsl.g" ++#line 771 "./glsl.g" + + case 17: { + // nothing to do. + } break; + +-#line 784 "./glsl.g" ++#line 778 "./glsl.g" + + case 18: { + sym(1).function.id = sym(1).function_identifier; + sym(1).function.arguments = 0; + } break; + +-#line 792 "./glsl.g" ++#line 786 "./glsl.g" + + case 19: { + sym(1).function.id = sym(1).function_identifier; + sym(1).function.arguments = 0; + } break; + +-#line 800 "./glsl.g" ++#line 794 "./glsl.g" + + case 20: { + sym(1).function.id = sym(1).function_identifier; +@@ -353,7 +353,7 @@ case 20: { + makeAstNode< List<ExpressionAST *> >(expression(2)); + } break; + +-#line 809 "./glsl.g" ++#line 803 "./glsl.g" + + case 21: { + sym(1).function.arguments = +@@ -361,379 +361,379 @@ case 21: { + (sym(1).function.arguments, expression(3)); + } break; + +-#line 818 "./glsl.g" ++#line 812 "./glsl.g" + + case 22: { + // nothing to do. + } break; + +-#line 825 "./glsl.g" ++#line 819 "./glsl.g" + + case 23: { + ast(1) = makeAstNode<FunctionIdentifierAST>(type(1)); + } break; + +-#line 832 "./glsl.g" ++#line 826 "./glsl.g" + + case 24: { + ast(1) = makeAstNode<FunctionIdentifierAST>(string(1)); + } break; + +-#line 839 "./glsl.g" ++#line 833 "./glsl.g" + + case 25: { + // nothing to do. + } break; + +-#line 846 "./glsl.g" ++#line 840 "./glsl.g" + + case 26: { + ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PreIncrement, expression(2)); + } break; + +-#line 853 "./glsl.g" ++#line 847 "./glsl.g" + + case 27: { + ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PreDecrement, expression(2)); + } break; + +-#line 860 "./glsl.g" ++#line 854 "./glsl.g" + + case 28: { + ast(1) = makeAstNode<UnaryExpressionAST>(sym(1).kind, expression(2)); + } break; + +-#line 867 "./glsl.g" ++#line 861 "./glsl.g" + + case 29: { + sym(1).kind = AST::Kind_UnaryPlus; + } break; + +-#line 874 "./glsl.g" ++#line 868 "./glsl.g" + + case 30: { + sym(1).kind = AST::Kind_UnaryMinus; + } break; + +-#line 881 "./glsl.g" ++#line 875 "./glsl.g" + + case 31: { + sym(1).kind = AST::Kind_LogicalNot; + } break; + +-#line 888 "./glsl.g" ++#line 882 "./glsl.g" + + case 32: { + sym(1).kind = AST::Kind_BitwiseNot; + } break; + +-#line 895 "./glsl.g" ++#line 889 "./glsl.g" + + case 33: { + // nothing to do. + } break; + +-#line 902 "./glsl.g" ++#line 896 "./glsl.g" + + case 34: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Multiply, expression(1), expression(3)); + } break; + +-#line 909 "./glsl.g" ++#line 903 "./glsl.g" + + case 35: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Divide, expression(1), expression(3)); + } break; + +-#line 916 "./glsl.g" ++#line 910 "./glsl.g" + + case 36: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Modulus, expression(1), expression(3)); + } break; + +-#line 923 "./glsl.g" ++#line 917 "./glsl.g" + + case 37: { + // nothing to do. + } break; + +-#line 930 "./glsl.g" ++#line 924 "./glsl.g" + + case 38: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Plus, expression(1), expression(3)); + } break; + +-#line 937 "./glsl.g" ++#line 931 "./glsl.g" + + case 39: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Minus, expression(1), expression(3)); + } break; + +-#line 944 "./glsl.g" ++#line 938 "./glsl.g" + + case 40: { + // nothing to do. + } break; + +-#line 951 "./glsl.g" ++#line 945 "./glsl.g" + + case 41: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ShiftLeft, expression(1), expression(3)); + } break; + +-#line 958 "./glsl.g" ++#line 952 "./glsl.g" + + case 42: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ShiftRight, expression(1), expression(3)); + } break; + +-#line 965 "./glsl.g" ++#line 959 "./glsl.g" + + case 43: { + // nothing to do. + } break; + +-#line 972 "./glsl.g" ++#line 966 "./glsl.g" + + case 44: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LessThan, expression(1), expression(3)); + } break; + +-#line 979 "./glsl.g" ++#line 973 "./glsl.g" + + case 45: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_GreaterThan, expression(1), expression(3)); + } break; + +-#line 986 "./glsl.g" ++#line 980 "./glsl.g" + + case 46: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LessEqual, expression(1), expression(3)); + } break; + +-#line 993 "./glsl.g" ++#line 987 "./glsl.g" + + case 47: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_GreaterEqual, expression(1), expression(3)); + } break; + +-#line 1000 "./glsl.g" ++#line 994 "./glsl.g" + + case 48: { + // nothing to do. + } break; + +-#line 1007 "./glsl.g" ++#line 1001 "./glsl.g" + + case 49: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Equal, expression(1), expression(3)); + } break; + +-#line 1014 "./glsl.g" ++#line 1008 "./glsl.g" + + case 50: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_NotEqual, expression(1), expression(3)); + } break; + +-#line 1021 "./glsl.g" ++#line 1015 "./glsl.g" + + case 51: { + // nothing to do. + } break; + +-#line 1028 "./glsl.g" ++#line 1022 "./glsl.g" + + case 52: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseAnd, expression(1), expression(3)); + } break; + +-#line 1035 "./glsl.g" ++#line 1029 "./glsl.g" + + case 53: { + // nothing to do. + } break; + +-#line 1042 "./glsl.g" ++#line 1036 "./glsl.g" + + case 54: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseXor, expression(1), expression(3)); + } break; + +-#line 1049 "./glsl.g" ++#line 1043 "./glsl.g" + + case 55: { + // nothing to do. + } break; + +-#line 1056 "./glsl.g" ++#line 1050 "./glsl.g" + + case 56: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseOr, expression(1), expression(3)); + } break; + +-#line 1063 "./glsl.g" ++#line 1057 "./glsl.g" + + case 57: { + // nothing to do. + } break; + +-#line 1070 "./glsl.g" ++#line 1064 "./glsl.g" + + case 58: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalAnd, expression(1), expression(3)); + } break; + +-#line 1077 "./glsl.g" ++#line 1071 "./glsl.g" + + case 59: { + // nothing to do. + } break; + +-#line 1084 "./glsl.g" ++#line 1078 "./glsl.g" + + case 60: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalXor, expression(1), expression(3)); + } break; + +-#line 1091 "./glsl.g" ++#line 1085 "./glsl.g" + + case 61: { + // nothing to do. + } break; + +-#line 1098 "./glsl.g" ++#line 1092 "./glsl.g" + + case 62: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalOr, expression(1), expression(3)); + } break; + +-#line 1105 "./glsl.g" ++#line 1099 "./glsl.g" + + case 63: { + // nothing to do. + } break; + +-#line 1112 "./glsl.g" ++#line 1106 "./glsl.g" + + case 64: { + ast(1) = makeAstNode<TernaryExpressionAST>(AST::Kind_Conditional, expression(1), expression(3), expression(5)); + } break; + +-#line 1119 "./glsl.g" ++#line 1113 "./glsl.g" + + case 65: { + // nothing to do. + } break; + +-#line 1126 "./glsl.g" ++#line 1120 "./glsl.g" + + case 66: { + ast(1) = makeAstNode<AssignmentExpressionAST>(sym(2).kind, expression(1), expression(3)); + } break; + +-#line 1133 "./glsl.g" ++#line 1127 "./glsl.g" + + case 67: { + sym(1).kind = AST::Kind_Assign; + } break; + +-#line 1140 "./glsl.g" ++#line 1134 "./glsl.g" + + case 68: { + sym(1).kind = AST::Kind_AssignMultiply; + } break; + +-#line 1147 "./glsl.g" ++#line 1141 "./glsl.g" + + case 69: { + sym(1).kind = AST::Kind_AssignDivide; + } break; + +-#line 1154 "./glsl.g" ++#line 1148 "./glsl.g" + + case 70: { + sym(1).kind = AST::Kind_AssignModulus; + } break; + +-#line 1161 "./glsl.g" ++#line 1155 "./glsl.g" + + case 71: { + sym(1).kind = AST::Kind_AssignPlus; + } break; + +-#line 1168 "./glsl.g" ++#line 1162 "./glsl.g" + + case 72: { + sym(1).kind = AST::Kind_AssignMinus; + } break; + +-#line 1175 "./glsl.g" ++#line 1169 "./glsl.g" + + case 73: { + sym(1).kind = AST::Kind_AssignShiftLeft; + } break; + +-#line 1182 "./glsl.g" ++#line 1176 "./glsl.g" + + case 74: { + sym(1).kind = AST::Kind_AssignShiftRight; + } break; + +-#line 1189 "./glsl.g" ++#line 1183 "./glsl.g" + + case 75: { + sym(1).kind = AST::Kind_AssignAnd; + } break; + +-#line 1196 "./glsl.g" ++#line 1190 "./glsl.g" + + case 76: { + sym(1).kind = AST::Kind_AssignXor; + } break; + +-#line 1203 "./glsl.g" ++#line 1197 "./glsl.g" + + case 77: { + sym(1).kind = AST::Kind_AssignOr; + } break; + +-#line 1210 "./glsl.g" ++#line 1204 "./glsl.g" + + case 78: { + // nothing to do. + } break; + +-#line 1217 "./glsl.g" ++#line 1211 "./glsl.g" + + case 79: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Comma, expression(1), expression(3)); + } break; + +-#line 1224 "./glsl.g" ++#line 1218 "./glsl.g" + + case 80: { + // nothing to do. + } break; + +-#line 1231 "./glsl.g" ++#line 1225 "./glsl.g" + + case 81: { + // nothing to do. + } break; + +-#line 1238 "./glsl.g" ++#line 1232 "./glsl.g" + + case 82: { + ast(1) = makeAstNode<InitDeclarationAST>(sym(1).declaration_list); + } break; + +-#line 1245 "./glsl.g" ++#line 1239 "./glsl.g" + + case 83: { + ast(1) = makeAstNode<PrecisionDeclarationAST>(sym(2).precision, type(3)); + } break; + +-#line 1252 "./glsl.g" ++#line 1246 "./glsl.g" + + case 84: { + if (sym(1).type_qualifier.qualifier != QualifiedTypeAST::Struct) { +@@ -743,7 +743,7 @@ case 84: { + ast(1) = makeAstNode<TypeDeclarationAST>(type); + } break; + +-#line 1263 "./glsl.g" ++#line 1257 "./glsl.g" + + case 85: { + if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) { +@@ -761,7 +761,7 @@ case 85: { + makeAstNode<VariableDeclarationAST>(qualtype, string(6))); + } break; + +-#line 1282 "./glsl.g" ++#line 1276 "./glsl.g" + + case 86: { + if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) { +@@ -780,7 +780,7 @@ case 86: { + (makeAstNode<ArrayTypeAST>(qualtype), string(6))); + } break; + +-#line 1302 "./glsl.g" ++#line 1296 "./glsl.g" + + case 87: { + if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) { +@@ -799,7 +799,7 @@ case 87: { + (makeAstNode<ArrayTypeAST>(qualtype, expression(8)), string(6))); + } break; + +-#line 1322 "./glsl.g" ++#line 1316 "./glsl.g" + + case 88: { + TypeAST *type = makeAstNode<QualifiedTypeAST> +@@ -808,59 +808,59 @@ case 88: { + ast(1) = makeAstNode<TypeDeclarationAST>(type); + } break; + +-#line 1332 "./glsl.g" ++#line 1326 "./glsl.g" + + case 89: { + function(1)->finishParams(); + } break; + +-#line 1339 "./glsl.g" ++#line 1333 "./glsl.g" + + case 90: { + // nothing to do. + } break; + +-#line 1346 "./glsl.g" ++#line 1340 "./glsl.g" + + case 91: { + // nothing to do. + } break; + +-#line 1353 "./glsl.g" ++#line 1347 "./glsl.g" + + case 92: { + function(1)->params = makeAstNode< List<ParameterDeclarationAST *> > + (sym(2).param_declaration); + } break; + +-#line 1361 "./glsl.g" ++#line 1355 "./glsl.g" + + case 93: { + function(1)->params = makeAstNode< List<ParameterDeclarationAST *> > + (function(1)->params, sym(3).param_declaration); + } break; + +-#line 1369 "./glsl.g" ++#line 1363 "./glsl.g" + + case 94: { + function(1) = makeAstNode<FunctionDeclarationAST>(type(1), string(2)); + } break; + +-#line 1376 "./glsl.g" ++#line 1370 "./glsl.g" + + case 95: { + sym(1).param_declarator.type = type(1); + sym(1).param_declarator.name = string(2); + } break; + +-#line 1384 "./glsl.g" ++#line 1378 "./glsl.g" + + case 96: { + sym(1).param_declarator.type = makeAstNode<ArrayTypeAST>(type(1), expression(4)); + sym(1).param_declarator.name = string(2); + } break; + +-#line 1392 "./glsl.g" ++#line 1386 "./glsl.g" + + case 97: { + ast(1) = makeAstNode<ParameterDeclarationAST> +@@ -871,7 +871,7 @@ case 97: { + sym(3).param_declarator.name); + } break; + +-#line 1404 "./glsl.g" ++#line 1398 "./glsl.g" + + case 98: { + ast(1) = makeAstNode<ParameterDeclarationAST> +@@ -880,7 +880,7 @@ case 98: { + sym(2).param_declarator.name); + } break; + +-#line 1414 "./glsl.g" ++#line 1408 "./glsl.g" + + case 99: { + ast(1) = makeAstNode<ParameterDeclarationAST> +@@ -890,7 +890,7 @@ case 99: { + (const QString *)0); + } break; + +-#line 1425 "./glsl.g" ++#line 1419 "./glsl.g" + + case 100: { + ast(1) = makeAstNode<ParameterDeclarationAST> +@@ -898,44 +898,44 @@ case 100: { + (const QString *)0); + } break; + +-#line 1434 "./glsl.g" ++#line 1428 "./glsl.g" + + case 101: { + sym(1).qualifier = ParameterDeclarationAST::In; + } break; + +-#line 1441 "./glsl.g" ++#line 1435 "./glsl.g" + + case 102: { + sym(1).qualifier = ParameterDeclarationAST::In; + } break; + +-#line 1448 "./glsl.g" ++#line 1442 "./glsl.g" + + case 103: { + sym(1).qualifier = ParameterDeclarationAST::Out; + } break; + +-#line 1455 "./glsl.g" ++#line 1449 "./glsl.g" + + case 104: { + sym(1).qualifier = ParameterDeclarationAST::InOut; + } break; + +-#line 1462 "./glsl.g" ++#line 1456 "./glsl.g" + + case 105: { + // nothing to do. + } break; + +-#line 1469 "./glsl.g" ++#line 1463 "./glsl.g" + + case 106: { + sym(1).declaration_list = makeAstNode< List<DeclarationAST *> > + (sym(1).declaration); + } break; + +-#line 1477 "./glsl.g" ++#line 1471 "./glsl.g" + + case 107: { + TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); +@@ -944,7 +944,7 @@ case 107: { + (sym(1).declaration_list, decl); + } break; + +-#line 1487 "./glsl.g" ++#line 1481 "./glsl.g" + + case 108: { + TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); +@@ -954,7 +954,7 @@ case 108: { + (sym(1).declaration_list, decl); + } break; + +-#line 1498 "./glsl.g" ++#line 1492 "./glsl.g" + + case 109: { + TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); +@@ -964,7 +964,7 @@ case 109: { + (sym(1).declaration_list, decl); + } break; + +-#line 1509 "./glsl.g" ++#line 1503 "./glsl.g" + + case 110: { + TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); +@@ -975,7 +975,7 @@ case 110: { + (sym(1).declaration_list, decl); + } break; + +-#line 1521 "./glsl.g" ++#line 1515 "./glsl.g" + + case 111: { + TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); +@@ -986,7 +986,7 @@ case 111: { + (sym(1).declaration_list, decl); + } break; + +-#line 1533 "./glsl.g" ++#line 1527 "./glsl.g" + + case 112: { + TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); +@@ -996,40 +996,40 @@ case 112: { + (sym(1).declaration_list, decl); + } break; + +-#line 1544 "./glsl.g" ++#line 1538 "./glsl.g" + + case 113: { + ast(1) = makeAstNode<TypeDeclarationAST>(type(1)); + } break; + +-#line 1551 "./glsl.g" ++#line 1545 "./glsl.g" + + case 114: { + ast(1) = makeAstNode<VariableDeclarationAST>(type(1), string(2)); + } break; + +-#line 1558 "./glsl.g" ++#line 1552 "./glsl.g" + + case 115: { + ast(1) = makeAstNode<VariableDeclarationAST> + (makeAstNode<ArrayTypeAST>(type(1)), string(2)); + } break; + +-#line 1566 "./glsl.g" ++#line 1560 "./glsl.g" + + case 116: { + ast(1) = makeAstNode<VariableDeclarationAST> + (makeAstNode<ArrayTypeAST>(type(1), expression(4)), string(2)); + } break; + +-#line 1574 "./glsl.g" ++#line 1568 "./glsl.g" + + case 117: { + ast(1) = makeAstNode<VariableDeclarationAST> + (makeAstNode<ArrayTypeAST>(type(1)), string(2), expression(6)); + } break; + +-#line 1582 "./glsl.g" ++#line 1576 "./glsl.g" + + case 118: { + ast(1) = makeAstNode<VariableDeclarationAST> +@@ -1037,26 +1037,26 @@ case 118: { + string(2), expression(7)); + } break; + +-#line 1591 "./glsl.g" ++#line 1585 "./glsl.g" + + case 119: { + ast(1) = makeAstNode<VariableDeclarationAST> + (type(1), string(2), expression(4)); + } break; + +-#line 1599 "./glsl.g" ++#line 1593 "./glsl.g" + + case 120: { + ast(1) = makeAstNode<InvariantDeclarationAST>(string(2)); + } break; + +-#line 1606 "./glsl.g" ++#line 1600 "./glsl.g" + + case 121: { + ast(1) = makeAstNode<QualifiedTypeAST>(0, type(1), (List<LayoutQualifierAST *> *)0); + } break; + +-#line 1613 "./glsl.g" ++#line 1607 "./glsl.g" + + case 122: { + ast(1) = makeAstNode<QualifiedTypeAST> +@@ -1064,207 +1064,207 @@ case 122: { + sym(1).type_qualifier.layout_list); + } break; + +-#line 1622 "./glsl.g" ++#line 1616 "./glsl.g" + + case 123: { + sym(1).qualifier = QualifiedTypeAST::Invariant; + } break; + +-#line 1629 "./glsl.g" ++#line 1623 "./glsl.g" + + case 124: { + sym(1).qualifier = QualifiedTypeAST::Smooth; + } break; + +-#line 1636 "./glsl.g" ++#line 1630 "./glsl.g" + + case 125: { + sym(1).qualifier = QualifiedTypeAST::Flat; + } break; + +-#line 1643 "./glsl.g" ++#line 1637 "./glsl.g" + + case 126: { + sym(1).qualifier = QualifiedTypeAST::NoPerspective; + } break; + +-#line 1650 "./glsl.g" ++#line 1644 "./glsl.g" + + case 127: { + sym(1) = sym(3); + } break; + +-#line 1657 "./glsl.g" ++#line 1651 "./glsl.g" + + case 128: { + sym(1).layout_list = makeAstNode< List<LayoutQualifierAST *> >(sym(1).layout); + } break; + +-#line 1664 "./glsl.g" ++#line 1658 "./glsl.g" + + case 129: { + sym(1).layout_list = makeAstNode< List<LayoutQualifierAST *> >(sym(1).layout_list, sym(3).layout); + } break; + +-#line 1671 "./glsl.g" ++#line 1665 "./glsl.g" + + case 130: { + sym(1).layout = makeAstNode<LayoutQualifierAST>(string(1), (const QString *)0); + } break; + +-#line 1678 "./glsl.g" ++#line 1672 "./glsl.g" + + case 131: { + sym(1).layout = makeAstNode<LayoutQualifierAST>(string(1), string(3)); + } break; + +-#line 1685 "./glsl.g" ++#line 1679 "./glsl.g" + + case 132: { + sym(1).qualifier = QualifiedTypeAST::Const; + } break; + +-#line 1692 "./glsl.g" ++#line 1686 "./glsl.g" + + case 133: { + sym(1).type_qualifier.qualifier = sym(1).qualifier; + sym(1).type_qualifier.layout_list = 0; + } break; + +-#line 1700 "./glsl.g" ++#line 1694 "./glsl.g" + + case 134: { + sym(1).type_qualifier.layout_list = sym(1).layout_list; + sym(1).type_qualifier.qualifier = 0; + } break; + +-#line 1708 "./glsl.g" ++#line 1702 "./glsl.g" + + case 135: { + sym(1).type_qualifier.layout_list = sym(1).layout_list; + sym(1).type_qualifier.qualifier = sym(2).qualifier; + } break; + +-#line 1716 "./glsl.g" ++#line 1710 "./glsl.g" + + case 136: { + sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier; + sym(1).type_qualifier.layout_list = 0; + } break; + +-#line 1724 "./glsl.g" ++#line 1718 "./glsl.g" + + case 137: { + sym(1).type_qualifier.qualifier = sym(1).qualifier; + sym(1).type_qualifier.layout_list = 0; + } break; + +-#line 1732 "./glsl.g" ++#line 1726 "./glsl.g" + + case 138: { + sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier; + sym(1).type_qualifier.layout_list = 0; + } break; + +-#line 1740 "./glsl.g" ++#line 1734 "./glsl.g" + + case 139: { + sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier | sym(3).qualifier; + sym(1).type_qualifier.layout_list = 0; + } break; + +-#line 1748 "./glsl.g" ++#line 1742 "./glsl.g" + + case 140: { + sym(1).type_qualifier.qualifier = QualifiedTypeAST::Invariant; + sym(1).type_qualifier.layout_list = 0; + } break; + +-#line 1756 "./glsl.g" ++#line 1750 "./glsl.g" + + case 141: { + sym(1).qualifier = QualifiedTypeAST::Const; + } break; + +-#line 1763 "./glsl.g" ++#line 1757 "./glsl.g" + + case 142: { + sym(1).qualifier = QualifiedTypeAST::Attribute; + } break; + +-#line 1770 "./glsl.g" ++#line 1764 "./glsl.g" + + case 143: { + sym(1).qualifier = QualifiedTypeAST::Varying; + } break; + +-#line 1777 "./glsl.g" ++#line 1771 "./glsl.g" + + case 144: { + sym(1).qualifier = QualifiedTypeAST::CentroidVarying; + } break; + +-#line 1784 "./glsl.g" ++#line 1778 "./glsl.g" + + case 145: { + sym(1).qualifier = QualifiedTypeAST::In; + } break; + +-#line 1791 "./glsl.g" ++#line 1785 "./glsl.g" + + case 146: { + sym(1).qualifier = QualifiedTypeAST::Out; + } break; + +-#line 1798 "./glsl.g" ++#line 1792 "./glsl.g" + + case 147: { + sym(1).qualifier = QualifiedTypeAST::CentroidIn; + } break; + +-#line 1805 "./glsl.g" ++#line 1799 "./glsl.g" + + case 148: { + sym(1).qualifier = QualifiedTypeAST::CentroidOut; + } break; + +-#line 1812 "./glsl.g" ++#line 1806 "./glsl.g" + + case 149: { + sym(1).qualifier = QualifiedTypeAST::PatchIn; + } break; + +-#line 1819 "./glsl.g" ++#line 1813 "./glsl.g" + + case 150: { + sym(1).qualifier = QualifiedTypeAST::PatchOut; + } break; + +-#line 1826 "./glsl.g" ++#line 1820 "./glsl.g" + + case 151: { + sym(1).qualifier = QualifiedTypeAST::SampleIn; + } break; + +-#line 1833 "./glsl.g" ++#line 1827 "./glsl.g" + + case 152: { + sym(1).qualifier = QualifiedTypeAST::SampleOut; + } break; + +-#line 1840 "./glsl.g" ++#line 1834 "./glsl.g" + + case 153: { + sym(1).qualifier = QualifiedTypeAST::Uniform; + } break; + +-#line 1847 "./glsl.g" ++#line 1841 "./glsl.g" + + case 154: { + // nothing to do. + } break; + +-#line 1854 "./glsl.g" ++#line 1848 "./glsl.g" + + case 155: { + if (!type(2)->setPrecision(sym(1).precision)) { +@@ -1273,595 +1273,595 @@ case 155: { + ast(1) = type(2); + } break; + +-#line 1864 "./glsl.g" ++#line 1858 "./glsl.g" + + case 156: { + // nothing to do. + } break; + +-#line 1871 "./glsl.g" ++#line 1865 "./glsl.g" + + case 157: { + ast(1) = makeAstNode<ArrayTypeAST>(type(1)); + } break; + +-#line 1878 "./glsl.g" ++#line 1872 "./glsl.g" + + case 158: { + ast(1) = makeAstNode<ArrayTypeAST>(type(1), expression(3)); + } break; + +-#line 1885 "./glsl.g" ++#line 1879 "./glsl.g" + + case 159: { + ast(1) = makeBasicType(T_VOID); + } break; + +-#line 1892 "./glsl.g" ++#line 1886 "./glsl.g" + + case 160: { + ast(1) = makeBasicType(T_FLOAT); + } break; + +-#line 1899 "./glsl.g" ++#line 1893 "./glsl.g" + + case 161: { + ast(1) = makeBasicType(T_DOUBLE); + } break; + +-#line 1906 "./glsl.g" ++#line 1900 "./glsl.g" + + case 162: { + ast(1) = makeBasicType(T_INT); + } break; + +-#line 1913 "./glsl.g" ++#line 1907 "./glsl.g" + + case 163: { + ast(1) = makeBasicType(T_UINT); + } break; + +-#line 1920 "./glsl.g" ++#line 1914 "./glsl.g" + + case 164: { + ast(1) = makeBasicType(T_BOOL); + } break; + +-#line 1927 "./glsl.g" ++#line 1921 "./glsl.g" + + case 165: { + ast(1) = makeBasicType(T_VEC2); + } break; + +-#line 1934 "./glsl.g" ++#line 1928 "./glsl.g" + + case 166: { + ast(1) = makeBasicType(T_VEC3); + } break; + +-#line 1941 "./glsl.g" ++#line 1935 "./glsl.g" + + case 167: { + ast(1) = makeBasicType(T_VEC4); + } break; + +-#line 1948 "./glsl.g" ++#line 1942 "./glsl.g" + + case 168: { + ast(1) = makeBasicType(T_DVEC2); + } break; + +-#line 1955 "./glsl.g" ++#line 1949 "./glsl.g" + + case 169: { + ast(1) = makeBasicType(T_DVEC3); + } break; + +-#line 1962 "./glsl.g" ++#line 1956 "./glsl.g" + + case 170: { + ast(1) = makeBasicType(T_DVEC4); + } break; + +-#line 1969 "./glsl.g" ++#line 1963 "./glsl.g" + + case 171: { + ast(1) = makeBasicType(T_BVEC2); + } break; + +-#line 1976 "./glsl.g" ++#line 1970 "./glsl.g" + + case 172: { + ast(1) = makeBasicType(T_BVEC3); + } break; + +-#line 1983 "./glsl.g" ++#line 1977 "./glsl.g" + + case 173: { + ast(1) = makeBasicType(T_BVEC4); + } break; + +-#line 1990 "./glsl.g" ++#line 1984 "./glsl.g" + + case 174: { + ast(1) = makeBasicType(T_IVEC2); + } break; + +-#line 1997 "./glsl.g" ++#line 1991 "./glsl.g" + + case 175: { + ast(1) = makeBasicType(T_IVEC3); + } break; + +-#line 2004 "./glsl.g" ++#line 1998 "./glsl.g" + + case 176: { + ast(1) = makeBasicType(T_IVEC4); + } break; + +-#line 2011 "./glsl.g" ++#line 2005 "./glsl.g" + + case 177: { + ast(1) = makeBasicType(T_UVEC2); + } break; + +-#line 2018 "./glsl.g" ++#line 2012 "./glsl.g" + + case 178: { + ast(1) = makeBasicType(T_UVEC3); + } break; + +-#line 2025 "./glsl.g" ++#line 2019 "./glsl.g" + + case 179: { + ast(1) = makeBasicType(T_UVEC4); + } break; + +-#line 2032 "./glsl.g" ++#line 2026 "./glsl.g" + + case 180: { + ast(1) = makeBasicType(T_MAT2); + } break; + +-#line 2039 "./glsl.g" ++#line 2033 "./glsl.g" + + case 181: { + ast(1) = makeBasicType(T_MAT3); + } break; + +-#line 2046 "./glsl.g" ++#line 2040 "./glsl.g" + + case 182: { + ast(1) = makeBasicType(T_MAT4); + } break; + +-#line 2053 "./glsl.g" ++#line 2047 "./glsl.g" + + case 183: { + ast(1) = makeBasicType(T_MAT2); + } break; + +-#line 2060 "./glsl.g" ++#line 2054 "./glsl.g" + + case 184: { + ast(1) = makeBasicType(T_MAT2X3); + } break; + +-#line 2067 "./glsl.g" ++#line 2061 "./glsl.g" + + case 185: { + ast(1) = makeBasicType(T_MAT2X4); + } break; + +-#line 2074 "./glsl.g" ++#line 2068 "./glsl.g" + + case 186: { + ast(1) = makeBasicType(T_MAT3X2); + } break; + +-#line 2081 "./glsl.g" ++#line 2075 "./glsl.g" + + case 187: { + ast(1) = makeBasicType(T_MAT3); + } break; + +-#line 2088 "./glsl.g" ++#line 2082 "./glsl.g" + + case 188: { + ast(1) = makeBasicType(T_MAT3X4); + } break; + +-#line 2095 "./glsl.g" ++#line 2089 "./glsl.g" + + case 189: { + ast(1) = makeBasicType(T_MAT4X2); + } break; + +-#line 2102 "./glsl.g" ++#line 2096 "./glsl.g" + + case 190: { + ast(1) = makeBasicType(T_MAT4X3); + } break; + +-#line 2109 "./glsl.g" ++#line 2103 "./glsl.g" + + case 191: { + ast(1) = makeBasicType(T_MAT4); + } break; + +-#line 2116 "./glsl.g" ++#line 2110 "./glsl.g" + + case 192: { + ast(1) = makeBasicType(T_DMAT2); + } break; + +-#line 2123 "./glsl.g" ++#line 2117 "./glsl.g" + + case 193: { + ast(1) = makeBasicType(T_DMAT3); + } break; + +-#line 2130 "./glsl.g" ++#line 2124 "./glsl.g" + + case 194: { + ast(1) = makeBasicType(T_DMAT4); + } break; + +-#line 2137 "./glsl.g" ++#line 2131 "./glsl.g" + + case 195: { + ast(1) = makeBasicType(T_DMAT2); + } break; + +-#line 2144 "./glsl.g" ++#line 2138 "./glsl.g" + + case 196: { + ast(1) = makeBasicType(T_DMAT2X3); + } break; + +-#line 2151 "./glsl.g" ++#line 2145 "./glsl.g" + + case 197: { + ast(1) = makeBasicType(T_DMAT2X4); + } break; + +-#line 2158 "./glsl.g" ++#line 2152 "./glsl.g" + + case 198: { + ast(1) = makeBasicType(T_DMAT3X2); + } break; + +-#line 2165 "./glsl.g" ++#line 2159 "./glsl.g" + + case 199: { + ast(1) = makeBasicType(T_DMAT3); + } break; + +-#line 2172 "./glsl.g" ++#line 2166 "./glsl.g" + + case 200: { + ast(1) = makeBasicType(T_DMAT3X4); + } break; + +-#line 2179 "./glsl.g" ++#line 2173 "./glsl.g" + + case 201: { + ast(1) = makeBasicType(T_DMAT4X2); + } break; + +-#line 2186 "./glsl.g" ++#line 2180 "./glsl.g" + + case 202: { + ast(1) = makeBasicType(T_DMAT4X3); + } break; + +-#line 2193 "./glsl.g" ++#line 2187 "./glsl.g" + + case 203: { + ast(1) = makeBasicType(T_DMAT4); + } break; + +-#line 2200 "./glsl.g" ++#line 2194 "./glsl.g" + + case 204: { + ast(1) = makeBasicType(T_SAMPLER1D); + } break; + +-#line 2207 "./glsl.g" ++#line 2201 "./glsl.g" + + case 205: { + ast(1) = makeBasicType(T_SAMPLER2D); + } break; + +-#line 2214 "./glsl.g" ++#line 2208 "./glsl.g" + + case 206: { + ast(1) = makeBasicType(T_SAMPLER3D); + } break; + +-#line 2221 "./glsl.g" ++#line 2215 "./glsl.g" + + case 207: { + ast(1) = makeBasicType(T_SAMPLERCUBE); + } break; + +-#line 2228 "./glsl.g" ++#line 2222 "./glsl.g" + + case 208: { + ast(1) = makeBasicType(T_SAMPLER1DSHADOW); + } break; + +-#line 2235 "./glsl.g" ++#line 2229 "./glsl.g" + + case 209: { + ast(1) = makeBasicType(T_SAMPLER2DSHADOW); + } break; + +-#line 2242 "./glsl.g" ++#line 2236 "./glsl.g" + + case 210: { + ast(1) = makeBasicType(T_SAMPLERCUBESHADOW); + } break; + +-#line 2249 "./glsl.g" ++#line 2243 "./glsl.g" + + case 211: { + ast(1) = makeBasicType(T_SAMPLER1DARRAY); + } break; + +-#line 2256 "./glsl.g" ++#line 2250 "./glsl.g" + + case 212: { + ast(1) = makeBasicType(T_SAMPLER2DARRAY); + } break; + +-#line 2263 "./glsl.g" ++#line 2257 "./glsl.g" + + case 213: { + ast(1) = makeBasicType(T_SAMPLER1DARRAYSHADOW); + } break; + +-#line 2270 "./glsl.g" ++#line 2264 "./glsl.g" + + case 214: { + ast(1) = makeBasicType(T_SAMPLER2DARRAYSHADOW); + } break; + +-#line 2277 "./glsl.g" ++#line 2271 "./glsl.g" + + case 215: { + ast(1) = makeBasicType(T_SAMPLERCUBEARRAY); + } break; + +-#line 2284 "./glsl.g" ++#line 2278 "./glsl.g" + + case 216: { + ast(1) = makeBasicType(T_SAMPLERCUBEARRAYSHADOW); + } break; + +-#line 2291 "./glsl.g" ++#line 2285 "./glsl.g" + + case 217: { + ast(1) = makeBasicType(T_ISAMPLER1D); + } break; + +-#line 2298 "./glsl.g" ++#line 2292 "./glsl.g" + + case 218: { + ast(1) = makeBasicType(T_ISAMPLER2D); + } break; + +-#line 2305 "./glsl.g" ++#line 2299 "./glsl.g" + + case 219: { + ast(1) = makeBasicType(T_ISAMPLER3D); + } break; + +-#line 2312 "./glsl.g" ++#line 2306 "./glsl.g" + + case 220: { + ast(1) = makeBasicType(T_ISAMPLERCUBE); + } break; + +-#line 2319 "./glsl.g" ++#line 2313 "./glsl.g" + + case 221: { + ast(1) = makeBasicType(T_ISAMPLER1DARRAY); + } break; + +-#line 2326 "./glsl.g" ++#line 2320 "./glsl.g" + + case 222: { + ast(1) = makeBasicType(T_ISAMPLER2DARRAY); + } break; + +-#line 2333 "./glsl.g" ++#line 2327 "./glsl.g" + + case 223: { + ast(1) = makeBasicType(T_ISAMPLERCUBEARRAY); + } break; + +-#line 2340 "./glsl.g" ++#line 2334 "./glsl.g" + + case 224: { + ast(1) = makeBasicType(T_USAMPLER1D); + } break; + +-#line 2347 "./glsl.g" ++#line 2341 "./glsl.g" + + case 225: { + ast(1) = makeBasicType(T_USAMPLER2D); + } break; + +-#line 2354 "./glsl.g" ++#line 2348 "./glsl.g" + + case 226: { + ast(1) = makeBasicType(T_USAMPLER3D); + } break; + +-#line 2361 "./glsl.g" ++#line 2355 "./glsl.g" + + case 227: { + ast(1) = makeBasicType(T_USAMPLERCUBE); + } break; + +-#line 2368 "./glsl.g" ++#line 2362 "./glsl.g" + + case 228: { + ast(1) = makeBasicType(T_USAMPLER1DARRAY); + } break; + +-#line 2375 "./glsl.g" ++#line 2369 "./glsl.g" + + case 229: { + ast(1) = makeBasicType(T_USAMPLER2DARRAY); + } break; + +-#line 2382 "./glsl.g" ++#line 2376 "./glsl.g" + + case 230: { + ast(1) = makeBasicType(T_USAMPLERCUBEARRAY); + } break; + +-#line 2389 "./glsl.g" ++#line 2383 "./glsl.g" + + case 231: { + ast(1) = makeBasicType(T_SAMPLER2DRECT); + } break; + +-#line 2396 "./glsl.g" ++#line 2390 "./glsl.g" + + case 232: { + ast(1) = makeBasicType(T_SAMPLER2DRECTSHADOW); + } break; + +-#line 2403 "./glsl.g" ++#line 2397 "./glsl.g" + + case 233: { + ast(1) = makeBasicType(T_ISAMPLER2DRECT); + } break; + +-#line 2410 "./glsl.g" ++#line 2404 "./glsl.g" + + case 234: { + ast(1) = makeBasicType(T_USAMPLER2DRECT); + } break; + +-#line 2417 "./glsl.g" ++#line 2411 "./glsl.g" + + case 235: { + ast(1) = makeBasicType(T_SAMPLERBUFFER); + } break; + +-#line 2424 "./glsl.g" ++#line 2418 "./glsl.g" + + case 236: { + ast(1) = makeBasicType(T_ISAMPLERBUFFER); + } break; + +-#line 2431 "./glsl.g" ++#line 2425 "./glsl.g" + + case 237: { + ast(1) = makeBasicType(T_USAMPLERBUFFER); + } break; + +-#line 2438 "./glsl.g" ++#line 2432 "./glsl.g" + + case 238: { + ast(1) = makeBasicType(T_SAMPLER2DMS); + } break; + +-#line 2445 "./glsl.g" ++#line 2439 "./glsl.g" + + case 239: { + ast(1) = makeBasicType(T_ISAMPLER2DMS); + } break; + +-#line 2452 "./glsl.g" ++#line 2446 "./glsl.g" + + case 240: { + ast(1) = makeBasicType(T_USAMPLER2DMS); + } break; + +-#line 2459 "./glsl.g" ++#line 2453 "./glsl.g" + + case 241: { + ast(1) = makeBasicType(T_SAMPLER2DMSARRAY); + } break; + +-#line 2466 "./glsl.g" ++#line 2460 "./glsl.g" + + case 242: { + ast(1) = makeBasicType(T_ISAMPLER2DMSARRAY); + } break; + +-#line 2473 "./glsl.g" ++#line 2467 "./glsl.g" + + case 243: { + ast(1) = makeBasicType(T_USAMPLER2DMSARRAY); + } break; + +-#line 2480 "./glsl.g" ++#line 2474 "./glsl.g" + + case 244: { + // nothing to do. + } break; + +-#line 2487 "./glsl.g" ++#line 2481 "./glsl.g" + + case 245: { + ast(1) = makeAstNode<NamedTypeAST>(string(1)); + } break; + +-#line 2494 "./glsl.g" ++#line 2488 "./glsl.g" + + case 246: { + sym(1).precision = TypeAST::Highp; + } break; + +-#line 2501 "./glsl.g" ++#line 2495 "./glsl.g" + + case 247: { + sym(1).precision = TypeAST::Mediump; + } break; + +-#line 2508 "./glsl.g" ++#line 2502 "./glsl.g" + + case 248: { + sym(1).precision = TypeAST::Lowp; + } break; + +-#line 2515 "./glsl.g" ++#line 2509 "./glsl.g" + + case 249: { + ast(1) = makeAstNode<StructTypeAST>(string(2), sym(4).field_list); + } break; + +-#line 2522 "./glsl.g" ++#line 2516 "./glsl.g" + + case 250: { + ast(1) = makeAstNode<StructTypeAST>(sym(3).field_list); + } break; + +-#line 2529 "./glsl.g" ++#line 2523 "./glsl.g" + + case 251: { + // nothing to do. + } break; + +-#line 2536 "./glsl.g" ++#line 2530 "./glsl.g" + + case 252: { + sym(1).field_list = appendLists(sym(1).field_list, sym(2).field_list); + } break; + +-#line 2543 "./glsl.g" ++#line 2537 "./glsl.g" + + case 253: { + sym(1).field_list = StructTypeAST::fixInnerTypes(type(1), sym(2).field_list); + } break; + +-#line 2550 "./glsl.g" ++#line 2544 "./glsl.g" + + case 254: { + sym(1).field_list = StructTypeAST::fixInnerTypes +@@ -1870,106 +1870,106 @@ case 254: { + sym(1).type_qualifier.layout_list), sym(3).field_list); + } break; + +-#line 2560 "./glsl.g" ++#line 2554 "./glsl.g" + + case 255: { + // nothing to do. + sym(1).field_list = makeAstNode< List<StructTypeAST::Field *> >(sym(1).field); + } break; + +-#line 2568 "./glsl.g" ++#line 2562 "./glsl.g" + + case 256: { + sym(1).field_list = makeAstNode< List<StructTypeAST::Field *> >(sym(1).field_list, sym(3).field); + } break; + +-#line 2575 "./glsl.g" ++#line 2569 "./glsl.g" + + case 257: { + sym(1).field = makeAstNode<StructTypeAST::Field>(string(1)); + } break; + +-#line 2582 "./glsl.g" ++#line 2576 "./glsl.g" + + case 258: { + sym(1).field = makeAstNode<StructTypeAST::Field> + (string(1), makeAstNode<ArrayTypeAST>((TypeAST *)0)); + } break; + +-#line 2590 "./glsl.g" ++#line 2584 "./glsl.g" + + case 259: { + sym(1).field = makeAstNode<StructTypeAST::Field> + (string(1), makeAstNode<ArrayTypeAST>((TypeAST *)0, expression(3))); + } break; + +-#line 2598 "./glsl.g" ++#line 2592 "./glsl.g" + + case 260: { + // nothing to do. + } break; + +-#line 2605 "./glsl.g" ++#line 2599 "./glsl.g" + + case 261: { + ast(1) = makeAstNode<DeclarationStatementAST>(sym(1).declaration); + } break; + +-#line 2612 "./glsl.g" ++#line 2606 "./glsl.g" + + case 262: { + // nothing to do. + } break; + +-#line 2619 "./glsl.g" ++#line 2613 "./glsl.g" + + case 263: { + // nothing to do. + } break; + +-#line 2626 "./glsl.g" ++#line 2620 "./glsl.g" + + case 264: { + // nothing to do. + } break; + +-#line 2633 "./glsl.g" ++#line 2627 "./glsl.g" + + case 265: { + // nothing to do. + } break; + +-#line 2640 "./glsl.g" ++#line 2634 "./glsl.g" + + case 266: { + // nothing to do. + } break; + +-#line 2647 "./glsl.g" ++#line 2641 "./glsl.g" + + case 267: { + // nothing to do. + } break; + +-#line 2654 "./glsl.g" ++#line 2648 "./glsl.g" + + case 268: { + // nothing to do. + } break; + +-#line 2661 "./glsl.g" ++#line 2655 "./glsl.g" + + case 269: { + // nothing to do. + } break; + +-#line 2668 "./glsl.g" ++#line 2662 "./glsl.g" + + case 270: { + // nothing to do. + } break; + +-#line 2675 "./glsl.g" ++#line 2669 "./glsl.g" + + case 271: { + CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(); +@@ -1978,7 +1978,7 @@ case 271: { + ast(1) = stmt; + } break; + +-#line 2685 "./glsl.g" ++#line 2679 "./glsl.g" + + case 272: { + CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(sym(2).statement_list); +@@ -1987,19 +1987,19 @@ case 272: { + ast(1) = stmt; + } break; + +-#line 2695 "./glsl.g" ++#line 2689 "./glsl.g" + + case 273: { + // nothing to do. + } break; + +-#line 2702 "./glsl.g" ++#line 2696 "./glsl.g" + + case 274: { + // nothing to do. + } break; + +-#line 2709 "./glsl.g" ++#line 2703 "./glsl.g" + + case 275: { + CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(); +@@ -2008,7 +2008,7 @@ case 275: { + ast(1) = stmt; + } break; + +-#line 2719 "./glsl.g" ++#line 2713 "./glsl.g" + + case 276: { + CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(sym(2).statement_list); +@@ -2017,186 +2017,186 @@ case 276: { + ast(1) = stmt; + } break; + +-#line 2729 "./glsl.g" ++#line 2723 "./glsl.g" + + case 277: { + sym(1).statement_list = makeAstNode< List<StatementAST *> >(sym(1).statement); + } break; + +-#line 2736 "./glsl.g" ++#line 2730 "./glsl.g" + + case 278: { + sym(1).statement_list = makeAstNode< List<StatementAST *> >(sym(1).statement_list, sym(2).statement); + } break; + +-#line 2743 "./glsl.g" ++#line 2737 "./glsl.g" + + case 279: { + ast(1) = makeAstNode<CompoundStatementAST>(); // Empty statement + } break; + +-#line 2750 "./glsl.g" ++#line 2744 "./glsl.g" + + case 280: { + ast(1) = makeAstNode<ExpressionStatementAST>(expression(1)); + } break; + +-#line 2757 "./glsl.g" ++#line 2751 "./glsl.g" + + case 281: { + ast(1) = makeAstNode<IfStatementAST>(expression(3), sym(5).ifstmt.thenClause, sym(5).ifstmt.elseClause); + } break; + +-#line 2764 "./glsl.g" ++#line 2758 "./glsl.g" + + case 282: { + sym(1).ifstmt.thenClause = statement(1); + sym(1).ifstmt.elseClause = statement(3); + } break; + +-#line 2772 "./glsl.g" ++#line 2766 "./glsl.g" + + case 283: { + sym(1).ifstmt.thenClause = statement(1); + sym(1).ifstmt.elseClause = 0; + } break; + +-#line 2780 "./glsl.g" ++#line 2774 "./glsl.g" + + case 284: { + // nothing to do. + } break; + +-#line 2787 "./glsl.g" ++#line 2781 "./glsl.g" + + case 285: { + ast(1) = makeAstNode<DeclarationExpressionAST> + (type(1), string(2), expression(4)); + } break; + +-#line 2795 "./glsl.g" ++#line 2789 "./glsl.g" + + case 286: { + ast(1) = makeAstNode<SwitchStatementAST>(expression(3), statement(6)); + } break; + +-#line 2802 "./glsl.g" ++#line 2796 "./glsl.g" + + case 287: { + ast(1) = makeAstNode<CompoundStatementAST>(); + } break; + +-#line 2809 "./glsl.g" ++#line 2803 "./glsl.g" + + case 288: { + ast(1) = makeAstNode<CompoundStatementAST>(sym(1).statement_list); + } break; + +-#line 2816 "./glsl.g" ++#line 2810 "./glsl.g" + + case 289: { + ast(1) = makeAstNode<CaseLabelStatementAST>(expression(2)); + } break; + +-#line 2823 "./glsl.g" ++#line 2817 "./glsl.g" + + case 290: { + ast(1) = makeAstNode<CaseLabelStatementAST>(); + } break; + +-#line 2830 "./glsl.g" ++#line 2824 "./glsl.g" + + case 291: { + ast(1) = makeAstNode<WhileStatementAST>(expression(3), statement(5)); + } break; + +-#line 2837 "./glsl.g" ++#line 2831 "./glsl.g" + + case 292: { + ast(1) = makeAstNode<DoStatementAST>(statement(2), expression(5)); + } break; + +-#line 2844 "./glsl.g" ++#line 2838 "./glsl.g" + + case 293: { + ast(1) = makeAstNode<ForStatementAST>(statement(3), sym(4).forstmt.condition, sym(4).forstmt.increment, statement(6)); + } break; + +-#line 2851 "./glsl.g" ++#line 2845 "./glsl.g" + + case 294: { + // nothing to do. + } break; + +-#line 2858 "./glsl.g" ++#line 2852 "./glsl.g" + + case 295: { + // nothing to do. + } break; + +-#line 2865 "./glsl.g" ++#line 2859 "./glsl.g" + + case 296: { + // nothing to do. + } break; + +-#line 2872 "./glsl.g" ++#line 2866 "./glsl.g" + + case 297: { + // nothing to do. + } break; + +-#line 2879 "./glsl.g" ++#line 2873 "./glsl.g" + + case 298: { + sym(1).forstmt.condition = expression(1); + sym(1).forstmt.increment = 0; + } break; + +-#line 2887 "./glsl.g" ++#line 2881 "./glsl.g" + + case 299: { + sym(1).forstmt.condition = expression(1); + sym(1).forstmt.increment = expression(3); + } break; + +-#line 2895 "./glsl.g" ++#line 2889 "./glsl.g" + + case 300: { + ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Continue); + } break; + +-#line 2902 "./glsl.g" ++#line 2896 "./glsl.g" + + case 301: { + ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Break); + } break; + +-#line 2909 "./glsl.g" ++#line 2903 "./glsl.g" + + case 302: { + ast(1) = makeAstNode<ReturnStatementAST>(); + } break; + +-#line 2916 "./glsl.g" ++#line 2910 "./glsl.g" + + case 303: { + ast(1) = makeAstNode<ReturnStatementAST>(expression(2)); + } break; + +-#line 2923 "./glsl.g" ++#line 2917 "./glsl.g" + + case 304: { + ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Discard); + } break; + +-#line 2930 "./glsl.g" ++#line 2924 "./glsl.g" + + case 305: { + ast(1) = makeAstNode<TranslationUnitAST>(sym(1).declaration_list); + } break; + +-#line 2937 "./glsl.g" ++#line 2931 "./glsl.g" + + case 306: { + if (sym(1).declaration) { +@@ -2207,7 +2207,7 @@ case 306: { + } + } break; + +-#line 2949 "./glsl.g" ++#line 2943 "./glsl.g" + + case 307: { + if (sym(1).declaration_list && sym(2).declaration) { +@@ -2223,49 +2223,49 @@ case 307: { + } + } break; + +-#line 2966 "./glsl.g" ++#line 2960 "./glsl.g" + + case 308: { + // nothing to do. + } break; + +-#line 2973 "./glsl.g" ++#line 2967 "./glsl.g" + + case 309: { + // nothing to do. + } break; + +-#line 2980 "./glsl.g" ++#line 2974 "./glsl.g" + + case 310: { + ast(1) = 0; + } break; + +-#line 2987 "./glsl.g" ++#line 2981 "./glsl.g" + + case 311: { + function(1)->body = statement(2); + } break; + +-#line 2994 "./glsl.g" ++#line 2988 "./glsl.g" + + case 312: { + ast(1) = 0; + } break; + +-#line 3002 "./glsl.g" ++#line 2996 "./glsl.g" + + case 313: { + ast(1) = ast(2); + } break; + +-#line 3009 "./glsl.g" ++#line 3003 "./glsl.g" + + case 314: { + ast(1) = ast(2); + } break; + +-#line 3015 "./glsl.g" ++#line 3009 "./glsl.g" + + } // end switch + } // end Parser::reduce() +diff --git a/src/libs/glsl/glslparser.h b/src/libs/glsl/glslparser.h +index 7bf70e2..bab2616 100644 +--- a/src/libs/glsl/glslparser.h ++++ b/src/libs/glsl/glslparser.h +@@ -1,5 +1,5 @@ + +-#line 217 "./glsl.g" ++#line 215 "./glsl.g" + + /************************************************************************** + ** +-- +1.7.10 + diff --git a/community-testing/qtcreator/qtcreator.desktop b/community-testing/qtcreator/qtcreator.desktop new file mode 100644 index 000000000..0fd562bd9 --- /dev/null +++ b/community-testing/qtcreator/qtcreator.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=/usr/bin/qtcreator +Name=Qt-Creator +GenericName=C++ IDE +X-KDE-StartupNotify=true +Icon=/usr/share/icons/hicolor/128x128/apps/qtcreator.png +Terminal=false +Type=Application +Categories=Qt;Development diff --git a/community-testing/qtcreator/qtcreator.install b/community-testing/qtcreator/qtcreator.install new file mode 100644 index 000000000..4d4a283db --- /dev/null +++ b/community-testing/qtcreator/qtcreator.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD index a4d931af5..4431fcecf 100644 --- a/community/acpid/PKGBUILD +++ b/community/acpid/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 71877 2012-06-02 17:57:44Z seblu $ +# $Id: PKGBUILD 76355 2012-09-16 14:46:11Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: xduugu # Contributor: Manolis Tzanidakis # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us pkgname=acpid -pkgver=2.0.16 -pkgrel=3 +pkgver=2.0.17 +pkgrel=1 pkgdesc='A daemon for delivering ACPI power management events with netlink support' arch=('i686' 'x86_64') url='http://tedfelix.com/linux/acpid-netlink.html' @@ -22,7 +22,7 @@ source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz" 'acpid.service' 'anything' 'handler.sh') -md5sums=('d59fc02c9c34f0d5c137495302e2c074' +md5sums=('d858729b7d984c5e3a0c7558e9de1584' '077475c75fbdd9de75f9a397130ccd91' '929c6d2e91295c22ed9ec6212d7eabef' 'ee6cb99e50e580c50331a73045412ae9' diff --git a/community/cdrtools/PKGBUILD b/community/cdrtools/PKGBUILD index 140834e21..c6d20cea3 100644 --- a/community/cdrtools/PKGBUILD +++ b/community/cdrtools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 75213 2012-08-16 09:19:22Z stativ $ +# $Id: PKGBUILD 76416 2012-09-17 14:33:56Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=cdrtools pkgver=3.01a08 -pkgrel=1 +pkgrel=2 pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning" arch=('i686' 'x86_64') url="http://cdrecord.berlios.de/private/cdrecord.html" @@ -36,6 +36,13 @@ package() { # autoload 'sg' module needed by cdrecord install -d -m755 "$pkgdir"/usr/lib/modules-load.d/ echo sg > "$pkgdir"/usr/lib/modules-load.d/cdrecord.conf + + # create symlinks for cdrkit compatibility + cd "$pkgdir"/usr/bin + ln -s cdrecord wodim + ln -s readcd readom + ln -s mkisofs genisoimage + ln -s cdda2wav icedax } # vim:set ts=2 sw=2 et: diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD index 416bf559e..1242ff2ba 100644 --- a/community/dwdiff/PKGBUILD +++ b/community/dwdiff/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 69754 2012-04-23 09:14:53Z ibiru $ +# $Id: PKGBUILD 76393 2012-09-17 08:46:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=dwdiff -pkgver=2.0 -pkgrel=2 +pkgver=2.0.4 +pkgrel=1 pkgdesc="A front-end for the diff program that operates at the word level instead of the line level" arch=('i686' 'x86_64') url="http://os.ghalkes.nl/dwdiff.html" depends=('diffutils' 'icu') license=('GPL') source=("http://os.ghalkes.nl/dist/$pkgname-$pkgver.tgz") -md5sums=('98dd16b58a1f136a2cd49f7dd88c5313') +md5sums=('1bb69cbfb76583f69c6912f925fc4cec') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gpsbabel/PKGBUILD b/community/gpsbabel/PKGBUILD index 47499b1a3..9ffb08e33 100644 --- a/community/gpsbabel/PKGBUILD +++ b/community/gpsbabel/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 71956 2012-06-04 07:44:12Z spupykin $ +# $Id: PKGBUILD 76414 2012-09-17 13:51:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=gpsbabel -pkgver=1.4.3 +pkgver=1.4.4 pkgrel=1 pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats" arch=('i686' 'x86_64') url="http://www.gpsbabel.org" license=('GPL') depends=('libusb-compat' 'expat') -makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'openjdk6') +makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'java-environment=6' 'docbook-xsl') optdepends=('qt' 'qtwebkit') options=('docs') source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz" "gpsbabel.desktop::http://pkgs.fedoraproject.org/gitweb/?p=gpsbabel.git;a=blob_plain;f=gpsbabel.desktop;hb=HEAD") -md5sums=('916f7e124f6df911a24e1ea323e9c529' +md5sums=('6c4c8f0cb9fcf9f8302585148878f174' '7bdbd243e29a8831842d31c079f04c45') build() { diff --git a/community/i7z/PKGBUILD b/community/i7z/PKGBUILD index f573fc123..bd3cda36c 100644 --- a/community/i7z/PKGBUILD +++ b/community/i7z/PKGBUILD @@ -1,8 +1,9 @@ +# $Id: PKGBUILD 76391 2012-09-17 08:17:57Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Nathan O <ndowens.aur at gmail dot com> pkgname=i7z -pkgver=0.27.1 +pkgver=0.27.2 pkgrel=1 pkgdesc="A better i7 (and now i3, i5) reporting tool for Linux" arch=('i686' 'x86_64') @@ -12,7 +13,7 @@ makedepends=('qt') optdepends=('qt: for i7z-gui') url="http://code.google.com/p/i7z/" source=("http://i7z.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('4408e0e39b195b8fe6383cadc971a862') +md5sums=('7f2c4928146b722d67ecdd0d905a4353') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD index 3065207ca..b26790757 100644 --- a/community/jack2/PKGBUILD +++ b/community/jack2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70089 2012-04-29 08:01:28Z allan $ +# $Id: PKGBUILD 76357 2012-09-16 14:53:18Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Daniele Paolella <danielepaolella@email.it> # Contributor: Philipp Überbacher <hollunder at gmx dot at> @@ -9,7 +9,7 @@ pkgname=('jack2' 'jack2-dbus') #pkgname= # single build (overrides split) _tarname=jack pkgver=1.9.8 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://jackaudio.org/" backup=(etc/security/limits.d/99-audio.conf) @@ -42,6 +42,11 @@ _isbuild() { build() { cd "$srcdir/$_tarname-$pkgver" + # Some optimisation bug exists for current GCC + # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663 + export CFLAGS="${CFLAGS/-O[0-9]/-O0}" + export CXXFLAGS="$CFLAGS" + # fix doxygen building sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD index a6ceb1292..e9d2c6f33 100644 --- a/community/kadu/PKGBUILD +++ b/community/kadu/PKGBUILD @@ -1,34 +1,34 @@ -# $Id: PKGBUILD 76119 2012-09-11 16:47:42Z bpiotrowski $ +# $Id: PKGBUILD 76360 2012-09-16 14:56:37Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Mateusz Herych # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=kadu -pkgver=0.12.2 +pkgver=0.12.3 pkgrel=1 -pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" +pkgdesc='A Qt-based Jabber/XMPP and Gadu-Gadu client' arch=('i686' 'x86_64') -url="http://www.kadu.net/" +url='http://www.kadu.net/' license=('GPL') depends=('libgadu' 'libxss' 'enchant' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit' 'xdg-utils') makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') install=kadu.install source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2) -md5sums=('e546834f85bed14279691998545d203c') +md5sums=('c5d6f0bd384cd96090819ea018eb8ad8') build() { - cd "$srcdir" + cd $srcdir mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../$pkgname-$pkgver \ -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "$srcdir/build" - make DESTDIR="$pkgdir" install - mv "$pkgdir"/usr/sdk "$pkgdir"/usr/share/kadu/sdk - rm -rf "$pkgdir/usr/{lib,include}/{libgadu*,pkgconfig}" - rm -rf "$pkgdir/usr/share/kadu/{HISTORY,README}" + cd $srcdir/build + make DESTDIR=$pkgdir install + mv $pkgdir/usr/sdk "$pkgdir"/usr/share/kadu/sdk + rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig} + rm -rf $pkgdir/usr/share/kadu/{HISTORY,README} } diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD index 50d0a1589..3dccf2057 100644 --- a/community/ldc/PKGBUILD +++ b/community/ldc/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 72875 2012-06-24 11:09:33Z svenstaro $ +# $Id: PKGBUILD 76398 2012-09-17 09:39:27Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=ldc -pkgver=20120624 +pkgver=20120917 pkgrel=1 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ md5sums=() _gitroot=git://github.com/ldc-developers/ldc.git _gitname=ldc -_gitbranch=llvm-3.1 +_gitbranch=master [[ $CARCH == "x86_64" ]] && _multilib="ON" [[ $CARCH == "i686" ]] && _multilib="OFF" diff --git a/community/lib32-libphobos-ldc/PKGBUILD b/community/lib32-libphobos-ldc/PKGBUILD index cc43715a9..d33790daf 100644 --- a/community/lib32-libphobos-ldc/PKGBUILD +++ b/community/lib32-libphobos-ldc/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 72029 2012-06-06 11:58:40Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=lib32-libphobos-ldc -pkgver=20120607 +pkgver=20120917 pkgrel=1 pkgdesc="libphobos for ldc (32-bit)" arch=('x86_64') @@ -14,7 +14,7 @@ md5sums=() _gitroot=git://github.com/ldc-developers/ldc.git _gitname=ldc -_gitbranch=llvm-3.1 +_gitbranch=master build() { cd "$srcdir" diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index c512a6908..7f2076dab 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73806 2012-07-15 20:17:53Z spupykin $ +# $Id: PKGBUILD 76403 2012-09-17 10:17:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> @@ -7,7 +7,7 @@ pkgname=minidlna pkgver=1.0.25 -pkgrel=1 +pkgrel=2 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/minidlna/" @@ -19,12 +19,12 @@ backup=('etc/minidlna.conf' changelog=changelog source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz minidlna.rc - minidlna.conf - minidlna.service) + minidlna.service + minidlna.tmpfiles) md5sums=('d966256baf2f9b068b9de871ab5dade5' 'c9863d5703e0a8469cc200f2739567e7' - 'af1b8c0fef9902f797b0324c255da5a1' - '1903ed9ceee43b8bb86146b9ad8eb50c') + '1903ed9ceee43b8bb86146b9ad8eb50c' + '26de27b12d6a37c47d9714107d07aac9') build() { cd "$srcdir/$pkgname-$pkgver" @@ -43,6 +43,6 @@ package() { echo 'MINIDLNA_OPTS=""' >>$pkgdir/etc/conf.d/minidlna # systemd files - install -Dm0644 $srcdir/minidlna.conf $pkgdir/usr/lib/tmpfiles.d/minidlna.conf + install -Dm0644 $srcdir/minidlna.tmpfiles $pkgdir/usr/lib/tmpfiles.d/minidlna.conf install -Dm0644 $srcdir/minidlna.service $pkgdir/usr/lib/systemd/system/minidlna.service } diff --git a/community/minidlna/minidlna.tmpfiles b/community/minidlna/minidlna.tmpfiles new file mode 100644 index 000000000..56e057f62 --- /dev/null +++ b/community/minidlna/minidlna.tmpfiles @@ -0,0 +1,5 @@ +# systemd tmpfile settings for minidlna +# See tmpfiles.d(5) for details + +d /var/run/minidlna 0755 nobody nobody - +d /var/cache/minidlna 0755 nobody nobody - diff --git a/community/mp3unicode/PKGBUILD b/community/mp3unicode/PKGBUILD index d9122cba7..5a76772f3 100644 --- a/community/mp3unicode/PKGBUILD +++ b/community/mp3unicode/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 67970 2012-03-16 13:11:55Z giovanni $ +# $Id: PKGBUILD 76345 2012-09-16 07:08:17Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Zhukov Pavel <gelios@gmail.com> pkgname=mp3unicode -pkgver=1.2 -pkgrel=5 +pkgver=1.2.1 +pkgrel=1 pkgdesc="A command line utility to convert ID3 tags in mp3 files between different encodings" arch=('i686' 'x86_64') url="http://mp3unicode.yellowsite.ru/" license=('GPL') depends=('taglib') -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('36665ee3ed71585e377f46fda6124a09') +source=(https://github.com/downloads/alonbl/$pkgname/$pkgname-$pkgver.tar.bz2) +sha256sums=('375b432ce784407e74fceb055d115bf83b1bd04a83b95256171e1a36e00cfe07') build() { cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr \ - --mandir=/usr/share/man + ./configure --prefix=/usr --mandir=/usr/share/man make } diff --git a/community/nestopia/PKGBUILD b/community/nestopia/PKGBUILD index c73ddbce7..b2bc7ab0a 100644 --- a/community/nestopia/PKGBUILD +++ b/community/nestopia/PKGBUILD @@ -1,46 +1,31 @@ -# $Id: PKGBUILD 63676 2012-02-05 12:05:46Z ibiru $ +# $Id: PKGBUILD 76405 2012-09-17 10:50:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com> # Contributor: robb_force <robb_force@holybuffalo.net> pkgname=nestopia -pkgver=1.40h -pkgrel=5 +pkgver=1.41 +pkgrel=1 pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.' -url='http://rbelmont.mameworld.info/?page_id=200' +url='http://0ldsk00l.ca/nestopia.html' license=('GPL') arch=('i686' 'x86_64') -depends=('sdl>=1.2.12' 'alsa-lib' 'gtk2>=2.4' 'mesa') +depends=('sdl' 'alsa-lib' 'gtk3' 'mesa') makedepends=('unzip') -# rbelmont.mameworld.info blocks some user-agents -DLAGENTS=('http::/usr/bin/wget -c -t 3 --waitretry=3 --user-agent=Mozilla/5.0 -O %o %u' - 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u') -source=("https://downloads.sourceforge.net/project/nestopia/Nestopia/v${pkgver//[a-z]/}/Nestopia${pkgver//[.a-z]/}src.zip" - "http://rbelmont.mameworld.info/nst${pkgver//[a.a-z]/}_lnx_release_${pkgver:${#pkgver}-1:1}.zip" - "nestopia" +source=("$pkgname-$pkgver.tar.gz::https://github.com/rdanbrook/nestopia/tarball/$pkgver" "nestopia_bogus_error_on_save_settings.patch") -md5sums=('526c99a06d2b257135e7047b0ed95ae0' - 'f9a9a905bada67e11dac1364612d0b35' - 'abc2f030dd291f58d65c9095ef024225' +md5sums=('6baa5cb1bd4e929b200bdf33ea221606' '0160078c9afcbb1a6ac389c3989929f7') build() { - cd ${srcdir} + cd ${srcdir}/rdanbrook-nestopia-* # remove a bogus error message on exit - patch -p0 < nestopia_bogus_error_on_save_settings.patch - make -j1 - - # Install the nestopia script that copies required files to ~/.nestopia - install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/usr/bin/${pkgname} - - # Older releases used a .sh file. Make a symlink to make everyone happy - cd ${pkgdir}/usr/bin - ln -s ${pkgname} ${pkgname}.sh + patch -p0 <$srcdir/nestopia_bogus_error_on_save_settings.patch + make PREFIX=/usr -j1 +} - # Install the required files and executable in /usr/share - cd ${srcdir} - install -Dm755 nst ${pkgdir}/usr/bin/${pkgname}-bin - install -dm775 ${pkgdir}/usr/share/${pkgname}/ - install -m644 nstcontrols ${pkgdir}/usr/share/${pkgname}/ - install -m644 NstDatabase.xml ${pkgdir}/usr/share/${pkgname}/ +package() { + cd ${srcdir}/rdanbrook-nestopia-* + mkdir -p $pkgdir/usr/{bin,share/nestopia} + make install PREFIX=$pkgdir/usr } diff --git a/community/partclone/PKGBUILD b/community/partclone/PKGBUILD index 84832c36e..f8fee5daa 100644 --- a/community/partclone/PKGBUILD +++ b/community/partclone/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76316 2012-09-15 19:44:12Z jsteel $ +# $Id: PKGBUILD 76351 2012-09-16 13:33:43Z jsteel $ # Maintainer: Jonathan Steel <mail at jsteel dot org> # Contrinutor: Dan Serban # Contributor: Franz Burgmann @@ -13,7 +13,6 @@ arch=('i686' 'x86_64') url="http://partclone.org" license=('GPL') depends=('progsreiserfs' 'ntfs-3g') -conflicts=('partclone-testing' 'partclone-git') source=(https://downloads.sourceforge.net/project/$pkgname/stable/$pkgver/${pkgname}_$pkgver.tar.gz) md5sums=('c873588f26185d6ce8db7b4c5470aa00') diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD index ded8a65b4..e9d827e59 100644 --- a/community/pgadmin3/PKGBUILD +++ b/community/pgadmin3/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73360 2012-07-06 16:34:53Z spupykin $ +# $Id: PKGBUILD 76420 2012-09-17 16:09:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Benjamin Andresen <benny@klapmuetz.org> # Contributor: bekks <eduard.warkentin@gmx.de> pkgname=pgadmin3 -pkgver=1.14.3 +pkgver=1.16.0 pkgrel=1 pkgdesc="Comprehensive design and management interface for PostgreSQL" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ license=('custom') depends=('wxgtk' 'postgresql-libs' 'libxslt') makedepends=('libpqxx' 'krb5' 'postgresql' 'gendesk' 'imagemagick') source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz) -md5sums=('0669074fda039f5128abb40f63948ff5') +md5sums=('30ba5470a625176995a21099a9ae3058') build() { cd "$srcdir" diff --git a/community/qtcurve-gtk2/PKGBUILD b/community/qtcurve-gtk2/PKGBUILD index 6c8399cb9..f02f92c5c 100644 --- a/community/qtcurve-gtk2/PKGBUILD +++ b/community/qtcurve-gtk2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69999 2012-04-28 00:40:23Z svenstaro $ +# $Id: PKGBUILD 76418 2012-09-17 15:35:37Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qtcurve-gtk2 pkgver=1.8.15 -pkgrel=1 +pkgrel=2 pkgdesc="A configurable set of widget styles for KDE and Gtk" arch=('i686' 'x86_64') url="http://www.kde-look.org/content/show.php?content=40492" @@ -14,13 +14,18 @@ depends=('gtk2') makedepends=('cmake') groups=('qtcurve') options=('!libtool') -source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2") -md5sums=('00054b1923f995fa55e0573730b9f3a6') +source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2" + cairo_flush_fix.patch) +md5sums=('00054b1923f995fa55e0573730b9f3a6' + '3aec00bd00af49ed42a47855ec37f670') build() { cd "${srcdir}" - mkdir build - cd build + + patch -Np1 -i ${srcdir}/cairo_flush_fix.patch -d QtCurve-Gtk2-${pkgver} + + mkdir -p build + cd build/ cmake ../QtCurve-Gtk2-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr diff --git a/community/qtcurve-gtk2/cairo_flush_fix.patch b/community/qtcurve-gtk2/cairo_flush_fix.patch new file mode 100644 index 000000000..12ed2d291 --- /dev/null +++ b/community/qtcurve-gtk2/cairo_flush_fix.patch @@ -0,0 +1,11 @@ +diff -urB QtCurve-Gtk2-1.8.15.orig/style/shadowhelper.c QtCurve-Gtk2-1.8.15/style/shadowhelper.c +--- QtCurve-Gtk2-1.8.15.orig/style/shadowhelper.c 2012-04-24 17:19:54.000000000 -0400 ++++ QtCurve-Gtk2-1.8.15/style/shadowhelper.c 2012-09-14 08:29:55.828897057 -0400 +@@ -58,6 +58,7 @@ + cairo_rectangle(cr, 0, 0, shadowSize, shadowSize); + cairo_fill(cr); + cairo_destroy(cr); ++ cairo_surface_destroy(dest); + g_object_unref(pixbuf); + return pixmap; + } diff --git a/community/smbnetfs/PKGBUILD b/community/smbnetfs/PKGBUILD index c17f456b6..7e880f082 100644 --- a/community/smbnetfs/PKGBUILD +++ b/community/smbnetfs/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 65451 2012-02-21 05:52:02Z spupykin $ +# $Id: PKGBUILD 76408 2012-09-17 10:51:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=smbnetfs pkgver=0.5.3a -pkgrel=4 +pkgrel=5 pkgdesc="small C program that mounts Microsoft network neighborhood in single directory." arch=('i686' 'x86_64') url="http://smbnetfs.sourceforge.net/" license=('GPL') depends=('fuse' 'smbclient') -backup=(etc/smbnetfs/.smb/smb.conf \ - etc/smbnetfs/.smb/smbnetfs.conf \ - etc/smbnetfs/.smb/smbnetfs.auth \ - etc/smbnetfs/.smb/smbnetfs.host) +backup=('etc/smbnetfs/.smb/smb.conf' + 'etc/smbnetfs/.smb/smbnetfs.conf' + 'etc/smbnetfs/.smb/smbnetfs.auth' + 'etc/smbnetfs/.smb/smbnetfs.host') install=smbnetfs.install options=(docs) -source=(http://downloads.sourceforge.net/smbnetfs/$pkgname-$pkgver.tar.bz2 \ - rc-smbnetfs \ - conf-smbnetfs) +source=(http://downloads.sourceforge.net/smbnetfs/$pkgname-$pkgver.tar.bz2 + rc-smbnetfs + conf-smbnetfs + smbnetfs.service) md5sums=('66d1477ca981f5a07b4b21c6bdbdc442' 'b6cff0ee75cafd739ad44216236b5e28' - 'e150c4cd894cc6ade11b94c95cf17ec4') + 'e150c4cd894cc6ade11b94c95cf17ec4' + '0fdd0dbaa5f16b1ecd00ec1ddcdfc223') build() { cd $srcdir/$pkgname-$pkgver @@ -33,10 +35,10 @@ build() { mv $pkgdir/usr/share/doc/smbnetfs* $pkgdir/usr/share/doc/smbnetfs mkdir -p $pkgdir/etc/smbnetfs/.smb - install -D -m 0644 $srcdir/$pkgname-$pkgver/conf/* $pkgdir/etc/smbnetfs/.smb/ -# install -D -m 0644 $srcdir/$pkgname-$pkgver/doc/INSTALL $pkgdir/usr/share/doc/smbnetfs/INSTALL - install -D -m 0644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/smbnetfs/README - install -D -m 0755 $srcdir/rc-smbnetfs $pkgdir/etc/rc.d/smbnetfs - install -D -m 0644 $srcdir/conf-smbnetfs $pkgdir/etc/conf.d/smbnetfs + install -m0644 $srcdir/$pkgname-$pkgver/conf/* $pkgdir/etc/smbnetfs/.smb/ + install -Dm0644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/smbnetfs/README + install -Dm0755 $srcdir/rc-smbnetfs $pkgdir/etc/rc.d/smbnetfs + install -Dm0644 $srcdir/conf-smbnetfs $pkgdir/etc/conf.d/smbnetfs + install -Dm0644 $srcdir/smbnetfs.service $pkgdir/usr/lib/systemd/system/smbnetfs.service touch $pkgdir/etc/smbnetfs/.smb/smb.conf } diff --git a/community/smbnetfs/smbnetfs.service b/community/smbnetfs/smbnetfs.service new file mode 100644 index 000000000..cf3cd0f58 --- /dev/null +++ b/community/smbnetfs/smbnetfs.service @@ -0,0 +1,13 @@ +[Unit] +Description=Mount Samba Shares +After=network.target + +[Service] +Environment=HOME=/etc/smbnetfs SMBNETFS_MOUNT_POINT=/mnt/smbnet +EnvironmentFile=/etc/conf.d/smbnetfs +User=nobody +ExecStart=/usr/bin/smbnetfs -f -o allow_other $SMBNETFS_MOUNT_POINT +ExecStop=/bin/fusermount -u $SMBNETFS_MOUNT_POINT + +[Install] +WantedBy=multi-user.target diff --git a/community/vile/PKGBUILD b/community/vile/PKGBUILD index ff6273f1d..1d7b359f8 100644 --- a/community/vile/PKGBUILD +++ b/community/vile/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65367 2012-02-21 02:23:34Z spupykin $ +# $Id: PKGBUILD 76396 2012-09-17 08:49:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=vile @@ -15,6 +15,7 @@ md5sums=('b5a0d89165f633a662cdb4b5c57f2e2f') build() { cd $srcdir/$pkgname-$pkgver + sed -i 's|FLEX_BETA|FLEX_NOBETA|g' filters/filters.h ./configure --prefix=/usr make make install DESTDIR=$pkgdir diff --git a/community/vsftpd/PKGBUILD b/community/vsftpd/PKGBUILD index 77da787b7..1ce9b482c 100644 --- a/community/vsftpd/PKGBUILD +++ b/community/vsftpd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73933 2012-07-17 06:43:49Z bpiotrowski $ +# $Id: PKGBUILD 76364 2012-09-16 15:05:42Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=vsftpd -pkgver=3.0.0 -pkgrel=4 +pkgver=3.0.1 +pkgrel=1 pkgdesc="Very Secure FTP daemon" arch=('i686' 'x86_64') url="https://security.appspot.com/vsftpd.html" @@ -13,11 +13,11 @@ license=('GPL2') depends=('openssl') backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd') install=vsftpd.install -source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz{,.asc} +source=(https://security.appspot.com/downloads/$pkgname-$pkgver.tar.gz{,.asc} vsftpd.xinetd vsftpd.d vsftpd-ssl.socket vsftpd.socket vsftpd.service vsftpd@.service vsftpd-ssl.service vsftpd-ssl@.service) -sha1sums=('436da30cefa33e22a0266077ab95397e9432e297' - '2142ac8a84f18ecc1ebac21b9ac07858c35ae6af' +sha1sums=('a366c82e726892eb50e5e74bac92d832d360da74' + 'c30e2813d190bbead6434dd109b21ec2c1076c81' 'c87b4ce56dac15223694a6e86c01ea813b877596' '24f268956c24e78be0c234c6d31f41487922eafe' 'f81dab50243f7e82dc9722ca79b2b24de0882eb2' diff --git a/core/pinentry/PKGBUILD b/core/pinentry/PKGBUILD index 072a2b244..b5c199b3c 100644 --- a/core/pinentry/PKGBUILD +++ b/core/pinentry/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 160802 2012-06-06 10:36:53Z tpowa $ +# $Id: PKGBUILD 166720 2012-09-17 05:06:14Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=pinentry -pkgver=0.8.1 -pkgrel=4 +pkgver=0.8.2 +pkgrel=1 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" arch=('i686' 'x86_64') license=('GPL') @@ -11,7 +11,7 @@ depends=('ncurses' 'libcap>=2.16') makedepends=('gtk2' 'qt') optdepends=('gtk2: for gtk2 backend' 'qt: for qt4 backend') -source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz +source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2 qt4-pinentry-window.patch) install=pinentry.install @@ -36,5 +36,5 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=${pkgdir} install } -md5sums=('81f99904daee5331eb6738408bb024b6' +md5sums=('82e6114e5e27a8ab36f314b332a6e024' '450b8713fe42f1bd93311ef84767c3d8') diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index 422680e26..9e4844f8c 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166279 2012-09-05 18:34:02Z andrea $ +# $Id: PKGBUILD 166735 2012-09-17 09:38:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -11,7 +11,7 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-krdc' 'kdenetwork-krfb') pkgver=4.9.1 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') diff --git a/extra/libmp3splt/PKGBUILD b/extra/libmp3splt/PKGBUILD index acb42e268..e57a3086e 100644 --- a/extra/libmp3splt/PKGBUILD +++ b/extra/libmp3splt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 159128 2012-05-16 12:24:49Z tpowa $ +# $Id: PKGBUILD 166724 2012-09-17 05:18:15Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libmp3splt -pkgver=0.7.2 +pkgver=0.7.3 pkgrel=1 pkgdesc="Library for splitting mp3 and ogg files without decoding" arch=('i686' 'x86_64') @@ -25,4 +25,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir/ install } -md5sums=('848817d1d980729aec99bbc62caddd76') +md5sums=('f63e41774514e9e05272e16b92182ce5') diff --git a/extra/misdnuser/PKGBUILD b/extra/misdnuser/PKGBUILD index 991c9a59f..2536b39fe 100644 --- a/extra/misdnuser/PKGBUILD +++ b/extra/misdnuser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165895 2012-09-03 06:51:02Z tpowa $ +# $Id: PKGBUILD 166730 2012-09-17 05:26:17Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=misdnuser -pkgver=2.0.15_20120831 +pkgver=2.0.17_20120917 pkgrel=1 pkgdesc="Tools and library for mISDN" arch=('i686' 'x86_64') @@ -43,8 +43,7 @@ package() { install -D -m644 ${srcdir}/c2faxrecv-mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/c2faxrecv-mISDNcapid.service install -D -m644 ${srcdir}/mISDNcapid.conf ${pkgdir}/usr/lib/tmpfiles.d/mISDNcapid.conf } - -md5sums=('541c10711ff396160e44a1bd7ec11949' +md5sums=('4cdb52f2c0ff1a1426573ac5ef09e9f8' '2009563b144de037ecb20f8d727a772e' '8f305ee6e35fa12a8bec0632bfe7a076' '32ead7f063e007c784aa883d441f33c2' diff --git a/extra/mp3splt/PKGBUILD b/extra/mp3splt/PKGBUILD index 7add37552..6419c587d 100644 --- a/extra/mp3splt/PKGBUILD +++ b/extra/mp3splt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 159130 2012-05-16 12:25:44Z tpowa $ +# $Id: PKGBUILD 166726 2012-09-17 05:19:09Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=mp3splt -pkgver=2.4.2 +pkgver=2.4.3 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Commandline tool for splitting mp3 and ogg files without decoding" @@ -22,4 +22,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir/ install } -md5sums=('f4c5c42f9dec9fb72b7f6ffeacd82906') +md5sums=('33559a6f8e6179afd8ca7c9886ffa207') diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD index 7693efe1a..ce29d86a3 100644 --- a/extra/qemu-kvm/PKGBUILD +++ b/extra/qemu-kvm/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 163622 2012-07-17 06:22:37Z tpowa $ +# $Id: PKGBUILD 166722 2012-09-17 05:16:37Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu-kvm -pkgver=1.1.1 +pkgver=1.2.0 pkgrel=1 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=(i686 x86_64) @@ -57,5 +57,5 @@ package() esac done } -md5sums=('f8f5629b00f48192cc0467e1d31c4dd2' +md5sums=('d7b18b673c48abfee65a9c0245df0415' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index ed2d7127c..6a9b87fdc 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166511 2012-09-09 07:04:08Z andyrtr $ +# $Id: PKGBUILD 166751 2012-09-17 16:20:14Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.20.7 +pkgver=2.20.8 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -18,7 +18,7 @@ conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'x options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('e34503e60f3bc54a7ecbca3a4e7052a5a1015b0f1b4009bf84c101b5e08f9bac') +sha256sums=('2a126b2bb93b8d9db5eef68f1496e83713fd51ac435a7fafc7a36ff9c7ca83e7') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD index 25aa4265e..b9c08bef3 100644 --- a/extra/xf86-video-nouveau/PKGBUILD +++ b/extra/xf86-video-nouveau/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162034 2012-06-19 01:44:22Z ibiru $ +# $Id: PKGBUILD 166750 2012-09-17 16:20:09Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: buddabrod <buddabrod@gmail.com> pkgname=xf86-video-nouveau -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 pkgdesc="Open Source 2D acceleration driver for nVidia cards" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ conflicts=('xorg-server<1.11.99.902') options=('!libtool') install=$pkgname.install source=($url/release/$pkgname-$pkgver.tar.bz2) -md5sums=('d120bdd4ee9fc3581f3b93e3b31c4574') +sha256sums=('765731c2a91d434d4360517a128d18af70b158f727e49813f1a42e26cccbc45d') build() { cd $pkgname-$pkgver diff --git a/multilib/jack2-multilib/PKGBUILD b/multilib/jack2-multilib/PKGBUILD index d32898b23..d133aad7a 100644 --- a/multilib/jack2-multilib/PKGBUILD +++ b/multilib/jack2-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70231 2012-05-02 16:32:12Z schiv $ +# $Id: PKGBUILD 76361 2012-09-16 15:00:40Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: SpepS <dreamspepser at yahoo dot it> @@ -15,7 +15,7 @@ pkgname=('jack2-multilib' 'jack2-dbus-multilib') #pkgname= # single build (overrides split) _tarname=jack pkgver=1.9.8 -pkgrel=2 +pkgrel=3 arch=('x86_64') url="http://jackaudio.org/" backup=(etc/security/limits.d/99-audio.conf) @@ -57,6 +57,11 @@ build() { export LINKFLAGS="$LDFLAGS" + # Some optimisation bug exists for current GCC + # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663 + export CFLAGS="${CFLAGS/-O[0-9]/-O0}" + export CXXFLAGS="$CFLAGS" + # fix doxygen building sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript diff --git a/multilib/lib32-gtk2/PKGBUILD b/multilib/lib32-gtk2/PKGBUILD index f147c2317..65c4a1ca7 100644 --- a/multilib/lib32-gtk2/PKGBUILD +++ b/multilib/lib32-gtk2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74437 2012-07-28 15:00:19Z bluewind $ +# $Id: PKGBUILD 76349 2012-09-16 10:33:37Z lcarlier $ # Maintainer: Ionut Biru <ibiru@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> _pkgbasename=gtk2 pkgname=lib32-$_pkgbasename -pkgver=2.24.11 +pkgver=2.24.12 pkgrel=1 pkgdesc="The GTK+ Toolkit (v2) (32-bit)" arch=('x86_64') @@ -20,7 +20,7 @@ license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz xid-collision-debug.patch gtk-modules-32.patch) -sha256sums=('328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9' +sha256sums=('c5eba3b9259e4bf7554e9dc9db5d72038aa8b1bdd40fa0364b3705c226d11808' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' '2effb13404442ae266d4c663347e88cd1ca19e9a83b452da1743bac16af9c7b0') diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD index 096113fa3..74827bf58 100644 --- a/multilib/wine/PKGBUILD +++ b/multilib/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 75806 2012-08-31 20:40:09Z svenstaro $ +# $Id: PKGBUILD 76407 2012-09-17 10:50:59Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=wine -pkgver=1.5.12 +pkgver=1.5.13 pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('42d8a0b933768447aa73447c4f0ec2ed') +md5sums=('a03d2feafdf6ece0a1cdd6d0daf6a8ae') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" diff --git a/testing/nfsidmap/PKGBUILD b/testing/nfsidmap/PKGBUILD new file mode 100644 index 000000000..17f3e5580 --- /dev/null +++ b/testing/nfsidmap/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 166728 2012-09-17 05:20:12Z tpowa $ +# Maintainer: +# Contributor: Judd <jvinet@zeroflux.org> + +pkgname=nfsidmap +pkgver=0.25 +pkgrel=1 +pkgdesc="Library to help mapping IDs, mainly for NFSv4" +arch=('i686' 'x86_64') +url="http://www.citi.umich.edu/projects/nfsv4/linux/" +depends=('glibc' 'libldap>=2.4.18') +license=('custom:nfsidmap') +options=(!libtool) +source=(http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-$pkgver.tar.gz) + +build() { + cd $srcdir/lib$pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd $srcdir/lib$pkgname-$pkgver + make DESTDIR=$pkgdir install + + # install license + install -Dm644 COPYING $pkgdir/usr/share/licenses/nfsidmap/LICENSE +} +md5sums=('2ac4893c92716add1a1447ae01df77ab') diff --git a/testing/procps-ng/PKGBUILD b/testing/procps-ng/PKGBUILD index 72b8d73c7..cab5fac96 100644 --- a/testing/procps-ng/PKGBUILD +++ b/testing/procps-ng/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 166144 2012-09-04 17:22:05Z tomegun $ -# Maintainer: Eric Bélanger <eric@archlinux.org> +# $Id: PKGBUILD 166733 2012-09-17 08:10:26Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Eric Bélanger <eric@archlinux.org> pkgname=procps-ng pkgver=3.3.3 -pkgrel=5 -pkgdesc="Utilities for monitoring your system and processes on your system" +pkgrel=6 +pkgdesc='Utilities for monitoring your system and its processes' arch=('i686' 'x86_64') url="http://gitorious.org/procps" license=('GPL' 'LGPL') @@ -18,7 +19,7 @@ options=('!libtool') source=(procps-ng-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver} sysctl.conf) sha1sums=('e78a098f1a3c06722155800cc5cfa0c865af03c0' - 'efb6cdc17ee39be8433ae9c8e9bb02d1f47eeefc') + '97ff07bab9aa5daa8d54a1346f73ba74f8e12a53') build() { cd "${srcdir}/procps-procps" @@ -31,9 +32,9 @@ build() { package() { cd "${srcdir}/procps-procps" make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/sysctl.conf" "${pkgdir}/etc/sysctl.conf" + install -D -m644 ../sysctl.conf "${pkgdir}/etc/sysctl.conf" - # moved to util-linux + # provided by util-linux rm "${pkgdir}/bin/kill" rm "${pkgdir}/usr/share/man/man1/kill.1" } diff --git a/testing/procps-ng/sysctl.conf b/testing/procps-ng/sysctl.conf index baddd90a6..4695cdd92 100644 --- a/testing/procps-ng/sysctl.conf +++ b/testing/procps-ng/sysctl.conf @@ -1,46 +1,41 @@ -# /etc/sysctl.conf - Configuration file for setting system variables -# See sysctl.conf (5) for information. +# Configuration file for runtime kernel parameters. +# See sysctl.conf(5) for more information. -# you can have the CD-ROM close when you use it, and open -# when you are done. -#dev.cdrom.autoeject = 1 +# Have the CD-ROM close when you use it, and open when you are done. #dev.cdrom.autoclose = 1 +#dev.cdrom.autoeject = 1 -# protection from the SYN flood attack +# Protection from the SYN flood attack. net.ipv4.tcp_syncookies = 1 -# see the evil packets in your log files +# See evil packets in your logs. #net.ipv4.conf.all.log_martians = 1 -# if not functioning as a router, there is no need to accept redirects or source routes +# Never accept redirects or source routes (these are only useful for routers). #net.ipv4.conf.all.accept_redirects = 0 #net.ipv4.conf.all.accept_source_route = 0 #net.ipv6.conf.all.accept_redirects = 0 #net.ipv6.conf.all.accept_source_route = 0 -# Disable packet forwarding +# Disable packet forwarding. net.ipv4.ip_forward = 0 net.ipv6.conf.all.forwarding = 0 -# Enable IPv6 Privacy Extensions -net.ipv6.conf.default.use_tempaddr = 2 -net.ipv6.conf.all.use_tempaddr = 2 - -# sets the port range used for outgoing connections -#net.ipv4.ip_local_port_range = 32768 61000 +# Tweak the port range used for outgoing connections. +#net.ipv4.ip_local_port_range = 32768 61000 -# Swapping too much or not enough? Disks spinning up when you'd -# rather they didn't? Tweak these. +# Tweak those values to alter disk syncing and swap behavior. #vm.vfs_cache_pressure = 100 #vm.laptop_mode = 0 #vm.swappiness = 60 +# Tweak how the flow of kernel messages is throttled. #kernel.printk_ratelimit_burst = 10 #kernel.printk_ratelimit = 5 -#kernel.panic_on_oops = 0 -# Reboot 600 seconds after a panic +# Reboot 600 seconds after kernel panic or oops. +#kernel.panic_on_oops = 1 #kernel.panic = 600 -# Disable SysRq key (note: console security issues) +# Disable SysRq key to avoid console security issues. kernel.sysrq = 0 diff --git a/testing/qt/PKGBUILD b/testing/qt/PKGBUILD index d9a30c3cc..b7a869a92 100644 --- a/testing/qt/PKGBUILD +++ b/testing/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166631 2012-09-13 15:17:13Z andrea $ +# $Id: PKGBUILD 166748 2012-09-17 16:06:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.8.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -18,19 +18,24 @@ _pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}" source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' - 'improve-cups-support.patch') + 'improve-cups-support.patch' + 'fix-crash-in-assistant.patch') md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' '6b771c8a81dd90b45e8a79afa0e5bbfd' - 'c439c7731c25387352d8453ca7574971') + 'c439c7731c25387352d8453ca7574971' + '57590084078b6379f0501f7728b02ae2') build() { cd "${srcdir}"/${_pkgfqn} # (FS#28381) (KDEBUG#180051) patch -p1 -i "${srcdir}"/improve-cups-support.patch + + # (FS#) + patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} diff --git a/testing/qt/fix-crash-in-assistant.patch b/testing/qt/fix-crash-in-assistant.patch new file mode 100644 index 000000000..4246e0532 --- /dev/null +++ b/testing/qt/fix-crash-in-assistant.patch @@ -0,0 +1,11 @@ +--- qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp 2012-06-26 17:37:47.334536023 +0000 ++++ qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp~ 2012-06-26 17:37:08.531487286 +0000 +@@ -944,8 +944,7 @@ + if (helpEngine.usesAppFont()) + font = helpEngine.appFont(); + +- const QWidgetList &widgets = qApp->allWidgets(); +- foreach (QWidget* widget, widgets) ++ foreach (QWidget* widget, QApplication::allWidgets()) + widget->setFont(font); + } diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD index b597c137a..ff4657500 100644 --- a/testing/sudo/PKGBUILD +++ b/testing/sudo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166625 2012-09-13 12:56:03Z foutrelis $ +# $Id: PKGBUILD 166746 2012-09-17 15:48:51Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sudo -_sudover=1.8.6p1 +_sudover=1.8.6p2 pkgver=${_sudover/p/.p} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" @@ -16,7 +16,7 @@ backup=('etc/sudoers' 'etc/pam.d/sudo') options=('!libtool') source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz sudo.pam) -sha256sums=('70d6a3ceb6168c879a80a5fa03cdd06178b95d0ecb6bf87aa0bc7c159da944cc' +sha256sums=('d342ba710cc326bfa2065ed8ebe262a72b54a497a686aa4cbbbd0ae3028dcf4b' 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae') build() { |