[arch-commits] Commit in xorg-server/trunk (4 files)

2011-11-16 Thread Jan de Groot
Date: Wednesday, November 16, 2011 @ 06:32:26
  Author: jgc
Revision: 142828

- Fix segmentation fault due to race conditions in Record extension (FS#24653)
- Update git-fixes, add commit that fixes segfault-on-exit
- Add patch to fix passive grabs with XI2 clients

Added:
  xorg-server/trunk/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch
  xorg-server/trunk/xserver-1.11.2-record-crasher.patch
Modified:
  xorg-server/trunk/PKGBUILD
  xorg-server/trunk/git-fixes.patch

+
 PKGBUILD   |   18 
 Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch |   31 +
 git-fixes.patch|   44 ++
 xserver-1.11.2-record-crasher.patch|  241 +++
 4 files changed, 331 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-16 03:17:22 UTC (rev 142827)
+++ PKGBUILD2011-11-16 11:32:26 UTC (rev 142828)
@@ -4,17 +4,19 @@
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 
'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
 pkgver=1.11.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom')
 url=http://xorg.freedesktop.org;
-makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 
'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 
'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 
'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 
'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 
'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto')
+makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 
'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 
'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 
'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 
'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 
'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'udev' 
'libgcrypt')
 options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
 autoconfig-nvidia.patch
 autoconfig-sis.patch
 revert-trapezoids.patch
 git-fixes.patch
+xserver-1.11.2-record-crasher.patch
+Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch
 xvfb-run
 xvfb-run.1
 10-quirks.conf)
@@ -22,7 +24,9 @@
  '6c7e87d63ac4b535e19a80c89d0cf091'
  'f8194638ca4872c2b0a67862a70bcebf'
  'f6c84f4936f8e00abdfbd9fb4eda83fb'
- 'b9cdb3855cc2b2e974a98b9a20d1ec2b'
+ '6fb42ec979ecd6125b6599f54dc00d14'
+ '3f9de4dbfee2da90167192d8ca9eb2b4'
+ '47f9b979fe38043b42ff866fd0d0'
  '52fd3effd80d7bc6c1660d4ecf23d31c'
  '376c70308715cd2643f7bff936d9934b'
  'd4f7dfc6be4ef4e2c6dd7632a9d88abe')
@@ -42,6 +46,14 @@
   # Add post-release patches from 1.11 branch
   patch -Np1 -i ${srcdir}/git-fixes.patch
 
+  # From Fedora.
+  # Upstream URL: http://patchwork.freedesktop.org/patch/7866/
+  patch -Np1 -i ${srcdir}/xserver-1.11.2-record-crasher.patch
+
+  # From Fedora.
+  # Upstream URL: https://bugs.freedesktop.org/show_bug.cgi?id=42298
+  patch -Np1 -i 
${srcdir}/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch
+
   autoreconf -fi
   ./configure --prefix=/usr \
   --enable-ipv6 \

Added: Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch
===
--- Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch  
(rev 0)
+++ Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch  2011-11-16 
11:32:26 UTC (rev 142828)
@@ -0,0 +1,31 @@
+From 97f2af5876dab0dfab06be735416f3fc950ed39e Mon Sep 17 00:00:00 2001
+From: Peter Hutterer peter.hutte...@who-t.net
+Date: Thu, 27 Oct 2011 11:03:39 +1000
+Subject: [PATCH] Xi: allow passive keygrabs on the XIAll(Master)Devices fake
+ devices
+
+They don't have a KeyClassRec, but we must still allow passive grabs on
+them.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Tested-by: Bastien Nocera had...@hadess.net
+---
+ Xi/exevents.c |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Xi/exevents.c b/Xi/exevents.c
+index 053c76f..edf2c39 100644
+--- a/Xi/exevents.c
 b/Xi/exevents.c
+@@ -1495,7 +1495,7 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr 
modifier_device,
+ rc = CheckGrabValues(client, param);
+ if (rc != Success)
+ return rc;
+-if (k == NULL)
++if ((dev-id != XIAllDevices  dev-id != XIAllMasterDevices)  k == 
NULL)
+   return BadMatch;
+   

[arch-commits] Commit in xorg-server/repos (22 files)

2011-11-16 Thread Jan de Groot
Date: Wednesday, November 16, 2011 @ 06:34:48
  Author: jgc
Revision: 142829

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  xorg-server/repos/testing-i686/
  xorg-server/repos/testing-i686/10-quirks.conf
(from rev 142828, xorg-server/trunk/10-quirks.conf)
  xorg-server/repos/testing-i686/PKGBUILD
(from rev 142828, xorg-server/trunk/PKGBUILD)
  
xorg-server/repos/testing-i686/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch
(from rev 142828, 
xorg-server/trunk/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch)
  xorg-server/repos/testing-i686/autoconfig-nvidia.patch
(from rev 142828, xorg-server/trunk/autoconfig-nvidia.patch)
  xorg-server/repos/testing-i686/autoconfig-sis.patch
(from rev 142828, xorg-server/trunk/autoconfig-sis.patch)
  xorg-server/repos/testing-i686/git-fixes.patch
(from rev 142828, xorg-server/trunk/git-fixes.patch)
  xorg-server/repos/testing-i686/revert-trapezoids.patch
(from rev 142828, xorg-server/trunk/revert-trapezoids.patch)
  xorg-server/repos/testing-i686/xserver-1.11.2-record-crasher.patch
(from rev 142828, xorg-server/trunk/xserver-1.11.2-record-crasher.patch)
  xorg-server/repos/testing-i686/xvfb-run
(from rev 142828, xorg-server/trunk/xvfb-run)
  xorg-server/repos/testing-i686/xvfb-run.1
(from rev 142828, xorg-server/trunk/xvfb-run.1)
  xorg-server/repos/testing-x86_64/
  xorg-server/repos/testing-x86_64/10-quirks.conf
(from rev 142828, xorg-server/trunk/10-quirks.conf)
  xorg-server/repos/testing-x86_64/PKGBUILD
(from rev 142828, xorg-server/trunk/PKGBUILD)
  
xorg-server/repos/testing-x86_64/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch
(from rev 142828, 
xorg-server/trunk/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch)
  xorg-server/repos/testing-x86_64/autoconfig-nvidia.patch
(from rev 142828, xorg-server/trunk/autoconfig-nvidia.patch)
  xorg-server/repos/testing-x86_64/autoconfig-sis.patch
(from rev 142828, xorg-server/trunk/autoconfig-sis.patch)
  xorg-server/repos/testing-x86_64/git-fixes.patch
(from rev 142828, xorg-server/trunk/git-fixes.patch)
  xorg-server/repos/testing-x86_64/revert-trapezoids.patch
(from rev 142828, xorg-server/trunk/revert-trapezoids.patch)
  xorg-server/repos/testing-x86_64/xserver-1.11.2-record-crasher.patch
(from rev 142828, xorg-server/trunk/xserver-1.11.2-record-crasher.patch)
  xorg-server/repos/testing-x86_64/xvfb-run
(from rev 142828, xorg-server/trunk/xvfb-run)
  xorg-server/repos/testing-x86_64/xvfb-run.1
(from rev 142828, xorg-server/trunk/xvfb-run.1)

---+
 testing-i686/10-quirks.conf   |   
10 
 testing-i686/PKGBUILD |  
205 +++
 testing-i686/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch   |   
31 +
 testing-i686/autoconfig-nvidia.patch  |   
29 +
 testing-i686/autoconfig-sis.patch |   
19 
 testing-i686/git-fixes.patch  |  
161 +
 testing-i686/revert-trapezoids.patch  |  
179 ++
 testing-i686/xserver-1.11.2-record-crasher.patch  |  
241 
 testing-i686/xvfb-run |  
180 ++
 testing-i686/xvfb-run.1   |  
282 ++
 testing-x86_64/10-quirks.conf |   
10 
 testing-x86_64/PKGBUILD   |  
205 +++
 testing-x86_64/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch |   
31 +
 testing-x86_64/autoconfig-nvidia.patch|   
29 +
 testing-x86_64/autoconfig-sis.patch   |   
19 
 testing-x86_64/git-fixes.patch|  
161 +
 testing-x86_64/revert-trapezoids.patch|  
179 ++
 testing-x86_64/xserver-1.11.2-record-crasher.patch|  
241 
 testing-x86_64/xvfb-run   |  
180 ++
 testing-x86_64/xvfb-run.1 |  
282 ++
 20 files changed, 2674 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 142828:142829 to see the changes.


[arch-commits] Commit in xkeyboard-config/trunk (PKGBUILD git-fixes.patch)

2011-11-16 Thread Jan de Groot
Date: Wednesday, November 16, 2011 @ 06:46:30
  Author: jgc
Revision: 142830

upgpkg: xkeyboard-config 2.4.1-2

Add upstream fixes

Added:
  xkeyboard-config/trunk/git-fixes.patch
Modified:
  xkeyboard-config/trunk/PKGBUILD

-+
 PKGBUILD|9 
 git-fixes.patch | 2386 ++
 2 files changed, 2392 insertions(+), 3 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 142829:142830 to see the changes.


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

2011-11-16 Thread Jan de Groot
Date: Wednesday, November 16, 2011 @ 06:46:43
  Author: jgc
Revision: 142831

archrelease: copy trunk to testing-any

Added:
  xkeyboard-config/repos/testing-any/
  xkeyboard-config/repos/testing-any/PKGBUILD
(from rev 142830, xkeyboard-config/trunk/PKGBUILD)
  xkeyboard-config/repos/testing-any/git-fixes.patch
(from rev 142830, xkeyboard-config/trunk/git-fixes.patch)

-+
 PKGBUILD|   33 
 git-fixes.patch | 2386 ++
 2 files changed, 2419 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 142830:142831 to see the changes.


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

2011-11-16 Thread Allan McRae
Date: Wednesday, November 16, 2011 @ 06:52:11
  Author: allan
Revision: 142832

remove from base group

Modified:
  binutils/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-11-16 11:46:43 UTC (rev 142831)
+++ PKGBUILD2011-11-16 11:52:11 UTC (rev 142832)
@@ -11,7 +11,6 @@
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/binutils/;
 license=('GPL')
-groups=('base')
 depends=('glibc=2.14' 'zlib')
 checkdepends=('dejagnu')
 options=('!libtool' '!distcc' '!ccache')



[arch-commits] Commit in xf86-input-wacom/trunk (PKGBUILD)

2011-11-16 Thread Jan Steffens
Date: Wednesday, November 16, 2011 @ 08:10:36
  Author: heftig
Revision: 142833

0.12.0

Modified:
  xf86-input-wacom/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-11-16 11:52:11 UTC (rev 142832)
+++ PKGBUILD2011-11-16 13:10:36 UTC (rev 142833)
@@ -4,20 +4,20 @@
 # Contributor: M Rawash mraw...@gmail.com
 
 pkgname=xf86-input-wacom
-pkgver=0.11.1
-pkgrel=3
+pkgver=0.12.0
+pkgrel=1
 pkgdesc=X.Org Wacom tablet driver
 arch=('i686' 'x86_64')
 url=http://linuxwacom.sourceforge.net/;
 license=('GPL')
 backup=('etc/X11/xorg.conf.d/50-wacom.conf')
-depends=('libxi' 'libxrandr')
-makedepends=('xorg-server-devel=1.10.99.902' 'libxext' 'libxi')
-conflicts=('xorg-server1.10.99.902')
+depends=('libxi' 'libxrandr' 'libxinerama')
+makedepends=('xorg-server-devel=1.11.0' 'libxext')
+conflicts=('xorg-server1.11.0')
 options=(!libtool)
 
source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2
 70-wacom.rules)
-md5sums=('0aec4a338cc583ed497b6af68d6d80ab'
+md5sums=('e1c41d143d5040982ae050c7ef9039e3'
  '10db4f8272286690255c1bcc18bfdd92')
 
 build() {



[arch-commits] Commit in xf86-input-wacom/repos (8 files)

2011-11-16 Thread Jan Steffens
Date: Wednesday, November 16, 2011 @ 08:12:15
  Author: heftig
Revision: 142834

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xf86-input-wacom/repos/extra-i686/70-wacom.rules
(from rev 142833, xf86-input-wacom/trunk/70-wacom.rules)
  xf86-input-wacom/repos/extra-i686/PKGBUILD
(from rev 142833, xf86-input-wacom/trunk/PKGBUILD)
  xf86-input-wacom/repos/extra-x86_64/70-wacom.rules
(from rev 142833, xf86-input-wacom/trunk/70-wacom.rules)
  xf86-input-wacom/repos/extra-x86_64/PKGBUILD
(from rev 142833, xf86-input-wacom/trunk/PKGBUILD)
Deleted:
  xf86-input-wacom/repos/extra-i686/70-wacom.rules
  xf86-input-wacom/repos/extra-i686/PKGBUILD
  xf86-input-wacom/repos/extra-x86_64/70-wacom.rules
  xf86-input-wacom/repos/extra-x86_64/PKGBUILD

-+
 extra-i686/70-wacom.rules   |   24 +++---
 extra-i686/PKGBUILD |   70 +-
 extra-x86_64/70-wacom.rules |   24 +++---
 extra-x86_64/PKGBUILD   |   70 +-
 4 files changed, 94 insertions(+), 94 deletions(-)

Deleted: extra-i686/70-wacom.rules
===
--- extra-i686/70-wacom.rules   2011-11-16 13:10:36 UTC (rev 142833)
+++ extra-i686/70-wacom.rules   2011-11-16 13:12:15 UTC (rev 142834)
@@ -1,12 +0,0 @@
-ACTION!=add|change, GOTO=wacom_end
-
-# Match all serial wacom tablets with a serial ID starting with WACf
-# Notes: We assign NAME though we shouldn't, but currently the server requires 
it
-#We assign the lot to subsystem pnp too because server reads NAME from
-#the parent device. Once all that's fixed, as simple SUBSYSTEM=tty
-#will do and the ENV{NAME} can be removed.
-SUBSYSTEM==tty|pnp, SUBSYSTEMS==pnp, ATTRS{id}==WACf*, 
ENV{ID_MODEL}=Serial Wacom Tablet $attr{id}, ENV{ID_INPUT}=1, 
ENV{ID_INPUT_TABLET}=1, ENV{NAME}=Serial Wacom Tablet $attr{id}
-SUBSYSTEM==tty|pnp, SUBSYSTEMS==pnp, ATTRS{id}==FUJ*, 
ENV{ID_MODEL}=Serial Wacom Tablet $attr{id}, ENV{ID_INPUT}=1, 
ENV{ID_INPUT_TABLET}=1, ENV{NAME}=Serial Wacom Tablet $attr{id}
-
-LABEL=wacom_end
-

Copied: xf86-input-wacom/repos/extra-i686/70-wacom.rules (from rev 142833, 
xf86-input-wacom/trunk/70-wacom.rules)
===
--- extra-i686/70-wacom.rules   (rev 0)
+++ extra-i686/70-wacom.rules   2011-11-16 13:12:15 UTC (rev 142834)
@@ -0,0 +1,12 @@
+ACTION!=add|change, GOTO=wacom_end
+
+# Match all serial wacom tablets with a serial ID starting with WACf
+# Notes: We assign NAME though we shouldn't, but currently the server requires 
it
+#We assign the lot to subsystem pnp too because server reads NAME from
+#the parent device. Once all that's fixed, as simple SUBSYSTEM=tty
+#will do and the ENV{NAME} can be removed.
+SUBSYSTEM==tty|pnp, SUBSYSTEMS==pnp, ATTRS{id}==WACf*, 
ENV{ID_MODEL}=Serial Wacom Tablet $attr{id}, ENV{ID_INPUT}=1, 
ENV{ID_INPUT_TABLET}=1, ENV{NAME}=Serial Wacom Tablet $attr{id}
+SUBSYSTEM==tty|pnp, SUBSYSTEMS==pnp, ATTRS{id}==FUJ*, 
ENV{ID_MODEL}=Serial Wacom Tablet $attr{id}, ENV{ID_INPUT}=1, 
ENV{ID_INPUT_TABLET}=1, ENV{NAME}=Serial Wacom Tablet $attr{id}
+
+LABEL=wacom_end
+

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-16 13:10:36 UTC (rev 142833)
+++ extra-i686/PKGBUILD 2011-11-16 13:12:15 UTC (rev 142834)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan heftig Steffens jan.steff...@gmail.com
-# Contributor: Jan de Groot j...@archlinux.org
-# Contributor: M Rawash mraw...@gmail.com
-
-pkgname=xf86-input-wacom
-pkgver=0.11.1
-pkgrel=3
-pkgdesc=X.Org Wacom tablet driver
-arch=('i686' 'x86_64')
-url=http://linuxwacom.sourceforge.net/;
-license=('GPL')
-backup=('etc/X11/xorg.conf.d/50-wacom.conf')
-depends=('libxi' 'libxrandr')
-makedepends=('xorg-server-devel=1.10.99.902' 'libxext' 'libxi')
-conflicts=('xorg-server1.10.99.902')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-70-wacom.rules)
-md5sums=('0aec4a338cc583ed497b6af68d6d80ab'
- '10db4f8272286690255c1bcc18bfdd92')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -m755 -d ${pkgdir}/lib/udev/rules.d
-  install -m644 ${srcdir}/70-wacom.rules  ${pkgdir}/lib/udev/rules.d/
-}

Copied: xf86-input-wacom/repos/extra-i686/PKGBUILD (from rev 142833, 
xf86-input-wacom/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-16 13:12:15 UTC (rev 142834)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan heftig Steffens jan.steff...@gmail.com
+# 

[arch-commits] Commit in syslog-ng/repos (9 files)

2011-11-16 Thread Dave Reisner
Date: Wednesday, November 16, 2011 @ 09:19:52
  Author: dreisner
Revision: 142836

db-move: moved syslog-ng from [testing] to [core] (x86_64)

Added:
  syslog-ng/repos/core-x86_64/PKGBUILD
(from rev 142834, syslog-ng/repos/testing-x86_64/PKGBUILD)
  syslog-ng/repos/core-x86_64/syslog-ng.conf
(from rev 142834, syslog-ng/repos/testing-x86_64/syslog-ng.conf)
  syslog-ng/repos/core-x86_64/syslog-ng.logrotate
(from rev 142834, syslog-ng/repos/testing-x86_64/syslog-ng.logrotate)
  syslog-ng/repos/core-x86_64/syslog-ng.rc
(from rev 142834, syslog-ng/repos/testing-x86_64/syslog-ng.rc)
Deleted:
  syslog-ng/repos/core-x86_64/PKGBUILD
  syslog-ng/repos/core-x86_64/syslog-ng.conf
  syslog-ng/repos/core-x86_64/syslog-ng.logrotate
  syslog-ng/repos/core-x86_64/syslog-ng.rc
  syslog-ng/repos/testing-x86_64/

-+
 PKGBUILD|  108 ++---
 syslog-ng.conf  |  184 +-
 syslog-ng.logrotate |   14 +--
 syslog-ng.rc|  132 +--
 4 files changed, 218 insertions(+), 220 deletions(-)

Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2011-11-16 14:19:50 UTC (rev 142835)
+++ core-x86_64/PKGBUILD2011-11-16 14:19:52 UTC (rev 142836)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner dreis...@archlinux.org
-# Maintainer: Eric Bélanger e...@archlinux.org
-# Maintainer: Aaron Griffin aa...@archlinux.org
-
-pkgname=syslog-ng
-pkgver=3.3.1
-pkgrel=1
-pkgdesc=Next-generation syslogd with advanced networking and filtering 
capabilities
-arch=('i686' 'x86_64')
-license=('GPL2')
-groups=('base')
-url=http://www.balabit.com/network-security/syslog-ng/;
-depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk')
-makedepends=('flex' 'pkg-config')
-optdepends=('logrotate: for rotating log files')
-provides=('logger')
-options=('!libtool')
-backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \
-'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
-source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz;
-syslog-ng.conf
-syslog-ng.logrotate
-syslog-ng.rc)
-sha1sums=('f084d66754c7fa1eada56946f77ef3066faa27a1'
-  '98074e0facfc6ef036202662cc86d04b38a2c142'
-  'ac997b25d7d8e69e66782d3771a0e12aff55ae7f'
-  'a6ad26912b5bcbe1b47b003309945d733613b98f')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure \
---prefix=/usr \
---sysconfdir=/etc/syslog-ng \
---libexecdir=/usr/lib \
---localstatedir=/var/lib/syslog-ng \
---with-pidfile-dir=/run \
---disable-spoof-source \
---enable-systemd \
---with-systemdsystemunitdir=/lib/systemd/system
-
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-  install -dm755 $pkgdir/var/lib/syslog-ng 
$pkgdir/etc/syslog-ng/patterndb.d
-  install -Dm644 $srcdir/syslog-ng.conf 
$pkgdir/etc/syslog-ng/syslog-ng.conf
-  install -Dm644 $srcdir/syslog-ng.logrotate 
$pkgdir/etc/logrotate.d/syslog-ng
-  install -Dm755 $srcdir/syslog-ng.rc $pkgdir/etc/rc.d/syslog-ng
-}

Copied: syslog-ng/repos/core-x86_64/PKGBUILD (from rev 142834, 
syslog-ng/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2011-11-16 14:19:52 UTC (rev 142836)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+# Maintainer: Eric Bélanger e...@archlinux.org
+# Maintainer: Aaron Griffin aa...@archlinux.org
+
+pkgname=syslog-ng
+pkgver=3.3.2
+pkgrel=1
+pkgdesc=Next-generation syslogd with advanced networking and filtering 
capabilities
+arch=('i686' 'x86_64')
+license=('GPL2')
+groups=('base')
+url=http://www.balabit.com/network-security/syslog-ng/;
+depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk')
+makedepends=('flex' 'pkg-config')
+optdepends=('logrotate: for rotating log files')
+provides=('logger')
+options=('!libtool')
+backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \
+'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
+source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz;
+syslog-ng.conf
+syslog-ng.logrotate
+syslog-ng.rc)
+sha1sums=('a7cfc987cdd584e357e253d2794bad1159776638'
+  '98074e0facfc6ef036202662cc86d04b38a2c142'
+  'ac997b25d7d8e69e66782d3771a0e12aff55ae7f'
+  'a6ad26912b5bcbe1b47b003309945d733613b98f')
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure \
+--prefix=/usr \
+--sysconfdir=/etc/syslog-ng \
+--libexecdir=/usr/lib \
+--localstatedir=/var/lib/syslog-ng \
+--with-pidfile-dir=/run \
+--disable-spoof-source \
+--enable-systemd \
+

[arch-commits] Commit in syslog-ng/repos (9 files)

2011-11-16 Thread Dave Reisner
Date: Wednesday, November 16, 2011 @ 09:19:50
  Author: dreisner
Revision: 142835

db-move: moved syslog-ng from [testing] to [core] (i686)

Added:
  syslog-ng/repos/core-i686/PKGBUILD
(from rev 142834, syslog-ng/repos/testing-i686/PKGBUILD)
  syslog-ng/repos/core-i686/syslog-ng.conf
(from rev 142834, syslog-ng/repos/testing-i686/syslog-ng.conf)
  syslog-ng/repos/core-i686/syslog-ng.logrotate
(from rev 142834, syslog-ng/repos/testing-i686/syslog-ng.logrotate)
  syslog-ng/repos/core-i686/syslog-ng.rc
(from rev 142834, syslog-ng/repos/testing-i686/syslog-ng.rc)
Deleted:
  syslog-ng/repos/core-i686/PKGBUILD
  syslog-ng/repos/core-i686/syslog-ng.conf
  syslog-ng/repos/core-i686/syslog-ng.logrotate
  syslog-ng/repos/core-i686/syslog-ng.rc
  syslog-ng/repos/testing-i686/

-+
 PKGBUILD|  108 ++---
 syslog-ng.conf  |  184 +-
 syslog-ng.logrotate |   14 +--
 syslog-ng.rc|  132 +--
 4 files changed, 218 insertions(+), 220 deletions(-)

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2011-11-16 13:12:15 UTC (rev 142834)
+++ core-i686/PKGBUILD  2011-11-16 14:19:50 UTC (rev 142835)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner dreis...@archlinux.org
-# Maintainer: Eric Bélanger e...@archlinux.org
-# Maintainer: Aaron Griffin aa...@archlinux.org
-
-pkgname=syslog-ng
-pkgver=3.3.1
-pkgrel=1
-pkgdesc=Next-generation syslogd with advanced networking and filtering 
capabilities
-arch=('i686' 'x86_64')
-license=('GPL2')
-groups=('base')
-url=http://www.balabit.com/network-security/syslog-ng/;
-depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk')
-makedepends=('flex' 'pkg-config')
-optdepends=('logrotate: for rotating log files')
-provides=('logger')
-options=('!libtool')
-backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \
-'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
-source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz;
-syslog-ng.conf
-syslog-ng.logrotate
-syslog-ng.rc)
-sha1sums=('f084d66754c7fa1eada56946f77ef3066faa27a1'
-  '98074e0facfc6ef036202662cc86d04b38a2c142'
-  'ac997b25d7d8e69e66782d3771a0e12aff55ae7f'
-  'a6ad26912b5bcbe1b47b003309945d733613b98f')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure \
---prefix=/usr \
---sysconfdir=/etc/syslog-ng \
---libexecdir=/usr/lib \
---localstatedir=/var/lib/syslog-ng \
---with-pidfile-dir=/run \
---disable-spoof-source \
---enable-systemd \
---with-systemdsystemunitdir=/lib/systemd/system
-
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-  install -dm755 $pkgdir/var/lib/syslog-ng 
$pkgdir/etc/syslog-ng/patterndb.d
-  install -Dm644 $srcdir/syslog-ng.conf 
$pkgdir/etc/syslog-ng/syslog-ng.conf
-  install -Dm644 $srcdir/syslog-ng.logrotate 
$pkgdir/etc/logrotate.d/syslog-ng
-  install -Dm755 $srcdir/syslog-ng.rc $pkgdir/etc/rc.d/syslog-ng
-}

Copied: syslog-ng/repos/core-i686/PKGBUILD (from rev 142834, 
syslog-ng/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD  (rev 0)
+++ core-i686/PKGBUILD  2011-11-16 14:19:50 UTC (rev 142835)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+# Maintainer: Eric Bélanger e...@archlinux.org
+# Maintainer: Aaron Griffin aa...@archlinux.org
+
+pkgname=syslog-ng
+pkgver=3.3.2
+pkgrel=1
+pkgdesc=Next-generation syslogd with advanced networking and filtering 
capabilities
+arch=('i686' 'x86_64')
+license=('GPL2')
+groups=('base')
+url=http://www.balabit.com/network-security/syslog-ng/;
+depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk')
+makedepends=('flex' 'pkg-config')
+optdepends=('logrotate: for rotating log files')
+provides=('logger')
+options=('!libtool')
+backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \
+'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
+source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz;
+syslog-ng.conf
+syslog-ng.logrotate
+syslog-ng.rc)
+sha1sums=('a7cfc987cdd584e357e253d2794bad1159776638'
+  '98074e0facfc6ef036202662cc86d04b38a2c142'
+  'ac997b25d7d8e69e66782d3771a0e12aff55ae7f'
+  'a6ad26912b5bcbe1b47b003309945d733613b98f')
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure \
+--prefix=/usr \
+--sysconfdir=/etc/syslog-ng \
+--libexecdir=/usr/lib \
+--localstatedir=/var/lib/syslog-ng \
+--with-pidfile-dir=/run \
+--disable-spoof-source \
+--enable-systemd \
+--with-systemdsystemunitdir=/lib/systemd/system
+
+  make
+}
+
+package() {
+  make -C $pkgname-$pkgver 

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

2011-11-16 Thread Ray Rashif
Date: Wednesday, November 16, 2011 @ 14:17:25
  Author: schiv
Revision: 142837

upgpkg: libffado 2.0.1-5

add python2 optdep

Modified:
  libffado/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-11-16 14:19:52 UTC (rev 142836)
+++ PKGBUILD2011-11-16 19:17:25 UTC (rev 142837)
@@ -1,11 +1,11 @@
 # $Id$
-# Maintainer: Ray Rashif schivmeis...@gmail.com
+# Maintainer: Ray Rashif sc...@archlinux.org
 # Contributor: galiyo...@gmail.com
 # Contributor: Jon Kristian Nilsen jokr.nil...@gmail.com
 
 pkgname=libffado
 pkgver=2.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc=Driver for FireWire audio devices
 arch=('i686' 'x86_64')
 url=http://www.ffado.org/;
@@ -13,7 +13,8 @@
 depends=('libiec61883' 'libavc1394' 'libsigc++'
   'libxml++' 'alsa-lib' 'dbus')
 makedepends=('scons' 'python2-qt')
-optdepends=('python2-qt: mixer applet')
+optdepends=('python2: ffado-diag'
+'python2-qt: mixer applet')
 provides=('ffado')
 source=(http://www.ffado.org/files/$pkgname-$pkgver.tar.gz;
 '60-ffado.rules')
@@ -43,7 +44,7 @@
 package() {
   cd $srcdir/$pkgname-$pkgver
 
-  scons DESTDIR=$pkgdir/ WILL_DEAL_WITH_XDG_MYSELF=True install
+  scons DESTDIR=$pkgdir WILL_DEAL_WITH_XDG_MYSELF=True install
 
   # add audio device rules
   # see https://bugs.archlinux.org/task/26342



[arch-commits] Commit in libffado/repos (8 files)

2011-11-16 Thread Ray Rashif
Date: Wednesday, November 16, 2011 @ 14:18:19
  Author: schiv
Revision: 142838

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  libffado/repos/testing-i686/60-ffado.rules
(from rev 142837, libffado/trunk/60-ffado.rules)
  libffado/repos/testing-i686/PKGBUILD
(from rev 142837, libffado/trunk/PKGBUILD)
  libffado/repos/testing-x86_64/60-ffado.rules
(from rev 142837, libffado/trunk/60-ffado.rules)
  libffado/repos/testing-x86_64/PKGBUILD
(from rev 142837, libffado/trunk/PKGBUILD)
Deleted:
  libffado/repos/testing-i686/60-ffado.rules
  libffado/repos/testing-i686/PKGBUILD
  libffado/repos/testing-x86_64/60-ffado.rules
  libffado/repos/testing-x86_64/PKGBUILD

---+
 testing-i686/60-ffado.rules   |   54 
 testing-i686/PKGBUILD |  133 
 testing-x86_64/60-ffado.rules |   54 
 testing-x86_64/PKGBUILD   |  133 
 4 files changed, 188 insertions(+), 186 deletions(-)

Deleted: testing-i686/60-ffado.rules
===
--- testing-i686/60-ffado.rules 2011-11-16 19:17:25 UTC (rev 142837)
+++ testing-i686/60-ffado.rules 2011-11-16 19:18:19 UTC (rev 142838)
@@ -1,27 +0,0 @@
-SUBSYSTEM!=firewire, GOTO=ffado_end
-
-ATTR{vendor}==0x000166, GROUP=audio, ENV{ID_FFADO}=1 # TC GROUP A/S
-ATTR{vendor}==0x0001f2, GROUP=audio, ENV{ID_FFADO}=1 # Mark of the 
Unicorn, Inc.
-ATTR{vendor}==0x0003db, GROUP=audio, ENV{ID_FFADO}=1 # Apogee 
Electronics Corp.
-ATTR{vendor}==0x000595, GROUP=audio, ENV{ID_FFADO}=1 # Alesis Corporation
-ATTR{vendor}==0x0007f5, GROUP=audio, ENV{ID_FFADO}=1 # Bridgeco Co AG
-ATTR{vendor}==0x000a92, GROUP=audio, ENV{ID_FFADO}=1 # Presonus 
Corporation
-ATTR{vendor}==0x000aac, GROUP=audio, ENV{ID_FFADO}=1 # TerraTec 
Electronic GmbH
-ATTR{vendor}==0x000d6c, GROUP=audio, ENV{ID_FFADO}=1 # M-Audio
-ATTR{vendor}==0x000f1b, GROUP=audio, ENV{ID_FFADO}=1 # Ego Systems Inc.
-ATTR{vendor}==0x000ff2, GROUP=audio, ENV{ID_FFADO}=1 # Loud Technologies 
Inc.
-ATTR{vendor}==0x001260, GROUP=audio, ENV{ID_FFADO}=1 # Stanton 
Magnetics,inc.
-ATTR{vendor}==0x00130e, GROUP=audio, ENV{ID_FFADO}=1 # Focusrite Audio 
Engineering Limited
-ATTR{vendor}==0x001486, GROUP=audio, ENV{ID_FFADO}=1 # Echo Digital 
Audio Corporation
-ATTR{vendor}==0x001564, GROUP=audio, ENV{ID_FFADO}=1 # BEHRINGER 
Spezielle Studiotechnik GmbH
-ATTR{vendor}==0x001c2d, GROUP=audio, ENV{ID_FFADO}=1 # FlexRadio Systems
-ATTR{vendor}==0x001c6a, GROUP=audio, ENV{ID_FFADO}=1 # Weiss Engineering 
Ltd.
-ATTR{vendor}==0x0040ab, GROUP=audio, ENV{ID_FFADO}=1 # ROLAND DG 
CORPORATION
-
-# The devices below abuse another Vendor's ID, and therefore we need more 
advanced rules for those.
-
-ATTR{vendor}==0x0a, ATTR{model}==0x03, 
ATTR{units}==*0x00a02d:0x010001*, GROUP=audio, ENV{ID_FFADO}=1 # CME, 
Matrix K FW
-ATTR{vendor}==0x0f, ATTR{model}==0x01006?, 
ATTR{units}==*0x00a02d:0x010001*, GROUP=audio, ENV{ID_FFADO}=1 # Mackie, 
Onyx Firewire
-ATTR{vendor}==0x000a35, ATTR{units}==0x000a35:0x0[12], GROUP=audio, 
ENV{ID_FFADO}=1 # RME
-
-LABEL=ffado_end

Copied: libffado/repos/testing-i686/60-ffado.rules (from rev 142837, 
libffado/trunk/60-ffado.rules)
===
--- testing-i686/60-ffado.rules (rev 0)
+++ testing-i686/60-ffado.rules 2011-11-16 19:18:19 UTC (rev 142838)
@@ -0,0 +1,27 @@
+SUBSYSTEM!=firewire, GOTO=ffado_end
+
+ATTR{vendor}==0x000166, GROUP=audio, ENV{ID_FFADO}=1 # TC GROUP A/S
+ATTR{vendor}==0x0001f2, GROUP=audio, ENV{ID_FFADO}=1 # Mark of the 
Unicorn, Inc.
+ATTR{vendor}==0x0003db, GROUP=audio, ENV{ID_FFADO}=1 # Apogee 
Electronics Corp.
+ATTR{vendor}==0x000595, GROUP=audio, ENV{ID_FFADO}=1 # Alesis Corporation
+ATTR{vendor}==0x0007f5, GROUP=audio, ENV{ID_FFADO}=1 # Bridgeco Co AG
+ATTR{vendor}==0x000a92, GROUP=audio, ENV{ID_FFADO}=1 # Presonus 
Corporation
+ATTR{vendor}==0x000aac, GROUP=audio, ENV{ID_FFADO}=1 # TerraTec 
Electronic GmbH
+ATTR{vendor}==0x000d6c, GROUP=audio, ENV{ID_FFADO}=1 # M-Audio
+ATTR{vendor}==0x000f1b, GROUP=audio, ENV{ID_FFADO}=1 # Ego Systems Inc.
+ATTR{vendor}==0x000ff2, GROUP=audio, ENV{ID_FFADO}=1 # Loud Technologies 
Inc.
+ATTR{vendor}==0x001260, GROUP=audio, ENV{ID_FFADO}=1 # Stanton 
Magnetics,inc.
+ATTR{vendor}==0x00130e, GROUP=audio, ENV{ID_FFADO}=1 # Focusrite Audio 
Engineering Limited
+ATTR{vendor}==0x001486, GROUP=audio, ENV{ID_FFADO}=1 # Echo Digital 
Audio Corporation
+ATTR{vendor}==0x001564, GROUP=audio, ENV{ID_FFADO}=1 # BEHRINGER 
Spezielle Studiotechnik GmbH
+ATTR{vendor}==0x001c2d, GROUP=audio, ENV{ID_FFADO}=1 # FlexRadio Systems
+ATTR{vendor}==0x001c6a, GROUP=audio, ENV{ID_FFADO}=1 # Weiss Engineering 
Ltd.
+ATTR{vendor}==0x0040ab, GROUP=audio, ENV{ID_FFADO}=1 # ROLAND DG 
CORPORATION
+
+# The devices below abuse another Vendor's ID, and therefore we need more 
advanced rules for 

[arch-commits] Commit in rfkill/repos (9 files)

2011-11-16 Thread Dan McGee
Date: Wednesday, November 16, 2011 @ 15:25:33
  Author: dan
Revision: 142839

db-move: moved rfkill from [testing] to [core] (i686)

Added:
  rfkill/repos/core-i686/60-rfkill.rules
(from rev 142838, rfkill/repos/testing-i686/60-rfkill.rules)
  rfkill/repos/core-i686/PKGBUILD
(from rev 142838, rfkill/repos/testing-i686/PKGBUILD)
  rfkill/repos/core-i686/rfkill.conf.d
(from rev 142838, rfkill/repos/testing-i686/rfkill.conf.d)
  rfkill/repos/core-i686/rfkill.rc.d
(from rev 142838, rfkill/repos/testing-i686/rfkill.rc.d)
Deleted:
  rfkill/repos/core-i686/60-rfkill.rules
  rfkill/repos/core-i686/PKGBUILD
  rfkill/repos/core-i686/rfkill.conf.d
  rfkill/repos/core-i686/rfkill.rc.d
  rfkill/repos/testing-i686/

-+
 60-rfkill.rules |2 -
 PKGBUILD|   76 +++---
 rfkill.conf.d   |   40 ++--
 rfkill.rc.d |   76 +++---
 4 files changed, 97 insertions(+), 97 deletions(-)

Deleted: core-i686/60-rfkill.rules
===
--- core-i686/60-rfkill.rules   2011-11-16 19:18:19 UTC (rev 142838)
+++ core-i686/60-rfkill.rules   2011-11-16 20:25:33 UTC (rev 142839)
@@ -1 +0,0 @@
-KERNEL==rfkill, GROUP=rfkill, MODE=0664

Copied: rfkill/repos/core-i686/60-rfkill.rules (from rev 142838, 
rfkill/repos/testing-i686/60-rfkill.rules)
===
--- core-i686/60-rfkill.rules   (rev 0)
+++ core-i686/60-rfkill.rules   2011-11-16 20:25:33 UTC (rev 142839)
@@ -0,0 +1 @@
+KERNEL==rfkill, GROUP=rfkill, MODE=0664

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2011-11-16 19:18:19 UTC (rev 142838)
+++ core-i686/PKGBUILD  2011-11-16 20:25:33 UTC (rev 142839)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Thomas Bächler tho...@archlinux.org
-# Contributor: Giovanni Scafora giova...@archlinux.org
-
-pkgname=rfkill
-pkgver=0.4
-pkgrel=2
-pkgdesc=A tool for enabling and disabling wireless devices
-arch=('i686' 'x86_64')
-url=http://linuxwireless.org/en/users/Documentation/rfkill;
-license=('custom')
-depends=('glibc' 'filesystem=2010.01')
-source=(http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-60-rfkill.rules
-rfkill.conf.d
-rfkill.rc.d)
-backup=(etc/conf.d/rfkill)
-md5sums=('727892c0fb35c80ee3849fbe89b45350'
- '63f9bf9264911242e430867a41e8918c'
- '398e7cadf023e05e3e0c323aa33575b9'
- '793f0510e26547eb2632efce7d16e50e')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  # License
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  # Udev rule
-  install -Dm644 ${srcdir}/60-rfkill.rules 
${pkgdir}/lib/udev/rules.d/60-rfkill.rules
-  # Init script
-  install -Dm644 ${srcdir}/rfkill.conf.d ${pkgdir}/etc/conf.d/rfkill
-  install -Dm755 ${srcdir}/rfkill.rc.d ${pkgdir}/etc/rc.d/rfkill
-}

Copied: rfkill/repos/core-i686/PKGBUILD (from rev 142838, 
rfkill/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD  (rev 0)
+++ core-i686/PKGBUILD  2011-11-16 20:25:33 UTC (rev 142839)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Thomas Bächler tho...@archlinux.org
+# Contributor: Giovanni Scafora giova...@archlinux.org
+
+pkgname=rfkill
+pkgver=0.4
+pkgrel=3
+pkgdesc=A tool for enabling and disabling wireless devices
+arch=('i686' 'x86_64')
+url=http://linuxwireless.org/en/users/Documentation/rfkill;
+license=('custom')
+depends=('glibc' 'filesystem=2010.01')
+source=(http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+60-rfkill.rules
+rfkill.conf.d
+rfkill.rc.d)
+backup=(etc/conf.d/rfkill)
+md5sums=('727892c0fb35c80ee3849fbe89b45350'
+ '63f9bf9264911242e430867a41e8918c'
+ '398e7cadf023e05e3e0c323aa33575b9'
+ '793f0510e26547eb2632efce7d16e50e')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  # License
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  # Udev rule
+  install -Dm644 ${srcdir}/60-rfkill.rules 
${pkgdir}/lib/udev/rules.d/60-rfkill.rules
+  # Init script
+  install -Dm644 ${srcdir}/rfkill.conf.d ${pkgdir}/etc/conf.d/rfkill
+  install -Dm755 ${srcdir}/rfkill.rc.d ${pkgdir}/etc/rc.d/rfkill
+}

Deleted: core-i686/rfkill.conf.d
===
--- core-i686/rfkill.conf.d 2011-11-16 19:18:19 UTC (rev 142838)
+++ core-i686/rfkill.conf.d 2011-11-16 20:25:33 UTC (rev 142839)
@@ -1,20 +0,0 @@
-#
-# /etc/conf.d/rfkill
-# Configuration for the rfkill startup 

[arch-commits] Commit in rfkill/repos (9 files)

2011-11-16 Thread Dan McGee
Date: Wednesday, November 16, 2011 @ 15:25:37
  Author: dan
Revision: 142840

db-move: moved rfkill from [testing] to [core] (x86_64)

Added:
  rfkill/repos/core-x86_64/60-rfkill.rules
(from rev 142838, rfkill/repos/testing-x86_64/60-rfkill.rules)
  rfkill/repos/core-x86_64/PKGBUILD
(from rev 142838, rfkill/repos/testing-x86_64/PKGBUILD)
  rfkill/repos/core-x86_64/rfkill.conf.d
(from rev 142838, rfkill/repos/testing-x86_64/rfkill.conf.d)
  rfkill/repos/core-x86_64/rfkill.rc.d
(from rev 142838, rfkill/repos/testing-x86_64/rfkill.rc.d)
Deleted:
  rfkill/repos/core-x86_64/60-rfkill.rules
  rfkill/repos/core-x86_64/PKGBUILD
  rfkill/repos/core-x86_64/rfkill.conf.d
  rfkill/repos/core-x86_64/rfkill.rc.d
  rfkill/repos/testing-x86_64/

-+
 60-rfkill.rules |2 -
 PKGBUILD|   76 +++---
 rfkill.conf.d   |   40 ++--
 rfkill.rc.d |   76 +++---
 4 files changed, 97 insertions(+), 97 deletions(-)

Deleted: core-x86_64/60-rfkill.rules
===
--- core-x86_64/60-rfkill.rules 2011-11-16 20:25:33 UTC (rev 142839)
+++ core-x86_64/60-rfkill.rules 2011-11-16 20:25:37 UTC (rev 142840)
@@ -1 +0,0 @@
-KERNEL==rfkill, GROUP=rfkill, MODE=0664

Copied: rfkill/repos/core-x86_64/60-rfkill.rules (from rev 142838, 
rfkill/repos/testing-x86_64/60-rfkill.rules)
===
--- core-x86_64/60-rfkill.rules (rev 0)
+++ core-x86_64/60-rfkill.rules 2011-11-16 20:25:37 UTC (rev 142840)
@@ -0,0 +1 @@
+KERNEL==rfkill, GROUP=rfkill, MODE=0664

Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2011-11-16 20:25:33 UTC (rev 142839)
+++ core-x86_64/PKGBUILD2011-11-16 20:25:37 UTC (rev 142840)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Thomas Bächler tho...@archlinux.org
-# Contributor: Giovanni Scafora giova...@archlinux.org
-
-pkgname=rfkill
-pkgver=0.4
-pkgrel=2
-pkgdesc=A tool for enabling and disabling wireless devices
-arch=('i686' 'x86_64')
-url=http://linuxwireless.org/en/users/Documentation/rfkill;
-license=('custom')
-depends=('glibc' 'filesystem=2010.01')
-source=(http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-60-rfkill.rules
-rfkill.conf.d
-rfkill.rc.d)
-backup=(etc/conf.d/rfkill)
-md5sums=('727892c0fb35c80ee3849fbe89b45350'
- '63f9bf9264911242e430867a41e8918c'
- '398e7cadf023e05e3e0c323aa33575b9'
- '793f0510e26547eb2632efce7d16e50e')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  # License
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  # Udev rule
-  install -Dm644 ${srcdir}/60-rfkill.rules 
${pkgdir}/lib/udev/rules.d/60-rfkill.rules
-  # Init script
-  install -Dm644 ${srcdir}/rfkill.conf.d ${pkgdir}/etc/conf.d/rfkill
-  install -Dm755 ${srcdir}/rfkill.rc.d ${pkgdir}/etc/rc.d/rfkill
-}

Copied: rfkill/repos/core-x86_64/PKGBUILD (from rev 142838, 
rfkill/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2011-11-16 20:25:37 UTC (rev 142840)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Thomas Bächler tho...@archlinux.org
+# Contributor: Giovanni Scafora giova...@archlinux.org
+
+pkgname=rfkill
+pkgver=0.4
+pkgrel=3
+pkgdesc=A tool for enabling and disabling wireless devices
+arch=('i686' 'x86_64')
+url=http://linuxwireless.org/en/users/Documentation/rfkill;
+license=('custom')
+depends=('glibc' 'filesystem=2010.01')
+source=(http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+60-rfkill.rules
+rfkill.conf.d
+rfkill.rc.d)
+backup=(etc/conf.d/rfkill)
+md5sums=('727892c0fb35c80ee3849fbe89b45350'
+ '63f9bf9264911242e430867a41e8918c'
+ '398e7cadf023e05e3e0c323aa33575b9'
+ '793f0510e26547eb2632efce7d16e50e')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  # License
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  # Udev rule
+  install -Dm644 ${srcdir}/60-rfkill.rules 
${pkgdir}/lib/udev/rules.d/60-rfkill.rules
+  # Init script
+  install -Dm644 ${srcdir}/rfkill.conf.d ${pkgdir}/etc/conf.d/rfkill
+  install -Dm755 ${srcdir}/rfkill.rc.d ${pkgdir}/etc/rc.d/rfkill
+}

Deleted: core-x86_64/rfkill.conf.d
===
--- core-x86_64/rfkill.conf.d   2011-11-16 20:25:33 UTC (rev 142839)
+++ core-x86_64/rfkill.conf.d   2011-11-16 20:25:37 UTC (rev 142840)
@@ -1,20 +0,0 

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

2011-11-16 Thread Dan McGee
Date: Wednesday, November 16, 2011 @ 15:25:46
  Author: dan
Revision: 142841

db-move: moved heirloom-mailx from [testing] to [core] (i686)

Added:
  heirloom-mailx/repos/core-i686/PKGBUILD
(from rev 142838, heirloom-mailx/repos/testing-i686/PKGBUILD)
Deleted:
  heirloom-mailx/repos/core-i686/PKGBUILD
  heirloom-mailx/repos/testing-i686/

--+
 PKGBUILD |  128 ++---
 1 file changed, 64 insertions(+), 64 deletions(-)

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2011-11-16 20:25:37 UTC (rev 142840)
+++ core-i686/PKGBUILD  2011-11-16 20:25:46 UTC (rev 142841)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault steph...@archlinux.org
-# Contributor: Sergej Pupykin pupykin.s+a...@gmail.com
-# Contributor: Andreas Wagner Andreas dot Wagner at em dot uni-frankfurt dot 
de
-
-pkgname=heirloom-mailx
-pkgver=12.5
-pkgrel=2
-pkgdesc=A commandline utility for sending and receiving email
-arch=('i686' 'x86_64')
-url=http://heirloom.sourceforge.net/mailx.html;
-license=('custom')
-groups=('base')
-depends=('openssl' 'krb5')
-optdepends=('smtp-forwarder: for sending mail')
-replaces=('mailx' 'mailx-heirloom')
-provides=('mailx' 'mailx-heirloom')
-conflicts=('mailx' 'mailx-heirloom')
-backup=(etc/mail.rc)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('1998dd6168a68400e533712ae7163c72b6a7c056')
-options=('!makeflags') # Does not build with MAKEFLAGS=-jX, X1
-
-# source PKGBUILD  mksource
-mksource() {
-  export CVSROOT=:pserver:anonym...@nail.cvs.sourceforge.net:/cvsroot/nail
-  D=nail
-  [ -d ${D} ]  cvs up ${D} || cvs co ${D}
-  
-  _dirname=${pkgname}-${pkgver}
-  mv $D ${_dirname}
-  tar -cJv --exclude=CVS -f ${_dirname}.tar.xz ${_dirname}
-  rm -rf ${_dirname}
-}
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  sed -i 's|/etc/nail.rc|/etc/mail.rc|g' mailx.1
-
-  # For Linux and BSD, this should be set.
-  echo set bsdcompat  nail.rc
-
-  sed -i s/pg/less/ cmd1.c
-
-  echo PREFIX=/usr \
-   MAILRC=/etc/mail.rc \
-   SENDMAIL=/usr/sbin/sendmail \
-   MAILSPOOL=/var/spool/mail \
-   UCBINSTALL=/bin/install  makeflags
-
-  make `cat makeflags` IPv6=-DHAVE_IPv6_FUNCS
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} `cat makeflags` install
-
-  # For compatibility with the old mailx program
-  ln -sf mailx ${pkgdir}/usr/bin/mail
-  ln -sf mailx.1.gz ${pkgdir}/usr/share/man/man1/mail.1.gz
-
-  install -D -m0644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: heirloom-mailx/repos/core-i686/PKGBUILD (from rev 142838, 
heirloom-mailx/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD  (rev 0)
+++ core-i686/PKGBUILD  2011-11-16 20:25:46 UTC (rev 142841)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault steph...@archlinux.org
+# Contributor: Sergej Pupykin pupykin.s@a...@gmail.com
+# Contributor: Andreas Wagner andreas.wag...@em.uni-frankfurt.de
+
+pkgname=heirloom-mailx
+pkgver=12.5
+pkgrel=3
+pkgdesc=A commandline utility for sending and receiving email
+arch=('i686' 'x86_64')
+url=http://heirloom.sourceforge.net/mailx.html;
+license=('custom')
+groups=('base')
+depends=('openssl' 'krb5')
+optdepends=('smtp-forwarder: for sending mail')
+replaces=('mailx' 'mailx-heirloom')
+provides=('mailx' 'mailx-heirloom')
+conflicts=('mailx' 'mailx-heirloom')
+backup=(etc/mail.rc)
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+sha1sums=('1998dd6168a68400e533712ae7163c72b6a7c056')
+options=('!makeflags') # Does not build with MAKEFLAGS=-jX, X1
+
+# source PKGBUILD  mksource
+mksource() {
+  export CVSROOT=:pserver:anonym...@nail.cvs.sourceforge.net:/cvsroot/nail
+  D=nail
+  [ -d ${D} ]  cvs up ${D} || cvs co ${D}
+  
+  _dirname=${pkgname}-${pkgver}
+  mv $D ${_dirname}
+  tar -cJv --exclude=CVS -f ${_dirname}.tar.xz ${_dirname}
+  rm -rf ${_dirname}
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  sed -i 's|/etc/nail.rc|/etc/mail.rc|g' mailx.1
+
+  # For Linux and BSD, this should be set.
+  echo set bsdcompat  nail.rc
+
+  sed -i s/pg/less/ cmd1.c
+
+  echo PREFIX=/usr \
+   MAILRC=/etc/mail.rc \
+   SENDMAIL=/usr/sbin/sendmail \
+   MAILSPOOL=/var/spool/mail \
+   UCBINSTALL=/bin/install  makeflags
+
+  make `cat makeflags` IPv6=-DHAVE_IPv6_FUNCS
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} `cat makeflags` install
+
+  # For compatibility with the old mailx program
+  ln -sf mailx ${pkgdir}/usr/bin/mail
+  ln -sf mailx.1.gz ${pkgdir}/usr/share/man/man1/mail.1.gz
+
+  install -D -m0644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}



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

2011-11-16 Thread Dan McGee
Date: Wednesday, November 16, 2011 @ 15:25:47
  Author: dan
Revision: 142842

db-move: moved heirloom-mailx from [testing] to [core] (x86_64)

Added:
  heirloom-mailx/repos/core-x86_64/PKGBUILD
(from rev 142838, heirloom-mailx/repos/testing-x86_64/PKGBUILD)
Deleted:
  heirloom-mailx/repos/core-x86_64/PKGBUILD
  heirloom-mailx/repos/testing-x86_64/

--+
 PKGBUILD |  128 ++---
 1 file changed, 64 insertions(+), 64 deletions(-)

Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2011-11-16 20:25:46 UTC (rev 142841)
+++ core-x86_64/PKGBUILD2011-11-16 20:25:47 UTC (rev 142842)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault steph...@archlinux.org
-# Contributor: Sergej Pupykin pupykin.s+a...@gmail.com
-# Contributor: Andreas Wagner Andreas dot Wagner at em dot uni-frankfurt dot 
de
-
-pkgname=heirloom-mailx
-pkgver=12.5
-pkgrel=2
-pkgdesc=A commandline utility for sending and receiving email
-arch=('i686' 'x86_64')
-url=http://heirloom.sourceforge.net/mailx.html;
-license=('custom')
-groups=('base')
-depends=('openssl' 'krb5')
-optdepends=('smtp-forwarder: for sending mail')
-replaces=('mailx' 'mailx-heirloom')
-provides=('mailx' 'mailx-heirloom')
-conflicts=('mailx' 'mailx-heirloom')
-backup=(etc/mail.rc)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('1998dd6168a68400e533712ae7163c72b6a7c056')
-options=('!makeflags') # Does not build with MAKEFLAGS=-jX, X1
-
-# source PKGBUILD  mksource
-mksource() {
-  export CVSROOT=:pserver:anonym...@nail.cvs.sourceforge.net:/cvsroot/nail
-  D=nail
-  [ -d ${D} ]  cvs up ${D} || cvs co ${D}
-  
-  _dirname=${pkgname}-${pkgver}
-  mv $D ${_dirname}
-  tar -cJv --exclude=CVS -f ${_dirname}.tar.xz ${_dirname}
-  rm -rf ${_dirname}
-}
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  sed -i 's|/etc/nail.rc|/etc/mail.rc|g' mailx.1
-
-  # For Linux and BSD, this should be set.
-  echo set bsdcompat  nail.rc
-
-  sed -i s/pg/less/ cmd1.c
-
-  echo PREFIX=/usr \
-   MAILRC=/etc/mail.rc \
-   SENDMAIL=/usr/sbin/sendmail \
-   MAILSPOOL=/var/spool/mail \
-   UCBINSTALL=/bin/install  makeflags
-
-  make `cat makeflags` IPv6=-DHAVE_IPv6_FUNCS
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} `cat makeflags` install
-
-  # For compatibility with the old mailx program
-  ln -sf mailx ${pkgdir}/usr/bin/mail
-  ln -sf mailx.1.gz ${pkgdir}/usr/share/man/man1/mail.1.gz
-
-  install -D -m0644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: heirloom-mailx/repos/core-x86_64/PKGBUILD (from rev 142838, 
heirloom-mailx/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2011-11-16 20:25:47 UTC (rev 142842)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault steph...@archlinux.org
+# Contributor: Sergej Pupykin pupykin.s@a...@gmail.com
+# Contributor: Andreas Wagner andreas.wag...@em.uni-frankfurt.de
+
+pkgname=heirloom-mailx
+pkgver=12.5
+pkgrel=3
+pkgdesc=A commandline utility for sending and receiving email
+arch=('i686' 'x86_64')
+url=http://heirloom.sourceforge.net/mailx.html;
+license=('custom')
+groups=('base')
+depends=('openssl' 'krb5')
+optdepends=('smtp-forwarder: for sending mail')
+replaces=('mailx' 'mailx-heirloom')
+provides=('mailx' 'mailx-heirloom')
+conflicts=('mailx' 'mailx-heirloom')
+backup=(etc/mail.rc)
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+sha1sums=('1998dd6168a68400e533712ae7163c72b6a7c056')
+options=('!makeflags') # Does not build with MAKEFLAGS=-jX, X1
+
+# source PKGBUILD  mksource
+mksource() {
+  export CVSROOT=:pserver:anonym...@nail.cvs.sourceforge.net:/cvsroot/nail
+  D=nail
+  [ -d ${D} ]  cvs up ${D} || cvs co ${D}
+  
+  _dirname=${pkgname}-${pkgver}
+  mv $D ${_dirname}
+  tar -cJv --exclude=CVS -f ${_dirname}.tar.xz ${_dirname}
+  rm -rf ${_dirname}
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  sed -i 's|/etc/nail.rc|/etc/mail.rc|g' mailx.1
+
+  # For Linux and BSD, this should be set.
+  echo set bsdcompat  nail.rc
+
+  sed -i s/pg/less/ cmd1.c
+
+  echo PREFIX=/usr \
+   MAILRC=/etc/mail.rc \
+   SENDMAIL=/usr/sbin/sendmail \
+   MAILSPOOL=/var/spool/mail \
+   UCBINSTALL=/bin/install  makeflags
+
+  make `cat makeflags` IPv6=-DHAVE_IPv6_FUNCS
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} `cat makeflags` install
+
+  # For compatibility with the old mailx program
+  ln -sf mailx ${pkgdir}/usr/bin/mail
+  ln -sf mailx.1.gz ${pkgdir}/usr/share/man/man1/mail.1.gz
+
+  install -D -m0644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}



[arch-commits] Commit in gtk2/trunk (PKGBUILD revert-iconview.patch)

2011-11-16 Thread Ionut Biru
Date: Wednesday, November 16, 2011 @ 18:10:40
  Author: ibiru
Revision: 142843

fix lxappearance crash

Added:
  gtk2/trunk/revert-iconview.patch
Modified:
  gtk2/trunk/PKGBUILD

---+
 PKGBUILD  |   27 +++
 revert-iconview.patch |   30 ++
 2 files changed, 45 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-16 20:25:47 UTC (rev 142842)
+++ PKGBUILD2011-11-16 23:10:40 UTC (rev 142843)
@@ -4,21 +4,24 @@
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
 pkgver=2.24.8
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url=http://www.gtk.org/;
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 
'libxcomposite' 'libxdamage'
  'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 
'gobject-introspection')
 options=('!libtool' '!docs')
 license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
-xid-collision-debug.patch)
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
+xid-collision-debug.patch
+revert-iconview.patch)
 sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c'
-'d758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+'d758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+'517b3d0797b27324b8fa042ce4b653334ff3b55e48b921de3485505b9ca99fba')
 
 build() {
-cd ${srcdir}/gtk+-${pkgver}
-patch -Np1 -i ${srcdir}/xid-collision-debug.patch
+cd $srcdir/gtk+-$pkgver
+patch -Np1 -i $srcdir/xid-collision-debug.patch
+patch -Np1 -i $srcdir/revert-iconview.patch
 
 CXX=/bin/false ./configure --prefix=/usr \
 --sysconfdir=/etc \
@@ -37,19 +40,19 @@
 depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 
'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 
'gtk-update-icon-cache')
 backup=(etc/gtk-2.0/gtkrc)
 
-cd ${srcdir}/gtk+-${pkgver}
+cd $srcdir/gtk+-$pkgver
 
-make DESTDIR=${pkgdir} install
+make DESTDIR=$pkgdir install
 sed -i s#env python#env python2# $pkgdir/usr/bin/gtk-builder-convert
-echo 'gtk-fallback-icon-theme = gnome'  ${pkgdir}/etc/gtk-2.0/gtkrc
+echo 'gtk-fallback-icon-theme = gnome'  $pkgdir/etc/gtk-2.0/gtkrc
 #split this out to use with gtk3 too
-rm ${pkgdir}/usr/bin/gtk-update-icon-cache
+rm $pkgdir/usr/bin/gtk-update-icon-cache
 }
 package_gtk-update-icon-cache() {
 pkgdesc=The GTK+ update icon cache tool
 depends=('gdk-pixbuf2')
 
-cd ${srcdir}/gtk+-${pkgver}/gtk
+cd $srcdir/gtk+-$pkgver/gtk
 
-install -D -m755 gtk-update-icon-cache 
${pkgdir}/usr/bin/gtk-update-icon-cache
+install -D -m755 gtk-update-icon-cache 
$pkgdir/usr/bin/gtk-update-icon-cache
 }

Added: revert-iconview.patch
===
--- revert-iconview.patch   (rev 0)
+++ revert-iconview.patch   2011-11-16 23:10:40 UTC (rev 142843)
@@ -0,0 +1,30 @@
+From 5c3bb1839cac52828756f9ddb98f49d586853991 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi cosi...@gnome.org
+Date: Wed, 16 Nov 2011 22:38:45 +
+Subject: Revert iconview: layout items immediately when setting a 
GtkTreeModel
+
+It makes GtkIconView segfault on GTK 2.24.
+
+gtk_icon_view_expose() calls gtk_icon_view_layout() first thing if
+there's a layout queued anyway, so we wouldn't end up in the same
+situation causing the crash the original patch is supposed to fix.
+
+This reverts commit 5a03f4a6a50237d86959f596dda143dfc2f040d1.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=663138
+---
+diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
+index 62877fa..54b3f3b 100644
+--- a/gtk/gtkiconview.c
 b/gtk/gtkiconview.c
+@@ -5423,7 +5423,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view,
+ 
+   gtk_icon_view_build_items (icon_view);
+ 
+-  gtk_icon_view_layout (icon_view);
++  gtk_icon_view_queue_layout (icon_view);
+ }
+ 
+   g_object_notify (G_OBJECT (icon_view), model);  
+--
+cgit v0.9.0.2



[arch-commits] Commit in gtk2/repos (14 files)

2011-11-16 Thread Ionut Biru
Date: Wednesday, November 16, 2011 @ 18:13:07
  Author: ibiru
Revision: 142844

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  gtk2/repos/extra-i686/PKGBUILD
(from rev 142843, gtk2/trunk/PKGBUILD)
  gtk2/repos/extra-i686/gtk2.install
(from rev 142843, gtk2/trunk/gtk2.install)
  gtk2/repos/extra-i686/revert-iconview.patch
(from rev 142843, gtk2/trunk/revert-iconview.patch)
  gtk2/repos/extra-i686/xid-collision-debug.patch
(from rev 142843, gtk2/trunk/xid-collision-debug.patch)
  gtk2/repos/extra-x86_64/PKGBUILD
(from rev 142843, gtk2/trunk/PKGBUILD)
  gtk2/repos/extra-x86_64/gtk2.install
(from rev 142843, gtk2/trunk/gtk2.install)
  gtk2/repos/extra-x86_64/revert-iconview.patch
(from rev 142843, gtk2/trunk/revert-iconview.patch)
  gtk2/repos/extra-x86_64/xid-collision-debug.patch
(from rev 142843, gtk2/trunk/xid-collision-debug.patch)
Deleted:
  gtk2/repos/extra-i686/PKGBUILD
  gtk2/repos/extra-i686/gtk2.install
  gtk2/repos/extra-i686/xid-collision-debug.patch
  gtk2/repos/extra-x86_64/PKGBUILD
  gtk2/repos/extra-x86_64/gtk2.install
  gtk2/repos/extra-x86_64/xid-collision-debug.patch

+
 extra-i686/PKGBUILD|  113 +++
 extra-i686/gtk2.install|   32 
 extra-i686/revert-iconview.patch   |   30 
 extra-i686/xid-collision-debug.patch   |   30 
 extra-x86_64/PKGBUILD  |  113 +++
 extra-x86_64/gtk2.install  |   32 
 extra-x86_64/revert-iconview.patch |   30 
 extra-x86_64/xid-collision-debug.patch |   30 
 8 files changed, 238 insertions(+), 172 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-16 23:10:40 UTC (rev 142843)
+++ extra-i686/PKGBUILD 2011-11-16 23:13:07 UTC (rev 142844)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgbase=gtk2
-pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.8
-pkgrel=1
-arch=('i686' 'x86_64')
-url=http://www.gtk.org/;
-makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 
'libxcomposite' 'libxdamage'
- 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 
'gobject-introspection')
-options=('!libtool' '!docs')
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
-xid-collision-debug.patch)
-sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c'
-'d758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
-
-build() {
-cd ${srcdir}/gtk+-${pkgver}
-patch -Np1 -i ${srcdir}/xid-collision-debug.patch
-
-CXX=/bin/false ./configure --prefix=/usr \
---sysconfdir=/etc \
---localstatedir=/var \
---with-xinput=yes
-
-#https://bugzilla.gnome.org/show_bug.cgi?id=655517
-sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-make
-}
-
-package_gtk2() {
-pkgdesc=GTK+ is a multi-platform toolkit (v2)
-install=gtk2.install
-depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 
'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 
'gtk-update-icon-cache')
-backup=(etc/gtk-2.0/gtkrc)
-
-cd ${srcdir}/gtk+-${pkgver}
-
-make DESTDIR=${pkgdir} install
-sed -i s#env python#env python2# $pkgdir/usr/bin/gtk-builder-convert
-echo 'gtk-fallback-icon-theme = gnome'  ${pkgdir}/etc/gtk-2.0/gtkrc
-#split this out to use with gtk3 too
-rm ${pkgdir}/usr/bin/gtk-update-icon-cache
-}
-package_gtk-update-icon-cache() {
-pkgdesc=The GTK+ update icon cache tool
-depends=('gdk-pixbuf2')
-
-cd ${srcdir}/gtk+-${pkgver}/gtk
-
-install -D -m755 gtk-update-icon-cache 
${pkgdir}/usr/bin/gtk-update-icon-cache
-}

Copied: gtk2/repos/extra-i686/PKGBUILD (from rev 142843, gtk2/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-16 23:13:07 UTC (rev 142844)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgbase=gtk2
+pkgname=('gtk2' 'gtk-update-icon-cache')
+pkgver=2.24.8
+pkgrel=2
+arch=('i686' 'x86_64')
+url=http://www.gtk.org/;
+makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 
'libxcomposite' 'libxdamage'
+ 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 
'gobject-introspection')
+options=('!libtool' '!docs')
+license=('LGPL')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
+xid-collision-debug.patch
+revert-iconview.patch)
+sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c'
+'d758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+

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

2011-11-16 Thread Ionut Biru
Date: Wednesday, November 16, 2011 @ 18:51:52
  Author: ibiru
Revision: 142845

update to 9.8.1-P1

Modified:
  bind/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-11-16 23:13:07 UTC (rev 142844)
+++ PKGBUILD2011-11-16 23:51:52 UTC (rev 142845)
@@ -6,8 +6,8 @@
 pkgname=bind
 
 # Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.8.1
-_pkgver=9.8.1
+pkgver=9.8.1.P1
+_pkgver=9.8.1-P1
 pkgrel=1
 
 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the 
DNS protocols'
@@ -26,7 +26,7 @@
 'named.logrotate'
 'localhost.zone'
 '127.0.0.zone')
-sha1sums=('7e6ed6ebc896b1de33a9f440233066c60539de4c'
+sha1sums=('1cff6594aa185d84942edd2f3cc06dff9cebb04b'
   'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
   'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb'
   '18f477f510df31e6c6f547ee2d5fc46e973479bf'



[arch-commits] Commit in bind/repos (40 files)

2011-11-16 Thread Ionut Biru
Date: Wednesday, November 16, 2011 @ 18:53:56
  Author: ibiru
Revision: 142846

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  bind/repos/extra-i686/127.0.0.zone
(from rev 142845, bind/trunk/127.0.0.zone)
  bind/repos/extra-i686/PKGBUILD
(from rev 142845, bind/trunk/PKGBUILD)
  bind/repos/extra-i686/install
(from rev 142845, bind/trunk/install)
  bind/repos/extra-i686/localhost.zone
(from rev 142845, bind/trunk/localhost.zone)
  bind/repos/extra-i686/named
(from rev 142845, bind/trunk/named)
  bind/repos/extra-i686/named.conf
(from rev 142845, bind/trunk/named.conf)
  bind/repos/extra-i686/named.conf.d
(from rev 142845, bind/trunk/named.conf.d)
  bind/repos/extra-i686/named.logrotate
(from rev 142845, bind/trunk/named.logrotate)
  bind/repos/extra-i686/remove-tools.patch
(from rev 142845, bind/trunk/remove-tools.patch)
  bind/repos/extra-i686/so_bsdcompat.patch
(from rev 142845, bind/trunk/so_bsdcompat.patch)
  bind/repos/extra-x86_64/127.0.0.zone
(from rev 142845, bind/trunk/127.0.0.zone)
  bind/repos/extra-x86_64/PKGBUILD
(from rev 142845, bind/trunk/PKGBUILD)
  bind/repos/extra-x86_64/install
(from rev 142845, bind/trunk/install)
  bind/repos/extra-x86_64/localhost.zone
(from rev 142845, bind/trunk/localhost.zone)
  bind/repos/extra-x86_64/named
(from rev 142845, bind/trunk/named)
  bind/repos/extra-x86_64/named.conf
(from rev 142845, bind/trunk/named.conf)
  bind/repos/extra-x86_64/named.conf.d
(from rev 142845, bind/trunk/named.conf.d)
  bind/repos/extra-x86_64/named.logrotate
(from rev 142845, bind/trunk/named.logrotate)
  bind/repos/extra-x86_64/remove-tools.patch
(from rev 142845, bind/trunk/remove-tools.patch)
  bind/repos/extra-x86_64/so_bsdcompat.patch
(from rev 142845, bind/trunk/so_bsdcompat.patch)
Deleted:
  bind/repos/extra-i686/127.0.0.zone
  bind/repos/extra-i686/PKGBUILD
  bind/repos/extra-i686/install
  bind/repos/extra-i686/localhost.zone
  bind/repos/extra-i686/named
  bind/repos/extra-i686/named.conf
  bind/repos/extra-i686/named.conf.d
  bind/repos/extra-i686/named.logrotate
  bind/repos/extra-i686/remove-tools.patch
  bind/repos/extra-i686/so_bsdcompat.patch
  bind/repos/extra-x86_64/127.0.0.zone
  bind/repos/extra-x86_64/PKGBUILD
  bind/repos/extra-x86_64/install
  bind/repos/extra-x86_64/localhost.zone
  bind/repos/extra-x86_64/named
  bind/repos/extra-x86_64/named.conf
  bind/repos/extra-x86_64/named.conf.d
  bind/repos/extra-x86_64/named.logrotate
  bind/repos/extra-x86_64/remove-tools.patch
  bind/repos/extra-x86_64/so_bsdcompat.patch

-+
 extra-i686/127.0.0.zone |   22 ++--
 extra-i686/PKGBUILD |  178 +++---
 extra-i686/install  |   42 
 extra-i686/localhost.zone   |   20 ++--
 extra-i686/named|  104 +++---
 extra-i686/named.conf   |  128 +--
 extra-i686/named.conf.d |8 -
 extra-i686/named.logrotate  |   12 +-
 extra-i686/remove-tools.patch   |   24 ++---
 extra-i686/so_bsdcompat.patch   |   24 ++---
 extra-x86_64/127.0.0.zone   |   22 ++--
 extra-x86_64/PKGBUILD   |  178 +++---
 extra-x86_64/install|   42 
 extra-x86_64/localhost.zone |   20 ++--
 extra-x86_64/named  |  104 +++---
 extra-x86_64/named.conf |  128 +--
 extra-x86_64/named.conf.d   |8 -
 extra-x86_64/named.logrotate|   12 +-
 extra-x86_64/remove-tools.patch |   24 ++---
 extra-x86_64/so_bsdcompat.patch |   24 ++---
 20 files changed, 562 insertions(+), 562 deletions(-)

Deleted: extra-i686/127.0.0.zone
===
--- extra-i686/127.0.0.zone 2011-11-16 23:51:52 UTC (rev 142845)
+++ extra-i686/127.0.0.zone 2011-11-16 23:53:56 UTC (rev 142846)
@@ -1,11 +0,0 @@
-$ORIGIN 0.0.127.in-addr.arpa.
-
-@  1D IN SOA   localhost. root.localhost. (
-   42  ; serial (mmdd##)
-   3H  ; refresh
-   15M ; retry
-   1W  ; expiry
-   1D ); minimum ttl
-
-   1D IN NSlocalhost.
-1  1D IN PTR   localhost.

Copied: bind/repos/extra-i686/127.0.0.zone (from rev 142845, 
bind/trunk/127.0.0.zone)
===
--- extra-i686/127.0.0.zone (rev 0)
+++ extra-i686/127.0.0.zone 2011-11-16 23:53:56 UTC (rev 142846)
@@ -0,0 +1,11 @@
+$ORIGIN 0.0.127.in-addr.arpa.
+
+@  1D IN SOA   localhost. root.localhost. (
+  

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

2011-11-16 Thread Gaetan Bisson
Date: Wednesday, November 16, 2011 @ 19:38:27
  Author: bisson
Revision: 142847

db-move: moved jfsutils from [testing] to [core] (i686)

Added:
  jfsutils/repos/core-i686/PKGBUILD
(from rev 142846, jfsutils/repos/testing-i686/PKGBUILD)
Deleted:
  jfsutils/repos/core-i686/PKGBUILD
  jfsutils/repos/testing-i686/

--+
 PKGBUILD |   54 ++
 1 file changed, 30 insertions(+), 24 deletions(-)

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2011-11-16 23:53:56 UTC (rev 142846)
+++ core-i686/PKGBUILD  2011-11-17 00:38:27 UTC (rev 142847)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski tp...@archlinux.org
-pkgname=jfsutils
-pkgver=1.1.15
-pkgrel=2
-pkgdesc=JFS filesystem utilities
-arch=(i686 x86_64)
-url=http://jfs.sourceforge.net;
-license=('GPL')
-groups=('base')
-depends=('util-linux-ng')
-source=(http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8809465cd48a202895bc2a12e1923b5d')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --sbindir=/sbin 
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: jfsutils/repos/core-i686/PKGBUILD (from rev 142846, 
jfsutils/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD  (rev 0)
+++ core-i686/PKGBUILD  2011-11-17 00:38:27 UTC (rev 142847)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+
+pkgname=jfsutils
+pkgver=1.1.15
+pkgrel=3
+pkgdesc='JFS filesystem utilities'
+arch=('i686' 'x86_64')
+url='http://jfs.sourceforge.net'
+license=('GPL')
+groups=('base')
+depends=('util-linux-ng')
+source=(http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz;)
+sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure --sbindir=/sbin 
+   make
+}
+
+check() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make check
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+}



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

2011-11-16 Thread Gaetan Bisson
Date: Wednesday, November 16, 2011 @ 19:38:27
  Author: bisson
Revision: 142848

db-move: moved jfsutils from [testing] to [core] (x86_64)

Added:
  jfsutils/repos/core-x86_64/PKGBUILD
(from rev 142846, jfsutils/repos/testing-x86_64/PKGBUILD)
Deleted:
  jfsutils/repos/core-x86_64/PKGBUILD
  jfsutils/repos/testing-x86_64/

--+
 PKGBUILD |   54 ++
 1 file changed, 30 insertions(+), 24 deletions(-)

Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2011-11-17 00:38:27 UTC (rev 142847)
+++ core-x86_64/PKGBUILD2011-11-17 00:38:27 UTC (rev 142848)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski tp...@archlinux.org
-pkgname=jfsutils
-pkgver=1.1.15
-pkgrel=2
-pkgdesc=JFS filesystem utilities
-arch=(i686 x86_64)
-url=http://jfs.sourceforge.net;
-license=('GPL')
-groups=('base')
-depends=('util-linux-ng')
-source=(http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8809465cd48a202895bc2a12e1923b5d')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --sbindir=/sbin 
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: jfsutils/repos/core-x86_64/PKGBUILD (from rev 142846, 
jfsutils/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2011-11-17 00:38:27 UTC (rev 142848)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+
+pkgname=jfsutils
+pkgver=1.1.15
+pkgrel=3
+pkgdesc='JFS filesystem utilities'
+arch=('i686' 'x86_64')
+url='http://jfs.sourceforge.net'
+license=('GPL')
+groups=('base')
+depends=('util-linux-ng')
+source=(http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz;)
+sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure --sbindir=/sbin 
+   make
+}
+
+check() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make check
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+}



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

2011-11-16 Thread Eric Bélanger
Date: Wednesday, November 16, 2011 @ 20:39:01
  Author: eric
Revision: 142849

upgpkg: libdvdcss 1.2.11-1

Upstream update

Modified:
  libdvdcss/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-11-17 00:38:27 UTC (rev 142848)
+++ PKGBUILD2011-11-17 01:39:01 UTC (rev 142849)
@@ -4,8 +4,8 @@
 # Contributor Sarah Hay sarah...@mb.sympatico.ca
 
 pkgname=libdvdcss
-pkgver=1.2.10
-pkgrel=2
+pkgver=1.2.11
+pkgrel=1
 pkgdesc=A portable abstraction library for DVD decryption
 url=http://www.videolan.org/libdvdcss;
 arch=('i686' 'x86_64')
@@ -13,9 +13,8 @@
 depends=('glibc')
 options=('!libtool')
 
source=(http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('7c933d011e34c218048d48f0c1a8b4ff56798dcd')
+sha512sums=('32dec992cf2f352a09c4edc39ea16101fc9005f3aecc43460aa1b5834c104d3f2c1efc81051339fa18fd4f33cfa949fd17ffe84414519a92b91d0d8a1ae4c467')
 
-
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr



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

2011-11-16 Thread Eric Bélanger
Date: Wednesday, November 16, 2011 @ 20:39:31
  Author: eric
Revision: 142850

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  libdvdcss/repos/extra-i686/PKGBUILD
(from rev 142849, libdvdcss/trunk/PKGBUILD)
  libdvdcss/repos/extra-x86_64/PKGBUILD
(from rev 142849, libdvdcss/trunk/PKGBUILD)
Deleted:
  libdvdcss/repos/extra-i686/PKGBUILD
  libdvdcss/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |   55 +++-
 extra-x86_64/PKGBUILD |   55 +++-
 2 files changed, 54 insertions(+), 56 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-17 01:39:01 UTC (rev 142849)
+++ extra-i686/PKGBUILD 2011-11-17 01:39:31 UTC (rev 142850)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault steph...@archlinux.org
-# Contributor: arjan ar...@archlinux.org
-# Contributor Sarah Hay sarah...@mb.sympatico.ca
-
-pkgname=libdvdcss
-pkgver=1.2.10
-pkgrel=2
-pkgdesc=A portable abstraction library for DVD decryption
-url=http://www.videolan.org/libdvdcss;
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('glibc')
-options=('!libtool')
-source=(http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('7c933d011e34c218048d48f0c1a8b4ff56798dcd')
-
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=$pkgdir install
-}

Copied: libdvdcss/repos/extra-i686/PKGBUILD (from rev 142849, 
libdvdcss/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-17 01:39:31 UTC (rev 142850)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault steph...@archlinux.org
+# Contributor: arjan ar...@archlinux.org
+# Contributor Sarah Hay sarah...@mb.sympatico.ca
+
+pkgname=libdvdcss
+pkgver=1.2.11
+pkgrel=1
+pkgdesc=A portable abstraction library for DVD decryption
+url=http://www.videolan.org/libdvdcss;
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('glibc')
+options=('!libtool')
+source=(http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+sha512sums=('32dec992cf2f352a09c4edc39ea16101fc9005f3aecc43460aa1b5834c104d3f2c1efc81051339fa18fd4f33cfa949fd17ffe84414519a92b91d0d8a1ae4c467')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=$pkgdir install
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-11-17 01:39:01 UTC (rev 142849)
+++ extra-x86_64/PKGBUILD   2011-11-17 01:39:31 UTC (rev 142850)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault steph...@archlinux.org
-# Contributor: arjan ar...@archlinux.org
-# Contributor Sarah Hay sarah...@mb.sympatico.ca
-
-pkgname=libdvdcss
-pkgver=1.2.10
-pkgrel=2
-pkgdesc=A portable abstraction library for DVD decryption
-url=http://www.videolan.org/libdvdcss;
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('glibc')
-options=('!libtool')
-source=(http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('7c933d011e34c218048d48f0c1a8b4ff56798dcd')
-
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=$pkgdir install
-}

Copied: libdvdcss/repos/extra-x86_64/PKGBUILD (from rev 142849, 
libdvdcss/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-11-17 01:39:31 UTC (rev 142850)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault steph...@archlinux.org
+# Contributor: arjan ar...@archlinux.org
+# Contributor Sarah Hay sarah...@mb.sympatico.ca
+
+pkgname=libdvdcss
+pkgver=1.2.11
+pkgrel=1
+pkgdesc=A portable abstraction library for DVD decryption
+url=http://www.videolan.org/libdvdcss;
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('glibc')
+options=('!libtool')
+source=(http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+sha512sums=('32dec992cf2f352a09c4edc39ea16101fc9005f3aecc43460aa1b5834c104d3f2c1efc81051339fa18fd4f33cfa949fd17ffe84414519a92b91d0d8a1ae4c467')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=$pkgdir install
+}



[arch-commits] Commit in python-distribute/trunk (2 files)

2011-11-16 Thread Stéphane Gaudreault
Date: Wednesday, November 16, 2011 @ 22:08:59
  Author: stephane
Revision: 142851

upgpkg: python-distribute 0.6.24-1

upstream update

Modified:
  python-distribute/trunk/PKGBUILD
  python-distribute/trunk/distribute-python2_and_3.patch

+
 PKGBUILD   |9 +---
 distribute-python2_and_3.patch |   42 ++-
 2 files changed, 26 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-17 01:39:31 UTC (rev 142850)
+++ PKGBUILD2011-11-17 03:08:59 UTC (rev 142851)
@@ -3,7 +3,7 @@
 # Contributor: Sebastien Binet binet@farnsworth
 pkgbase=python-distribute
 pkgname=('python-distribute' 'python2-distribute')
-pkgver=0.6.21
+pkgver=0.6.24
 pkgrel=1
 pkgdesc=Easily build and distribute Python packages
 arch=('any')
@@ -12,8 +12,8 @@
 makedepends=('python' 'python2')
 
source=(http://pypi.python.org/packages/source/d/distribute/distribute-${pkgver}.tar.gz
 distribute-python2_and_3.patch)
-sha1sums=('4bc3df524ba1d684ba997caab3346040551a3820'
-  '19a78b79123095dc4a99cda4ba0d02e34210c310')
+sha1sums=('0670bdbba2be6892f67a6f946259776fa8331525'
+  '479a239fae1047fa4a8c64b89f4aec2934f027b9')
 
 build() {
cd ${srcdir}
@@ -31,6 +31,9 @@
 
# Build python 2 module
cd ../distribute-${pkgver}-python2
+
+   sed -i -e s|^#\!.*/usr/bin/python|#!/usr/bin/python2| 
setuptools/tests/test_resources.py
+
python2 setup.py build
python2 setup.py test
 }

Modified: distribute-python2_and_3.patch
===
--- distribute-python2_and_3.patch  2011-11-17 01:39:31 UTC (rev 142850)
+++ distribute-python2_and_3.patch  2011-11-17 03:08:59 UTC (rev 142851)
@@ -1,19 +1,18 @@
-diff -Naur distribute-0.6.19.ori//distribute.egg-info/entry_points.txt 
distribute-0.6.19/distribute.egg-info/entry_points.txt
 distribute-0.6.19.ori//distribute.egg-info/entry_points.txt
2011-06-01 20:10:28.0 -0400
-+++ distribute-0.6.19/distribute.egg-info/entry_points.txt 2011-06-20 
06:34:22.599954085 -0400
-@@ -32,7 +32,8 @@
- 
- [console_scripts]
- easy_install = setuptools.command.easy_install:main
--easy_install-2.6 = setuptools.command.easy_install:main
+diff -Naur distribute-0.6.24.ori/distribute.egg-info/entry_points.txt 
distribute-0.6.24/distribute.egg-info/entry_points.txt
+--- distribute-0.6.24.ori/distribute.egg-info/entry_points.txt 2011-10-16 
09:09:39.0 -0400
 distribute-0.6.24/distribute.egg-info/entry_points.txt 2011-11-16 
21:40:38.410170855 -0500
+@@ -11,6 +11,8 @@
+ install_egg_info = setuptools.command.install_egg_info:install_egg_info
+ alias = setuptools.command.alias:alias
+ easy_install = setuptools.command.easy_install:easy_install
 +easy_install-2.7 = setuptools.command.easy_install:main
-+easy_install-3.2 = setuptools.command.easy_install:main
- 
- [setuptools.file_finders]
- svn_cvs = setuptools.command.sdist:_default_revctrl
-diff -Naur distribute-0.6.19.ori//distribute_setup.py 
distribute-0.6.19/distribute_setup.py
 distribute-0.6.19.ori//distribute_setup.py 2011-06-01 06:24:15.0 
-0400
-+++ distribute-0.6.19/distribute_setup.py  2011-06-20 06:35:31.729951812 
-0400
++easy_install-3.2 = setuptools.command.easy_install:main  
+ install_scripts = setuptools.command.install_scripts:install_scripts
+ bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+ bdist_egg = setuptools.command.bdist_egg:bdist_egg
+diff -Naur distribute-0.6.24.ori/distribute_setup.py 
distribute-0.6.24/distribute_setup.py
+--- distribute-0.6.24.ori/distribute_setup.py  2011-10-16 09:05:57.0 
-0400
 distribute-0.6.24/distribute_setup.py  2011-11-16 21:41:55.990174043 
-0500
 @@ -299,8 +299,7 @@
  log.warn('Could not find the install location')
  return
@@ -24,15 +23,14 @@
  pkg_info = os.path.join(placeholder, setuptools_file)
  if os.path.exists(pkg_info):
  log.warn('%s already exists', pkg_info)
-diff -Naur distribute-0.6.19.ori//setup.py distribute-0.6.19/setup.py
 distribute-0.6.19.ori//setup.py2011-06-01 06:23:28.0 -0400
-+++ distribute-0.6.19/setup.py 2011-06-20 06:37:05.806615385 -0400
-@@ -100,6 +100,8 @@
+diff -Naur distribute-0.6.24.ori/setup.py distribute-0.6.24/setup.py
+--- distribute-0.6.24.ori/setup.py 2011-10-16 09:05:57.0 -0400
 distribute-0.6.24/setup.py 2011-11-16 21:42:52.496843023 -0500
+@@ -99,6 +99,7 @@
+ finally:
  f.close()
  
- 
 +console_scripts = [easy_install-%s = setuptools.command.easy_install:main % 
sys.version[:3]]
-+
+ 
  # if we are installing Distribute using python setup.py install
  # we need to get setuptools out of the way
- def _easy_install_marker():



[arch-commits] Commit in python-distribute/repos/extra-any (4 files)

2011-11-16 Thread Stéphane Gaudreault
Date: Wednesday, November 16, 2011 @ 22:09:08
  Author: stephane
Revision: 142852

archrelease: copy trunk to extra-any

Added:
  python-distribute/repos/extra-any/PKGBUILD
(from rev 142851, python-distribute/trunk/PKGBUILD)
  python-distribute/repos/extra-any/distribute-python2_and_3.patch
(from rev 142851, python-distribute/trunk/distribute-python2_and_3.patch)
Deleted:
  python-distribute/repos/extra-any/PKGBUILD
  python-distribute/repos/extra-any/distribute-python2_and_3.patch

+
 PKGBUILD   |  107 ---
 distribute-python2_and_3.patch |   74 +-
 2 files changed, 91 insertions(+), 90 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-11-17 03:08:59 UTC (rev 142851)
+++ PKGBUILD2011-11-17 03:09:08 UTC (rev 142852)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault steph...@archlinux.org
-# Contributor: Sebastien Binet binet@farnsworth
-pkgbase=python-distribute
-pkgname=('python-distribute' 'python2-distribute')
-pkgver=0.6.21
-pkgrel=1
-pkgdesc=Easily build and distribute Python packages
-arch=('any')
-license=('PSF')
-url=http://pypi.python.org/pypi/distribute;
-makedepends=('python' 'python2')
-source=(http://pypi.python.org/packages/source/d/distribute/distribute-${pkgver}.tar.gz
-distribute-python2_and_3.patch)
-sha1sums=('4bc3df524ba1d684ba997caab3346040551a3820'
-  '19a78b79123095dc4a99cda4ba0d02e34210c310')
-
-build() {
-   cd ${srcdir}
-
-   pushd distribute-${pkgver}
-   patch -Np1 -i ../distribute-python2_and_3.patch
-   popd
-
-   cp -a distribute-${pkgver}{,-python2}
-
-   # Build python 3 module
-   cd distribute-${pkgver}
-   python setup.py build
-   python setup.py test
-
-   # Build python 2 module
-   cd ../distribute-${pkgver}-python2
-   python2 setup.py build
-   python2 setup.py test
-}
-
-package_python-distribute() {
-   depends=('python=3.2')
-
-   cd ${srcdir}/distribute-${pkgver}
-   python setup.py install --prefix=/usr --root=${pkgdir} --optimize=1 
--skip-build
-}
-
-package_python2-distribute() {
-   depends=('python2=2.7')
-   provides=('setuptools=0.6c11')
-   conflicts=('setuptools')
-
-   cd ${srcdir}/distribute-${pkgver}-python2
-   python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1 
--skip-build
-}

Copied: python-distribute/repos/extra-any/PKGBUILD (from rev 142851, 
python-distribute/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-11-17 03:09:08 UTC (rev 142852)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault steph...@archlinux.org
+# Contributor: Sebastien Binet binet@farnsworth
+pkgbase=python-distribute
+pkgname=('python-distribute' 'python2-distribute')
+pkgver=0.6.24
+pkgrel=1
+pkgdesc=Easily build and distribute Python packages
+arch=('any')
+license=('PSF')
+url=http://pypi.python.org/pypi/distribute;
+makedepends=('python' 'python2')
+source=(http://pypi.python.org/packages/source/d/distribute/distribute-${pkgver}.tar.gz
+distribute-python2_and_3.patch)
+sha1sums=('0670bdbba2be6892f67a6f946259776fa8331525'
+  '479a239fae1047fa4a8c64b89f4aec2934f027b9')
+
+build() {
+   cd ${srcdir}
+
+   pushd distribute-${pkgver}
+   patch -Np1 -i ../distribute-python2_and_3.patch
+   popd
+
+   cp -a distribute-${pkgver}{,-python2}
+
+   # Build python 3 module
+   cd distribute-${pkgver}
+   python setup.py build
+   python setup.py test
+
+   # Build python 2 module
+   cd ../distribute-${pkgver}-python2
+
+   sed -i -e s|^#\!.*/usr/bin/python|#!/usr/bin/python2| 
setuptools/tests/test_resources.py
+
+   python2 setup.py build
+   python2 setup.py test
+}
+
+package_python-distribute() {
+   depends=('python=3.2')
+
+   cd ${srcdir}/distribute-${pkgver}
+   python setup.py install --prefix=/usr --root=${pkgdir} --optimize=1 
--skip-build
+}
+
+package_python2-distribute() {
+   depends=('python2=2.7')
+   provides=('setuptools=0.6c11')
+   conflicts=('setuptools')
+
+   cd ${srcdir}/distribute-${pkgver}-python2
+   python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1 
--skip-build
+}

Deleted: distribute-python2_and_3.patch
===
--- distribute-python2_and_3.patch  2011-11-17 03:08:59 UTC (rev 142851)
+++ distribute-python2_and_3.patch  2011-11-17 03:09:08 UTC (rev 142852)
@@ -1,38 +0,0 @@
-diff -Naur distribute-0.6.19.ori//distribute.egg-info/entry_points.txt 
distribute-0.6.19/distribute.egg-info/entry_points.txt
 distribute-0.6.19.ori//distribute.egg-info/entry_points.txt
2011-06-01 20:10:28.0 -0400
-+++ distribute-0.6.19/distribute.egg-info/entry_points.txt 2011-06-20 
06:34:22.599954085 -0400
-@@ -32,7 +32,8 @@
- 
- [console_scripts]
- easy_install = setuptools.command.easy_install:main

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

2011-11-16 Thread Evangelos Foutras
Date: Wednesday, November 16, 2011 @ 23:08:02
  Author: foutrelis
Revision: 142853

upgpkg: chromium 15.0.874.121-1

New upstream release.

Modified:
  chromium/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-11-17 03:09:08 UTC (rev 142852)
+++ PKGBUILD2011-11-17 04:08:02 UTC (rev 142853)
@@ -5,7 +5,7 @@
 # Contributor: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=chromium
-pkgver=15.0.874.120
+pkgver=15.0.874.121
 pkgrel=1
 pkgdesc=The open-source project behind Google Chrome, an attempt at creating 
a safer, faster, and more stable browser
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@
 gcc-4.6.patch
 nacl.gypi
 fix-downloads-on-ntfs.patch)
-sha256sums=('bdfc4533708249b50743acaae4f49772e56c8070ea2fc4af114694c40d8ed929'
+sha256sums=('4d3e340b43ca1f5dd7bd5b7b0c575dfe158eee3ba5163a1c42be53dfc7db5aec'
 '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
 'c53bfc4db9dde684fbaed6a4bbecb207e3e7a0a2703233426fe076a6d3c557f3'
 '9c5e0803904d1a0e71ab7444c92a7046a34a9518eeba7a70f2eec7abecb8bf4e'



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

2011-11-16 Thread Evangelos Foutras
Date: Wednesday, November 16, 2011 @ 23:08:47
  Author: foutrelis
Revision: 142854

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  chromium/repos/extra-i686/PKGBUILD
(from rev 142853, chromium/trunk/PKGBUILD)
  chromium/repos/extra-i686/chromium.desktop
(from rev 142853, chromium/trunk/chromium.desktop)
  chromium/repos/extra-i686/chromium.install
(from rev 142853, chromium/trunk/chromium.install)
  chromium/repos/extra-i686/chromium.sh
(from rev 142853, chromium/trunk/chromium.sh)
  chromium/repos/extra-i686/fix-downloads-on-ntfs.patch
(from rev 142853, chromium/trunk/fix-downloads-on-ntfs.patch)
  chromium/repos/extra-i686/gcc-4.6.patch
(from rev 142853, chromium/trunk/gcc-4.6.patch)
  chromium/repos/extra-i686/nacl.gypi
(from rev 142853, chromium/trunk/nacl.gypi)
  chromium/repos/extra-x86_64/PKGBUILD
(from rev 142853, chromium/trunk/PKGBUILD)
  chromium/repos/extra-x86_64/chromium.desktop
(from rev 142853, chromium/trunk/chromium.desktop)
  chromium/repos/extra-x86_64/chromium.install
(from rev 142853, chromium/trunk/chromium.install)
  chromium/repos/extra-x86_64/chromium.sh
(from rev 142853, chromium/trunk/chromium.sh)
  chromium/repos/extra-x86_64/fix-downloads-on-ntfs.patch
(from rev 142853, chromium/trunk/fix-downloads-on-ntfs.patch)
  chromium/repos/extra-x86_64/gcc-4.6.patch
(from rev 142853, chromium/trunk/gcc-4.6.patch)
  chromium/repos/extra-x86_64/nacl.gypi
(from rev 142853, chromium/trunk/nacl.gypi)
Deleted:
  chromium/repos/extra-i686/PKGBUILD
  chromium/repos/extra-i686/chromium.desktop
  chromium/repos/extra-i686/chromium.install
  chromium/repos/extra-i686/chromium.sh
  chromium/repos/extra-i686/fix-downloads-on-ntfs.patch
  chromium/repos/extra-i686/gcc-4.6.patch
  chromium/repos/extra-i686/nacl.gypi
  chromium/repos/extra-x86_64/PKGBUILD
  chromium/repos/extra-x86_64/chromium.desktop
  chromium/repos/extra-x86_64/chromium.install
  chromium/repos/extra-x86_64/chromium.sh
  chromium/repos/extra-x86_64/fix-downloads-on-ntfs.patch
  chromium/repos/extra-x86_64/gcc-4.6.patch
  chromium/repos/extra-x86_64/nacl.gypi

--+
 extra-i686/PKGBUILD  |  254 ++---
 extra-i686/chromium.desktop  |  226 -
 extra-i686/chromium.install  |   24 +-
 extra-i686/chromium.sh   |8 
 extra-i686/fix-downloads-on-ntfs.patch   |   52 ++---
 extra-i686/gcc-4.6.patch |  198 +++---
 extra-i686/nacl.gypi |   16 -
 extra-x86_64/PKGBUILD|  254 ++---
 extra-x86_64/chromium.desktop|  226 -
 extra-x86_64/chromium.install|   24 +-
 extra-x86_64/chromium.sh |8 
 extra-x86_64/fix-downloads-on-ntfs.patch |   52 ++---
 extra-x86_64/gcc-4.6.patch   |  198 +++---
 extra-x86_64/nacl.gypi   |   16 -
 14 files changed, 778 insertions(+), 778 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 142853:142854 to see the changes.


[arch-commits] Commit in transcode/trunk (6 files)

2011-11-16 Thread Eric Bélanger
Date: Thursday, November 17, 2011 @ 02:09:00
  Author: eric
Revision: 142855

upgpkg: transcode 1.1.6-1

Upstream update, Add build patch for subtitleripper, Add v4l-utils makedepends, 
Enable SMP build, Cleanup configure options, PKGBUILD clean up, Remove old 
patches

Added:
  transcode/trunk/subtitleripper-0.3.4-linkingorder.patch
  transcode/trunk/subtitleripper-0.3.4-respect-ldflags.patch
Modified:
  transcode/trunk/PKGBUILD
Deleted:
  transcode/trunk/transcode-1.1.5-ffmpeg.patch
  transcode/trunk/transcode-1.1.5-jpeg-7.patch
  transcode/trunk/transcode-1.1.5-mpa.patch

+
 PKGBUILD   |   54 +++
 subtitleripper-0.3.4-linkingorder.patch|   28 ++
 subtitleripper-0.3.4-respect-ldflags.patch |   28 ++
 transcode-1.1.5-ffmpeg.patch   |  124 ---
 transcode-1.1.5-jpeg-7.patch   |   16 ---
 transcode-1.1.5-mpa.patch  |   10 --
 6 files changed, 73 insertions(+), 187 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-17 04:08:47 UTC (rev 142854)
+++ PKGBUILD2011-11-17 07:09:00 UTC (rev 142855)
@@ -5,59 +5,39 @@
 
 pkgname=transcode
 _sripver=0.3-4
-pkgver=1.1.5
-pkgrel=7
+pkgver=1.1.6
+pkgrel=1
 pkgdesc=A video/DVD ripper and encoder for the terminal/console
 arch=('i686' 'x86_64')
 url=http://tcforge.berlios.de/;
 license=('GPL')
 depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
-makedepends=('nasm')
-options=('!libtool' '!makeflags')
-source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2
+makedepends=('nasm' 'v4l-utils')
+options=('!libtool')
+source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2

http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
-   transcode-1.1.5-jpeg-7.patch  transcode-1.1.5-mpa.patch 
transcode-1.1.5-ffmpeg.patch)
-sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26'
+subtitleripper-0.3.4-linkingorder.patch 
subtitleripper-0.3.4-respect-ldflags.patch)
+sha1sums=('e176622b2c2834b006cda3c368ab521407d375c4'
   'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
-  '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977'
-  '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2'
-  '2d3bb4486394ee55540e772f134e193874e5c2b4')
+  'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
+  '591943a33235342a66c3df0625a164a1479c09ae')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p0  ../transcode-1.1.5-jpeg-7.patch
-  patch -p1  ../transcode-1.1.5-mpa.patch
-  patch -p1  ../transcode-1.1.5-ffmpeg.patch
-
- # building from here
+  sed -i 's|linux/videodev.h|libv4l1-videodev.h|' configure 
   ./configure --prefix=/usr \
---enable-sse=no --enable-sse2=no --enable-altivec=no --enable-mmx \
+--disable-sse --disable-sse2 --disable-altivec --enable-mmx \
 --enable-lame --enable-ogg --enable-vorbis --enable-theora \
 --enable-libdv --enable-libxml2 --enable-v4l \
 --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \
 --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \
---enable-xvid --enable-x264 --enable-alsa \
---enable-libmpeg2 --enable-libmpeg2convert \
---with-libxml2-prefix=/usr \
---with-mjpegtools-prefix=/usr \
---with-imagemagick-prefix=/usr \
---with-libdv-includes=/usr \
---with-libpostproc-includes=/usr/include/libpostproc \
---with-ogg-prefix=/usr \
---with-lame-libs=/usr \
---with-lzo-libs=/usr/lib \
---with-libavcodec-prefix=/usr \
---with-libavcodec-includes=/usr/include \
---with-libavcodec-libs=/usr/lib
-
+--enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2 
--enable-libmpeg2convert
   make
- ##
- # this imports the latest subtitleripper sources and replaces the internal
-  mkdir contrib
-  mv ${srcdir}/subtitleripper contrib/subrip
- # removes dependency on libppm, make it dependend on netpbm just failed, 
argh...
-  cd contrib/subrip
+
+  cd ${srcdir}/subtitleripper
+  patch -p1 -i ${srcdir}/subtitleripper-0.3.4-linkingorder.patch
+  patch -p1 -i ${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch
   sed -e 's|^\(.*lppm.*\)$|#\1|' \
   -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
   -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
@@ -69,7 +49,7 @@
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 
-  cd contrib/subrip
+  cd ${srcdir}/subtitleripper
   install -m 755 pgm2txt ${pkgdir}/usr/bin/
   install -m 755 srttool ${pkgdir}/usr/bin/
   install -m 755 subtitle2pgm ${pkgdir}/usr/bin/

Added: subtitleripper-0.3.4-linkingorder.patch
===
--- 

[arch-commits] Commit in transcode/repos (14 files)

2011-11-16 Thread Eric Bélanger
Date: Thursday, November 17, 2011 @ 02:09:40
  Author: eric
Revision: 142856

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  transcode/repos/extra-i686/PKGBUILD
(from rev 142855, transcode/trunk/PKGBUILD)
  transcode/repos/extra-i686/subtitleripper-0.3.4-linkingorder.patch
(from rev 142855, transcode/trunk/subtitleripper-0.3.4-linkingorder.patch)
  transcode/repos/extra-i686/subtitleripper-0.3.4-respect-ldflags.patch
(from rev 142855, 
transcode/trunk/subtitleripper-0.3.4-respect-ldflags.patch)
  transcode/repos/extra-x86_64/PKGBUILD
(from rev 142855, transcode/trunk/PKGBUILD)
  transcode/repos/extra-x86_64/subtitleripper-0.3.4-linkingorder.patch
(from rev 142855, transcode/trunk/subtitleripper-0.3.4-linkingorder.patch)
  transcode/repos/extra-x86_64/subtitleripper-0.3.4-respect-ldflags.patch
(from rev 142855, 
transcode/trunk/subtitleripper-0.3.4-respect-ldflags.patch)
Deleted:
  transcode/repos/extra-i686/PKGBUILD
  transcode/repos/extra-i686/transcode-1.1.5-ffmpeg.patch
  transcode/repos/extra-i686/transcode-1.1.5-jpeg-7.patch
  transcode/repos/extra-i686/transcode-1.1.5-mpa.patch
  transcode/repos/extra-x86_64/PKGBUILD
  transcode/repos/extra-x86_64/transcode-1.1.5-ffmpeg.patch
  transcode/repos/extra-x86_64/transcode-1.1.5-jpeg-7.patch
  transcode/repos/extra-x86_64/transcode-1.1.5-mpa.patch

-+
 extra-i686/PKGBUILD |  136 +-
 extra-i686/subtitleripper-0.3.4-linkingorder.patch  |   28 ++
 extra-i686/subtitleripper-0.3.4-respect-ldflags.patch   |   28 ++
 extra-i686/transcode-1.1.5-ffmpeg.patch |  124 
 extra-i686/transcode-1.1.5-jpeg-7.patch |   16 -
 extra-i686/transcode-1.1.5-mpa.patch|   10 -
 extra-x86_64/PKGBUILD   |  136 +-
 extra-x86_64/subtitleripper-0.3.4-linkingorder.patch|   28 ++
 extra-x86_64/subtitleripper-0.3.4-respect-ldflags.patch |   28 ++
 extra-x86_64/transcode-1.1.5-ffmpeg.patch   |  124 
 extra-x86_64/transcode-1.1.5-jpeg-7.patch   |   16 -
 extra-x86_64/transcode-1.1.5-mpa.patch  |   10 -
 12 files changed, 228 insertions(+), 456 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-17 07:09:00 UTC (rev 142855)
+++ extra-i686/PKGBUILD 2011-11-17 07:09:40 UTC (rev 142856)
@@ -1,78 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Sarah Hay sarah...@mb.sympatico.ca
-# Contributor: roberto robe...@archlinux.org
-
-pkgname=transcode
-_sripver=0.3-4
-pkgver=1.1.5
-pkgrel=7
-pkgdesc=A video/DVD ripper and encoder for the terminal/console
-arch=('i686' 'x86_64')
-url=http://tcforge.berlios.de/;
-license=('GPL')
-depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
-'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
-makedepends=('nasm')
-options=('!libtool' '!makeflags')
-source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2
-   
http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
-   transcode-1.1.5-jpeg-7.patch  transcode-1.1.5-mpa.patch 
transcode-1.1.5-ffmpeg.patch)
-sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26'
-  'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
-  '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977'
-  '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2'
-  '2d3bb4486394ee55540e772f134e193874e5c2b4')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p0  ../transcode-1.1.5-jpeg-7.patch
-  patch -p1  ../transcode-1.1.5-mpa.patch
-  patch -p1  ../transcode-1.1.5-ffmpeg.patch
-
- # building from here
-  ./configure --prefix=/usr \
---enable-sse=no --enable-sse2=no --enable-altivec=no --enable-mmx \
---enable-lame --enable-ogg --enable-vorbis --enable-theora \
---enable-libdv --enable-libxml2 --enable-v4l \
---enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \
---enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \
---enable-xvid --enable-x264 --enable-alsa \
---enable-libmpeg2 --enable-libmpeg2convert \
---with-libxml2-prefix=/usr \
---with-mjpegtools-prefix=/usr \
---with-imagemagick-prefix=/usr \
---with-libdv-includes=/usr \
---with-libpostproc-includes=/usr/include/libpostproc \
---with-ogg-prefix=/usr \
---with-lame-libs=/usr \
---with-lzo-libs=/usr/lib \
---with-libavcodec-prefix=/usr \
---with-libavcodec-includes=/usr/include \
---with-libavcodec-libs=/usr/lib
-
-  make
- ##
- # this imports the latest subtitleripper sources and replaces the internal
-  mkdir contrib
-  mv ${srcdir}/subtitleripper contrib/subrip
- # removes dependency on libppm, make it dependend on netpbm just