[arch-commits] Commit in ntp/trunk (PKGBUILD ntp-4.2.4-html2man.patch)

2009-12-13 Thread Eric Bélanger
Date: Sunday, December 13, 2009 @ 07:00:20
  Author: eric
Revision: 61216

upgpkg: ntp 4.2.6-1
Upstream update, Automated generation of extra man pages

Added:
  ntp/trunk/ntp-4.2.4-html2man.patch
Modified:
  ntp/trunk/PKGBUILD

--+
 PKGBUILD |   66 +---
 ntp-4.2.4-html2man.patch |  183 +
 2 files changed, 220 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 07:55:37 UTC (rev 61215)
+++ PKGBUILD2009-12-13 12:00:20 UTC (rev 61216)
@@ -1,70 +1,78 @@
 # $Id$
 # Maintainer: dorphell 
 pkgname=ntp
-pkgver=4.2.4p7
-pkgrel=3
+pkgver=4.2.6
+pkgrel=1
 pkgdesc="NTP (Network Time Protocol) tries to keep servers in sync"
 arch=(i686 x86_64)
 license=('custom')
 url="http://www.ntp.org/";
 depends=('openssl>=0.9.8h' 'readline>=6.0.00' 'libcap')
+makedepends=('perl-html-parser')
 backup=('etc/ntp.conf' 'etc/conf.d/ntp-client.conf')
 options=('!emptydirs')
 source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${pkgver}.tar.gz
 ftp://ftp.archlinux.org/other/ntp/ntp-4.2.4p6-manpages.tar.bz2
 ntp-4.2.4_p7-nano.patch
fix-ipv6.patch
+   ntp-4.2.4-html2man.patch
 ntp.conf
 ntp-client.conf
 ntpd
 ntpdate)
+md5sums=('4d64a99592b818aa9419fc9dcb149746' '3396ea6276147617e5cf79cefffee018'\
+ '36c5711228cb0cf48966daa993e06f55' '9dabdbc6b8cd020f2205515df7972c21'\
+ '1b04e888717bb31479a6087632981723' '5bd3924f5720b97837969ec4ec4d5e09'\
+ 'c7f50632b69bd4f32cf052d0b1848463' '46118a8ec2c4f5bbfafd730af21b7c03'\
+ '140855352baeb89da0c6c1c475c18b57')
+sha1sums=('a1f21b23c8c80f35801d59e30ba30779f2025a72' 
'993b849a2e5fa719f53f85c4e83ee52eecbea56d'\
+ '4de6cd3fad1946146107f86d1f161eb835fbb2d3' 
'3632f8a00838f48e484bca24de06db443cc14fff'\
+ '7f8783e243e23c8853a9f9fb5b36f467aab8dc15' 
'3625ed2aa71d9e0dd04634f32e65d83b76cfe780'\
+ 'c8e388f2577b4329da5e77f0455083db6dd97fa8' 
'd9b09de9d718a864270e9330e20109e182dfbdd9'\
+ '6dfc3b6996f591123ee8938fd0fe7c27eb5c7552')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver || return 1
+  cd "$srcdir/$pkgname-$pkgver" || return 1
   # fix glibc build issue
   patch -Np1 -i ../ntp-4.2.4_p7-nano.patch || return 1
   # fix ipv6 support
   patch -Np1 -i ../fix-ipv6.patch || return 1
+  # fix man page generation
+  patch -Np1 -i ../ntp-4.2.4-html2man.patch || return 1
   # configure
+  export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
+  libtoolize --copy  --force || return 1
   ac_cv_header_dns_sd_h=0 ./configure --prefix=/usr --mandir=/usr/share/man 
--enable-linux-caps || return 1
 
   # build and install
   make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  make DESTDIR="$pkgdir" install || return 1
 
   # install conf files
-  mkdir -p $pkgdir/usr/share/ntp || return 1
-  install -D -m644 conf/* $pkgdir/usr/share/ntp/ || return 1
+  mkdir -p "$pkgdir/usr/share/ntp" || return 1
+  install -D -m644 conf/* "$pkgdir/usr/share/ntp/" || return 1
 
   # install launch scripts 
-  mkdir -p $pkgdir/etc/rc.d || return 1
-  install -D -m755 $srcdir/{ntpd,ntpdate} $pkgdir/etc/rc.d/ || return 1
+  mkdir -p "$pkgdir/etc/rc.d" || return 1
+  install -D -m755 "$srcdir"/{ntpd,ntpdate} "$pkgdir/etc/rc.d/" || return 1
 
   # install man pages
-  install -d $pkgdir/usr/share/man/man{1,5}
-  install -m644 $srcdir/man/*.5 \
-   $pkgdir/usr/share/man/man5/ || return 1
-  for i in $srcdir/man/*.8 ; do
-install -m644 $i $pkgdir/usr/share/man/man1/$(basename $i .8).1 || return 1
-  done
-  mv $pkgdir/usr/share/man/man1/keygen.1 
$pkgdir/usr/share/man/man1/ntp-keygen.1 || return 1
+  cd html
+  ../scripts/html2man || return 1
+  sed -i 's/^[\t\ ]*$//;/./,/^$/!d' man/man*/*.[58] || return 1
+  install -d "$pkgdir"/usr/share/man/man{5,8}
+  install -m644 man/man5/* "$pkgdir/usr/share/man/man5/" || return 1
+  install -m644 man/man8/* "$pkgdir/usr/share/man/man8/" || return 1
+  cd ..
 
   # install sample configs
-  install -D -m644 $srcdir/ntp.conf $pkgdir/etc/ntp.conf || return 1
-  install -D -m644 $srcdir/ntp-client.conf \
-   $pkgdir/etc/conf.d/ntp-client.conf || return 1
+  install -D -m644 "$srcdir/ntp.conf" "$pkgdir/etc/ntp.conf" || return 1
+  install -D -m644 "$srcdir/ntp-client.conf" \
+   "$pkgdir/etc/conf.d/ntp-client.conf" || return 1
 
   # create /var/lib/ntp
-  mkdir -p $pkgdir/var/lib/ntp || return 1
-  touch $pkgdir/var/lib/ntp/.placeholder || return 1
+  mkdir -p "$pkgdir/var/lib/ntp" || return 1
+  touch "$pkgdir/var/lib/ntp/.placeholder" || return 1
 
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYRIGHT 
$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT
+  install -Dm644 "$srcdir/$pkgname-$pkgver/COPYRIGHT" 
"$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
 }
-md5sums=('8c19ff62ed4f7d64f8e2aa59cb11f364'
- '3396ea6276147617e5cf79cefffee018'
- '36c5711228cb0cf48

[arch-commits] Commit in ntp/repos (3 files)

2009-12-13 Thread Eric Bélanger
Date: Sunday, December 13, 2009 @ 07:00:44
  Author: eric
Revision: 61217

Merged revisions 61216 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/ntp/trunk


  r61216 | eric | 2009-12-13 07:00:20 -0500 (Sun, 13 Dec 2009) | 2 lines
  
  upgpkg: ntp 4.2.6-1
  Upstream update, Automated generation of extra man pages


Added:
  ntp/repos/extra-i686/ntp-4.2.4-html2man.patch
(from rev 61216, ntp/trunk/ntp-4.2.4-html2man.patch)
Modified:
  ntp/repos/extra-i686/ (properties)
  ntp/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |   66 +---
 ntp-4.2.4-html2man.patch |  183 +
 2 files changed, 220 insertions(+), 29 deletions(-)


Property changes on: ntp/repos/extra-i686
___
Modified: svnmerge-integrated
   - /ntp/trunk:1-43087
   + /ntp/trunk:1-61216

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-13 12:00:20 UTC (rev 61216)
+++ extra-i686/PKGBUILD 2009-12-13 12:00:44 UTC (rev 61217)
@@ -1,70 +1,78 @@
 # $Id$
 # Maintainer: dorphell 
 pkgname=ntp
-pkgver=4.2.4p7
-pkgrel=3
+pkgver=4.2.6
+pkgrel=1
 pkgdesc="NTP (Network Time Protocol) tries to keep servers in sync"
 arch=(i686 x86_64)
 license=('custom')
 url="http://www.ntp.org/";
 depends=('openssl>=0.9.8h' 'readline>=6.0.00' 'libcap')
+makedepends=('perl-html-parser')
 backup=('etc/ntp.conf' 'etc/conf.d/ntp-client.conf')
 options=('!emptydirs')
 source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${pkgver}.tar.gz
 ftp://ftp.archlinux.org/other/ntp/ntp-4.2.4p6-manpages.tar.bz2
 ntp-4.2.4_p7-nano.patch
fix-ipv6.patch
+   ntp-4.2.4-html2man.patch
 ntp.conf
 ntp-client.conf
 ntpd
 ntpdate)
+md5sums=('4d64a99592b818aa9419fc9dcb149746' '3396ea6276147617e5cf79cefffee018'\
+ '36c5711228cb0cf48966daa993e06f55' '9dabdbc6b8cd020f2205515df7972c21'\
+ '1b04e888717bb31479a6087632981723' '5bd3924f5720b97837969ec4ec4d5e09'\
+ 'c7f50632b69bd4f32cf052d0b1848463' '46118a8ec2c4f5bbfafd730af21b7c03'\
+ '140855352baeb89da0c6c1c475c18b57')
+sha1sums=('a1f21b23c8c80f35801d59e30ba30779f2025a72' 
'993b849a2e5fa719f53f85c4e83ee52eecbea56d'\
+ '4de6cd3fad1946146107f86d1f161eb835fbb2d3' 
'3632f8a00838f48e484bca24de06db443cc14fff'\
+ '7f8783e243e23c8853a9f9fb5b36f467aab8dc15' 
'3625ed2aa71d9e0dd04634f32e65d83b76cfe780'\
+ 'c8e388f2577b4329da5e77f0455083db6dd97fa8' 
'd9b09de9d718a864270e9330e20109e182dfbdd9'\
+ '6dfc3b6996f591123ee8938fd0fe7c27eb5c7552')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver || return 1
+  cd "$srcdir/$pkgname-$pkgver" || return 1
   # fix glibc build issue
   patch -Np1 -i ../ntp-4.2.4_p7-nano.patch || return 1
   # fix ipv6 support
   patch -Np1 -i ../fix-ipv6.patch || return 1
+  # fix man page generation
+  patch -Np1 -i ../ntp-4.2.4-html2man.patch || return 1
   # configure
+  export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
+  libtoolize --copy  --force || return 1
   ac_cv_header_dns_sd_h=0 ./configure --prefix=/usr --mandir=/usr/share/man 
--enable-linux-caps || return 1
 
   # build and install
   make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  make DESTDIR="$pkgdir" install || return 1
 
   # install conf files
-  mkdir -p $pkgdir/usr/share/ntp || return 1
-  install -D -m644 conf/* $pkgdir/usr/share/ntp/ || return 1
+  mkdir -p "$pkgdir/usr/share/ntp" || return 1
+  install -D -m644 conf/* "$pkgdir/usr/share/ntp/" || return 1
 
   # install launch scripts 
-  mkdir -p $pkgdir/etc/rc.d || return 1
-  install -D -m755 $srcdir/{ntpd,ntpdate} $pkgdir/etc/rc.d/ || return 1
+  mkdir -p "$pkgdir/etc/rc.d" || return 1
+  install -D -m755 "$srcdir"/{ntpd,ntpdate} "$pkgdir/etc/rc.d/" || return 1
 
   # install man pages
-  install -d $pkgdir/usr/share/man/man{1,5}
-  install -m644 $srcdir/man/*.5 \
-   $pkgdir/usr/share/man/man5/ || return 1
-  for i in $srcdir/man/*.8 ; do
-install -m644 $i $pkgdir/usr/share/man/man1/$(basename $i .8).1 || return 1
-  done
-  mv $pkgdir/usr/share/man/man1/keygen.1 
$pkgdir/usr/share/man/man1/ntp-keygen.1 || return 1
+  cd html
+  ../scripts/html2man || return 1
+  sed -i 's/^[\t\ ]*$//;/./,/^$/!d' man/man*/*.[58] || return 1
+  install -d "$pkgdir"/usr/share/man/man{5,8}
+  install -m644 man/man5/* "$pkgdir/usr/share/man/man5/" || return 1
+  install -m644 man/man8/* "$pkgdir/usr/share/man/man8/" || return 1
+  cd ..
 
   # install sample configs
-  install -D -m644 $srcdir/ntp.conf $pkgdir/etc/ntp.conf || return 1
-  install -D -m644 $srcdir/ntp-client.conf \
-   $pkgdir/etc/conf.d/ntp-client.conf || return 1
+  install -D -m644 "$srcdir/ntp.conf" "$pkgdir/etc/ntp.conf" || return 1
+  install -D -m644 "$srcdir/ntp-client.conf" \
+   "$pkgdir/etc/conf.d/ntp-client.conf" || return 1
 
   # create /var/li

[arch-commits] Commit in ntp/repos (3 files)

2009-12-13 Thread Eric Bélanger
Date: Sunday, December 13, 2009 @ 07:01:27
  Author: eric
Revision: 61218

Merged revisions 61216 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/ntp/trunk


  r61216 | eric | 2009-12-13 07:00:20 -0500 (Sun, 13 Dec 2009) | 2 lines
  
  upgpkg: ntp 4.2.6-1
  Upstream update, Automated generation of extra man pages


Added:
  ntp/repos/extra-x86_64/ntp-4.2.4-html2man.patch
(from rev 61216, ntp/trunk/ntp-4.2.4-html2man.patch)
Modified:
  ntp/repos/extra-x86_64/   (properties)
  ntp/repos/extra-x86_64/PKGBUILD

--+
 PKGBUILD |   66 +---
 ntp-4.2.4-html2man.patch |  183 +
 2 files changed, 220 insertions(+), 29 deletions(-)


Property changes on: ntp/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /ntp/trunk:1-43110
   + /ntp/trunk:1-61217

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-13 12:00:44 UTC (rev 61217)
+++ extra-x86_64/PKGBUILD   2009-12-13 12:01:27 UTC (rev 61218)
@@ -1,70 +1,78 @@
 # $Id$
 # Maintainer: dorphell 
 pkgname=ntp
-pkgver=4.2.4p7
-pkgrel=3
+pkgver=4.2.6
+pkgrel=1
 pkgdesc="NTP (Network Time Protocol) tries to keep servers in sync"
 arch=(i686 x86_64)
 license=('custom')
 url="http://www.ntp.org/";
 depends=('openssl>=0.9.8h' 'readline>=6.0.00' 'libcap')
+makedepends=('perl-html-parser')
 backup=('etc/ntp.conf' 'etc/conf.d/ntp-client.conf')
 options=('!emptydirs')
 source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${pkgver}.tar.gz
 ftp://ftp.archlinux.org/other/ntp/ntp-4.2.4p6-manpages.tar.bz2
 ntp-4.2.4_p7-nano.patch
fix-ipv6.patch
+   ntp-4.2.4-html2man.patch
 ntp.conf
 ntp-client.conf
 ntpd
 ntpdate)
+md5sums=('4d64a99592b818aa9419fc9dcb149746' '3396ea6276147617e5cf79cefffee018'\
+ '36c5711228cb0cf48966daa993e06f55' '9dabdbc6b8cd020f2205515df7972c21'\
+ '1b04e888717bb31479a6087632981723' '5bd3924f5720b97837969ec4ec4d5e09'\
+ 'c7f50632b69bd4f32cf052d0b1848463' '46118a8ec2c4f5bbfafd730af21b7c03'\
+ '140855352baeb89da0c6c1c475c18b57')
+sha1sums=('a1f21b23c8c80f35801d59e30ba30779f2025a72' 
'993b849a2e5fa719f53f85c4e83ee52eecbea56d'\
+ '4de6cd3fad1946146107f86d1f161eb835fbb2d3' 
'3632f8a00838f48e484bca24de06db443cc14fff'\
+ '7f8783e243e23c8853a9f9fb5b36f467aab8dc15' 
'3625ed2aa71d9e0dd04634f32e65d83b76cfe780'\
+ 'c8e388f2577b4329da5e77f0455083db6dd97fa8' 
'd9b09de9d718a864270e9330e20109e182dfbdd9'\
+ '6dfc3b6996f591123ee8938fd0fe7c27eb5c7552')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver || return 1
+  cd "$srcdir/$pkgname-$pkgver" || return 1
   # fix glibc build issue
   patch -Np1 -i ../ntp-4.2.4_p7-nano.patch || return 1
   # fix ipv6 support
   patch -Np1 -i ../fix-ipv6.patch || return 1
+  # fix man page generation
+  patch -Np1 -i ../ntp-4.2.4-html2man.patch || return 1
   # configure
+  export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
+  libtoolize --copy  --force || return 1
   ac_cv_header_dns_sd_h=0 ./configure --prefix=/usr --mandir=/usr/share/man 
--enable-linux-caps || return 1
 
   # build and install
   make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  make DESTDIR="$pkgdir" install || return 1
 
   # install conf files
-  mkdir -p $pkgdir/usr/share/ntp || return 1
-  install -D -m644 conf/* $pkgdir/usr/share/ntp/ || return 1
+  mkdir -p "$pkgdir/usr/share/ntp" || return 1
+  install -D -m644 conf/* "$pkgdir/usr/share/ntp/" || return 1
 
   # install launch scripts 
-  mkdir -p $pkgdir/etc/rc.d || return 1
-  install -D -m755 $srcdir/{ntpd,ntpdate} $pkgdir/etc/rc.d/ || return 1
+  mkdir -p "$pkgdir/etc/rc.d" || return 1
+  install -D -m755 "$srcdir"/{ntpd,ntpdate} "$pkgdir/etc/rc.d/" || return 1
 
   # install man pages
-  install -d $pkgdir/usr/share/man/man{1,5}
-  install -m644 $srcdir/man/*.5 \
-   $pkgdir/usr/share/man/man5/ || return 1
-  for i in $srcdir/man/*.8 ; do
-install -m644 $i $pkgdir/usr/share/man/man1/$(basename $i .8).1 || return 1
-  done
-  mv $pkgdir/usr/share/man/man1/keygen.1 
$pkgdir/usr/share/man/man1/ntp-keygen.1 || return 1
+  cd html
+  ../scripts/html2man || return 1
+  sed -i 's/^[\t\ ]*$//;/./,/^$/!d' man/man*/*.[58] || return 1
+  install -d "$pkgdir"/usr/share/man/man{5,8}
+  install -m644 man/man5/* "$pkgdir/usr/share/man/man5/" || return 1
+  install -m644 man/man8/* "$pkgdir/usr/share/man/man8/" || return 1
+  cd ..
 
   # install sample configs
-  install -D -m644 $srcdir/ntp.conf $pkgdir/etc/ntp.conf || return 1
-  install -D -m644 $srcdir/ntp-client.conf \
-   $pkgdir/etc/conf.d/ntp-client.conf || return 1
+  install -D -m644 "$srcdir/ntp.conf" "$pkgdir/etc/ntp.conf" || return 1
+  install -D -m644 "$srcdir/ntp-client.conf" \
+   "$pkgdir/etc/conf.d/ntp-client.conf" |

[arch-commits] Commit in ntp/trunk (PKGBUILD)

2009-12-13 Thread Eric Bélanger
Date: Sunday, December 13, 2009 @ 07:03:48
  Author: eric
Revision: 61219

Cleaned up source array

Modified:
  ntp/trunk/PKGBUILD

--+
 PKGBUILD |   19 ---
 1 file changed, 8 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 12:01:27 UTC (rev 61218)
+++ PKGBUILD2009-12-13 12:03:48 UTC (rev 61219)
@@ -12,7 +12,6 @@
 backup=('etc/ntp.conf' 'etc/conf.d/ntp-client.conf')
 options=('!emptydirs')
 source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${pkgver}.tar.gz
-ftp://ftp.archlinux.org/other/ntp/ntp-4.2.4p6-manpages.tar.bz2
 ntp-4.2.4_p7-nano.patch
fix-ipv6.patch
ntp-4.2.4-html2man.patch
@@ -20,16 +19,14 @@
 ntp-client.conf
 ntpd
 ntpdate)
-md5sums=('4d64a99592b818aa9419fc9dcb149746' '3396ea6276147617e5cf79cefffee018'\
- '36c5711228cb0cf48966daa993e06f55' '9dabdbc6b8cd020f2205515df7972c21'\
- '1b04e888717bb31479a6087632981723' '5bd3924f5720b97837969ec4ec4d5e09'\
- 'c7f50632b69bd4f32cf052d0b1848463' '46118a8ec2c4f5bbfafd730af21b7c03'\
- '140855352baeb89da0c6c1c475c18b57')
-sha1sums=('a1f21b23c8c80f35801d59e30ba30779f2025a72' 
'993b849a2e5fa719f53f85c4e83ee52eecbea56d'\
- '4de6cd3fad1946146107f86d1f161eb835fbb2d3' 
'3632f8a00838f48e484bca24de06db443cc14fff'\
- '7f8783e243e23c8853a9f9fb5b36f467aab8dc15' 
'3625ed2aa71d9e0dd04634f32e65d83b76cfe780'\
- 'c8e388f2577b4329da5e77f0455083db6dd97fa8' 
'd9b09de9d718a864270e9330e20109e182dfbdd9'\
- '6dfc3b6996f591123ee8938fd0fe7c27eb5c7552')
+md5sums=('4d64a99592b818aa9419fc9dcb149746' '36c5711228cb0cf48966daa993e06f55'\
+ '9dabdbc6b8cd020f2205515df7972c21' '1b04e888717bb31479a6087632981723'\
+ '5bd3924f5720b97837969ec4ec4d5e09' 'c7f50632b69bd4f32cf052d0b1848463'\
+ '46118a8ec2c4f5bbfafd730af21b7c03' '140855352baeb89da0c6c1c475c18b57')
+sha1sums=('a1f21b23c8c80f35801d59e30ba30779f2025a72' 
'4de6cd3fad1946146107f86d1f161eb835fbb2d3'\
+ '3632f8a00838f48e484bca24de06db443cc14fff' 
'7f8783e243e23c8853a9f9fb5b36f467aab8dc15'\
+ '3625ed2aa71d9e0dd04634f32e65d83b76cfe780' 
'c8e388f2577b4329da5e77f0455083db6dd97fa8'\
+ 'd9b09de9d718a864270e9330e20109e182dfbdd9' 
'6dfc3b6996f591123ee8938fd0fe7c27eb5c7552')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver" || return 1



[arch-commits] Commit in ntp/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-13 Thread Eric Bélanger
Date: Sunday, December 13, 2009 @ 07:04:21
  Author: eric
Revision: 61220

Merged revisions 61219 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/ntp/trunk


  r61219 | eric | 2009-12-13 07:03:48 -0500 (Sun, 13 Dec 2009) | 1 line
  
  Cleaned up source array


Modified:
  ntp/repos/extra-i686/ (properties)
  ntp/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |   19 ---
 1 file changed, 8 insertions(+), 11 deletions(-)


Property changes on: ntp/repos/extra-i686
___
Modified: svnmerge-integrated
   - /ntp/trunk:1-61216
   + /ntp/trunk:1-61219

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-13 12:03:48 UTC (rev 61219)
+++ extra-i686/PKGBUILD 2009-12-13 12:04:21 UTC (rev 61220)
@@ -12,7 +12,6 @@
 backup=('etc/ntp.conf' 'etc/conf.d/ntp-client.conf')
 options=('!emptydirs')
 source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${pkgver}.tar.gz
-ftp://ftp.archlinux.org/other/ntp/ntp-4.2.4p6-manpages.tar.bz2
 ntp-4.2.4_p7-nano.patch
fix-ipv6.patch
ntp-4.2.4-html2man.patch
@@ -20,16 +19,14 @@
 ntp-client.conf
 ntpd
 ntpdate)
-md5sums=('4d64a99592b818aa9419fc9dcb149746' '3396ea6276147617e5cf79cefffee018'\
- '36c5711228cb0cf48966daa993e06f55' '9dabdbc6b8cd020f2205515df7972c21'\
- '1b04e888717bb31479a6087632981723' '5bd3924f5720b97837969ec4ec4d5e09'\
- 'c7f50632b69bd4f32cf052d0b1848463' '46118a8ec2c4f5bbfafd730af21b7c03'\
- '140855352baeb89da0c6c1c475c18b57')
-sha1sums=('a1f21b23c8c80f35801d59e30ba30779f2025a72' 
'993b849a2e5fa719f53f85c4e83ee52eecbea56d'\
- '4de6cd3fad1946146107f86d1f161eb835fbb2d3' 
'3632f8a00838f48e484bca24de06db443cc14fff'\
- '7f8783e243e23c8853a9f9fb5b36f467aab8dc15' 
'3625ed2aa71d9e0dd04634f32e65d83b76cfe780'\
- 'c8e388f2577b4329da5e77f0455083db6dd97fa8' 
'd9b09de9d718a864270e9330e20109e182dfbdd9'\
- '6dfc3b6996f591123ee8938fd0fe7c27eb5c7552')
+md5sums=('4d64a99592b818aa9419fc9dcb149746' '36c5711228cb0cf48966daa993e06f55'\
+ '9dabdbc6b8cd020f2205515df7972c21' '1b04e888717bb31479a6087632981723'\
+ '5bd3924f5720b97837969ec4ec4d5e09' 'c7f50632b69bd4f32cf052d0b1848463'\
+ '46118a8ec2c4f5bbfafd730af21b7c03' '140855352baeb89da0c6c1c475c18b57')
+sha1sums=('a1f21b23c8c80f35801d59e30ba30779f2025a72' 
'4de6cd3fad1946146107f86d1f161eb835fbb2d3'\
+ '3632f8a00838f48e484bca24de06db443cc14fff' 
'7f8783e243e23c8853a9f9fb5b36f467aab8dc15'\
+ '3625ed2aa71d9e0dd04634f32e65d83b76cfe780' 
'c8e388f2577b4329da5e77f0455083db6dd97fa8'\
+ 'd9b09de9d718a864270e9330e20109e182dfbdd9' 
'6dfc3b6996f591123ee8938fd0fe7c27eb5c7552')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver" || return 1



[arch-commits] Commit in ntp/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-13 Thread Eric Bélanger
Date: Sunday, December 13, 2009 @ 07:04:52
  Author: eric
Revision: 61221

Merged revisions 61219 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/ntp/trunk


  r61219 | eric | 2009-12-13 07:03:48 -0500 (Sun, 13 Dec 2009) | 1 line
  
  Cleaned up source array


Modified:
  ntp/repos/extra-x86_64/   (properties)
  ntp/repos/extra-x86_64/PKGBUILD

--+
 PKGBUILD |   19 ---
 1 file changed, 8 insertions(+), 11 deletions(-)


Property changes on: ntp/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /ntp/trunk:1-61217
   + /ntp/trunk:1-61220

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-13 12:04:21 UTC (rev 61220)
+++ extra-x86_64/PKGBUILD   2009-12-13 12:04:52 UTC (rev 61221)
@@ -12,7 +12,6 @@
 backup=('etc/ntp.conf' 'etc/conf.d/ntp-client.conf')
 options=('!emptydirs')
 source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${pkgver}.tar.gz
-ftp://ftp.archlinux.org/other/ntp/ntp-4.2.4p6-manpages.tar.bz2
 ntp-4.2.4_p7-nano.patch
fix-ipv6.patch
ntp-4.2.4-html2man.patch
@@ -20,16 +19,14 @@
 ntp-client.conf
 ntpd
 ntpdate)
-md5sums=('4d64a99592b818aa9419fc9dcb149746' '3396ea6276147617e5cf79cefffee018'\
- '36c5711228cb0cf48966daa993e06f55' '9dabdbc6b8cd020f2205515df7972c21'\
- '1b04e888717bb31479a6087632981723' '5bd3924f5720b97837969ec4ec4d5e09'\
- 'c7f50632b69bd4f32cf052d0b1848463' '46118a8ec2c4f5bbfafd730af21b7c03'\
- '140855352baeb89da0c6c1c475c18b57')
-sha1sums=('a1f21b23c8c80f35801d59e30ba30779f2025a72' 
'993b849a2e5fa719f53f85c4e83ee52eecbea56d'\
- '4de6cd3fad1946146107f86d1f161eb835fbb2d3' 
'3632f8a00838f48e484bca24de06db443cc14fff'\
- '7f8783e243e23c8853a9f9fb5b36f467aab8dc15' 
'3625ed2aa71d9e0dd04634f32e65d83b76cfe780'\
- 'c8e388f2577b4329da5e77f0455083db6dd97fa8' 
'd9b09de9d718a864270e9330e20109e182dfbdd9'\
- '6dfc3b6996f591123ee8938fd0fe7c27eb5c7552')
+md5sums=('4d64a99592b818aa9419fc9dcb149746' '36c5711228cb0cf48966daa993e06f55'\
+ '9dabdbc6b8cd020f2205515df7972c21' '1b04e888717bb31479a6087632981723'\
+ '5bd3924f5720b97837969ec4ec4d5e09' 'c7f50632b69bd4f32cf052d0b1848463'\
+ '46118a8ec2c4f5bbfafd730af21b7c03' '140855352baeb89da0c6c1c475c18b57')
+sha1sums=('a1f21b23c8c80f35801d59e30ba30779f2025a72' 
'4de6cd3fad1946146107f86d1f161eb835fbb2d3'\
+ '3632f8a00838f48e484bca24de06db443cc14fff' 
'7f8783e243e23c8853a9f9fb5b36f467aab8dc15'\
+ '3625ed2aa71d9e0dd04634f32e65d83b76cfe780' 
'c8e388f2577b4329da5e77f0455083db6dd97fa8'\
+ 'd9b09de9d718a864270e9330e20109e182dfbdd9' 
'6dfc3b6996f591123ee8938fd0fe7c27eb5c7552')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver" || return 1



[arch-commits] Commit in (5 files)

2009-12-13 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 12:02:55
  Author: vesa
Revision: 61222

ghc-6.12 separation

Added:
  haskell-parsec/
  haskell-parsec/repos/
  haskell-parsec/trunk/
  haskell-parsec/trunk/PKGBUILD
  haskell-parsec/trunk/haskell-parsec.install

+
 PKGBUILD   |   26 ++
 haskell-parsec.install |   13 +
 2 files changed, 39 insertions(+)

Added: haskell-parsec/trunk/PKGBUILD
===
--- haskell-parsec/trunk/PKGBUILD   (rev 0)
+++ haskell-parsec/trunk/PKGBUILD   2009-12-13 17:02:55 UTC (rev 61222)
@@ -0,0 +1,26 @@
+# Maintainer: Vesa Kaihlavirta 
+# Contributor: Arch Haskell Team 
+pkgname=haskell-parsec
+pkgrel=1
+pkgver=3.0.1
+pkgdesc="Monadic parser combinators"
+url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/parsec";
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=(ghc=6.12.1 sh)
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/parsec/$pkgver/parsec-$pkgver.tar.gz)
+install=haskell-parsec.install
+
+build() {
+cd $srcdir/parsec-$pkgver
+runhaskell Setup configure --prefix=/usr || return 1
+runhaskell Setup build   || return 1
+runhaskell Setup register   --gen-script || return 1
+runhaskell Setup unregister --gen-script || return 1
+install -D -m744 register.sh   
$pkgdir/usr/share/haskell/$pkgname/register.sh
+install-m744 unregister.sh 
$pkgdir/usr/share/haskell/$pkgname/unregister.sh
+runhaskell Setup copy --destdir=$pkgdir || return 1
+install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE || 
return 1
+}
+md5sums=('6b1ac06edfe73e23238333a6319e09e8')

Added: haskell-parsec/trunk/haskell-parsec.install
===
--- haskell-parsec/trunk/haskell-parsec.install (rev 0)
+++ haskell-parsec/trunk/haskell-parsec.install 2009-12-13 17:02:55 UTC (rev 
61222)
@@ -0,0 +1,13 @@
+HS_DIR=/usr/share/haskell/haskell-parsec
+post_install() {
+  ${HS_DIR}/register.sh
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}



[arch-commits] Commit in haskell-parsec/repos (testing-i686)

2009-12-13 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 12:03:27
  Author: vesa
Revision: 61223

archrelease: new repo testing-i686

Added:
  haskell-parsec/repos/testing-i686/



[arch-commits] Commit in haskell-parsec/repos (testing-i686)

2009-12-13 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 12:03:41
  Author: vesa
Revision: 61224

Initialized merge tracking via "svnmerge" with revisions "1-61222" from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-parsec/trunk

Modified:
  haskell-parsec/repos/testing-i686/(properties)


Property changes on: haskell-parsec/repos/testing-i686
___
Added: svnmerge-integrated
   + /haskell-parsec/trunk:1-61222



[arch-commits] Commit in (5 files)

2009-12-13 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 12:05:34
  Author: vesa
Revision: 61225

ghc 6.12 libsep

Added:
  haskell-network/
  haskell-network/repos/
  haskell-network/trunk/
  haskell-network/trunk/PKGBUILD
  haskell-network/trunk/haskell-network.install

-+
 PKGBUILD|   28 
 haskell-network.install |   13 +
 2 files changed, 41 insertions(+)

Added: haskell-network/trunk/PKGBUILD
===
--- haskell-network/trunk/PKGBUILD  (rev 0)
+++ haskell-network/trunk/PKGBUILD  2009-12-13 17:05:34 UTC (rev 61225)
@@ -0,0 +1,28 @@
+# Maintainer: Vesa Kaihlavirta 
+# Contributor: Arch Haskell Team 
+pkgname=haskell-network
+pkgrel=1
+pkgver=2.2.1.5
+pkgdesc="Networking-related facilities"
+url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/network";
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=(ghc=6.12.1 sh)
+makedepends=('haskell-parsec<3.1')
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/network/$pkgver/network-$pkgver.tar.gz)
+install=haskell-network.install
+
+build() {
+cd $srcdir/network-$pkgver
+runhaskell Setup configure --prefix=/usr || return 1
+runhaskell Setup build   || return 1
+runhaskell Setup register   --gen-script || return 1
+runhaskell Setup unregister --gen-script || return 1
+install -D -m744 register.sh   
$pkgdir/usr/share/haskell/$pkgname/register.sh
+install-m744 unregister.sh 
$pkgdir/usr/share/haskell/$pkgname/unregister.sh
+runhaskell Setup copy --destdir=$pkgdir || return 1
+install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE || 
return 1
+}
+md5sums=('6e952a0ffa3f488ad8857655e2dd8180')
+md5sums=('a89eeb3806080ed9af47f18918822bb3')

Added: haskell-network/trunk/haskell-network.install
===
--- haskell-network/trunk/haskell-network.install   
(rev 0)
+++ haskell-network/trunk/haskell-network.install   2009-12-13 17:05:34 UTC 
(rev 61225)
@@ -0,0 +1,13 @@
+HS_DIR=/usr/share/haskell/haskell-network
+post_install() {
+  ${HS_DIR}/register.sh
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}



[arch-commits] Commit in haskell-network/repos (testing-i686)

2009-12-13 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 12:06:14
  Author: vesa
Revision: 61226

archrelease: new repo testing-i686

Added:
  haskell-network/repos/testing-i686/



[arch-commits] Commit in haskell-network/repos (testing-i686)

2009-12-13 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 12:06:29
  Author: vesa
Revision: 61227

Initialized merge tracking via "svnmerge" with revisions "1-61225" from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-network/trunk

Modified:
  haskell-network/repos/testing-i686/   (properties)


Property changes on: haskell-network/repos/testing-i686
___
Added: svnmerge-integrated
   + /haskell-network/trunk:1-61225



[arch-commits] Commit in boost/trunk (PKGBUILD fix-gzip-crc.patch)

2009-12-13 Thread Ionut Biru
Date: Sunday, December 13, 2009 @ 12:39:39
  Author: ibiru
Revision: 61228

upgpkg: boost 1.41.0-1.1
fix crc regression that is on x86_64 for gzip

Added:
  boost/trunk/fix-gzip-crc.patch
Modified:
  boost/trunk/PKGBUILD

+
 PKGBUILD   |9 ++---
 fix-gzip-crc.patch |   24 
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 17:06:29 UTC (rev 61227)
+++ PKGBUILD2009-12-13 17:39:39 UTC (rev 61228)
@@ -7,20 +7,21 @@
 pkgname=boost
 pkgver=1.41.0
 _boostver=1_41_0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Free peer-reviewed portable C++ source libraries"
 arch=('i686' 'x86_64')
 url="http://www.boost.org/";
 depends=('bzip2' 'zlib')
 makedepends=('python>=2.6')
 optdepends=('python: for python bindings')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_${_boostver}.tar.gz)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_${_boostver}.tar.gz
+   fix-gzip-crc.patch)
 license=('custom')
 options=(!ccache)
-md5sums=('ddb04c9b9164a36a91dcf36819666dd9')
 
 build() {
   cd "${srcdir}/${pkgname}_${_boostver}"
+  patch -Np1 -i $srcdir/fix-gzip-crc.patch || return 1
 
   # build bjam
   cd ${srcdir}/${pkgname}_${_boostver}/tools/jam/src
@@ -65,3 +66,5 @@
   install -m644 ${srcdir}/${pkgname}_${_boostver}/LICENSE_1_0.txt \
 ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
 }
+md5sums=('ddb04c9b9164a36a91dcf36819666dd9'
+ '682f124a765b2935c7352f38c08848cc')

Added: fix-gzip-crc.patch
===
--- fix-gzip-crc.patch  (rev 0)
+++ fix-gzip-crc.patch  2009-12-13 17:39:39 UTC (rev 61228)
@@ -0,0 +1,24 @@
+diff -Nur boost_1_41_0.orig/boost/iostreams/filter/zlib.hpp 
boost_1_41_0/boost/iostreams/filter/zlib.hpp
+--- boost_1_41_0.orig/boost/iostreams/filter/zlib.hpp  2009-10-14 
18:20:36.0 +0300
 boost_1_41_0/boost/iostreams/filter/zlib.hpp   2009-12-13 
16:47:53.078056507 +0200
+@@ -20,6 +20,7 @@
+ #include // allocator, bad_alloc.
+ #include   
+ #include   // MSVC, STATIC_CONSTANT, DEDUCED_TYPENAME, 
DINKUM.
++#include  // uint*_t
+ #include 
+ #include// buffer size.
+ #include 
+@@ -43,9 +44,9 @@
+ namespace zlib {
+ // Typedefs
+ 
+-typedef unsigned int uint;
+-typedef unsigned char byte;
+-typedef unsigned long ulong;
++typedef uint32_t uint;
++typedef uint8_t byte;
++typedef uint32_t ulong;
+ 
+ // Prefix 'x' prevents symbols from being redefined when Z_PREFIX is defined
+ typedef void* (*xalloc_func)(void*, zlib::uint, zlib::uint);



[arch-commits] Commit in boost/repos (3 files)

2009-12-13 Thread Ionut Biru
Date: Sunday, December 13, 2009 @ 12:40:19
  Author: ibiru
Revision: 61229

Merged revisions 61228 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/boost/trunk


  r61228 | ibiru | 2009-12-13 19:39:39 +0200 (Sun, 13 Dec 2009) | 2 lines
  
  upgpkg: boost 1.41.0-1.1
  fix crc regression that is on x86_64 for gzip


Added:
  boost/repos/extra-x86_64/fix-gzip-crc.patch
(from rev 61228, boost/trunk/fix-gzip-crc.patch)
Modified:
  boost/repos/extra-x86_64/ (properties)
  boost/repos/extra-x86_64/PKGBUILD

+
 PKGBUILD   |9 ++---
 fix-gzip-crc.patch |   24 
 2 files changed, 30 insertions(+), 3 deletions(-)


Property changes on: boost/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /boost/trunk:1-60627
   + /boost/trunk:1-61228

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-13 17:39:39 UTC (rev 61228)
+++ extra-x86_64/PKGBUILD   2009-12-13 17:40:19 UTC (rev 61229)
@@ -7,20 +7,21 @@
 pkgname=boost
 pkgver=1.41.0
 _boostver=1_41_0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Free peer-reviewed portable C++ source libraries"
 arch=('i686' 'x86_64')
 url="http://www.boost.org/";
 depends=('bzip2' 'zlib')
 makedepends=('python>=2.6')
 optdepends=('python: for python bindings')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_${_boostver}.tar.gz)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_${_boostver}.tar.gz
+   fix-gzip-crc.patch)
 license=('custom')
 options=(!ccache)
-md5sums=('ddb04c9b9164a36a91dcf36819666dd9')
 
 build() {
   cd "${srcdir}/${pkgname}_${_boostver}"
+  patch -Np1 -i $srcdir/fix-gzip-crc.patch || return 1
 
   # build bjam
   cd ${srcdir}/${pkgname}_${_boostver}/tools/jam/src
@@ -65,3 +66,5 @@
   install -m644 ${srcdir}/${pkgname}_${_boostver}/LICENSE_1_0.txt \
 ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
 }
+md5sums=('ddb04c9b9164a36a91dcf36819666dd9'
+ '682f124a765b2935c7352f38c08848cc')

Copied: boost/repos/extra-x86_64/fix-gzip-crc.patch (from rev 61228, 
boost/trunk/fix-gzip-crc.patch)
===
--- extra-x86_64/fix-gzip-crc.patch (rev 0)
+++ extra-x86_64/fix-gzip-crc.patch 2009-12-13 17:40:19 UTC (rev 61229)
@@ -0,0 +1,24 @@
+diff -Nur boost_1_41_0.orig/boost/iostreams/filter/zlib.hpp 
boost_1_41_0/boost/iostreams/filter/zlib.hpp
+--- boost_1_41_0.orig/boost/iostreams/filter/zlib.hpp  2009-10-14 
18:20:36.0 +0300
 boost_1_41_0/boost/iostreams/filter/zlib.hpp   2009-12-13 
16:47:53.078056507 +0200
+@@ -20,6 +20,7 @@
+ #include // allocator, bad_alloc.
+ #include   
+ #include   // MSVC, STATIC_CONSTANT, DEDUCED_TYPENAME, 
DINKUM.
++#include  // uint*_t
+ #include 
+ #include// buffer size.
+ #include 
+@@ -43,9 +44,9 @@
+ namespace zlib {
+ // Typedefs
+ 
+-typedef unsigned int uint;
+-typedef unsigned char byte;
+-typedef unsigned long ulong;
++typedef uint32_t uint;
++typedef uint8_t byte;
++typedef uint32_t ulong;
+ 
+ // Prefix 'x' prevents symbols from being redefined when Z_PREFIX is defined
+ typedef void* (*xalloc_func)(void*, zlib::uint, zlib::uint);



[arch-commits] Commit in openbox/trunk (PKGBUILD fix-workspaces-number-in-gdm.patch)

2009-12-13 Thread Andrea Scarpino
Date: Sunday, December 13, 2009 @ 12:53:47
  Author: andrea
Revision: 61230

upgpkg: openbox 3.4.8-2
fix workspaces number after GDM login (FS#17467)

Added:
  openbox/trunk/fix-workspaces-number-in-gdm.patch
Modified:
  openbox/trunk/PKGBUILD

+
 PKGBUILD   |   12 +++
 fix-workspaces-number-in-gdm.patch |   36 +++
 2 files changed, 44 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 17:40:19 UTC (rev 61229)
+++ PKGBUILD2009-12-13 17:53:47 UTC (rev 61230)
@@ -1,11 +1,11 @@
 # $Id$
-# Contributor: Andrea Scarpino 
+# Maintainer: Andrea Scarpino 
 # Contributor: tobias 
 # Contributor: Sarah Hay 
 
 pkgname=openbox
 pkgver=3.4.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A window manager for the X11 windowing system"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,15 +18,19 @@
 options=('!libtool' 'force')
 backup=('usr/etc/xdg/openbox/menu.xml' 'usr/etc/xdg/openbox/rc.xml')
 source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz
-   'which-2.20.patch')
+   'which-2.20.patch'
+   'fix-workspaces-number-in-gdm.patch')
 md5sums=('3523fe9760947a15fb8ed3611090ccd2'
- 'b72cac492e0ed83fd5ced9c1263cfa24')
+ 'b72cac492e0ed83fd5ced9c1263cfa24'
+ 'ce1f5cd7dbcba9601e2f6dfa666064dc')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   #FS#11455
   patch -Np1 -i ${srcdir}/which-2.20.patch || return 1
+  #FS#16676
+  patch -Np1 -i ${srcdir}/fix-workspaces-number-in-gdm.patch || return 1
 
   ./configure --prefix=/usr \
 --with-x \

Added: fix-workspaces-number-in-gdm.patch
===
--- fix-workspaces-number-in-gdm.patch  (rev 0)
+++ fix-workspaces-number-in-gdm.patch  2009-12-13 17:53:47 UTC (rev 61230)
@@ -0,0 +1,36 @@
+--- openbox-3.4.8/data/xsession/openbox-gnome-session.in~  2009-12-13 
18:46:58.480826774 +0100
 openbox-3.4.8/data/xsession/openbox-gnome-session.in   2009-12-13 
18:49:15.776973708 +0100
+@@ -7,6 +7,9 @@
+   exit
+ fi
+ 
++# Clean up after GDM
++xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES 
-remove _NET_CURRENT_DESKTOP 2> /dev/null
++
+ VER=$(gnome-session --version 2>/dev/null | \
+   sed -e 's/[^0-9.]*\([0-9.]\+\)/\1/')
+ 
+--- openbox-3.4.8/data/xsession/openbox-kde-session.in~2009-12-13 
18:47:07.676987674 +0100
 openbox-3.4.8/data/xsession/openbox-kde-session.in 2009-12-13 
18:48:48.140310531 +0100
+@@ -7,6 +7,9 @@
+   exit
+ fi
+ 
++# Clean up after GDM
++xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES 
-remove _NET_CURRENT_DESKTOP 2> /dev/null
++
+ # Run KDE with Openbox as its window manager
+ export KDEWM="@bindir@/openbox"
+ exec startkde "$@"
+--- openbox-3.4.8/data/xsession/openbox-session.in~2009-12-13 
18:47:13.173649966 +0100
 openbox-3.4.8/data/xsession/openbox-session.in 2009-12-13 
18:48:17.696977111 +0100
+@@ -7,6 +7,9 @@
+   exit
+ fi
+ 
++# Clean up after GDM
++xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES 
-remove _NET_CURRENT_DESKTOP 2> /dev/null
++
+ AUTOSTART="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/autostart.sh"
+ GLOBALAUTOSTART="@configdir@/openbox/autostart.sh"
+ 



[arch-commits] Commit in openbox/repos (3 files)

2009-12-13 Thread Andrea Scarpino
Date: Sunday, December 13, 2009 @ 12:54:29
  Author: andrea
Revision: 61231

Merged revisions 61230 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/openbox/trunk


  r61230 | andrea | 2009-12-13 18:53:47 +0100 (Sun, 13 Dec 2009) | 2 lines
  
  upgpkg: openbox 3.4.8-2
  fix workspaces number after GDM login (FS#17467)


Added:
  openbox/repos/extra-i686/fix-workspaces-number-in-gdm.patch
(from rev 61230, openbox/trunk/fix-workspaces-number-in-gdm.patch)
Modified:
  openbox/repos/extra-i686/ (properties)
  openbox/repos/extra-i686/PKGBUILD

+
 PKGBUILD   |   12 +++
 fix-workspaces-number-in-gdm.patch |   36 +++
 2 files changed, 44 insertions(+), 4 deletions(-)


Property changes on: openbox/repos/extra-i686
___
Modified: svnmerge-integrated
   - /openbox/trunk:1-60909
   + /openbox/trunk:1-61230

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-13 17:53:47 UTC (rev 61230)
+++ extra-i686/PKGBUILD 2009-12-13 17:54:29 UTC (rev 61231)
@@ -1,11 +1,11 @@
 # $Id$
-# Contributor: Andrea Scarpino 
+# Maintainer: Andrea Scarpino 
 # Contributor: tobias 
 # Contributor: Sarah Hay 
 
 pkgname=openbox
 pkgver=3.4.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A window manager for the X11 windowing system"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,15 +18,19 @@
 options=('!libtool' 'force')
 backup=('usr/etc/xdg/openbox/menu.xml' 'usr/etc/xdg/openbox/rc.xml')
 source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz
-   'which-2.20.patch')
+   'which-2.20.patch'
+   'fix-workspaces-number-in-gdm.patch')
 md5sums=('3523fe9760947a15fb8ed3611090ccd2'
- 'b72cac492e0ed83fd5ced9c1263cfa24')
+ 'b72cac492e0ed83fd5ced9c1263cfa24'
+ 'ce1f5cd7dbcba9601e2f6dfa666064dc')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   #FS#11455
   patch -Np1 -i ${srcdir}/which-2.20.patch || return 1
+  #FS#16676
+  patch -Np1 -i ${srcdir}/fix-workspaces-number-in-gdm.patch || return 1
 
   ./configure --prefix=/usr \
 --with-x \

Copied: openbox/repos/extra-i686/fix-workspaces-number-in-gdm.patch (from rev 
61230, openbox/trunk/fix-workspaces-number-in-gdm.patch)
===
--- extra-i686/fix-workspaces-number-in-gdm.patch   
(rev 0)
+++ extra-i686/fix-workspaces-number-in-gdm.patch   2009-12-13 17:54:29 UTC 
(rev 61231)
@@ -0,0 +1,36 @@
+--- openbox-3.4.8/data/xsession/openbox-gnome-session.in~  2009-12-13 
18:46:58.480826774 +0100
 openbox-3.4.8/data/xsession/openbox-gnome-session.in   2009-12-13 
18:49:15.776973708 +0100
+@@ -7,6 +7,9 @@
+   exit
+ fi
+ 
++# Clean up after GDM
++xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES 
-remove _NET_CURRENT_DESKTOP 2> /dev/null
++
+ VER=$(gnome-session --version 2>/dev/null | \
+   sed -e 's/[^0-9.]*\([0-9.]\+\)/\1/')
+ 
+--- openbox-3.4.8/data/xsession/openbox-kde-session.in~2009-12-13 
18:47:07.676987674 +0100
 openbox-3.4.8/data/xsession/openbox-kde-session.in 2009-12-13 
18:48:48.140310531 +0100
+@@ -7,6 +7,9 @@
+   exit
+ fi
+ 
++# Clean up after GDM
++xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES 
-remove _NET_CURRENT_DESKTOP 2> /dev/null
++
+ # Run KDE with Openbox as its window manager
+ export KDEWM="@bindir@/openbox"
+ exec startkde "$@"
+--- openbox-3.4.8/data/xsession/openbox-session.in~2009-12-13 
18:47:13.173649966 +0100
 openbox-3.4.8/data/xsession/openbox-session.in 2009-12-13 
18:48:17.696977111 +0100
+@@ -7,6 +7,9 @@
+   exit
+ fi
+ 
++# Clean up after GDM
++xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES 
-remove _NET_CURRENT_DESKTOP 2> /dev/null
++
+ AUTOSTART="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/autostart.sh"
+ GLOBALAUTOSTART="@configdir@/openbox/autostart.sh"
+ 



[arch-commits] Commit in wesnoth/trunk (PKGBUILD)

2009-12-13 Thread Ionut Biru
Date: Sunday, December 13, 2009 @ 12:57:40
  Author: ibiru
Revision: 61232

upgpkg: wesnoth 1.6.5-2.1
rebuild against boost 1.41.0-1.1 to fix regression that was introduced in 
boost 1.41, fixing multiplayer and loading saved games

Modified:
  wesnoth/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 17:54:29 UTC (rev 61231)
+++ PKGBUILD2009-12-13 17:57:40 UTC (rev 61232)
@@ -5,7 +5,7 @@
 
 pkgname=wesnoth
 pkgver=1.6.5
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A turn-based strategy game on a fantasy world"
 arch=(i686 x86_64)
 license=('GPL')



[arch-commits] Commit in wesnoth/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-13 Thread Ionut Biru
Date: Sunday, December 13, 2009 @ 13:01:43
  Author: ibiru
Revision: 61233

Merged revisions 60717,61232 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/wesnoth/trunk


  r60717 | ibiru | 2009-12-06 16:22:03 +0200 (Sun, 06 Dec 2009) | 2 lines
  
  upgpkg: wesnoth 1.6.5-2
  boost-1.41 rebuild

  r61232 | ibiru | 2009-12-13 19:57:40 +0200 (Sun, 13 Dec 2009) | 2 lines
  
  upgpkg: wesnoth 1.6.5-2.1
  rebuild against boost 1.41.0-1.1 to fix regression that was introduced in 
boost 1.41, fixing multiplayer and loading saved games


Modified:
  wesnoth/repos/extra-x86_64/   (properties)
  wesnoth/repos/extra-x86_64/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Property changes on: wesnoth/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /wesnoth/trunk:1-60719
   + <<< (modified)
/wesnoth/trunk:1-61232===
/wesnoth/trunk:1-60719>>> (latest)


Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-13 17:57:40 UTC (rev 61232)
+++ extra-x86_64/PKGBUILD   2009-12-13 18:01:43 UTC (rev 61233)
@@ -5,7 +5,7 @@
 
 pkgname=wesnoth
 pkgver=1.6.5
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A turn-based strategy game on a fantasy world"
 arch=(i686 x86_64)
 license=('GPL')



[arch-commits] Commit in openbox/repos (3 files)

2009-12-13 Thread Giovanni Scafora
Date: Sunday, December 13, 2009 @ 13:56:23
  Author: giovanni
Revision: 61234

Merged revisions 61230 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/openbox/trunk


  r61230 | andrea | 2009-12-13 09:53:47 -0800 (dom, 13 dic 2009) | 2 lines
  
  upgpkg: openbox 3.4.8-2
  fix workspaces number after GDM login (FS#17467)


Added:
  openbox/repos/extra-x86_64/fix-workspaces-number-in-gdm.patch
(from rev 61230, openbox/trunk/fix-workspaces-number-in-gdm.patch)
Modified:
  openbox/repos/extra-x86_64/   (properties)
  openbox/repos/extra-x86_64/PKGBUILD

+
 PKGBUILD   |   12 +++
 fix-workspaces-number-in-gdm.patch |   36 +++
 2 files changed, 44 insertions(+), 4 deletions(-)


Property changes on: openbox/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /openbox/trunk:1-60915
   + /openbox/trunk:1-61233

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-13 18:01:43 UTC (rev 61233)
+++ extra-x86_64/PKGBUILD   2009-12-13 18:56:23 UTC (rev 61234)
@@ -1,11 +1,11 @@
 # $Id$
-# Contributor: Andrea Scarpino 
+# Maintainer: Andrea Scarpino 
 # Contributor: tobias 
 # Contributor: Sarah Hay 
 
 pkgname=openbox
 pkgver=3.4.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A window manager for the X11 windowing system"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,15 +18,19 @@
 options=('!libtool' 'force')
 backup=('usr/etc/xdg/openbox/menu.xml' 'usr/etc/xdg/openbox/rc.xml')
 source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz
-   'which-2.20.patch')
+   'which-2.20.patch'
+   'fix-workspaces-number-in-gdm.patch')
 md5sums=('3523fe9760947a15fb8ed3611090ccd2'
- 'b72cac492e0ed83fd5ced9c1263cfa24')
+ 'b72cac492e0ed83fd5ced9c1263cfa24'
+ 'ce1f5cd7dbcba9601e2f6dfa666064dc')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   #FS#11455
   patch -Np1 -i ${srcdir}/which-2.20.patch || return 1
+  #FS#16676
+  patch -Np1 -i ${srcdir}/fix-workspaces-number-in-gdm.patch || return 1
 
   ./configure --prefix=/usr \
 --with-x \

Copied: openbox/repos/extra-x86_64/fix-workspaces-number-in-gdm.patch (from rev 
61230, openbox/trunk/fix-workspaces-number-in-gdm.patch)
===
--- extra-x86_64/fix-workspaces-number-in-gdm.patch 
(rev 0)
+++ extra-x86_64/fix-workspaces-number-in-gdm.patch 2009-12-13 18:56:23 UTC 
(rev 61234)
@@ -0,0 +1,36 @@
+--- openbox-3.4.8/data/xsession/openbox-gnome-session.in~  2009-12-13 
18:46:58.480826774 +0100
 openbox-3.4.8/data/xsession/openbox-gnome-session.in   2009-12-13 
18:49:15.776973708 +0100
+@@ -7,6 +7,9 @@
+   exit
+ fi
+ 
++# Clean up after GDM
++xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES 
-remove _NET_CURRENT_DESKTOP 2> /dev/null
++
+ VER=$(gnome-session --version 2>/dev/null | \
+   sed -e 's/[^0-9.]*\([0-9.]\+\)/\1/')
+ 
+--- openbox-3.4.8/data/xsession/openbox-kde-session.in~2009-12-13 
18:47:07.676987674 +0100
 openbox-3.4.8/data/xsession/openbox-kde-session.in 2009-12-13 
18:48:48.140310531 +0100
+@@ -7,6 +7,9 @@
+   exit
+ fi
+ 
++# Clean up after GDM
++xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES 
-remove _NET_CURRENT_DESKTOP 2> /dev/null
++
+ # Run KDE with Openbox as its window manager
+ export KDEWM="@bindir@/openbox"
+ exec startkde "$@"
+--- openbox-3.4.8/data/xsession/openbox-session.in~2009-12-13 
18:47:13.173649966 +0100
 openbox-3.4.8/data/xsession/openbox-session.in 2009-12-13 
18:48:17.696977111 +0100
+@@ -7,6 +7,9 @@
+   exit
+ fi
+ 
++# Clean up after GDM
++xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES 
-remove _NET_CURRENT_DESKTOP 2> /dev/null
++
+ AUTOSTART="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/autostart.sh"
+ GLOBALAUTOSTART="@configdir@/openbox/autostart.sh"
+ 



[arch-commits] Commit in chromium/trunk (3 files)

2009-12-13 Thread Pierre Schmitz
Date: Sunday, December 13, 2009 @ 14:13:26
  Author: pierre
Revision: 61235

Added:
  chromium/trunk/ffmpeg_branding_mime.patch
Modified:
  chromium/trunk/PKGBUILD   (contents, properties)
  chromium/trunk/chromium.sh

+
 PKGBUILD   |   31 +++
 chromium.sh|2 +-
 ffmpeg_branding_mime.patch |   29 +
 3 files changed, 49 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 18:56:23 UTC (rev 61234)
+++ PKGBUILD2009-12-13 19:13:26 UTC (rev 61235)
@@ -1,9 +1,9 @@
-# $Id: $
+# $Id$
 # Maintainer: Pierre Schmitz 
 
 pkgname=chromium
 pkgver=4.0.249.30
-pkgrel=1
+pkgrel=2
 pkgdesc='An open-source browser project that aims to build a safer, faster, 
and more stable way for all users to experience the web'
 arch=('i686' 'x86_64')
 url='http://www.chromium.org/'
@@ -16,27 +16,32 @@
 # downgrade from 4.0.267.0-2
 options=('force')
 source=("ftp://ftp.archlinux.org/other/chromium/chromium-${pkgver}.tar.xz";
-'chromium.desktop' 'chromium.sh' 'drop_sse2.patch')
+'chromium.desktop' 'chromium.sh'
+'drop_sse2.patch' 'ffmpeg_branding_mime.patch')
 md5sums=('59d316bd0f319178e1faffce7b2c81d2'
  '312df68330d6e288cbb2260bad620a32'
- 'a2fbdd2744e2dd92d3fa480815485725'
- 'a4a920d7b198c0a2f6e39d60ec75abd5')
+ '2689154f4a41511e136d9594a0086aa0'
+ 'a4a920d7b198c0a2f6e39d60ec75abd5'
+ '5e36845dd9e053da3bf5fc814e502d68')
 
 build() {
cd ${srcdir}/chromium-${pkgver}
 
-   export GYP_GENERATORS="make"
-   export BUILDTYPE="Release"
-   export GYP_DEFINES='gcc_version=44 no_strict_aliasing=1 
linux_sandbox_path=/usr/lib/chromium/chromium-sandbox'
+   export GYP_GENERATORS='make'
+   export BUILDTYPE='Release'
+   export GYP_DEFINES="gcc_version=44 \
+   no_strict_aliasing=1 \
+   linux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
+   linux_strip_binary=1 \
+   release_extra_cflags='${CFLAGS}' \
+   ffmpeg_branding=Chrome"
 
+   patch -p0 -i ${srcdir}/ffmpeg_branding_mime.patch || return 1
+
# i686 does not include SSE2
# see http://code.google.com/p/chromium/issues/detail?id=9007
patch -p0 -i ${srcdir}/drop_sse2.patch || return 1
 
-   if [ "${CARCH}" = 'x86_64' ]; then
-   GYP_DEFINES="${GYP_DEFINES} target_arch=x64"
-   fi
-
export PATH=./depot_tools/:$PATH
gclient runhooks --force || return 1
 
@@ -115,6 +120,8 @@
find . -name '.svn' -type d -exec rm -rf {} \;
find . -iname '*.dll' -delete
find . -iname '*.exe' -delete
+   find . -iname '*.o' -delete
+   find . -iname '*.nexe' -delete
 
cd ..
bsdtar cvJf $_current/chromium-$pkgver.tar.xz chromium-$pkgver


Property changes on: chromium/trunk/PKGBUILD
___
Added: svn:keywords
   + Id

Modified: chromium.sh
===
--- chromium.sh 2009-12-13 18:56:23 UTC (rev 61234)
+++ chromium.sh 2009-12-13 19:13:26 UTC (rev 61235)
@@ -2,4 +2,4 @@
 export PATH=$PATH:/usr/lib/chromium
 export CHROME_WRAPPER=/usr/lib/chromium/chromium
 export CHROME_DESKTOP=chromium.desktop
-/usr/lib/chromium/chromium $@
+exec /usr/lib/chromium/chromium $@

Added: ffmpeg_branding_mime.patch
===
--- ffmpeg_branding_mime.patch  (rev 0)
+++ ffmpeg_branding_mime.patch  2009-12-13 19:13:26 UTC (rev 61235)
@@ -0,0 +1,29 @@
+--- src/net/base/mime_util.cc.orig 2009-12-13 19:09:26.467781732 +0100
 src/net/base/mime_util.cc  2009-12-13 19:10:14.967931404 +0100
+@@ -188,7 +188,6 @@
+   "audio/ogg",
+   "application/ogg",
+ 
+-#if defined(GOOGLE_CHROME_BUILD)
+   // MPEG-4.
+   "video/mp4",
+   "video/x-m4v",
+@@ -198,7 +197,6 @@
+   // MP3.
+   "audio/mp3",
+   "audio/x-mp3",
+-#endif
+ };
+ 
+ // List of supported codecs when passed in with .
+@@ -206,10 +204,8 @@
+ // Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support
+ // for more information.
+ static const char* const supported_media_codecs[] = {
+-#if defined(GOOGLE_CHROME_BUILD)
+   "avc1",
+   "mp4a",
+-#endif
+   "theora",
+   "vorbis",
+ };



[arch-commits] Commit in kdevplatform/trunk (PKGBUILD)

2009-12-13 Thread Andrea Scarpino
Date: Sunday, December 13, 2009 @ 14:16:19
  Author: andrea
Revision: 61236

upgpkg: kdevplatform 0.9.97-1
upstream release

Modified:
  kdevplatform/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 19:13:26 UTC (rev 61235)
+++ PKGBUILD2009-12-13 19:16:19 UTC (rev 61236)
@@ -3,7 +3,7 @@
 # Contributor: Giovanni Scafora 
 
 pkgname=kdevplatform
-pkgver=0.9.96
+pkgver=0.9.97
 pkgrel=1
 pkgdesc="A C/C++ development platform for KDE"
 arch=('i686' 'x86_64')
@@ -12,12 +12,11 @@
 depends=('kdelibs' 'boost' 'subversion' 'commoncpp2')
 optdepends=("kdesdk-kompare: difference checking")
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/unstable/kdevelop/3.9.96/src/${pkgname}-${pkgver}.tar.bz2";)
-md5sums=('b7f560cf65df891e38a5551bf93e7056')
+source=("http://download.kde.org/unstable/kdevelop/3.9.97/src/${pkgname}-${pkgver}.tar.bz2";)
+md5sums=('1f7136eb3a1b314a327a24af58afe8c6')
 
 build() {
   cd ${srcdir}
-#  sed -i "s:38:39:g" $pkgname-$pkgver/plugins/classbrowser/CMakeLists.txt
   mkdir build
   cd build 
   cmake ../${pkgname}-${pkgver} \



[arch-commits] Commit in kdevplatform/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-13 Thread Andrea Scarpino
Date: Sunday, December 13, 2009 @ 14:16:59
  Author: andrea
Revision: 61237

Merged revisions 61236 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdevplatform/trunk


  r61236 | andrea | 2009-12-13 20:16:19 +0100 (Sun, 13 Dec 2009) | 2 lines
  
  upgpkg: kdevplatform 0.9.97-1
  upstream release


Modified:
  kdevplatform/repos/extra-i686/(properties)
  kdevplatform/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)


Property changes on: kdevplatform/repos/extra-i686
___
Modified: svnmerge-integrated
   - /kdevplatform/trunk:1-57735
   + /kdevplatform/trunk:1-61236

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-13 19:16:19 UTC (rev 61236)
+++ extra-i686/PKGBUILD 2009-12-13 19:16:59 UTC (rev 61237)
@@ -3,7 +3,7 @@
 # Contributor: Giovanni Scafora 
 
 pkgname=kdevplatform
-pkgver=0.9.96
+pkgver=0.9.97
 pkgrel=1
 pkgdesc="A C/C++ development platform for KDE"
 arch=('i686' 'x86_64')
@@ -12,12 +12,11 @@
 depends=('kdelibs' 'boost' 'subversion' 'commoncpp2')
 optdepends=("kdesdk-kompare: difference checking")
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/unstable/kdevelop/3.9.96/src/${pkgname}-${pkgver}.tar.bz2";)
-md5sums=('b7f560cf65df891e38a5551bf93e7056')
+source=("http://download.kde.org/unstable/kdevelop/3.9.97/src/${pkgname}-${pkgver}.tar.bz2";)
+md5sums=('1f7136eb3a1b314a327a24af58afe8c6')
 
 build() {
   cd ${srcdir}
-#  sed -i "s:38:39:g" $pkgname-$pkgver/plugins/classbrowser/CMakeLists.txt
   mkdir build
   cd build 
   cmake ../${pkgname}-${pkgver} \



[arch-commits] Commit in kernel26-lts/trunk (PKGBUILD kernel26-lts.install)

2009-12-13 Thread Tobias Powalowski
Date: Sunday, December 13, 2009 @ 14:56:34
  Author: tpowa
Revision: 61238

upgpkg: kernel26-lts 2.6.27.41-1
bump to latest version

Modified:
  kernel26-lts/trunk/PKGBUILD
  kernel26-lts/trunk/kernel26-lts.install

--+
 PKGBUILD |   10 +++---
 kernel26-lts.install |2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 19:16:59 UTC (rev 61237)
+++ PKGBUILD2009-12-13 19:56:34 UTC (rev 61238)
@@ -4,8 +4,8 @@
 pkgname=kernel26-lts
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.27
-pkgver=${_basekernel}.39
-pkgrel=2
+pkgver=${_basekernel}.41
+pkgrel=1
 pkgdesc="The Linux Kernel and modules - stable longtime supported kernel 
package suitable for servers"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -24,7 +24,7 @@
linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch
linux-2.6.27.9-ext4-cap-check-delay.patch)
 md5sums=('b3e78977aa79d3754cb7f8143d7ddabd'
- '9ce07344e2d9e5fe77ca474e8f5bd83a'
+ 'a431f1f68badcfa5a6cecc6b4d52d319'
  '1ab067cf0534e3fe16578cf10c020b1b'
  '20534542a14fe041f392abe377dc746a'
  'a13338958d1b241f8dfd4c6014cad3d4'
@@ -52,6 +52,10 @@
   if [ "${_kernelname}" != "" ]; then
 sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" 
./.config
   fi
+  # remove the extraversion from Makefile
+  # this ensures our kernel version is always 2.6.XX-lts
+  # this way, minor kernel updates will not break external modules
+  sed -i 's|^EXTRAVERSION = .*$|EXTRAVERSION = |g' Makefile
   # get kernel version  
   make prepare
   _kernver="$(make kernelrelease)"

Modified: kernel26-lts.install
===
--- kernel26-lts.install2009-12-13 19:16:59 UTC (rev 61237)
+++ kernel26-lts.install2009-12-13 19:56:34 UTC (rev 61238)
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=2.6.27.39-lts
+KERNEL_VERSION=2.6.27-lts
 
 post_install () {
   # updating module dependencies



[arch-commits] Commit in kernel26-lts/repos (3 files)

2009-12-13 Thread Tobias Powalowski
Date: Sunday, December 13, 2009 @ 14:57:16
  Author: tpowa
Revision: 61239

Merged revisions 61238 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kernel26-lts/trunk


  r61238 | tpowa | 2009-12-13 19:56:34 + (So, 13 Dez 2009) | 2 lines
  
  upgpkg: kernel26-lts 2.6.27.41-1
  bump to latest version


Modified:
  kernel26-lts/repos/testing-x86_64/(properties)
  kernel26-lts/repos/testing-x86_64/PKGBUILD
  kernel26-lts/repos/testing-x86_64/kernel26-lts.install

--+
 PKGBUILD |   10 +++---
 kernel26-lts.install |2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)


Property changes on: kernel26-lts/repos/testing-x86_64
___
Modified: svnmerge-integrated
   - /kernel26-lts/trunk:1-59862
   + /kernel26-lts/trunk:1-61238

Modified: testing-x86_64/PKGBUILD
===
--- testing-x86_64/PKGBUILD 2009-12-13 19:56:34 UTC (rev 61238)
+++ testing-x86_64/PKGBUILD 2009-12-13 19:57:16 UTC (rev 61239)
@@ -4,8 +4,8 @@
 pkgname=kernel26-lts
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.27
-pkgver=${_basekernel}.39
-pkgrel=2
+pkgver=${_basekernel}.41
+pkgrel=1
 pkgdesc="The Linux Kernel and modules - stable longtime supported kernel 
package suitable for servers"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -24,7 +24,7 @@
linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch
linux-2.6.27.9-ext4-cap-check-delay.patch)
 md5sums=('b3e78977aa79d3754cb7f8143d7ddabd'
- '9ce07344e2d9e5fe77ca474e8f5bd83a'
+ 'a431f1f68badcfa5a6cecc6b4d52d319'
  '1ab067cf0534e3fe16578cf10c020b1b'
  '20534542a14fe041f392abe377dc746a'
  'a13338958d1b241f8dfd4c6014cad3d4'
@@ -52,6 +52,10 @@
   if [ "${_kernelname}" != "" ]; then
 sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" 
./.config
   fi
+  # remove the extraversion from Makefile
+  # this ensures our kernel version is always 2.6.XX-lts
+  # this way, minor kernel updates will not break external modules
+  sed -i 's|^EXTRAVERSION = .*$|EXTRAVERSION = |g' Makefile
   # get kernel version  
   make prepare
   _kernver="$(make kernelrelease)"

Modified: testing-x86_64/kernel26-lts.install
===
--- testing-x86_64/kernel26-lts.install 2009-12-13 19:56:34 UTC (rev 61238)
+++ testing-x86_64/kernel26-lts.install 2009-12-13 19:57:16 UTC (rev 61239)
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=2.6.27.39-lts
+KERNEL_VERSION=2.6.27-lts
 
 post_install () {
   # updating module dependencies



[arch-commits] Commit in kdevplatform/trunk (PKGBUILD)

2009-12-13 Thread Giovanni Scafora
Date: Sunday, December 13, 2009 @ 15:03:53
  Author: giovanni
Revision: 61240

Modified:
  kdevplatform/trunk/PKGBUILD   (contents, properties)

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 19:57:16 UTC (rev 61239)
+++ PKGBUILD2009-12-13 20:03:53 UTC (rev 61240)
@@ -1,4 +1,4 @@
-# $Id: $
+# $Id$
 # Maintainer: Andrea Scarpino 
 # Contributor: Giovanni Scafora 
 


Property changes on: kdevplatform/trunk/PKGBUILD
___
Added: svn:keywords
   + Id



[arch-commits] Commit in kdevplatform/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-13 Thread Giovanni Scafora
Date: Sunday, December 13, 2009 @ 15:04:35
  Author: giovanni
Revision: 61241

Merged revisions 61236,61240 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdevplatform/trunk


  r61236 | andrea | 2009-12-13 11:16:19 -0800 (dom, 13 dic 2009) | 2 lines
  
  upgpkg: kdevplatform 0.9.97-1
  upstream release

  r61240 | giovanni | 2009-12-13 12:03:53 -0800 (dom, 13 dic 2009) | 1 line


Modified:
  kdevplatform/repos/extra-x86_64/  (properties)
  kdevplatform/repos/extra-x86_64/PKGBUILD  (contents, properties)

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)


Property changes on: kdevplatform/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /kdevplatform/trunk:1-57755
   + /kdevplatform/trunk:1-61240

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-13 20:03:53 UTC (rev 61240)
+++ extra-x86_64/PKGBUILD   2009-12-13 20:04:35 UTC (rev 61241)
@@ -1,9 +1,9 @@
-# $Id: $
+# $Id$
 # Maintainer: Andrea Scarpino 
 # Contributor: Giovanni Scafora 
 
 pkgname=kdevplatform
-pkgver=0.9.96
+pkgver=0.9.97
 pkgrel=1
 pkgdesc="A C/C++ development platform for KDE"
 arch=('i686' 'x86_64')
@@ -12,12 +12,11 @@
 depends=('kdelibs' 'boost' 'subversion' 'commoncpp2')
 optdepends=("kdesdk-kompare: difference checking")
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/unstable/kdevelop/3.9.96/src/${pkgname}-${pkgver}.tar.bz2";)
-md5sums=('b7f560cf65df891e38a5551bf93e7056')
+source=("http://download.kde.org/unstable/kdevelop/3.9.97/src/${pkgname}-${pkgver}.tar.bz2";)
+md5sums=('1f7136eb3a1b314a327a24af58afe8c6')
 
 build() {
   cd ${srcdir}
-#  sed -i "s:38:39:g" $pkgname-$pkgver/plugins/classbrowser/CMakeLists.txt
   mkdir build
   cd build 
   cmake ../${pkgname}-${pkgver} \


Property changes on: kdevplatform/repos/extra-x86_64/PKGBUILD
___
Added: svn:keywords
   + Id



[arch-commits] Commit in kernel26-lts/repos (3 files)

2009-12-13 Thread Tobias Powalowski
Date: Sunday, December 13, 2009 @ 15:08:15
  Author: tpowa
Revision: 61242

Merged revisions 61238 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kernel26-lts/trunk


  r61238 | tpowa | 2009-12-13 19:56:34 + (So, 13 Dez 2009) | 2 lines
  
  upgpkg: kernel26-lts 2.6.27.41-1
  bump to latest version


Modified:
  kernel26-lts/repos/testing-i686/  (properties)
  kernel26-lts/repos/testing-i686/PKGBUILD
  kernel26-lts/repos/testing-i686/kernel26-lts.install

--+
 PKGBUILD |   10 +++---
 kernel26-lts.install |2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)


Property changes on: kernel26-lts/repos/testing-i686
___
Modified: svnmerge-integrated
   - /kernel26-lts/trunk:1-59860
   + /kernel26-lts/trunk:1-61241

Modified: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2009-12-13 20:04:35 UTC (rev 61241)
+++ testing-i686/PKGBUILD   2009-12-13 20:08:15 UTC (rev 61242)
@@ -4,8 +4,8 @@
 pkgname=kernel26-lts
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.27
-pkgver=${_basekernel}.39
-pkgrel=2
+pkgver=${_basekernel}.41
+pkgrel=1
 pkgdesc="The Linux Kernel and modules - stable longtime supported kernel 
package suitable for servers"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -24,7 +24,7 @@
linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch
linux-2.6.27.9-ext4-cap-check-delay.patch)
 md5sums=('b3e78977aa79d3754cb7f8143d7ddabd'
- '9ce07344e2d9e5fe77ca474e8f5bd83a'
+ 'a431f1f68badcfa5a6cecc6b4d52d319'
  '1ab067cf0534e3fe16578cf10c020b1b'
  '20534542a14fe041f392abe377dc746a'
  'a13338958d1b241f8dfd4c6014cad3d4'
@@ -52,6 +52,10 @@
   if [ "${_kernelname}" != "" ]; then
 sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" 
./.config
   fi
+  # remove the extraversion from Makefile
+  # this ensures our kernel version is always 2.6.XX-lts
+  # this way, minor kernel updates will not break external modules
+  sed -i 's|^EXTRAVERSION = .*$|EXTRAVERSION = |g' Makefile
   # get kernel version  
   make prepare
   _kernver="$(make kernelrelease)"

Modified: testing-i686/kernel26-lts.install
===
--- testing-i686/kernel26-lts.install   2009-12-13 20:04:35 UTC (rev 61241)
+++ testing-i686/kernel26-lts.install   2009-12-13 20:08:15 UTC (rev 61242)
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=2.6.27.39-lts
+KERNEL_VERSION=2.6.27-lts
 
 post_install () {
   # updating module dependencies



[arch-commits] Commit in kdevelop/trunk (PKGBUILD)

2009-12-13 Thread Giovanni Scafora
Date: Sunday, December 13, 2009 @ 15:38:57
  Author: giovanni
Revision: 61243

upgpkg: kdevelop 3.9.97-1
upstream release

Modified:
  kdevelop/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 20:08:15 UTC (rev 61242)
+++ PKGBUILD2009-12-13 20:38:57 UTC (rev 61243)
@@ -3,16 +3,16 @@
 # Contributor: Giovanni Scafora 
 
 pkgname=kdevelop
-pkgver=3.9.96
+pkgver=3.9.97
 pkgrel=1
 pkgdesc="A C/C++ development environment for KDE"
 arch=('i686' 'x86_64')
 url="http://www.kdevelop.org/";
 license=('GPL')
-depends=('kdebase-workspace' 'kdevplatform>=0.9.96')
+depends=('kdebase-workspace' 'kdevplatform>=0.9.97')
 makedepends=('cmake' 'automoc4' 'perl')
 
source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";)
-md5sums=('81a3c07dd40c59473fd8f657ed86c725')
+md5sums=('260b4eae5962c1e57941ebbb64b42bb8')
 
 build() {
   cd ${srcdir}



[arch-commits] Commit in kdevelop/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-13 Thread Giovanni Scafora
Date: Sunday, December 13, 2009 @ 15:39:34
  Author: giovanni
Revision: 61244

Merged revisions 61243 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdevelop/trunk


  r61243 | giovanni | 2009-12-13 12:38:57 -0800 (dom, 13 dic 2009) | 2 lines
  
  upgpkg: kdevelop 3.9.97-1
  upstream release


Modified:
  kdevelop/repos/extra-x86_64/  (properties)
  kdevelop/repos/extra-x86_64/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


Property changes on: kdevelop/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /kdevelop/trunk:1-57760
   + /kdevelop/trunk:1-61243

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-13 20:38:57 UTC (rev 61243)
+++ extra-x86_64/PKGBUILD   2009-12-13 20:39:34 UTC (rev 61244)
@@ -3,16 +3,16 @@
 # Contributor: Giovanni Scafora 
 
 pkgname=kdevelop
-pkgver=3.9.96
+pkgver=3.9.97
 pkgrel=1
 pkgdesc="A C/C++ development environment for KDE"
 arch=('i686' 'x86_64')
 url="http://www.kdevelop.org/";
 license=('GPL')
-depends=('kdebase-workspace' 'kdevplatform>=0.9.96')
+depends=('kdebase-workspace' 'kdevplatform>=0.9.97')
 makedepends=('cmake' 'automoc4' 'perl')
 
source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";)
-md5sums=('81a3c07dd40c59473fd8f657ed86c725')
+md5sums=('260b4eae5962c1e57941ebbb64b42bb8')
 
 build() {
   cd ${srcdir}



[arch-commits] Commit in chromium/repos (4 files)

2009-12-13 Thread Pierre Schmitz
Date: Sunday, December 13, 2009 @ 16:10:22
  Author: pierre
Revision: 61245

Merged revisions 61235 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/chromium/trunk


  r61235 | pierre | 2009-12-13 20:13:26 +0100 (So, 13 Dez 2009) | 1 line
  
   


Added:
  chromium/repos/testing-i686/ffmpeg_branding_mime.patch
(from rev 61235, chromium/trunk/ffmpeg_branding_mime.patch)
Modified:
  chromium/repos/testing-i686/  (properties)
  chromium/repos/testing-i686/PKGBUILD  (contents, properties)
  chromium/repos/testing-i686/chromium.sh

+
 PKGBUILD   |   31 +++
 chromium.sh|2 +-
 ffmpeg_branding_mime.patch |   29 +
 3 files changed, 49 insertions(+), 13 deletions(-)


Property changes on: chromium/repos/testing-i686
___
Modified: svnmerge-integrated
   - /chromium/trunk:1-61172
   + /chromium/trunk:1-61244

Modified: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2009-12-13 20:39:34 UTC (rev 61244)
+++ testing-i686/PKGBUILD   2009-12-13 21:10:22 UTC (rev 61245)
@@ -1,9 +1,9 @@
-# $Id: $
+# $Id$
 # Maintainer: Pierre Schmitz 
 
 pkgname=chromium
 pkgver=4.0.249.30
-pkgrel=1
+pkgrel=2
 pkgdesc='An open-source browser project that aims to build a safer, faster, 
and more stable way for all users to experience the web'
 arch=('i686' 'x86_64')
 url='http://www.chromium.org/'
@@ -16,27 +16,32 @@
 # downgrade from 4.0.267.0-2
 options=('force')
 source=("ftp://ftp.archlinux.org/other/chromium/chromium-${pkgver}.tar.xz";
-'chromium.desktop' 'chromium.sh' 'drop_sse2.patch')
+'chromium.desktop' 'chromium.sh'
+'drop_sse2.patch' 'ffmpeg_branding_mime.patch')
 md5sums=('59d316bd0f319178e1faffce7b2c81d2'
  '312df68330d6e288cbb2260bad620a32'
- 'a2fbdd2744e2dd92d3fa480815485725'
- 'a4a920d7b198c0a2f6e39d60ec75abd5')
+ '2689154f4a41511e136d9594a0086aa0'
+ 'a4a920d7b198c0a2f6e39d60ec75abd5'
+ '5e36845dd9e053da3bf5fc814e502d68')
 
 build() {
cd ${srcdir}/chromium-${pkgver}
 
-   export GYP_GENERATORS="make"
-   export BUILDTYPE="Release"
-   export GYP_DEFINES='gcc_version=44 no_strict_aliasing=1 
linux_sandbox_path=/usr/lib/chromium/chromium-sandbox'
+   export GYP_GENERATORS='make'
+   export BUILDTYPE='Release'
+   export GYP_DEFINES="gcc_version=44 \
+   no_strict_aliasing=1 \
+   linux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
+   linux_strip_binary=1 \
+   release_extra_cflags='${CFLAGS}' \
+   ffmpeg_branding=Chrome"
 
+   patch -p0 -i ${srcdir}/ffmpeg_branding_mime.patch || return 1
+
# i686 does not include SSE2
# see http://code.google.com/p/chromium/issues/detail?id=9007
patch -p0 -i ${srcdir}/drop_sse2.patch || return 1
 
-   if [ "${CARCH}" = 'x86_64' ]; then
-   GYP_DEFINES="${GYP_DEFINES} target_arch=x64"
-   fi
-
export PATH=./depot_tools/:$PATH
gclient runhooks --force || return 1
 
@@ -115,6 +120,8 @@
find . -name '.svn' -type d -exec rm -rf {} \;
find . -iname '*.dll' -delete
find . -iname '*.exe' -delete
+   find . -iname '*.o' -delete
+   find . -iname '*.nexe' -delete
 
cd ..
bsdtar cvJf $_current/chromium-$pkgver.tar.xz chromium-$pkgver


Property changes on: chromium/repos/testing-i686/PKGBUILD
___
Added: svn:keywords
   + Id

Modified: testing-i686/chromium.sh
===
--- testing-i686/chromium.sh2009-12-13 20:39:34 UTC (rev 61244)
+++ testing-i686/chromium.sh2009-12-13 21:10:22 UTC (rev 61245)
@@ -2,4 +2,4 @@
 export PATH=$PATH:/usr/lib/chromium
 export CHROME_WRAPPER=/usr/lib/chromium/chromium
 export CHROME_DESKTOP=chromium.desktop
-/usr/lib/chromium/chromium $@
+exec /usr/lib/chromium/chromium $@

Copied: chromium/repos/testing-i686/ffmpeg_branding_mime.patch (from rev 61235, 
chromium/trunk/ffmpeg_branding_mime.patch)
===
--- testing-i686/ffmpeg_branding_mime.patch (rev 0)
+++ testing-i686/ffmpeg_branding_mime.patch 2009-12-13 21:10:22 UTC (rev 
61245)
@@ -0,0 +1,29 @@
+--- src/net/base/mime_util.cc.orig 2009-12-13 19:09:26.467781732 +0100
 src/net/base/mime_util.cc  2009-12-13 19:10:14.967931404 +0100
+@@ -188,7 +188,6 @@
+   "audio/ogg",
+   "application/ogg",
+ 
+-#if defined(GOOGLE_CHROME_BUILD)
+   // MPEG-4.
+   "video/mp4",
+   "video/x-m4v",
+@@ -198,7 +197,6 @@
+   // MP3.
+   "audio/mp3",
+   "audio/x-mp3",
+-#endif
+ };
+ 
+ // List of supported codecs when passed in with .
+@@ -206,10

[arch-commits] Commit in chromium/repos (4 files)

2009-12-13 Thread Pierre Schmitz
Date: Sunday, December 13, 2009 @ 16:14:12
  Author: pierre
Revision: 61246

Merged revisions 61235 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/chromium/trunk


  r61235 | pierre | 2009-12-13 20:13:26 +0100 (So, 13 Dez 2009) | 1 line
  
   


Added:
  chromium/repos/testing-x86_64/ffmpeg_branding_mime.patch
(from rev 61235, chromium/trunk/ffmpeg_branding_mime.patch)
Modified:
  chromium/repos/testing-x86_64/(properties)
  chromium/repos/testing-x86_64/PKGBUILD(contents, properties)
  chromium/repos/testing-x86_64/chromium.sh

+
 PKGBUILD   |   31 +++
 chromium.sh|2 +-
 ffmpeg_branding_mime.patch |   29 +
 3 files changed, 49 insertions(+), 13 deletions(-)


Property changes on: chromium/repos/testing-x86_64
___
Modified: svnmerge-integrated
   - /chromium/trunk:1-61171
   + /chromium/trunk:1-61245

Modified: testing-x86_64/PKGBUILD
===
--- testing-x86_64/PKGBUILD 2009-12-13 21:10:22 UTC (rev 61245)
+++ testing-x86_64/PKGBUILD 2009-12-13 21:14:12 UTC (rev 61246)
@@ -1,9 +1,9 @@
-# $Id: $
+# $Id$
 # Maintainer: Pierre Schmitz 
 
 pkgname=chromium
 pkgver=4.0.249.30
-pkgrel=1
+pkgrel=2
 pkgdesc='An open-source browser project that aims to build a safer, faster, 
and more stable way for all users to experience the web'
 arch=('i686' 'x86_64')
 url='http://www.chromium.org/'
@@ -16,27 +16,32 @@
 # downgrade from 4.0.267.0-2
 options=('force')
 source=("ftp://ftp.archlinux.org/other/chromium/chromium-${pkgver}.tar.xz";
-'chromium.desktop' 'chromium.sh' 'drop_sse2.patch')
+'chromium.desktop' 'chromium.sh'
+'drop_sse2.patch' 'ffmpeg_branding_mime.patch')
 md5sums=('59d316bd0f319178e1faffce7b2c81d2'
  '312df68330d6e288cbb2260bad620a32'
- 'a2fbdd2744e2dd92d3fa480815485725'
- 'a4a920d7b198c0a2f6e39d60ec75abd5')
+ '2689154f4a41511e136d9594a0086aa0'
+ 'a4a920d7b198c0a2f6e39d60ec75abd5'
+ '5e36845dd9e053da3bf5fc814e502d68')
 
 build() {
cd ${srcdir}/chromium-${pkgver}
 
-   export GYP_GENERATORS="make"
-   export BUILDTYPE="Release"
-   export GYP_DEFINES='gcc_version=44 no_strict_aliasing=1 
linux_sandbox_path=/usr/lib/chromium/chromium-sandbox'
+   export GYP_GENERATORS='make'
+   export BUILDTYPE='Release'
+   export GYP_DEFINES="gcc_version=44 \
+   no_strict_aliasing=1 \
+   linux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
+   linux_strip_binary=1 \
+   release_extra_cflags='${CFLAGS}' \
+   ffmpeg_branding=Chrome"
 
+   patch -p0 -i ${srcdir}/ffmpeg_branding_mime.patch || return 1
+
# i686 does not include SSE2
# see http://code.google.com/p/chromium/issues/detail?id=9007
patch -p0 -i ${srcdir}/drop_sse2.patch || return 1
 
-   if [ "${CARCH}" = 'x86_64' ]; then
-   GYP_DEFINES="${GYP_DEFINES} target_arch=x64"
-   fi
-
export PATH=./depot_tools/:$PATH
gclient runhooks --force || return 1
 
@@ -115,6 +120,8 @@
find . -name '.svn' -type d -exec rm -rf {} \;
find . -iname '*.dll' -delete
find . -iname '*.exe' -delete
+   find . -iname '*.o' -delete
+   find . -iname '*.nexe' -delete
 
cd ..
bsdtar cvJf $_current/chromium-$pkgver.tar.xz chromium-$pkgver


Property changes on: chromium/repos/testing-x86_64/PKGBUILD
___
Added: svn:keywords
   + Id

Modified: testing-x86_64/chromium.sh
===
--- testing-x86_64/chromium.sh  2009-12-13 21:10:22 UTC (rev 61245)
+++ testing-x86_64/chromium.sh  2009-12-13 21:14:12 UTC (rev 61246)
@@ -2,4 +2,4 @@
 export PATH=$PATH:/usr/lib/chromium
 export CHROME_WRAPPER=/usr/lib/chromium/chromium
 export CHROME_DESKTOP=chromium.desktop
-/usr/lib/chromium/chromium $@
+exec /usr/lib/chromium/chromium $@

Copied: chromium/repos/testing-x86_64/ffmpeg_branding_mime.patch (from rev 
61235, chromium/trunk/ffmpeg_branding_mime.patch)
===
--- testing-x86_64/ffmpeg_branding_mime.patch   (rev 0)
+++ testing-x86_64/ffmpeg_branding_mime.patch   2009-12-13 21:14:12 UTC (rev 
61246)
@@ -0,0 +1,29 @@
+--- src/net/base/mime_util.cc.orig 2009-12-13 19:09:26.467781732 +0100
 src/net/base/mime_util.cc  2009-12-13 19:10:14.967931404 +0100
+@@ -188,7 +188,6 @@
+   "audio/ogg",
+   "application/ogg",
+ 
+-#if defined(GOOGLE_CHROME_BUILD)
+   // MPEG-4.
+   "video/mp4",
+   "video/x-m4v",
+@@ -198,7 +197,6 @@
+   // MP3.
+   "audio/mp3",
+   "audio/x-mp3",
+-#endif
+ };
+ 
+ // List of supported codecs whe

[arch-commits] Commit in prelink/trunk (PKGBUILD)

2009-12-13 Thread Giovanni Scafora
Date: Sunday, December 13, 2009 @ 17:05:11
  Author: giovanni
Revision: 61247

upgpkg: prelink 20091104-1
upstream release

Modified:
  prelink/trunk/PKGBUILD

--+
 PKGBUILD |   25 +
 1 file changed, 13 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 21:14:12 UTC (rev 61246)
+++ PKGBUILD2009-12-13 22:05:11 UTC (rev 61247)
@@ -3,24 +3,25 @@
 # Contributor: Rouslan Solomakhin 
 
 pkgname=prelink
-pkgver=20060213
-pkgrel=2
+pkgver=20091104
+pkgrel=1
 pkgdesc="ELF prelinking utility to speed up dynamic linking."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://people.redhat.com/jakub/prelink/";
 license=('GPL')
-depends=(libelf)
+depends=('libelf')
 backup=(etc/prelink.conf)
-source=($url/$pkgname-$pkgver.tar.bz2 prelink.conf)
-md5sums=('a3ee7d324ecdf2f1a7b8b95c01ee75fa' '0793ed49e9b31c125cba4d936c333cf6')
+source=(http://people.redhat.com/jakub/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+prelink.conf)
+md5sums=('ed9a1ba2960bad7e266497e308f863ae'
+ '0793ed49e9b31c125cba4d936c333cf6')
 
+build() {
+  cd "${srcdir}/${pkgname}"
 
-build() {
-  cd $srcdir/$pkgname
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
+  ./configure --prefix=/usr \
+  --mandir=/usr/share/man || return 1
   make || return 1
   make DESTDIR=$pkgdir install || return 1
-  install -D -m 0644 $srcdir/prelink.conf \
-  $pkgdir/etc/prelink.conf
+  install -D -m 0644 ${srcdir}/prelink.conf "${pkgdir}/etc/prelink.conf" || 
return 1
 }
-# vim: ts=2 sw=2 et ft=sh



[arch-commits] Commit in prelink/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-13 Thread Giovanni Scafora
Date: Sunday, December 13, 2009 @ 17:05:47
  Author: giovanni
Revision: 61248

Merged revisions 61247 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/prelink/trunk


  r61247 | giovanni | 2009-12-13 14:05:11 -0800 (dom, 13 dic 2009) | 2 lines
  
  upgpkg: prelink 20091104-1
  upstream release


Modified:
  prelink/repos/extra-i686/ (properties)
  prelink/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |   25 +
 1 file changed, 13 insertions(+), 12 deletions(-)


Property changes on: prelink/repos/extra-i686
___
Modified: svnmerge-integrated
   - /prelink/trunk:1-35770
   + /prelink/trunk:1-61247

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-13 22:05:11 UTC (rev 61247)
+++ extra-i686/PKGBUILD 2009-12-13 22:05:47 UTC (rev 61248)
@@ -3,24 +3,25 @@
 # Contributor: Rouslan Solomakhin 
 
 pkgname=prelink
-pkgver=20060213
-pkgrel=2
+pkgver=20091104
+pkgrel=1
 pkgdesc="ELF prelinking utility to speed up dynamic linking."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://people.redhat.com/jakub/prelink/";
 license=('GPL')
-depends=(libelf)
+depends=('libelf')
 backup=(etc/prelink.conf)
-source=($url/$pkgname-$pkgver.tar.bz2 prelink.conf)
-md5sums=('a3ee7d324ecdf2f1a7b8b95c01ee75fa' '0793ed49e9b31c125cba4d936c333cf6')
+source=(http://people.redhat.com/jakub/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+prelink.conf)
+md5sums=('ed9a1ba2960bad7e266497e308f863ae'
+ '0793ed49e9b31c125cba4d936c333cf6')
 
+build() {
+  cd "${srcdir}/${pkgname}"
 
-build() {
-  cd $srcdir/$pkgname
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
+  ./configure --prefix=/usr \
+  --mandir=/usr/share/man || return 1
   make || return 1
   make DESTDIR=$pkgdir install || return 1
-  install -D -m 0644 $srcdir/prelink.conf \
-  $pkgdir/etc/prelink.conf
+  install -D -m 0644 ${srcdir}/prelink.conf "${pkgdir}/etc/prelink.conf" || 
return 1
 }
-# vim: ts=2 sw=2 et ft=sh



[arch-commits] Commit in prelink/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-13 Thread Giovanni Scafora
Date: Sunday, December 13, 2009 @ 17:06:38
  Author: giovanni
Revision: 61249

Merged revisions 61247 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/prelink/trunk


  r61247 | giovanni | 2009-12-13 14:05:11 -0800 (dom, 13 dic 2009) | 2 lines
  
  upgpkg: prelink 20091104-1
  upstream release


Modified:
  prelink/repos/extra-x86_64/   (properties)
  prelink/repos/extra-x86_64/PKGBUILD

--+
 PKGBUILD |   25 +
 1 file changed, 13 insertions(+), 12 deletions(-)


Property changes on: prelink/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /prelink/trunk:1-35765
   + /prelink/trunk:1-61248

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-13 22:05:47 UTC (rev 61248)
+++ extra-x86_64/PKGBUILD   2009-12-13 22:06:38 UTC (rev 61249)
@@ -3,24 +3,25 @@
 # Contributor: Rouslan Solomakhin 
 
 pkgname=prelink
-pkgver=20060213
-pkgrel=2
+pkgver=20091104
+pkgrel=1
 pkgdesc="ELF prelinking utility to speed up dynamic linking."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://people.redhat.com/jakub/prelink/";
 license=('GPL')
-depends=(libelf)
+depends=('libelf')
 backup=(etc/prelink.conf)
-source=($url/$pkgname-$pkgver.tar.bz2 prelink.conf)
-md5sums=('a3ee7d324ecdf2f1a7b8b95c01ee75fa' '0793ed49e9b31c125cba4d936c333cf6')
+source=(http://people.redhat.com/jakub/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+prelink.conf)
+md5sums=('ed9a1ba2960bad7e266497e308f863ae'
+ '0793ed49e9b31c125cba4d936c333cf6')
 
+build() {
+  cd "${srcdir}/${pkgname}"
 
-build() {
-  cd $srcdir/$pkgname
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
+  ./configure --prefix=/usr \
+  --mandir=/usr/share/man || return 1
   make || return 1
   make DESTDIR=$pkgdir install || return 1
-  install -D -m 0644 $srcdir/prelink.conf \
-  $pkgdir/etc/prelink.conf
+  install -D -m 0644 ${srcdir}/prelink.conf "${pkgdir}/etc/prelink.conf" || 
return 1
 }
-# vim: ts=2 sw=2 et ft=sh



[arch-commits] Commit in kdevelop/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-13 Thread Andrea Scarpino
Date: Sunday, December 13, 2009 @ 19:04:24
  Author: andrea
Revision: 61250

Merged revisions 61243 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdevelop/trunk


  r61243 | giovanni | 2009-12-13 21:38:57 +0100 (Sun, 13 Dec 2009) | 2 lines
  
  upgpkg: kdevelop 3.9.97-1
  upstream release


Modified:
  kdevelop/repos/extra-i686/(properties)
  kdevelop/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


Property changes on: kdevelop/repos/extra-i686
___
Modified: svnmerge-integrated
   - /kdevelop/trunk:1-57738
   + /kdevelop/trunk:1-61249

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-13 22:06:38 UTC (rev 61249)
+++ extra-i686/PKGBUILD 2009-12-14 00:04:24 UTC (rev 61250)
@@ -3,16 +3,16 @@
 # Contributor: Giovanni Scafora 
 
 pkgname=kdevelop
-pkgver=3.9.96
+pkgver=3.9.97
 pkgrel=1
 pkgdesc="A C/C++ development environment for KDE"
 arch=('i686' 'x86_64')
 url="http://www.kdevelop.org/";
 license=('GPL')
-depends=('kdebase-workspace' 'kdevplatform>=0.9.96')
+depends=('kdebase-workspace' 'kdevplatform>=0.9.97')
 makedepends=('cmake' 'automoc4' 'perl')
 
source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";)
-md5sums=('81a3c07dd40c59473fd8f657ed86c725')
+md5sums=('260b4eae5962c1e57941ebbb64b42bb8')
 
 build() {
   cd ${srcdir}



[arch-commits] Commit in cpufrequtils/trunk (PKGBUILD cpufreq.confd cpufreq.rcd)

2009-12-13 Thread Giovanni Scafora
Date: Sunday, December 13, 2009 @ 20:45:41
  Author: giovanni
Revision: 61251

upgpkg: cpufrequtils 006-2
Added freq to set up the exact cpu frequency using it with userspace 
governor

Modified:
  cpufrequtils/trunk/PKGBUILD
  cpufrequtils/trunk/cpufreq.confd
  cpufrequtils/trunk/cpufreq.rcd

---+
 PKGBUILD  |7 ---
 cpufreq.confd |2 ++
 cpufreq.rcd   |3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-14 00:04:24 UTC (rev 61250)
+++ PKGBUILD2009-12-14 01:45:41 UTC (rev 61251)
@@ -1,10 +1,11 @@
 # $Id$
 # Maintainer: kevin 
 # Contributor: phrakture 
+# Contributor: SpepS 
 
 pkgname=cpufrequtils
 pkgver=006
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace tools for the kernel cpufreq subsystem"
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html";
@@ -16,8 +17,8 @@
 cpufreq.confd)
 options=(!libtool)
 md5sums=('124b0de8f3a4d672539a85ce13eed869'
- '7be9ea55db712327783162ba6f7659ab'
- '8335b8503376a3776da2ddc84043887c')
+ '8f56a79aacb61ad70b74649b694f8b73'
+ '1815e1769d5e5c8b754877a1f77266fa')
 
 build()
 {

Modified: cpufreq.confd
===
--- cpufreq.confd   2009-12-14 00:04:24 UTC (rev 61250)
+++ cpufreq.confd   2009-12-14 01:45:41 UTC (rev 61251)
@@ -8,3 +8,5 @@
 # valid suffixes: Hz, kHz (default), MHz, GHz, THz
 min_freq="2.25GHz"
 max_freq="3GHz"
+# use freq to set up the exact cpu frequency using it with userspace governor
+#freq=

Modified: cpufreq.rcd
===
--- cpufreq.rcd 2009-12-14 00:04:24 UTC (rev 61250)
+++ cpufreq.rcd 2009-12-14 01:45:41 UTC (rev 61251)
@@ -35,6 +35,9 @@
for cpu in $CPUS; do
stat_append " $cpu"
cpufreq-set -c $cpu $params
+   if [ "$freq" != "" ]; then
+   cpufreq-set -c $cpu -f $freq
+   fi
done
stat_done
else



[arch-commits] Commit in cpufrequtils/repos (4 files)

2009-12-13 Thread Giovanni Scafora
Date: Sunday, December 13, 2009 @ 20:46:18
  Author: giovanni
Revision: 61252

Merged revisions 61251 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/cpufrequtils/trunk


  r61251 | giovanni | 2009-12-13 17:45:41 -0800 (dom, 13 dic 2009) | 2 lines
  
  upgpkg: cpufrequtils 006-2
  Added freq to set up the exact cpu frequency using it with userspace 
governor


Modified:
  cpufrequtils/repos/extra-i686/(properties)
  cpufrequtils/repos/extra-i686/PKGBUILD
  cpufrequtils/repos/extra-i686/cpufreq.confd
  cpufrequtils/repos/extra-i686/cpufreq.rcd

---+
 PKGBUILD  |7 ---
 cpufreq.confd |2 ++
 cpufreq.rcd   |3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)


Property changes on: cpufrequtils/repos/extra-i686
___
Modified: svnmerge-integrated
   - /cpufrequtils/trunk:1-60264
   + /cpufrequtils/trunk:1-61251

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-14 01:45:41 UTC (rev 61251)
+++ extra-i686/PKGBUILD 2009-12-14 01:46:18 UTC (rev 61252)
@@ -1,10 +1,11 @@
 # $Id$
 # Maintainer: kevin 
 # Contributor: phrakture 
+# Contributor: SpepS 
 
 pkgname=cpufrequtils
 pkgver=006
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace tools for the kernel cpufreq subsystem"
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html";
@@ -16,8 +17,8 @@
 cpufreq.confd)
 options=(!libtool)
 md5sums=('124b0de8f3a4d672539a85ce13eed869'
- '7be9ea55db712327783162ba6f7659ab'
- '8335b8503376a3776da2ddc84043887c')
+ '8f56a79aacb61ad70b74649b694f8b73'
+ '1815e1769d5e5c8b754877a1f77266fa')
 
 build()
 {

Modified: extra-i686/cpufreq.confd
===
--- extra-i686/cpufreq.confd2009-12-14 01:45:41 UTC (rev 61251)
+++ extra-i686/cpufreq.confd2009-12-14 01:46:18 UTC (rev 61252)
@@ -8,3 +8,5 @@
 # valid suffixes: Hz, kHz (default), MHz, GHz, THz
 min_freq="2.25GHz"
 max_freq="3GHz"
+# use freq to set up the exact cpu frequency using it with userspace governor
+#freq=

Modified: extra-i686/cpufreq.rcd
===
--- extra-i686/cpufreq.rcd  2009-12-14 01:45:41 UTC (rev 61251)
+++ extra-i686/cpufreq.rcd  2009-12-14 01:46:18 UTC (rev 61252)
@@ -35,6 +35,9 @@
for cpu in $CPUS; do
stat_append " $cpu"
cpufreq-set -c $cpu $params
+   if [ "$freq" != "" ]; then
+   cpufreq-set -c $cpu -f $freq
+   fi
done
stat_done
else



[arch-commits] Commit in cpufrequtils/repos (4 files)

2009-12-13 Thread Giovanni Scafora
Date: Sunday, December 13, 2009 @ 20:47:04
  Author: giovanni
Revision: 61253

Merged revisions 61251 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/cpufrequtils/trunk


  r61251 | giovanni | 2009-12-13 17:45:41 -0800 (dom, 13 dic 2009) | 2 lines
  
  upgpkg: cpufrequtils 006-2
  Added freq to set up the exact cpu frequency using it with userspace 
governor


Modified:
  cpufrequtils/repos/extra-x86_64/  (properties)
  cpufrequtils/repos/extra-x86_64/PKGBUILD
  cpufrequtils/repos/extra-x86_64/cpufreq.confd
  cpufrequtils/repos/extra-x86_64/cpufreq.rcd

---+
 PKGBUILD  |7 ---
 cpufreq.confd |2 ++
 cpufreq.rcd   |3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)


Property changes on: cpufrequtils/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /cpufrequtils/trunk:1-60265
   + /cpufrequtils/trunk:1-61252

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-14 01:46:18 UTC (rev 61252)
+++ extra-x86_64/PKGBUILD   2009-12-14 01:47:04 UTC (rev 61253)
@@ -1,10 +1,11 @@
 # $Id$
 # Maintainer: kevin 
 # Contributor: phrakture 
+# Contributor: SpepS 
 
 pkgname=cpufrequtils
 pkgver=006
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace tools for the kernel cpufreq subsystem"
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html";
@@ -16,8 +17,8 @@
 cpufreq.confd)
 options=(!libtool)
 md5sums=('124b0de8f3a4d672539a85ce13eed869'
- '7be9ea55db712327783162ba6f7659ab'
- '8335b8503376a3776da2ddc84043887c')
+ '8f56a79aacb61ad70b74649b694f8b73'
+ '1815e1769d5e5c8b754877a1f77266fa')
 
 build()
 {

Modified: extra-x86_64/cpufreq.confd
===
--- extra-x86_64/cpufreq.confd  2009-12-14 01:46:18 UTC (rev 61252)
+++ extra-x86_64/cpufreq.confd  2009-12-14 01:47:04 UTC (rev 61253)
@@ -8,3 +8,5 @@
 # valid suffixes: Hz, kHz (default), MHz, GHz, THz
 min_freq="2.25GHz"
 max_freq="3GHz"
+# use freq to set up the exact cpu frequency using it with userspace governor
+#freq=

Modified: extra-x86_64/cpufreq.rcd
===
--- extra-x86_64/cpufreq.rcd2009-12-14 01:46:18 UTC (rev 61252)
+++ extra-x86_64/cpufreq.rcd2009-12-14 01:47:04 UTC (rev 61253)
@@ -35,6 +35,9 @@
for cpu in $CPUS; do
stat_append " $cpu"
cpufreq-set -c $cpu $params
+   if [ "$freq" != "" ]; then
+   cpufreq-set -c $cpu -f $freq
+   fi
done
stat_done
else



[arch-commits] Commit in ntp/trunk (PKGBUILD)

2009-12-13 Thread Eric Bélanger
Date: Sunday, December 13, 2009 @ 21:07:12
  Author: eric
Revision: 61254

upgpkg: ntp 4.2.6-2
fixed man page conflict (close FS#17485)

Modified:
  ntp/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-14 01:47:04 UTC (rev 61253)
+++ PKGBUILD2009-12-14 02:07:12 UTC (rev 61254)
@@ -2,7 +2,7 @@
 # Maintainer: dorphell 
 pkgname=ntp
 pkgver=4.2.6
-pkgrel=1
+pkgrel=2
 pkgdesc="NTP (Network Time Protocol) tries to keep servers in sync"
 arch=(i686 x86_64)
 license=('custom')
@@ -60,6 +60,7 @@
   install -d "$pkgdir"/usr/share/man/man{5,8}
   install -m644 man/man5/* "$pkgdir/usr/share/man/man5/" || return 1
   install -m644 man/man8/* "$pkgdir/usr/share/man/man8/" || return 1
+  mv "$pkgdir/usr/share/man/man8/ntpd.8" 
"$pkgdir/usr/share/man/man8/ntp-ntpd.8" || return 1
   cd ..
 
   # install sample configs



[arch-commits] Commit in ntp/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-13 Thread Eric Bélanger
Date: Sunday, December 13, 2009 @ 21:07:32
  Author: eric
Revision: 61255

Merged revisions 61254 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/ntp/trunk


  r61254 | eric | 2009-12-13 21:07:12 -0500 (Sun, 13 Dec 2009) | 2 lines
  
  upgpkg: ntp 4.2.6-2
  fixed man page conflict (close FS#17485)


Modified:
  ntp/repos/extra-i686/ (properties)
  ntp/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


Property changes on: ntp/repos/extra-i686
___
Modified: svnmerge-integrated
   - /ntp/trunk:1-61219
   + /ntp/trunk:1-61254

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-14 02:07:12 UTC (rev 61254)
+++ extra-i686/PKGBUILD 2009-12-14 02:07:32 UTC (rev 61255)
@@ -2,7 +2,7 @@
 # Maintainer: dorphell 
 pkgname=ntp
 pkgver=4.2.6
-pkgrel=1
+pkgrel=2
 pkgdesc="NTP (Network Time Protocol) tries to keep servers in sync"
 arch=(i686 x86_64)
 license=('custom')
@@ -60,6 +60,7 @@
   install -d "$pkgdir"/usr/share/man/man{5,8}
   install -m644 man/man5/* "$pkgdir/usr/share/man/man5/" || return 1
   install -m644 man/man8/* "$pkgdir/usr/share/man/man8/" || return 1
+  mv "$pkgdir/usr/share/man/man8/ntpd.8" 
"$pkgdir/usr/share/man/man8/ntp-ntpd.8" || return 1
   cd ..
 
   # install sample configs



[arch-commits] Commit in ntp/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-13 Thread Eric Bélanger
Date: Sunday, December 13, 2009 @ 21:08:09
  Author: eric
Revision: 61256

Merged revisions 61254 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/ntp/trunk


  r61254 | eric | 2009-12-13 21:07:12 -0500 (Sun, 13 Dec 2009) | 2 lines
  
  upgpkg: ntp 4.2.6-2
  fixed man page conflict (close FS#17485)


Modified:
  ntp/repos/extra-x86_64/   (properties)
  ntp/repos/extra-x86_64/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


Property changes on: ntp/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /ntp/trunk:1-61220
   + /ntp/trunk:1-61255

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-14 02:07:32 UTC (rev 61255)
+++ extra-x86_64/PKGBUILD   2009-12-14 02:08:09 UTC (rev 61256)
@@ -2,7 +2,7 @@
 # Maintainer: dorphell 
 pkgname=ntp
 pkgver=4.2.6
-pkgrel=1
+pkgrel=2
 pkgdesc="NTP (Network Time Protocol) tries to keep servers in sync"
 arch=(i686 x86_64)
 license=('custom')
@@ -60,6 +60,7 @@
   install -d "$pkgdir"/usr/share/man/man{5,8}
   install -m644 man/man5/* "$pkgdir/usr/share/man/man5/" || return 1
   install -m644 man/man8/* "$pkgdir/usr/share/man/man8/" || return 1
+  mv "$pkgdir/usr/share/man/man8/ntpd.8" 
"$pkgdir/usr/share/man/man8/ntp-ntpd.8" || return 1
   cd ..
 
   # install sample configs



[arch-commits] Commit in cyrus-sasl/trunk (PKGBUILD)

2009-12-13 Thread Eric Bélanger
Date: Sunday, December 13, 2009 @ 21:29:46
  Author: eric
Revision: 61257

upgpkg: cyrus-sasl 2.1.23-3
Rebuilt against heimdal 1.3.1 (close FS#17493)

Modified:
  cyrus-sasl/trunk/PKGBUILD

--+
 PKGBUILD |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-14 02:08:09 UTC (rev 61256)
+++ PKGBUILD2009-12-14 02:29:46 UTC (rev 61257)
@@ -3,12 +3,12 @@
 
 pkgname=cyrus-sasl
 pkgver=2.1.23
-pkgrel=2
+pkgrel=3
 pkgdesc="SASL authentication daemon"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://asg.web.cmu.edu/cyrus/download/";
-depends=('pam>=1.0.1-2' 'heimdal>=1.2-1' 'libldap' 
'cyrus-sasl-plugins>=2.1.22-7' 'db>=4.7')
+depends=('pam>=1.0.1-2' 'heimdal>=1.3.1' 'libldap' 
'cyrus-sasl-plugins>=2.1.22-7' 'db>=4.7')
 replaces=(cyrus-sasl-mysql cyrus-sasl-pgsql)
 conflicts=(cyrus-sasl-mysql cyrus-sasl-pgsql)
 backup=(etc/conf.d/saslauthd)
@@ -20,18 +20,18 @@
  '96d8a2f6189501f8044838e04d5cae7f')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --mandir=/usr/share/man \
 --with-ldap=/usr --with-saslauthd=/var/run/saslauthd
   cd saslauthd
   make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  make testsaslauthd
-  install -m755 testsaslauthd ${pkgdir}/usr/sbin || return 1
+  make DESTDIR="${pkgdir}" install || return 1
+  make testsaslauthd || return 1
+  install -m755 testsaslauthd "${pkgdir}/usr/sbin" || return 1
 
-  install -dm766 ${pkgdir}/var/run/saslauthd
-  install -Dm755 ${srcdir}/saslauthd ${pkgdir}/etc/rc.d/saslauthd
-  install -Dm644 ${srcdir}/saslauthd.conf.d ${pkgdir}/etc/conf.d/saslauthd
+  install -dm766 "${pkgdir}/var/run/saslauthd"
+  install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd"
+  install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
 
-  install -Dm644 ../COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl/COPYING
+  install -Dm644 ../COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/COPYING"
 }



[arch-commits] Commit in cyrus-sasl/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-13 Thread Eric Bélanger
Date: Sunday, December 13, 2009 @ 21:30:05
  Author: eric
Revision: 61258

Merged revisions 61257 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/cyrus-sasl/trunk


  r61257 | eric | 2009-12-13 21:29:46 -0500 (Sun, 13 Dec 2009) | 2 lines
  
  upgpkg: cyrus-sasl 2.1.23-3
  Rebuilt against heimdal 1.3.1 (close FS#17493)


Modified:
  cyrus-sasl/repos/extra-i686/  (properties)
  cyrus-sasl/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)


Property changes on: cyrus-sasl/repos/extra-i686
___
Modified: svnmerge-integrated
   - /cyrus-sasl/trunk:1-57150
   + /cyrus-sasl/trunk:1-61257

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-14 02:29:46 UTC (rev 61257)
+++ extra-i686/PKGBUILD 2009-12-14 02:30:05 UTC (rev 61258)
@@ -3,12 +3,12 @@
 
 pkgname=cyrus-sasl
 pkgver=2.1.23
-pkgrel=2
+pkgrel=3
 pkgdesc="SASL authentication daemon"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://asg.web.cmu.edu/cyrus/download/";
-depends=('pam>=1.0.1-2' 'heimdal>=1.2-1' 'libldap' 
'cyrus-sasl-plugins>=2.1.22-7' 'db>=4.7')
+depends=('pam>=1.0.1-2' 'heimdal>=1.3.1' 'libldap' 
'cyrus-sasl-plugins>=2.1.22-7' 'db>=4.7')
 replaces=(cyrus-sasl-mysql cyrus-sasl-pgsql)
 conflicts=(cyrus-sasl-mysql cyrus-sasl-pgsql)
 backup=(etc/conf.d/saslauthd)
@@ -20,18 +20,18 @@
  '96d8a2f6189501f8044838e04d5cae7f')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --mandir=/usr/share/man \
 --with-ldap=/usr --with-saslauthd=/var/run/saslauthd
   cd saslauthd
   make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  make testsaslauthd
-  install -m755 testsaslauthd ${pkgdir}/usr/sbin || return 1
+  make DESTDIR="${pkgdir}" install || return 1
+  make testsaslauthd || return 1
+  install -m755 testsaslauthd "${pkgdir}/usr/sbin" || return 1
 
-  install -dm766 ${pkgdir}/var/run/saslauthd
-  install -Dm755 ${srcdir}/saslauthd ${pkgdir}/etc/rc.d/saslauthd
-  install -Dm644 ${srcdir}/saslauthd.conf.d ${pkgdir}/etc/conf.d/saslauthd
+  install -dm766 "${pkgdir}/var/run/saslauthd"
+  install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd"
+  install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
 
-  install -Dm644 ../COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl/COPYING
+  install -Dm644 ../COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/COPYING"
 }



[arch-commits] Commit in cyrus-sasl/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-13 Thread Eric Bélanger
Date: Sunday, December 13, 2009 @ 21:30:27
  Author: eric
Revision: 61259

Merged revisions 61257 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/cyrus-sasl/trunk


  r61257 | eric | 2009-12-13 21:29:46 -0500 (Sun, 13 Dec 2009) | 2 lines
  
  upgpkg: cyrus-sasl 2.1.23-3
  Rebuilt against heimdal 1.3.1 (close FS#17493)


Modified:
  cyrus-sasl/repos/extra-x86_64/(properties)
  cyrus-sasl/repos/extra-x86_64/PKGBUILD

--+
 PKGBUILD |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)


Property changes on: cyrus-sasl/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /cyrus-sasl/trunk:1-57113
   + /cyrus-sasl/trunk:1-61258

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-14 02:30:05 UTC (rev 61258)
+++ extra-x86_64/PKGBUILD   2009-12-14 02:30:27 UTC (rev 61259)
@@ -3,12 +3,12 @@
 
 pkgname=cyrus-sasl
 pkgver=2.1.23
-pkgrel=2
+pkgrel=3
 pkgdesc="SASL authentication daemon"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://asg.web.cmu.edu/cyrus/download/";
-depends=('pam>=1.0.1-2' 'heimdal>=1.2-1' 'libldap' 
'cyrus-sasl-plugins>=2.1.22-7' 'db>=4.7')
+depends=('pam>=1.0.1-2' 'heimdal>=1.3.1' 'libldap' 
'cyrus-sasl-plugins>=2.1.22-7' 'db>=4.7')
 replaces=(cyrus-sasl-mysql cyrus-sasl-pgsql)
 conflicts=(cyrus-sasl-mysql cyrus-sasl-pgsql)
 backup=(etc/conf.d/saslauthd)
@@ -20,18 +20,18 @@
  '96d8a2f6189501f8044838e04d5cae7f')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --mandir=/usr/share/man \
 --with-ldap=/usr --with-saslauthd=/var/run/saslauthd
   cd saslauthd
   make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  make testsaslauthd
-  install -m755 testsaslauthd ${pkgdir}/usr/sbin || return 1
+  make DESTDIR="${pkgdir}" install || return 1
+  make testsaslauthd || return 1
+  install -m755 testsaslauthd "${pkgdir}/usr/sbin" || return 1
 
-  install -dm766 ${pkgdir}/var/run/saslauthd
-  install -Dm755 ${srcdir}/saslauthd ${pkgdir}/etc/rc.d/saslauthd
-  install -Dm644 ${srcdir}/saslauthd.conf.d ${pkgdir}/etc/conf.d/saslauthd
+  install -dm766 "${pkgdir}/var/run/saslauthd"
+  install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd"
+  install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
 
-  install -Dm644 ../COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl/COPYING
+  install -Dm644 ../COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/COPYING"
 }