[arch-commits] Commit in hugin/trunk (PKGBUILD)
Date: Saturday, July 28, 2012 @ 02:14:51
Author: eric
Revision: 164242
upgpkg: hugin 2011.4.0-4
Rebuilt against glew 1.8
Modified:
hugin/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-07-28 04:44:32 UTC (rev 164241)
+++ PKGBUILD2012-07-28 06:14:51 UTC (rev 164242)
@@ -5,7 +5,7 @@
pkgname=hugin
pkgver=2011.4.0
-pkgrel=3
+pkgrel=4
pkgdesc=A frontend to the panorama-tools
arch=('i686' 'x86_64')
url=http://hugin.sourceforge.net/;
[arch-commits] Commit in hugin/repos (8 files)
Date: Saturday, July 28, 2012 @ 02:15:16
Author: eric
Revision: 164243
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
hugin/repos/staging-i686/
hugin/repos/staging-i686/PKGBUILD
(from rev 164242, hugin/trunk/PKGBUILD)
hugin/repos/staging-i686/gcc47.patch
(from rev 164242, hugin/trunk/gcc47.patch)
hugin/repos/staging-i686/hugin.install
(from rev 164242, hugin/trunk/hugin.install)
hugin/repos/staging-x86_64/
hugin/repos/staging-x86_64/PKGBUILD
(from rev 164242, hugin/trunk/PKGBUILD)
hugin/repos/staging-x86_64/gcc47.patch
(from rev 164242, hugin/trunk/gcc47.patch)
hugin/repos/staging-x86_64/hugin.install
(from rev 164242, hugin/trunk/hugin.install)
--+
staging-i686/PKGBUILD| 39 +++
staging-i686/gcc47.patch | 11 +++
staging-i686/hugin.install | 15 +++
staging-x86_64/PKGBUILD | 39 +++
staging-x86_64/gcc47.patch | 11 +++
staging-x86_64/hugin.install | 15 +++
6 files changed, 130 insertions(+)
Copied: hugin/repos/staging-i686/PKGBUILD (from rev 164242,
hugin/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-07-28 06:15:16 UTC (rev 164243)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Tobias Kieslich tob...@archlinux.org
+# Contributor: Giovanni Scafora giova...@archlinux.org
+# Contributor: Dominik Ryba domr...@post.pl
+
+pkgname=hugin
+pkgver=2011.4.0
+pkgrel=4
+pkgdesc=A frontend to the panorama-tools
+arch=('i686' 'x86_64')
+url=http://hugin.sourceforge.net/;
+license=('GPL')
+depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c'
+ 'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool')
+makedepends=('zip' 'cmake' 'boost' 'tclap')
+install=hugin.install
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2;
+gcc47.patch)
+sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b'
+ 'aa0fc9425bd7a4b5e270412f4ca72258fac77298')
+
+build() {
+ cd ${srcdir}
+ patch -Np0 -i gcc47.patch
+ mkdir build
+ cd build
+ export CXXFLAGS+= -fpermissive
+ cmake ${srcdir}/${pkgname}-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_EXE_LINKER_FLAGS=-lpthread \
+-DENABLE_LAPACK=yes
+ make
+}
+
+package(){
+ cd ${srcdir}/build
+ make DESTDIR=${pkgdir} install
+}
Copied: hugin/repos/staging-i686/gcc47.patch (from rev 164242,
hugin/trunk/gcc47.patch)
===
--- staging-i686/gcc47.patch(rev 0)
+++ staging-i686/gcc47.patch2012-07-28 06:15:16 UTC (rev 164243)
@@ -0,0 +1,11 @@
+diff -Nur hugin-2011.4.0.orig/src/celeste/Utilities.cpp
hugin-2011.4.0/src/celeste/Utilities.cpp
+--- hugin-2011.4.0.orig/src/celeste/Utilities.cpp 2012-07-08
15:18:16.864454043 +
hugin-2011.4.0/src/celeste/Utilities.cpp 2012-07-08 15:18:20.341089422
+
+@@ -27,6 +27,7 @@
+
+ #include math.h
+ #include stdlib.h
++#include unistd.h
+ #include Utilities.h
+
+ using namespace std;
Copied: hugin/repos/staging-i686/hugin.install (from rev 164242,
hugin/trunk/hugin.install)
===
--- staging-i686/hugin.install (rev 0)
+++ staging-i686/hugin.install 2012-07-28 06:15:16 UTC (rev 164243)
@@ -0,0 +1,15 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/gnome
+ update-desktop-database -q
+ update-mime-database usr/share/mime /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/gnome
+ update-desktop-database -q
+ update-mime-database usr/share/mime /dev/null
+}
Copied: hugin/repos/staging-x86_64/PKGBUILD (from rev 164242,
hugin/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-07-28 06:15:16 UTC (rev 164243)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Tobias Kieslich tob...@archlinux.org
+# Contributor: Giovanni Scafora giova...@archlinux.org
+# Contributor: Dominik Ryba domr...@post.pl
+
+pkgname=hugin
+pkgver=2011.4.0
+pkgrel=4
+pkgdesc=A frontend to the panorama-tools
+arch=('i686' 'x86_64')
+url=http://hugin.sourceforge.net/;
+license=('GPL')
+depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c'
+ 'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool')
+makedepends=('zip' 'cmake' 'boost' 'tclap')
+install=hugin.install
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2;
+gcc47.patch)
+sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b'
+
[arch-commits] Commit in cups/trunk (PKGBUILD)
Date: Saturday, July 28, 2012 @ 05:27:39
Author: andyrtr
Revision: 164244
upgpkg: cups 1.6.1-1
upstream update 1.6.1
Modified:
cups/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-07-28 06:15:16 UTC (rev 164243)
+++ PKGBUILD2012-07-28 09:27:39 UTC (rev 164244)
@@ -3,7 +3,7 @@
pkgbase=cups
pkgname=('libcups' 'cups')
-pkgver=1.6.0
+pkgver=1.6.1
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
@@ -17,7 +17,7 @@
cups-systemd-socket.patch
cups cups.logrotate cups.pam)
#options=('!emptydirs')
-md5sums=('07157b243dd11e90e3f654c4d62e7c8a'
+md5sums=('87ade07e3d1efd03c9c3add949cf9c00'
'9b8467a1e51d360096b70e2c3c081e6c'
'3733c23e77eb503bd94cc368e02830dc'
'90c30380d4c8cd48a908cfdadae1ea24'
[arch-commits] Commit in cups/repos (36 files)
Date: Saturday, July 28, 2012 @ 05:29:14 Author: andyrtr Revision: 164245 archrelease: copy trunk to testing-i686, testing-x86_64 Added: cups/repos/testing-i686/PKGBUILD (from rev 164244, cups/trunk/PKGBUILD) cups/repos/testing-i686/cups (from rev 164244, cups/trunk/cups) cups/repos/testing-i686/cups-no-export-ssllibs.patch (from rev 164244, cups/trunk/cups-no-export-ssllibs.patch) cups/repos/testing-i686/cups-no-gcrypt.patch (from rev 164244, cups/trunk/cups-no-gcrypt.patch) cups/repos/testing-i686/cups-no-gzip-man.patch (from rev 164244, cups/trunk/cups-no-gzip-man.patch) cups/repos/testing-i686/cups-systemd-socket.patch (from rev 164244, cups/trunk/cups-systemd-socket.patch) cups/repos/testing-i686/cups.install (from rev 164244, cups/trunk/cups.install) cups/repos/testing-i686/cups.logrotate (from rev 164244, cups/trunk/cups.logrotate) cups/repos/testing-i686/cups.pam (from rev 164244, cups/trunk/cups.pam) cups/repos/testing-x86_64/PKGBUILD (from rev 164244, cups/trunk/PKGBUILD) cups/repos/testing-x86_64/cups (from rev 164244, cups/trunk/cups) cups/repos/testing-x86_64/cups-no-export-ssllibs.patch (from rev 164244, cups/trunk/cups-no-export-ssllibs.patch) cups/repos/testing-x86_64/cups-no-gcrypt.patch (from rev 164244, cups/trunk/cups-no-gcrypt.patch) cups/repos/testing-x86_64/cups-no-gzip-man.patch (from rev 164244, cups/trunk/cups-no-gzip-man.patch) cups/repos/testing-x86_64/cups-systemd-socket.patch (from rev 164244, cups/trunk/cups-systemd-socket.patch) cups/repos/testing-x86_64/cups.install (from rev 164244, cups/trunk/cups.install) cups/repos/testing-x86_64/cups.logrotate (from rev 164244, cups/trunk/cups.logrotate) cups/repos/testing-x86_64/cups.pam (from rev 164244, cups/trunk/cups.pam) Deleted: cups/repos/testing-i686/PKGBUILD cups/repos/testing-i686/cups cups/repos/testing-i686/cups-no-export-ssllibs.patch cups/repos/testing-i686/cups-no-gcrypt.patch cups/repos/testing-i686/cups-no-gzip-man.patch cups/repos/testing-i686/cups-systemd-socket.patch cups/repos/testing-i686/cups.install cups/repos/testing-i686/cups.logrotate cups/repos/testing-i686/cups.pam cups/repos/testing-x86_64/PKGBUILD cups/repos/testing-x86_64/cups cups/repos/testing-x86_64/cups-no-export-ssllibs.patch cups/repos/testing-x86_64/cups-no-gcrypt.patch cups/repos/testing-x86_64/cups-no-gzip-man.patch cups/repos/testing-x86_64/cups-systemd-socket.patch cups/repos/testing-x86_64/cups.install cups/repos/testing-x86_64/cups.logrotate cups/repos/testing-x86_64/cups.pam -+ testing-i686/PKGBUILD | 306 - testing-i686/cups | 136 ++-- testing-i686/cups-no-export-ssllibs.patch | 24 testing-i686/cups-no-gcrypt.patch | 76 +- testing-i686/cups-no-gzip-man.patch | 36 - testing-i686/cups-systemd-socket.patch | 796 +- testing-i686/cups.install | 66 +- testing-i686/cups.logrotate | 16 testing-i686/cups.pam |6 testing-x86_64/PKGBUILD | 306 - testing-x86_64/cups | 136 ++-- testing-x86_64/cups-no-export-ssllibs.patch | 24 testing-x86_64/cups-no-gcrypt.patch | 76 +- testing-x86_64/cups-no-gzip-man.patch | 36 - testing-x86_64/cups-systemd-socket.patch| 796 +- testing-x86_64/cups.install | 66 +- testing-x86_64/cups.logrotate | 16 testing-x86_64/cups.pam |6 18 files changed, 1462 insertions(+), 1462 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 164244:164245 to see the changes.
[arch-commits] Commit in tcl/trunk (PKGBUILD)
Date: Saturday, July 28, 2012 @ 05:50:19
Author: allan
Revision: 164246
upgpkg: tcl 8.5.12-1
upstream update
Modified:
tcl/trunk/PKGBUILD
--+
PKGBUILD | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-07-28 09:29:14 UTC (rev 164245)
+++ PKGBUILD2012-07-28 09:50:19 UTC (rev 164246)
@@ -3,14 +3,14 @@
# Committer: Judd Vinet jvi...@zeroflux.org
pkgname=tcl
-pkgver=8.5.11
+pkgver=8.5.12
pkgrel=1
pkgdesc=The Tcl scripting language
arch=('i686' 'x86_64')
url=http://tcl.sourceforge.net/;
license=('custom')
source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
-md5sums=('b01a9691c83990b3db0ce62d1012ca67')
+md5sums=('174b2b4c619ba8f96875d8a051917703')
build() {
cd ${srcdir}/tcl${pkgver}/unix
@@ -24,10 +24,10 @@
make
}
-#check() {
-# cd ${srcdir}/tcl${pkgver}/unix
-# make test
-#}
+check() {
+ cd ${srcdir}/tcl${pkgver}/unix
+ make test
+}
package()
{
[arch-commits] Commit in tcl/repos (4 files)
Date: Saturday, July 28, 2012 @ 05:51:11
Author: allan
Revision: 164247
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
tcl/repos/testing-i686/
tcl/repos/testing-i686/PKGBUILD
(from rev 164246, tcl/trunk/PKGBUILD)
tcl/repos/testing-x86_64/
tcl/repos/testing-x86_64/PKGBUILD
(from rev 164246, tcl/trunk/PKGBUILD)
-+
testing-i686/PKGBUILD | 52 ++
testing-x86_64/PKGBUILD | 52 ++
2 files changed, 104 insertions(+)
Copied: tcl/repos/testing-i686/PKGBUILD (from rev 164246, tcl/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-07-28 09:51:11 UTC (rev 164247)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Committer: Judd Vinet jvi...@zeroflux.org
+
+pkgname=tcl
+pkgver=8.5.12
+pkgrel=1
+pkgdesc=The Tcl scripting language
+arch=('i686' 'x86_64')
+url=http://tcl.sourceforge.net/;
+license=('custom')
+source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
+md5sums=('174b2b4c619ba8f96875d8a051917703')
+
+build() {
+ cd ${srcdir}/tcl${pkgver}/unix
+
+ if [ $CARCH = x86_64 ]; then
+./configure --prefix=/usr --mandir=/usr/share/man --enable-threads
--enable-64bit
+ else
+./configure --prefix=/usr --mandir=/usr/share/man --enable-threads
--disable-64bit
+ fi
+
+ make
+}
+
+check() {
+ cd ${srcdir}/tcl${pkgver}/unix
+ make test
+}
+
+package()
+{
+ cd ${srcdir}/tcl${pkgver}/unix
+
+ make INSTALL_ROOT=${pkgdir} install install-private-headers
+ ln -sf tclsh8.5 ${pkgdir}/usr/bin/tclsh
+
+ # install license
+ install -Dm644 ../license.terms
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+ # remove buildroot traces
+ sed -i \
+-e s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L/usr/lib, \
+-e s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/include', \
+-e
s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/lib, \
+-e
s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/lib, \
+-e
s,^TCL_LIB_FILE='libtcl8.5..TCL_DBGX..so',TCL_LIB_FILE=\libtcl8.5\$\{TCL_DBGX\}.so\,
\
+-e s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/lib', \
+-e s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/lib', \
+${pkgdir}/usr/lib/tclConfig.sh
+}
Copied: tcl/repos/testing-x86_64/PKGBUILD (from rev 164246, tcl/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-07-28 09:51:11 UTC (rev 164247)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Committer: Judd Vinet jvi...@zeroflux.org
+
+pkgname=tcl
+pkgver=8.5.12
+pkgrel=1
+pkgdesc=The Tcl scripting language
+arch=('i686' 'x86_64')
+url=http://tcl.sourceforge.net/;
+license=('custom')
+source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
+md5sums=('174b2b4c619ba8f96875d8a051917703')
+
+build() {
+ cd ${srcdir}/tcl${pkgver}/unix
+
+ if [ $CARCH = x86_64 ]; then
+./configure --prefix=/usr --mandir=/usr/share/man --enable-threads
--enable-64bit
+ else
+./configure --prefix=/usr --mandir=/usr/share/man --enable-threads
--disable-64bit
+ fi
+
+ make
+}
+
+check() {
+ cd ${srcdir}/tcl${pkgver}/unix
+ make test
+}
+
+package()
+{
+ cd ${srcdir}/tcl${pkgver}/unix
+
+ make INSTALL_ROOT=${pkgdir} install install-private-headers
+ ln -sf tclsh8.5 ${pkgdir}/usr/bin/tclsh
+
+ # install license
+ install -Dm644 ../license.terms
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+ # remove buildroot traces
+ sed -i \
+-e s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L/usr/lib, \
+-e s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/include', \
+-e
s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/lib, \
+-e
s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/lib, \
+-e
s,^TCL_LIB_FILE='libtcl8.5..TCL_DBGX..so',TCL_LIB_FILE=\libtcl8.5\$\{TCL_DBGX\}.so\,
\
+-e s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/lib', \
+-e s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/lib', \
+${pkgdir}/usr/lib/tclConfig.sh
+}
[arch-commits] Commit in tk/trunk (PKGBUILD)
Date: Saturday, July 28, 2012 @ 05:51:48
Author: allan
Revision: 164248
upgpkg: tk 8.5.12-1
upstream update
Modified:
tk/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-07-28 09:51:11 UTC (rev 164247)
+++ PKGBUILD2012-07-28 09:51:48 UTC (rev 164248)
@@ -3,7 +3,7 @@
# Contributor: Judd Vinet jvi...@zeroflux.org
pkgname=tk
-pkgver=8.5.11
+pkgver=8.5.12
pkgrel=1
pkgdesc=A windowing toolkit for use with tcl
arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@
license=('custom')
depends=(tcl=${pkgver} 'libxss' 'libxft')
source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz)
-md5sums=('b61b72f0aad230091b100746f078b8f1')
+md5sums=('a01640176845c1f654a412cfc9bab13b')
build() {
cd ${srcdir}/tk${pkgver}/unix
[arch-commits] Commit in tk/repos (4 files)
Date: Saturday, July 28, 2012 @ 05:52:37
Author: allan
Revision: 164249
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
tk/repos/testing-i686/
tk/repos/testing-i686/PKGBUILD
(from rev 164248, tk/trunk/PKGBUILD)
tk/repos/testing-x86_64/
tk/repos/testing-x86_64/PKGBUILD
(from rev 164248, tk/trunk/PKGBUILD)
-+
testing-i686/PKGBUILD | 56 ++
testing-x86_64/PKGBUILD | 56 ++
2 files changed, 112 insertions(+)
Copied: tk/repos/testing-i686/PKGBUILD (from rev 164248, tk/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-07-28 09:52:37 UTC (rev 164249)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=tk
+pkgver=8.5.12
+pkgrel=1
+pkgdesc=A windowing toolkit for use with tcl
+arch=('i686' 'x86_64')
+url=http://tcl.sourceforge.net/;
+license=('custom')
+depends=(tcl=${pkgver} 'libxss' 'libxft')
+source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz)
+md5sums=('a01640176845c1f654a412cfc9bab13b')
+
+build() {
+ cd ${srcdir}/tk${pkgver}/unix
+
+ if [ $CARCH = x86_64 ]; then
+./configure --prefix=/usr --mandir=/usr/share/man --enable-threads
--enable-64bit
+ else
+./configure --prefix=/usr --mandir=/usr/share/man --enable-threads
--disable-64bit
+ fi
+
+ make
+}
+
+#check() {
+# cd ${srcdir}/tk${pkgver}/unix
+# make test
+#}
+
+package() {
+ cd ${srcdir}/tk${pkgver}/unix
+
+ make INSTALL_ROOT=${pkgdir} install install-private-headers
+ ln -sf wish8.5 ${pkgdir}/usr/bin/wish
+
+ # install private headers (FS#14388)
+ cd ${srcdir}/tk${pkgver}
+ for dir in compat generic generic/ttk unix; do
+install -dm755 ${pkgdir}/usr/include/tk-private/$dir
+install -m644 -t ${pkgdir}/usr/include/tk-private/$dir $dir/*.h
+ done
+
+ # install license
+ install -Dm644 license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+ # remove buildroot traces
+ sed -i \
+-e s,^TK_BUILD_LIB_SPEC='-L.*/unix,TK_BUILD_LIB_SPEC='-L/usr/lib, \
+-e s,^TK_SRC_DIR='.*',TK_SRC_DIR='/usr/include', \
+-e
s,^TK_BUILD_STUB_LIB_SPEC='-L.*/unix,TK_BUILD_STUB_LIB_SPEC='-L/usr/lib, \
+-e s,^TK_BUILD_STUB_LIB_PATH='.*/unix,TK_BUILD_STUB_LIB_PATH='/usr/lib, \
+${pkgdir}/usr/lib/tkConfig.sh
+}
Copied: tk/repos/testing-x86_64/PKGBUILD (from rev 164248, tk/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-07-28 09:52:37 UTC (rev 164249)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=tk
+pkgver=8.5.12
+pkgrel=1
+pkgdesc=A windowing toolkit for use with tcl
+arch=('i686' 'x86_64')
+url=http://tcl.sourceforge.net/;
+license=('custom')
+depends=(tcl=${pkgver} 'libxss' 'libxft')
+source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz)
+md5sums=('a01640176845c1f654a412cfc9bab13b')
+
+build() {
+ cd ${srcdir}/tk${pkgver}/unix
+
+ if [ $CARCH = x86_64 ]; then
+./configure --prefix=/usr --mandir=/usr/share/man --enable-threads
--enable-64bit
+ else
+./configure --prefix=/usr --mandir=/usr/share/man --enable-threads
--disable-64bit
+ fi
+
+ make
+}
+
+#check() {
+# cd ${srcdir}/tk${pkgver}/unix
+# make test
+#}
+
+package() {
+ cd ${srcdir}/tk${pkgver}/unix
+
+ make INSTALL_ROOT=${pkgdir} install install-private-headers
+ ln -sf wish8.5 ${pkgdir}/usr/bin/wish
+
+ # install private headers (FS#14388)
+ cd ${srcdir}/tk${pkgver}
+ for dir in compat generic generic/ttk unix; do
+install -dm755 ${pkgdir}/usr/include/tk-private/$dir
+install -m644 -t ${pkgdir}/usr/include/tk-private/$dir $dir/*.h
+ done
+
+ # install license
+ install -Dm644 license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+ # remove buildroot traces
+ sed -i \
+-e s,^TK_BUILD_LIB_SPEC='-L.*/unix,TK_BUILD_LIB_SPEC='-L/usr/lib, \
+-e s,^TK_SRC_DIR='.*',TK_SRC_DIR='/usr/include', \
+-e
s,^TK_BUILD_STUB_LIB_SPEC='-L.*/unix,TK_BUILD_STUB_LIB_SPEC='-L/usr/lib, \
+-e s,^TK_BUILD_STUB_LIB_PATH='.*/unix,TK_BUILD_STUB_LIB_PATH='/usr/lib, \
+${pkgdir}/usr/lib/tkConfig.sh
+}
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Saturday, July 28, 2012 @ 06:49:05
Author: andrea
Revision: 164250
upgpkg: calligra 2.4.3-2
Glew rebuild
Modified:
calligra/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-07-28 09:52:37 UTC (rev 164249)
+++ PKGBUILD2012-07-28 10:49:05 UTC (rev 164250)
@@ -23,7 +23,7 @@
'calligra-braindump'
'calligra-flow')
pkgver=2.4.3
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://www.calligra-suite.org/'
license=('FDL1.2' 'GPL2' 'LGPL')
[arch-commits] Commit in calligra/repos (28 files)
Date: Saturday, July 28, 2012 @ 06:50:36 Author: andrea Revision: 164251 archrelease: copy trunk to staging-i686, staging-x86_64 Added: calligra/repos/staging-i686/ calligra/repos/staging-i686/PKGBUILD (from rev 164250, calligra/trunk/PKGBUILD) calligra/repos/staging-i686/calligra-braindump.install (from rev 164250, calligra/trunk/calligra-braindump.install) calligra/repos/staging-i686/calligra-filters.install (from rev 164250, calligra/trunk/calligra-filters.install) calligra/repos/staging-i686/calligra-flow.install (from rev 164250, calligra/trunk/calligra-flow.install) calligra/repos/staging-i686/calligra-karbon.install (from rev 164250, calligra/trunk/calligra-karbon.install) calligra/repos/staging-i686/calligra-kexi.install (from rev 164250, calligra/trunk/calligra-kexi.install) calligra/repos/staging-i686/calligra-krita.install (from rev 164250, calligra/trunk/calligra-krita.install) calligra/repos/staging-i686/calligra-plan.install (from rev 164250, calligra/trunk/calligra-plan.install) calligra/repos/staging-i686/calligra-sheets.install (from rev 164250, calligra/trunk/calligra-sheets.install) calligra/repos/staging-i686/calligra-stage.install (from rev 164250, calligra/trunk/calligra-stage.install) calligra/repos/staging-i686/calligra-tools.install (from rev 164250, calligra/trunk/calligra-tools.install) calligra/repos/staging-i686/calligra-words.install (from rev 164250, calligra/trunk/calligra-words.install) calligra/repos/staging-i686/calligra.install (from rev 164250, calligra/trunk/calligra.install) calligra/repos/staging-x86_64/ calligra/repos/staging-x86_64/PKGBUILD (from rev 164250, calligra/trunk/PKGBUILD) calligra/repos/staging-x86_64/calligra-braindump.install (from rev 164250, calligra/trunk/calligra-braindump.install) calligra/repos/staging-x86_64/calligra-filters.install (from rev 164250, calligra/trunk/calligra-filters.install) calligra/repos/staging-x86_64/calligra-flow.install (from rev 164250, calligra/trunk/calligra-flow.install) calligra/repos/staging-x86_64/calligra-karbon.install (from rev 164250, calligra/trunk/calligra-karbon.install) calligra/repos/staging-x86_64/calligra-kexi.install (from rev 164250, calligra/trunk/calligra-kexi.install) calligra/repos/staging-x86_64/calligra-krita.install (from rev 164250, calligra/trunk/calligra-krita.install) calligra/repos/staging-x86_64/calligra-plan.install (from rev 164250, calligra/trunk/calligra-plan.install) calligra/repos/staging-x86_64/calligra-sheets.install (from rev 164250, calligra/trunk/calligra-sheets.install) calligra/repos/staging-x86_64/calligra-stage.install (from rev 164250, calligra/trunk/calligra-stage.install) calligra/repos/staging-x86_64/calligra-tools.install (from rev 164250, calligra/trunk/calligra-tools.install) calligra/repos/staging-x86_64/calligra-words.install (from rev 164250, calligra/trunk/calligra-words.install) calligra/repos/staging-x86_64/calligra.install (from rev 164250, calligra/trunk/calligra.install) ---+ staging-i686/PKGBUILD | 264 staging-i686/calligra-braindump.install | 12 + staging-i686/calligra-filters.install | 11 + staging-i686/calligra-flow.install| 12 + staging-i686/calligra-karbon.install | 12 + staging-i686/calligra-kexi.install| 11 + staging-i686/calligra-krita.install | 13 + staging-i686/calligra-plan.install| 12 + staging-i686/calligra-sheets.install | 12 + staging-i686/calligra-stage.install | 12 + staging-i686/calligra-tools.install | 12 + staging-i686/calligra-words.install | 12 + staging-i686/calligra.install | 11 + staging-x86_64/PKGBUILD | 264 staging-x86_64/calligra-braindump.install | 12 + staging-x86_64/calligra-filters.install | 11 + staging-x86_64/calligra-flow.install | 12 + staging-x86_64/calligra-karbon.install| 12 + staging-x86_64/calligra-kexi.install | 11 + staging-x86_64/calligra-krita.install | 13 + staging-x86_64/calligra-plan.install | 12 + staging-x86_64/calligra-sheets.install| 12 + staging-x86_64/calligra-stage.install | 12 + staging-x86_64/calligra-tools.install | 12 + staging-x86_64/calligra-words.install | 12 + staging-x86_64/calligra.install | 11 + 26 files changed, 812 insertions(+) Copied: calligra/repos/staging-i686/PKGBUILD (from rev 164250, calligra/trunk/PKGBUILD) === --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2012-07-28 10:50:36 UTC (rev 164251) @@ -0,0 +1,264 @@ +# $Id$ +# Maintainer: Ronald van Haren ronald.archlinux.org
[arch-commits] Commit in curl/trunk (PKGBUILD)
Date: Saturday, July 28, 2012 @ 09:52:22
Author: dreisner
Revision: 164252
fix typo in description (reported by Twilight Sparkle)
Modified:
curl/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-07-28 10:50:36 UTC (rev 164251)
+++ PKGBUILD2012-07-28 13:52:22 UTC (rev 164252)
@@ -8,7 +8,7 @@
pkgname=curl
pkgver=7.27.0
pkgrel=1
-pkgdesc=An URL retrival utility and library
+pkgdesc=An URL retrieval utility and library
arch=('i686' 'x86_64')
url=http://curl.haxx.se;
license=('MIT')
[arch-commits] Commit in libwacom/repos (6 files)
Date: Saturday, July 28, 2012 @ 16:26:26
Author: eric
Revision: 164253
db-move: moved libwacom from [testing] to [extra] ( i686, x86_64)
Added:
libwacom/repos/extra-i686/PKGBUILD
(from rev 164252, libwacom/repos/testing-i686/PKGBUILD)
libwacom/repos/extra-x86_64/PKGBUILD
(from rev 164252, libwacom/repos/testing-x86_64/PKGBUILD)
Deleted:
libwacom/repos/extra-i686/PKGBUILD
libwacom/repos/extra-x86_64/PKGBUILD
libwacom/repos/testing-i686/
libwacom/repos/testing-x86_64/
---+
extra-i686/PKGBUILD | 56 ++--
extra-x86_64/PKGBUILD | 56 ++--
2 files changed, 62 insertions(+), 50 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-07-28 13:52:22 UTC (rev 164252)
+++ extra-i686/PKGBUILD 2012-07-28 20:26:26 UTC (rev 164253)
@@ -1,25 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
-
-pkgname=libwacom
-pkgver=0.4
-pkgrel=1
-pkgdesc=Library to identify Wacom tablets and their features
-arch=('x86_64' 'i686')
-depends=('glib2' 'udev')
-license=('LGPL')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-url=http://www.gnome.org;
-sha256sums=('13a7989572126b7f9013f8289b7e59707e23690fbd5eaa7f033b88245fa12367')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --disable-static
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR=$pkgdir install
-}
Copied: libwacom/repos/extra-i686/PKGBUILD (from rev 164252,
libwacom/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-07-28 20:26:26 UTC (rev 164253)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+
+pkgname=libwacom
+pkgver=0.6
+pkgrel=1
+pkgdesc=Library to identify Wacom tablets and their features
+arch=('x86_64' 'i686')
+url=http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Libwacom;
+license=('MIT')
+depends=('glib2' 'systemd-tools')
+options=('!libtool')
+source=(http://sourceforge.net/projects/linuxwacom/files/libwacom/$pkgname-$pkgver.tar.bz2)
+sha256sums=('7115690698edc87deec482f0b2526567b858475d2135b5f8ccc946e5e76ec01d')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+ install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2012-07-28 13:52:22 UTC (rev 164252)
+++ extra-x86_64/PKGBUILD 2012-07-28 20:26:26 UTC (rev 164253)
@@ -1,25 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
-
-pkgname=libwacom
-pkgver=0.4
-pkgrel=1
-pkgdesc=Library to identify Wacom tablets and their features
-arch=('x86_64' 'i686')
-depends=('glib2' 'udev')
-license=('LGPL')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-url=http://www.gnome.org;
-sha256sums=('13a7989572126b7f9013f8289b7e59707e23690fbd5eaa7f033b88245fa12367')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --disable-static
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR=$pkgdir install
-}
Copied: libwacom/repos/extra-x86_64/PKGBUILD (from rev 164252,
libwacom/repos/testing-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-07-28 20:26:26 UTC (rev 164253)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+
+pkgname=libwacom
+pkgver=0.6
+pkgrel=1
+pkgdesc=Library to identify Wacom tablets and their features
+arch=('x86_64' 'i686')
+url=http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Libwacom;
+license=('MIT')
+depends=('glib2' 'systemd-tools')
+options=('!libtool')
+source=(http://sourceforge.net/projects/linuxwacom/files/libwacom/$pkgname-$pkgver.tar.bz2)
+sha256sums=('7115690698edc87deec482f0b2526567b858475d2135b5f8ccc946e5e76ec01d')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+ install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
[arch-commits] Commit in dhcp/trunk (ChangeLog PKGBUILD)
Date: Saturday, July 28, 2012 @ 18:36:14
Author: eric
Revision: 164254
upgpkg: dhcp 4.2.4.1-1
Upstream update, Fix description, Remove old unused ChangeLog
Modified:
dhcp/trunk/PKGBUILD
Deleted:
dhcp/trunk/ChangeLog
---+
ChangeLog | 11 ---
PKGBUILD | 48 +---
2 files changed, 25 insertions(+), 34 deletions(-)
Deleted: ChangeLog
===
--- ChangeLog 2012-07-28 20:26:26 UTC (rev 164253)
+++ ChangeLog 2012-07-28 22:36:14 UTC (rev 164254)
@@ -1,11 +0,0 @@
-
-2010-07-16 kevin ke...@archlinux.org
- * dhcp 4.2.0-1
-
-2009-07-19 kevin ke...@archlinux.org
- * dhcp 4.1.0.p1-1
- * Adopted RedHat patch to fix bug where dhcpd won't start if ipv6 module
- is not loaded. Fixes FS#12792.
- * Added /etc/conf.d/dhcp feature contributed by Fabiano Furtado Pessoa
- Coelho fusc...@gmail.com
-
Modified: PKGBUILD
===
--- PKGBUILD2012-07-28 20:26:26 UTC (rev 164253)
+++ PKGBUILD2012-07-28 22:36:14 UTC (rev 164254)
@@ -5,18 +5,20 @@
pkgname=('dhcp' 'dhclient')
# separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.3.2
-_pkgver=4.2.3-P2
+pkgver=4.2.4.1
+_pkgver=4.2.4-P1
-pkgrel=2
+pkgrel=1
arch=('i686' 'x86_64')
license=('custom:isc-dhcp')
url=https://www.isc.org/software/dhcp;
-source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz
+makedepends=('bash' 'iproute2' 'net-tools')
+source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
dhcp4 dhcp6 dhcp
dhcp-4.1.1-missing-ipv6-not-fatal.patch
dhclient-script-pathFixes.patch)
-md5sums=('14f57fd580d01633d0fad4809007a801'
+md5sums=('0ca7181024651f6323951d5498c8020b'
+ '0dfe000dd88555ea06b282ae5e574d5f'
'c49b1497837ba56c54e401a66e1bab9b'
'12c2f3ae47ed23eb698eb7f1bfd80f20'
'8f357e46e1efcbb746f38737a3f977a2'
@@ -24,13 +26,13 @@
'541b415a25a169eaf64b681405f79a80')
build() {
- cd ${srcdir}/${pkgbase}-${_pkgver}
+ cd ${srcdir}/${pkgbase}-${_pkgver}
# Define _GNU_SOURCE to fix IPV6.
sed '/^CFLAGS=$CFLAGS/ s/INGS/INGS -D_GNU_SOURCE/' -i configure
# Make not having ipv6 non-fatal.
- patch -Np0 -i ${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch
+ patch -Np0 -i ${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch
./configure --prefix=/usr --sysconfdir=/etc \
--with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
@@ -40,7 +42,7 @@
make
- patch -i ${srcdir}/dhclient-script-pathFixes.patch client/scripts/linux ||
return 1
+ patch -i ${srcdir}/dhclient-script-pathFixes.patch client/scripts/linux
}
package_dhcp(){
@@ -49,36 +51,36 @@
backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp')
install=dhcp.install
- cd ${srcdir}/${pkgbase}-${_pkgver}
- make DESTDIR=${pkgdir} install
+ cd ${srcdir}/${pkgbase}-${_pkgver}
+ make DESTDIR=${pkgdir} install
- install -D -m755 ${srcdir}/dhcp4 ${pkgdir}/etc/rc.d/dhcp4
- install -D -m755 ${srcdir}/dhcp6 ${pkgdir}/etc/rc.d/dhcp6
- install -D -m644 ${srcdir}/dhcp ${pkgdir}/etc/conf.d/${pkgbase}
- mkdir -p ${pkgdir}/var/state/dhcp
+ install -D -m755 ${srcdir}/dhcp4 ${pkgdir}/etc/rc.d/dhcp4
+ install -D -m755 ${srcdir}/dhcp6 ${pkgdir}/etc/rc.d/dhcp6
+ install -D -m644 ${srcdir}/dhcp ${pkgdir}/etc/conf.d/${pkgbase}
+ install -d ${pkgdir}/var/state/dhcp
# Remove dhclient
- make -C client DESTDIR=${pkgdir} uninstall
+ make -C client DESTDIR=${pkgdir} uninstall
# install license
- install -m644 -D LICENSE ${pkgdir}/usr/share/licenses/dhcp/LICENSE
+ install -m644 -D LICENSE ${pkgdir}/usr/share/licenses/dhcp/LICENSE
}
package_dhclient(){
- pkgdesc=dhclient is standalone client from the dhcp package
+ pkgdesc=A standalone DHCP client from the dhcp package
depends=('bash' 'iproute2' 'net-tools')
- cd ${srcdir}/${pkgbase}-${_pkgver}
- make -C client DESTDIR=${pkgdir} install
+ cd ${srcdir}/${pkgbase}-${_pkgver}
+ make -C client DESTDIR=${pkgdir} install
# move dhclient.conf to dhclient.conf.example
- mv ${pkgdir}/etc/dhclient.conf{,.example}
+ mv ${pkgdir}/etc/dhclient.conf{,.example}
- mkdir -p ${pkgdir}/var/state/dhclient
+ install -d ${pkgdir}/var/state/dhclient
# install dhclient linux script
- install -m755 -D client/scripts/linux ${pkgdir}/sbin/dhclient-script
+ install -m755 -D client/scripts/linux ${pkgdir}/sbin/dhclient-script
# install license
- install -m644 -D LICENSE ${pkgdir}/usr/share/licenses/dhclient/LICENSE
+ install -m644 -D LICENSE ${pkgdir}/usr/share/licenses/dhclient/LICENSE
}
[arch-commits] Commit in dhcp/repos (20 files)
Date: Saturday, July 28, 2012 @ 18:37:00
Author: eric
Revision: 164255
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
dhcp/repos/testing-i686/
dhcp/repos/testing-i686/PKGBUILD
(from rev 164254, dhcp/trunk/PKGBUILD)
dhcp/repos/testing-i686/dhclient-script-pathFixes.patch
(from rev 164254, dhcp/trunk/dhclient-script-pathFixes.patch)
dhcp/repos/testing-i686/dhcp
(from rev 164254, dhcp/trunk/dhcp)
dhcp/repos/testing-i686/dhcp-4.1.1-missing-ipv6-not-fatal.patch
(from rev 164254, dhcp/trunk/dhcp-4.1.1-missing-ipv6-not-fatal.patch)
dhcp/repos/testing-i686/dhcp.conf.d
(from rev 164254, dhcp/trunk/dhcp.conf.d)
dhcp/repos/testing-i686/dhcp.install
(from rev 164254, dhcp/trunk/dhcp.install)
dhcp/repos/testing-i686/dhcp4
(from rev 164254, dhcp/trunk/dhcp4)
dhcp/repos/testing-i686/dhcp6
(from rev 164254, dhcp/trunk/dhcp6)
dhcp/repos/testing-i686/dhcpd
(from rev 164254, dhcp/trunk/dhcpd)
dhcp/repos/testing-x86_64/
dhcp/repos/testing-x86_64/PKGBUILD
(from rev 164254, dhcp/trunk/PKGBUILD)
dhcp/repos/testing-x86_64/dhclient-script-pathFixes.patch
(from rev 164254, dhcp/trunk/dhclient-script-pathFixes.patch)
dhcp/repos/testing-x86_64/dhcp
(from rev 164254, dhcp/trunk/dhcp)
dhcp/repos/testing-x86_64/dhcp-4.1.1-missing-ipv6-not-fatal.patch
(from rev 164254, dhcp/trunk/dhcp-4.1.1-missing-ipv6-not-fatal.patch)
dhcp/repos/testing-x86_64/dhcp.conf.d
(from rev 164254, dhcp/trunk/dhcp.conf.d)
dhcp/repos/testing-x86_64/dhcp.install
(from rev 164254, dhcp/trunk/dhcp.install)
dhcp/repos/testing-x86_64/dhcp4
(from rev 164254, dhcp/trunk/dhcp4)
dhcp/repos/testing-x86_64/dhcp6
(from rev 164254, dhcp/trunk/dhcp6)
dhcp/repos/testing-x86_64/dhcpd
(from rev 164254, dhcp/trunk/dhcpd)
+
testing-i686/PKGBUILD | 86 +
testing-i686/dhclient-script-pathFixes.patch | 136 +++
testing-i686/dhcp | 10 +
testing-i686/dhcp-4.1.1-missing-ipv6-not-fatal.patch | 39
testing-i686/dhcp.conf.d |6
testing-i686/dhcp.install | 18 +
testing-i686/dhcp4 | 57 ++
testing-i686/dhcp6 | 57 ++
testing-i686/dhcpd | 40
testing-x86_64/PKGBUILD| 86 +
testing-x86_64/dhclient-script-pathFixes.patch | 136 +++
testing-x86_64/dhcp| 10 +
testing-x86_64/dhcp-4.1.1-missing-ipv6-not-fatal.patch | 39
testing-x86_64/dhcp.conf.d |6
testing-x86_64/dhcp.install| 18 +
testing-x86_64/dhcp4 | 57 ++
testing-x86_64/dhcp6 | 57 ++
testing-x86_64/dhcpd | 40
18 files changed, 898 insertions(+)
Copied: dhcp/repos/testing-i686/PKGBUILD (from rev 164254, dhcp/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-07-28 22:37:00 UTC (rev 164255)
@@ -0,0 +1,86 @@
+# $Id$
+# Maintainer: Daniel Isenmann daniel @archlinux.org
+
+pkgbase=dhcp
+pkgname=('dhcp' 'dhclient')
+
+# separate patch levels with a period to maintain proper versioning.
+pkgver=4.2.4.1
+_pkgver=4.2.4-P1
+
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('custom:isc-dhcp')
+url=https://www.isc.org/software/dhcp;
+makedepends=('bash' 'iproute2' 'net-tools')
+source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
+dhcp4 dhcp6 dhcp
+dhcp-4.1.1-missing-ipv6-not-fatal.patch
+dhclient-script-pathFixes.patch)
+md5sums=('0ca7181024651f6323951d5498c8020b'
+ '0dfe000dd88555ea06b282ae5e574d5f'
+ 'c49b1497837ba56c54e401a66e1bab9b'
+ '12c2f3ae47ed23eb698eb7f1bfd80f20'
+ '8f357e46e1efcbb746f38737a3f977a2'
+ 'fd64aeb4f399dcc41ea43089a3811094'
+ '541b415a25a169eaf64b681405f79a80')
+
+build() {
+ cd ${srcdir}/${pkgbase}-${_pkgver}
+
+ # Define _GNU_SOURCE to fix IPV6.
+ sed '/^CFLAGS=$CFLAGS/ s/INGS/INGS -D_GNU_SOURCE/' -i configure
+
+ # Make not having ipv6 non-fatal.
+ patch -Np0 -i ${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch
+
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
+ --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases \
+ --with-cli-lease-file=/var/state/dhclient/dhclient.leases \
+ --with-cli6-lease-file=/var/state/dhclient/dhclient6.leases
+
+ make
+
+ patch -i ${srcdir}/dhclient-script-pathFixes.patch client/scripts/linux
+}
+
[arch-commits] Commit in python-urwid/trunk (PKGBUILD)
Date: Saturday, July 28, 2012 @ 21:06:25
Author: eric
Revision: 164256
upgpkg: python-urwid 1.0.2-1
Upstream update, Fix license
Modified:
python-urwid/trunk/PKGBUILD
--+
PKGBUILD | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-07-28 22:37:00 UTC (rev 164255)
+++ PKGBUILD2012-07-29 01:06:25 UTC (rev 164256)
@@ -4,23 +4,23 @@
# Maintainer: Douglas Soares de Andrade dsandr...@gmail.com
pkgname=('python-urwid' 'python2-urwid')
-pkgver=1.0.1
+pkgver=1.0.2
pkgrel=1
pkgdesc=Urwid is a curses-based user interface library.
-license=('GPL')
+license=('LGPL')
arch=('i686' 'x86_64')
makedepends=('python2-distribute' 'python-distribute')
url=http://excess.org/urwid/;
source=(http://excess.org/urwid/urwid-$pkgver.tar.gz)
-md5sums=('828f7144b94920205e755c249d2e297f')
+md5sums=('00542bbd15fae7ea60b02a7570edee2b')
build() {
cp -r urwid-$pkgver python2-urwid-$pkgver
- cd $srcdir/urwid-$pkgver
+ cd $srcdir/urwid-$pkgver
python setup.py build
- cd $srcdir/python2-urwid-$pkgver
+ cd $srcdir/python2-urwid-$pkgver
sed -i 's#bin/python#bin/python2#' urwid/*.py
python2 setup.py build
@@ -29,14 +29,14 @@
package_python-urwid() {
depends=('python')
- cd $srcdir/urwid-$pkgver
- python setup.py install --prefix=/usr --root=$pkgdir --optimize=1
+ cd $srcdir/urwid-$pkgver
+ python setup.py install --prefix=/usr --root=$pkgdir --optimize=1
}
package_python2-urwid() {
depends=('python2')
- cd $srcdir/python2-urwid-$pkgver
- python2 setup.py install --prefix=/usr --root=$pkgdir --optimize=1
+ cd $srcdir/python2-urwid-$pkgver
+ python2 setup.py install --prefix=/usr --root=$pkgdir --optimize=1
}
[arch-commits] Commit in python-urwid/repos (4 files)
Date: Saturday, July 28, 2012 @ 21:06:48
Author: eric
Revision: 164257
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
python-urwid/repos/extra-i686/PKGBUILD
(from rev 164256, python-urwid/trunk/PKGBUILD)
python-urwid/repos/extra-x86_64/PKGBUILD
(from rev 164256, python-urwid/trunk/PKGBUILD)
Deleted:
python-urwid/repos/extra-i686/PKGBUILD
python-urwid/repos/extra-x86_64/PKGBUILD
---+
extra-i686/PKGBUILD | 84
extra-x86_64/PKGBUILD | 84
2 files changed, 84 insertions(+), 84 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-07-29 01:06:25 UTC (rev 164256)
+++ extra-i686/PKGBUILD 2012-07-29 01:06:48 UTC (rev 164257)
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD,v 1.10 2009/03/13 21:14:09 sergej Exp $
-# Maintainer: Daniel Isenmann dan...@archlinux.org
-# Maintainer: Sergej Pupykin ser...@aur.archlinux.org
-# Maintainer: Douglas Soares de Andrade dsandr...@gmail.com
-
-pkgname=('python-urwid' 'python2-urwid')
-pkgver=1.0.1
-pkgrel=1
-pkgdesc=Urwid is a curses-based user interface library.
-license=('GPL')
-arch=('i686' 'x86_64')
-makedepends=('python2-distribute' 'python-distribute')
-url=http://excess.org/urwid/;
-source=(http://excess.org/urwid/urwid-$pkgver.tar.gz)
-md5sums=('828f7144b94920205e755c249d2e297f')
-
-build() {
- cp -r urwid-$pkgver python2-urwid-$pkgver
-
- cd $srcdir/urwid-$pkgver
- python setup.py build
-
- cd $srcdir/python2-urwid-$pkgver
- sed -i 's#bin/python#bin/python2#' urwid/*.py
-
- python2 setup.py build
-}
-
-package_python-urwid() {
- depends=('python')
-
- cd $srcdir/urwid-$pkgver
- python setup.py install --prefix=/usr --root=$pkgdir --optimize=1
-}
-
-package_python2-urwid() {
- depends=('python2')
-
- cd $srcdir/python2-urwid-$pkgver
- python2 setup.py install --prefix=/usr --root=$pkgdir --optimize=1
-}
-
Copied: python-urwid/repos/extra-i686/PKGBUILD (from rev 164256,
python-urwid/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-07-29 01:06:48 UTC (rev 164257)
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD,v 1.10 2009/03/13 21:14:09 sergej Exp $
+# Maintainer: Daniel Isenmann dan...@archlinux.org
+# Maintainer: Sergej Pupykin ser...@aur.archlinux.org
+# Maintainer: Douglas Soares de Andrade dsandr...@gmail.com
+
+pkgname=('python-urwid' 'python2-urwid')
+pkgver=1.0.2
+pkgrel=1
+pkgdesc=Urwid is a curses-based user interface library.
+license=('LGPL')
+arch=('i686' 'x86_64')
+makedepends=('python2-distribute' 'python-distribute')
+url=http://excess.org/urwid/;
+source=(http://excess.org/urwid/urwid-$pkgver.tar.gz)
+md5sums=('00542bbd15fae7ea60b02a7570edee2b')
+
+build() {
+ cp -r urwid-$pkgver python2-urwid-$pkgver
+
+ cd $srcdir/urwid-$pkgver
+ python setup.py build
+
+ cd $srcdir/python2-urwid-$pkgver
+ sed -i 's#bin/python#bin/python2#' urwid/*.py
+
+ python2 setup.py build
+}
+
+package_python-urwid() {
+ depends=('python')
+
+ cd $srcdir/urwid-$pkgver
+ python setup.py install --prefix=/usr --root=$pkgdir --optimize=1
+}
+
+package_python2-urwid() {
+ depends=('python2')
+
+ cd $srcdir/python2-urwid-$pkgver
+ python2 setup.py install --prefix=/usr --root=$pkgdir --optimize=1
+}
+
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2012-07-29 01:06:25 UTC (rev 164256)
+++ extra-x86_64/PKGBUILD 2012-07-29 01:06:48 UTC (rev 164257)
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD,v 1.10 2009/03/13 21:14:09 sergej Exp $
-# Maintainer: Daniel Isenmann dan...@archlinux.org
-# Maintainer: Sergej Pupykin ser...@aur.archlinux.org
-# Maintainer: Douglas Soares de Andrade dsandr...@gmail.com
-
-pkgname=('python-urwid' 'python2-urwid')
-pkgver=1.0.1
-pkgrel=1
-pkgdesc=Urwid is a curses-based user interface library.
-license=('GPL')
-arch=('i686' 'x86_64')
-makedepends=('python2-distribute' 'python-distribute')
-url=http://excess.org/urwid/;
-source=(http://excess.org/urwid/urwid-$pkgver.tar.gz)
-md5sums=('828f7144b94920205e755c249d2e297f')
-
-build() {
- cp -r urwid-$pkgver python2-urwid-$pkgver
-
- cd $srcdir/urwid-$pkgver
- python setup.py build
-
- cd $srcdir/python2-urwid-$pkgver
- sed -i 's#bin/python#bin/python2#' urwid/*.py
-
- python2 setup.py build
-}
-
-package_python-urwid() {
- depends=('python')
-
- cd $srcdir/urwid-$pkgver
- python setup.py install --prefix=/usr --root=$pkgdir --optimize=1
-}
-
-package_python2-urwid() {
- depends=('python2')
-
- cd $srcdir/python2-urwid-$pkgver
- python2 setup.py install --prefix=/usr --root=$pkgdir --optimize=1
-}
-
Copied: python-urwid/repos/extra-x86_64/PKGBUILD (from rev 164256,
python-urwid/trunk/PKGBUILD)
[arch-commits] Commit in vpnc/trunk (PKGBUILD)
Date: Saturday, July 28, 2012 @ 21:12:57
Author: dreisner
Revision: 164258
upgpkg: vpnc 0.5.3.svn516-3
- fix path to resolvconf (FS#30901)
Modified:
vpnc/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-07-29 01:06:48 UTC (rev 164257)
+++ PKGBUILD2012-07-29 01:12:57 UTC (rev 164258)
@@ -6,7 +6,7 @@
_vpncver=0.5.3
_git=1b65c39e3cdebb89ce5c75f05d44a0519a67ede6
pkgver=$_vpncver.svn516
-pkgrel=2
+pkgrel=3
pkgdesc=VPN client for cisco3000 VPN Concentrators
url=http://www.unix-ag.uni-kl.de/~massar/vpnc/;
license=('GPL')
@@ -44,7 +44,7 @@
sed -i 's|^#OPENSSL|OPENSSL|g' Makefile
# fix resolvconf location for community/openresolv
- sed -i 's|/sbin/resolvconf|/usr|g' vpnc-script
+ sed -i 's|/sbin/resolvconf|/usr|g' $srcdir/vpnc-script
make
}
[arch-commits] Commit in vpnc/repos (8 files)
Date: Saturday, July 28, 2012 @ 21:13:10
Author: dreisner
Revision: 164259
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
vpnc/repos/extra-i686/PKGBUILD
(from rev 164258, vpnc/trunk/PKGBUILD)
vpnc/repos/extra-i686/vpnc.conf
(from rev 164258, vpnc/trunk/vpnc.conf)
vpnc/repos/extra-x86_64/PKGBUILD
(from rev 164258, vpnc/trunk/PKGBUILD)
vpnc/repos/extra-x86_64/vpnc.conf
(from rev 164258, vpnc/trunk/vpnc.conf)
Deleted:
vpnc/repos/extra-i686/PKGBUILD
vpnc/repos/extra-i686/vpnc.conf
vpnc/repos/extra-x86_64/PKGBUILD
vpnc/repos/extra-x86_64/vpnc.conf
+
extra-i686/PKGBUILD| 118 +++
extra-i686/vpnc.conf | 34 ++---
extra-x86_64/PKGBUILD | 118 +++
extra-x86_64/vpnc.conf | 34 ++---
4 files changed, 152 insertions(+), 152 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-07-29 01:12:57 UTC (rev 164258)
+++ extra-i686/PKGBUILD 2012-07-29 01:13:10 UTC (rev 164259)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner dreis...@archlinux.org
-# Contributor: Thomas Baechler tho...@archlinux.org
-
-pkgname=vpnc
-_vpncver=0.5.3
-_git=1b65c39e3cdebb89ce5c75f05d44a0519a67ede6
-pkgver=$_vpncver.svn516
-pkgrel=2
-pkgdesc=VPN client for cisco3000 VPN Concentrators
-url=http://www.unix-ag.uni-kl.de/~massar/vpnc/;
-license=('GPL')
-depends=('libgcrypt' 'openssl' 'iproute2')
-optdepends=('openresolv: Let vpnc manage resolv.conf')
-arch=('i686' 'x86_64')
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz;
-
http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/$_git:/vpnc-script;
-'vpnc.conf')
-backup=('etc/vpnc/default.conf')
-md5sums=('2118c5ccc464250c0892be57dbfabdf7'
- '6293c15ef6e7a3365ed7add5e336b806'
- 'a3f4e0cc682f437e310a1c86ae198e45')
-
-mktarball() {
- [[ -d tarball ]] || mkdir tarball
-
- pushd tarball
-
- svn co http://svn.unix-ag.uni-kl.de/vpnc/trunk
- _svnrev=$(cd trunk /dev/null; svn info | awk '/^Revision:/ { print $2 }')
-
- find trunk/ -type d -name .svn -exec rm -rf {} +
- mv trunk $pkgname-$_vpncver.svn$_svnrev
- tar cJf ../$pkgname-$_vpncver.svn$_svnrev.tar.xz
$pkgname-$_vpncver.svn$_svnrev/
-
- popd
- rm -rf tarball
-}
-
-build() {
- cd $pkgname-$pkgver
-
- # Build hybrid support
- sed -i 's|^#OPENSSL|OPENSSL|g' Makefile
-
- # fix resolvconf location for community/openresolv
- sed -i 's|/sbin/resolvconf|/usr|g' vpnc-script
-
- make
-}
-
-package() {
- cd $pkgname-$pkgver
-
- make DESTDIR=$pkgdir PREFIX=/usr install
-
- install -Dm644 $srcdir/vpnc.conf $pkgdir/etc/vpnc/default.conf
- install -Dm755 $srcdir/vpnc-script $pkgdir/etc/vpnc/vpnc-script
-}
Copied: vpnc/repos/extra-i686/PKGBUILD (from rev 164258, vpnc/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-07-29 01:13:10 UTC (rev 164259)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+# Contributor: Thomas Baechler tho...@archlinux.org
+
+pkgname=vpnc
+_vpncver=0.5.3
+_git=1b65c39e3cdebb89ce5c75f05d44a0519a67ede6
+pkgver=$_vpncver.svn516
+pkgrel=3
+pkgdesc=VPN client for cisco3000 VPN Concentrators
+url=http://www.unix-ag.uni-kl.de/~massar/vpnc/;
+license=('GPL')
+depends=('libgcrypt' 'openssl' 'iproute2')
+optdepends=('openresolv: Let vpnc manage resolv.conf')
+arch=('i686' 'x86_64')
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz;
+
http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/$_git:/vpnc-script;
+'vpnc.conf')
+backup=('etc/vpnc/default.conf')
+md5sums=('2118c5ccc464250c0892be57dbfabdf7'
+ '6293c15ef6e7a3365ed7add5e336b806'
+ 'a3f4e0cc682f437e310a1c86ae198e45')
+
+mktarball() {
+ [[ -d tarball ]] || mkdir tarball
+
+ pushd tarball
+
+ svn co http://svn.unix-ag.uni-kl.de/vpnc/trunk
+ _svnrev=$(cd trunk /dev/null; svn info | awk '/^Revision:/ { print $2 }')
+
+ find trunk/ -type d -name .svn -exec rm -rf {} +
+ mv trunk $pkgname-$_vpncver.svn$_svnrev
+ tar cJf ../$pkgname-$_vpncver.svn$_svnrev.tar.xz
$pkgname-$_vpncver.svn$_svnrev/
+
+ popd
+ rm -rf tarball
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ # Build hybrid support
+ sed -i 's|^#OPENSSL|OPENSSL|g' Makefile
+
+ # fix resolvconf location for community/openresolv
+ sed -i 's|/sbin/resolvconf|/usr|g' $srcdir/vpnc-script
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR=$pkgdir PREFIX=/usr install
+
+ install -Dm644 $srcdir/vpnc.conf $pkgdir/etc/vpnc/default.conf
+ install -Dm755 $srcdir/vpnc-script $pkgdir/etc/vpnc/vpnc-script
+}
Deleted: extra-i686/vpnc.conf
===
--- extra-i686/vpnc.conf2012-07-29 01:12:57 UTC (rev
[arch-commits] Commit in chromium/trunk (3 files)
Date: Saturday, July 28, 2012 @ 22:06:13
Author: foutrelis
Revision: 164260
Add proper patch for bison 2.6 build fix.
Added:
chromium/trunk/chromium-20.0.1132.57-bison-2.6-fix.patch
Modified:
chromium/trunk/PKGBUILD
Deleted:
chromium/trunk/chromium-20.0.1132.57-bison-2.6-remove-yyparse-decl.patch
---+
PKGBUILD | 12
chromium-20.0.1132.57-bison-2.6-fix.patch | 554
chromium-20.0.1132.57-bison-2.6-remove-yyparse-decl.patch | 22
3 files changed, 560 insertions(+), 28 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-07-29 01:13:10 UTC (rev 164259)
+++ PKGBUILD2012-07-29 02:06:13 UTC (rev 164260)
@@ -33,7 +33,7 @@
chromium.default
chromium.sh
chromium-gcc47.patch
-chromium-20.0.1132.57-bison-2.6-remove-yyparse-decl.patch
+chromium-20.0.1132.57-bison-2.6-fix.patch
chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch)
sha256sums=('1225c6b6306e89c8892bc0d18e94567d6081d777dee9b8c90efd0da9f6f2641b'
@@ -42,7 +42,7 @@
'478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
'4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9'
'f607347ba8477d3c8e60eb3803d26f3c9869f77fd49986c60887c59a6aa7d30d'
-'8d0e0c53562eee3400606365e33aab035c487d7d958063bc25eea550c6fa3793'
+'d7aecc17e1eb582fe791c3e5fb2ca3f0efcb9bf5379309c1c27be35be4363bba'
'c1baf14121502efbc2a31b64029dcafa0e28ca5b71ad0e28a3c6342d18198615'
'a700aa054800d1b21d84eaba27c38a703dfa023e9226d11a942690c2a0630aff')
@@ -55,10 +55,10 @@
# Fix build with glibc 2.16
patch -Np1 -i $srcdir/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
- # Fix build with bison 2.6 (XXX: hacky; waiting on proper upstream fix)
- # http://crbug.com/138243 / https://bugs.webkit.org/show_bug.cgi?id=91943
- patch -Np1 -i \
-$srcdir/chromium-20.0.1132.57-bison-2.6-remove-yyparse-decl.patch
+ # Fix build with bison 2.6 (patch from Alexis Menard)
+ # http://crbug.com/138243 / https://bugs.webkit.org/show_bug.cgi?id=92264
+ patch -d third_party/WebKit -Np1 -i \
+$srcdir/chromium-20.0.1132.57-bison-2.6-fix.patch
# http://code.google.com/p/chromium/issues/detail?id=109527
sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc
Added: chromium-20.0.1132.57-bison-2.6-fix.patch
===
--- chromium-20.0.1132.57-bison-2.6-fix.patch (rev 0)
+++ chromium-20.0.1132.57-bison-2.6-fix.patch 2012-07-29 02:06:13 UTC (rev
164260)
@@ -0,0 +1,554 @@
+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 1
+ #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 wtf/FastMalloc.h
+
+@@ -44,8 +45,6 @@
+ #define YYLTYPE_IS_TRIVIAL 1
+ #define YYDEBUG 0
+ #define YYMAXDEPTH 1
+-#define YYPARSE_PARAM parserParameter
+-#define PARSER static_castParser*(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
