[arch-commits] Commit in xorg-util-macros/trunk (PKGBUILD)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 03:18:20
  Author: jgc
Revision: 125801

upgpkg: xorg-util-macros 1.14.0-1
Update to 1.14.0

Modified:
  xorg-util-macros/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 05:43:05 UTC (rev 125800)
+++ PKGBUILD2011-05-30 07:18:20 UTC (rev 125801)
@@ -2,14 +2,14 @@
 #Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=xorg-util-macros
-pkgver=1.13.0
+pkgver=1.14.0
 pkgrel=1
 pkgdesc=X.Org Autotools macros
 arch=(any)
 license=('custom')
 url=http://xorg.freedesktop.org/;
 source=(${url}/releases/individual/util/util-macros-${pkgver}.tar.bz2)
-sha1sums=('5d86ac2a4c0aa3428d72aff35dacc07baf883121')
+sha1sums=('e9863638cc9119a7b8d77b554de30a99a3611075')
 
 build() {
   cd ${srcdir}/util-macros-${pkgver}



[arch-commits] Commit in xorg-util-macros/repos (extra-any)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 03:18:24
  Author: jgc
Revision: 125802

archrelease: remove extra-any

Deleted:
  xorg-util-macros/repos/extra-any/



[arch-commits] Commit in xorg-util-macros/repos (extra-any)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 03:18:38
  Author: jgc
Revision: 125803

archrelease: copy trunk to extra-any

Added:
  xorg-util-macros/repos/extra-any/



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

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 03:26:09
  Author: jgc
Revision: 125804

upgpkg: resourceproto 1.2.0-1
Update to 1.2.0

Modified:
  resourceproto/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 07:18:38 UTC (rev 125803)
+++ PKGBUILD2011-05-30 07:26:09 UTC (rev 125804)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=resourceproto
-pkgver=1.1.1
+pkgver=1.2.0
 pkgrel=1
 pkgdesc=X11 Resource extension wire protocol
 arch=(any)
@@ -10,7 +10,7 @@
 license=('custom')
 makedepends=('xorg-util-macros')
 source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('a529e14f5556d29e213a0b123e0aeb309cbb5110')
+sha1sums=('9ff9bb9243b0474330959dc3853973523c9dd9ce')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}



[arch-commits] Commit in resourceproto/repos (testing-any)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 03:26:22
  Author: jgc
Revision: 125805

archrelease: copy trunk to testing-any

Added:
  resourceproto/repos/testing-any/



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

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 04:22:14
  Author: jgc
Revision: 125806

upgpkg: xorg-server 1.10.2-1
Update to 1.10.2
Add latest fixes from upstream 1.10 branch
Patch autoconfig to use nouveau/nv/nvidia instead of only nv

Added:
  xorg-server/trunk/autoconfig-nvidia.patch
  xorg-server/trunk/git-fixes.patch
Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/glx-pixmap-crash.patch

-+
 PKGBUILD|   17 +-
 autoconfig-nvidia.patch |  104 +++
 git-fixes.patch |  318 ++
 glx-pixmap-crash.patch  |   85 
 4 files changed, 434 insertions(+), 90 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 07:26:22 UTC (rev 125805)
+++ PKGBUILD2011-05-30 08:22:14 UTC (rev 125806)
@@ -3,7 +3,7 @@
 
 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.10.1
+pkgver=1.10.2
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
@@ -11,18 +11,20 @@
 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')
 options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
+git-fixes.patch
 bg-none-revert.patch
-glx-pixmap-crash.patch
 xserver-1.10-pointer-barriers.patch
 xorg-redhat-die-ugly-pattern-die-die-die.patch
+autoconfig-nvidia.patch
 xvfb-run
 xvfb-run.1
 10-quirks.conf)
-sha1sums=('59ada4c9a59f7f1eb4b68c359e9cd58272aa4809'
+sha1sums=('fd831b3c6297d1a68830c602d767752d87b9ca54'
+  '6dd2bcd9d8b17d1a50ed8c15eb1cba480558e695'
   '629c6d8d52126eab81ee1b72a9e4209535f8cb81'
-  '19e7164dcf9814ad64231b50a46f651b0e68a27a'
   '1b95e91384a57d966428c7db98ed06f4cc562f91'
   '0efcdf61bde3c0cd813072b94e2b30ab922775b9'
+  'f9328fd7bc931bb02c8909ecfcef35403de33782'
   'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
   '6838fc00ef4618c924a77e0fb03c05346080908a'
   '993798f3d22ad672d769dae5f48d1fa068d5578f')
@@ -37,8 +39,13 @@
 
   # Patches from ~ajax/xserver xserver-next branch
   patch -Np1 -i ${srcdir}/bg-none-revert.patch
-  patch -Np1 -i ${srcdir}/glx-pixmap-crash.patch
 
+  # Upstream fixes from 1.10 branch
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+
+  # Use nouveau/nv/nvidia drivers for nvidia devices
+  patch -Np1 -i ${srcdir}/autoconfig-nvidia.patch
+
   autoreconf
   ./configure --prefix=/usr \
   --enable-ipv6 \

Added: autoconfig-nvidia.patch
===
--- autoconfig-nvidia.patch (rev 0)
+++ autoconfig-nvidia.patch 2011-05-30 08:22:14 UTC (rev 125806)
@@ -0,0 +1,104 @@
+From a685b5cf34532cef96fc9b05f735088ac0c0c7ad Mon Sep 17 00:00:00 2001
+From: Fedora X Ninjas x...@fedoraproject.org
+Date: Tue, 16 Feb 2010 11:38:17 +1000
+Subject: [PATCH 08/17] autoconfig: select nouveau by default for NVIDIA GPUs
+
+Also, don't treat DRI setup failure as an error for nouveau.
+
+Modified by Archlinux:
+Append nvidia driver to the list of prefered drivers
+---
+ glx/glxdri.c   |7 +--
+ glx/glxdri2.c  |7 +--
+ hw/xfree86/common/xf86AutoConfig.c |   19 ++-
+ 3 files changed, 28 insertions(+), 5 deletions(-)
+
+--- a/glx/glxdri.c
 b/glx/glxdri.c
+@@ -978,6 +978,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+ const __DRIconfig **driConfigs;
+ const __DRIextension **extensions;
+ int i;
++int from = X_ERROR;
+ 
+ if (!xf86LoaderCheckSymbol(DRIQueryDirectRenderingCapable) ||
+   !DRIQueryDirectRenderingCapable(pScreen, isCapable) ||
+@@ -1057,7 +1058,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+ 
+ screen-driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
+ if (screen-driver == NULL) {
+-  LogMessage(X_ERROR, AIGLX error: dlopen of %s failed (%s)\n,
++  if (!strcmp(driverName, nouveau))
++  from = X_INFO;
++  LogMessage(from, AIGLX error: dlopen of %s failed (%s)\n,
+  filename, dlerror());
+ goto handle_error;
+ }
+@@ -1193,7 +1196,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+ 
+ free(screen);
+ 
+-LogMessage(X_ERROR, AIGLX: reverting to software rendering\n);
++LogMessage(from, AIGLX: reverting to software rendering\n);
+ 
+ return NULL;
+ }
+--- a/glx/glxdri2.c
 b/glx/glxdri2.c
+@@ -708,6 +708,7 @@ 

[arch-commits] Commit in xorg-server/repos (extra-i686)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 04:22:16
  Author: jgc
Revision: 125807

archrelease: remove extra-i686

Deleted:
  xorg-server/repos/extra-i686/



[arch-commits] Commit in xorg-server/repos (extra-i686)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 04:22:22
  Author: jgc
Revision: 125808

archrelease: copy trunk to extra-i686

Added:
  xorg-server/repos/extra-i686/



[arch-commits] Commit in xorg-server/repos (extra-x86_64)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 04:22:25
  Author: jgc
Revision: 125809

archrelease: remove extra-x86_64

Deleted:
  xorg-server/repos/extra-x86_64/



[arch-commits] Commit in xorg-server/repos (extra-x86_64)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 04:22:32
  Author: jgc
Revision: 125810

archrelease: copy trunk to extra-x86_64

Added:
  xorg-server/repos/extra-x86_64/



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

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 04:49:25
  Author: jgc
Revision: 125811

upgpkg: xorg-server 1.10.2-2
Build with mesa and resourceproto from testing

Modified:
  xorg-server/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 08:22:32 UTC (rev 125810)
+++ PKGBUILD2011-05-30 08:49:25 UTC (rev 125811)
@@ -4,7 +4,7 @@
 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.10.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom')
 url=http://xorg.freedesktop.org;



[arch-commits] Commit in xorg-server/repos (testing-i686)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 04:49:32
  Author: jgc
Revision: 125812

archrelease: copy trunk to testing-i686

Added:
  xorg-server/repos/testing-i686/



[arch-commits] Commit in xorg-server/repos (testing-x86_64)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 04:49:37
  Author: jgc
Revision: 125813

archrelease: copy trunk to testing-x86_64

Added:
  xorg-server/repos/testing-x86_64/



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

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 05:11:42
  Author: jgc
Revision: 125814

upgpkg: apr 1.4.5-1
Update to 1.4.5
Remove forced compatibility with pre-2.6.27 kernels

Modified:
  apr/trunk/PKGBUILD

--+
 PKGBUILD |   13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 08:49:37 UTC (rev 125813)
+++ PKGBUILD2011-05-30 09:11:42 UTC (rev 125814)
@@ -4,7 +4,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=apr
-pkgver=1.4.4
+pkgver=1.4.5
 pkgrel=1
 pkgdesc=The Apache Portable Runtime
 arch=('i686' 'x86_64')
@@ -13,19 +13,16 @@
 options=('!libtool')
 license=('APACHE')
 source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2)
-md5sums=('daf5487c82dd7bec9c005c96f8cb01b1')
+md5sums=('8b53f5a5669d0597f2da889a2f576eb6')
 
 build() {
   cd ${srcdir}/apr-${pkgver}
-  export apr_cv_epoll_create1=no
-  export apr_cv_dup3=no
   export apr_cv_accept4=no
-  export apr_cv_sock_cloexec=no
 
   ./configure --prefix=/usr --includedir=/usr/include/apr-1 \
 --with-installbuilddir=/usr/share/apr-1/build \
 --enable-nonportable-atomics \
---with-devrandom=/dev/urandom || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+--with-devrandom=/dev/urandom
+  make
+  make DESTDIR=${pkgdir} install
 }



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

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 05:11:44
  Author: jgc
Revision: 125815

archrelease: remove extra-i686

Deleted:
  apr/repos/extra-i686/



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

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 05:11:51
  Author: jgc
Revision: 125816

archrelease: copy trunk to extra-i686

Added:
  apr/repos/extra-i686/



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

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 05:11:52
  Author: jgc
Revision: 125817

archrelease: remove extra-x86_64

Deleted:
  apr/repos/extra-x86_64/



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

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 05:11:58
  Author: jgc
Revision: 125818

archrelease: copy trunk to extra-x86_64

Added:
  apr/repos/extra-x86_64/



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

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 05:26:18
  Author: jgc
Revision: 125819

upgpkg: apr-util 1.3.12-1
Update to 1.3.12

Modified:
  apr-util/trunk/PKGBUILD

--+
 PKGBUILD |   17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 09:11:58 UTC (rev 125818)
+++ PKGBUILD2011-05-30 09:26:18 UTC (rev 125819)
@@ -3,7 +3,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=apr-util
-pkgver=1.3.11
+pkgver=1.3.12
 pkgrel=1
 pkgdesc=The Apache Portable Runtime
 arch=('i686' 'x86_64')
@@ -12,14 +12,13 @@
 options=('!libtool')
 license=('APACHE')
 source=(http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2;)
-md5sums=('2aeddb384b03f3f73107770724d5c97b')
+md5sums=('0f671b037ca62751a8a7005578085560')
 
 build() {
-   cd ${srcdir}/apr-util-${pkgver}
-
-   ./configure --prefix=/usr --with-apr=/usr \
-   --without-pgsql --without-mysql --without-sqlite2 
--without-sqlite3 \
-   --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap
-   make
-   make DESTDIR=${pkgdir} install
+  cd ${srcdir}/apr-util-${pkgver}
+  ./configure --prefix=/usr --with-apr=/usr \
+--without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \
+--with-berkeley-db=/usr --with-gdbm=/usr --with-ldap
+  make
+  make DESTDIR=${pkgdir} install
 }



[arch-commits] Commit in apr-util/repos (extra-i686)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 05:26:19
  Author: jgc
Revision: 125820

archrelease: remove extra-i686

Deleted:
  apr-util/repos/extra-i686/



[arch-commits] Commit in apr-util/repos (extra-i686)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 05:26:26
  Author: jgc
Revision: 125821

archrelease: copy trunk to extra-i686

Added:
  apr-util/repos/extra-i686/



[arch-commits] Commit in apr-util/repos (extra-x86_64)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 05:26:27
  Author: jgc
Revision: 125822

archrelease: remove extra-x86_64

Deleted:
  apr-util/repos/extra-x86_64/



[arch-commits] Commit in apr-util/repos (extra-x86_64)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 05:26:32
  Author: jgc
Revision: 125823

archrelease: copy trunk to extra-x86_64

Added:
  apr-util/repos/extra-x86_64/



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

2011-05-30 Thread andyrtr
Date: Monday, May 30, 2011 @ 05:43:02
  Author: andyrtr
Revision: 125824

upgpkg: libreoffice 3.4.0-1
upstream update 3.4.0; make java-runtime an optional dependency

Modified:
  libreoffice/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 09:26:32 UTC (rev 125823)
+++ PKGBUILD2011-05-30 09:43:02 UTC (rev 125824)
@@ -25,7 +25,7 @@
'libreoffice-extension-watch-window'
'libreoffice-extension-wiki-publisher')
 _LOver=3.4.0.2
-pkgver=3.4rc2
+pkgver=3.4.0
 pkgrel=1
 arch=('i686' 'x86_64')
 #_LO_tree=3.4
@@ -36,13 +36,13 @@
  'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 
'hsqldb-java' #'boost' - we use internal one for now that has some gcc4.6 fixes.
  'apache-ant' 'gperf' 'poppler' 'kdelibs' 'gconf' 'cppunit' 
#'libmysqlclient'
  'beanshell'  'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 
'libwpg' 'imagemagick'
-'mesa' 'gstreamer0.10-base'
+'mesa' 'gstreamer0.10-base' 'java-runtime'
   #'saxon' - currently broken 
  # the depends from libreoffice main pkg
  curl=7.20.0 hunspell=1.2.8 python2=2.7 'libwpd=0.9.2' 
'libwps' 'libxaw' neon=0.28.6
  'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 
icu=4.6 'libxslt'
  'redland' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  
'libtextcat'
- 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 
'java-runtime' 'gtk2' # keep gtk2 for install script
+ 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 
'gtk2' # keep gtk2 for install script
 'ttf-dejavu') # to satisfy regression tests
 # translate-toolkit - todo move them to extra to allow 
--with-system-foo builds
 # http://download.documentfoundation.org/mirrors/all.html
@@ -262,7 +262,7 @@
--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
--with-install-dirname=${pkgbase} --libdir=/usr/lib 
--mandir=/usr/share/man \
--with-lang= \
-   --enable-verbose \
+   --disable-verbose \
--enable-cairo\
--enable-crashdump \
--enable-dbus \
@@ -356,9 +356,10 @@
  depends=(curl=7.20.0 hunspell=1.2.8 python2=2.7 'libwpd=0.9.2' 
'libwps' 'libxaw' neon=0.28.6
   'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' icu=4.6 
'libxslt'
   'redland' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 
'libtextcat'
-  'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 
'java-runtime' 'gtk2') # keep gtk2 for install script
+  'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2') 
# keep gtk2 for install script 
+ #'java-runtime' 
   #'saxon'
- optdepends=( #'java-runtime: adds java support'
+ optdepends=('java-runtime: adds java support'
  'libcups:  adds printing support'
  'gconf:adds additional gnome support'
  'nss:  adds support for signed files/macros'



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

2011-05-30 Thread andyrtr
Date: Monday, May 30, 2011 @ 05:43:33
  Author: andyrtr
Revision: 125825

archrelease: copy trunk to testing-i686

Added:
  libreoffice/repos/testing-i686/



[arch-commits] Commit in libreoffice/repos (testing-x86_64)

2011-05-30 Thread andyrtr
Date: Monday, May 30, 2011 @ 05:43:53
  Author: andyrtr
Revision: 125826

archrelease: copy trunk to testing-x86_64

Added:
  libreoffice/repos/testing-x86_64/



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

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 05:46:57
  Author: jgc
Revision: 125827

upgpkg: apache 2.2.19-1
Update to 2.2.19, fixup ITK patch to apply with this version of Apache

Modified:
  apache/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 09:43:53 UTC (rev 125826)
+++ PKGBUILD2011-05-30 09:46:57 UTC (rev 125827)
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=apache
-pkgver=2.2.17
-pkgrel=3
+pkgver=2.2.19
+pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -35,7 +35,7 @@
 httpd.logrotate
 httpd
 arch.layout)
-md5sums=('16eadc59ea6b38af33874d300973202e'
+md5sums=('832f96a6ec4b8fc7cf49b9efd4e89060'
  'f1d9d41360908ceb2374da55ae99197a'
  'cdfa04985a0efa850976aef01c2a0c40'
  '0930d2d0612eb0a53a0d00aea7e8687f'
@@ -66,6 +66,9 @@
 
for mpm in prefork worker itk; do
if [ ${mpm} = itk ]; then
+# Fix patch to apply with latest Apache version
+sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' 
${srcdir}/03-add-mpm-to-build-system.patch
+
mkdir -p server/mpm/experimental/itk
cp -r server/mpm/prefork/* server/mpm/experimental/itk/
mv server/mpm/experimental/itk/prefork.c 
server/mpm/experimental/itk/itk.c



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

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 05:46:58
  Author: jgc
Revision: 125828

archrelease: remove extra-x86_64

Deleted:
  apache/repos/extra-x86_64/



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

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 05:47:05
  Author: jgc
Revision: 125829

archrelease: copy trunk to extra-x86_64

Added:
  apache/repos/extra-x86_64/



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

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 06:05:38
  Author: jgc
Revision: 125830

archrelease: remove extra-i686

Deleted:
  apache/repos/extra-i686/



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

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 06:05:44
  Author: jgc
Revision: 125831

archrelease: copy trunk to extra-i686

Added:
  apache/repos/extra-i686/



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

2011-05-30 Thread Ionut Biru
Date: Monday, May 30, 2011 @ 06:12:00
  Author: ibiru
Revision: 125832

db-move: networkmanager removed by ibiru for move to [extra] (i686)

Deleted:
  networkmanager/repos/extra-i686/



[arch-commits] Commit in networkmanager/repos (extra-i686 testing-i686)

2011-05-30 Thread Ionut Biru
Date: Monday, May 30, 2011 @ 06:12:01
  Author: ibiru
Revision: 125833

db-move: moved networkmanager from [testing] to [extra] (i686)

Added:
  networkmanager/repos/extra-i686/
Deleted:
  networkmanager/repos/testing-i686/



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

2011-05-30 Thread Ionut Biru
Date: Monday, May 30, 2011 @ 06:12:02
  Author: ibiru
Revision: 125834

db-move: networkmanager removed by ibiru for move to [extra] (x86_64)

Deleted:
  networkmanager/repos/extra-x86_64/



[arch-commits] Commit in networkmanager/repos (extra-x86_64 testing-x86_64)

2011-05-30 Thread Ionut Biru
Date: Monday, May 30, 2011 @ 06:12:04
  Author: ibiru
Revision: 125835

db-move: moved networkmanager from [testing] to [extra] (x86_64)

Added:
  networkmanager/repos/extra-x86_64/
Deleted:
  networkmanager/repos/testing-x86_64/



[arch-commits] Commit in network-manager-applet/repos (extra-i686)

2011-05-30 Thread Ionut Biru
Date: Monday, May 30, 2011 @ 06:12:06
  Author: ibiru
Revision: 125836

db-move: network-manager-applet removed by ibiru for move to [extra] (i686)

Deleted:
  network-manager-applet/repos/extra-i686/



[arch-commits] Commit in network-manager-applet/repos (extra-i686 testing-i686)

2011-05-30 Thread Ionut Biru
Date: Monday, May 30, 2011 @ 06:12:06
  Author: ibiru
Revision: 125837

db-move: moved network-manager-applet from [testing] to [extra] (i686)

Added:
  network-manager-applet/repos/extra-i686/
Deleted:
  network-manager-applet/repos/testing-i686/



[arch-commits] Commit in network-manager-applet/repos (extra-x86_64)

2011-05-30 Thread Ionut Biru
Date: Monday, May 30, 2011 @ 06:12:07
  Author: ibiru
Revision: 125838

db-move: network-manager-applet removed by ibiru for move to [extra] (x86_64)

Deleted:
  network-manager-applet/repos/extra-x86_64/



[arch-commits] Commit in network-manager-applet/repos (extra-x86_64 testing-x86_64)

2011-05-30 Thread Ionut Biru
Date: Monday, May 30, 2011 @ 06:12:08
  Author: ibiru
Revision: 125839

db-move: moved network-manager-applet from [testing] to [extra] (x86_64)

Added:
  network-manager-applet/repos/extra-x86_64/
Deleted:
  network-manager-applet/repos/testing-x86_64/



[arch-commits] Commit in glew/repos (staging-i686 testing-i686)

2011-05-30 Thread Stéphane Gaudreault
Date: Monday, May 30, 2011 @ 06:34:13
  Author: stephane
Revision: 125840

db-move: moved glew from [staging] to [testing] (i686)

Added:
  glew/repos/testing-i686/
Deleted:
  glew/repos/staging-i686/



[arch-commits] Commit in glew/repos (staging-x86_64 testing-x86_64)

2011-05-30 Thread Stéphane Gaudreault
Date: Monday, May 30, 2011 @ 06:34:14
  Author: stephane
Revision: 125841

db-move: moved glew from [staging] to [testing] (x86_64)

Added:
  glew/repos/testing-x86_64/
Deleted:
  glew/repos/staging-x86_64/



[arch-commits] Commit in hugin/repos (staging-x86_64 testing-x86_64)

2011-05-30 Thread Stéphane Gaudreault
Date: Monday, May 30, 2011 @ 06:34:15
  Author: stephane
Revision: 125843

db-move: moved hugin from [staging] to [testing] (x86_64)

Added:
  hugin/repos/testing-x86_64/
Deleted:
  hugin/repos/staging-x86_64/



[arch-commits] Commit in hugin/repos (staging-i686 testing-i686)

2011-05-30 Thread Stéphane Gaudreault
Date: Monday, May 30, 2011 @ 06:34:15
  Author: stephane
Revision: 125842

db-move: moved hugin from [staging] to [testing] (i686)

Added:
  hugin/repos/testing-i686/
Deleted:
  hugin/repos/staging-i686/



[arch-commits] Commit in koffice/repos (staging-i686 testing-i686)

2011-05-30 Thread Stéphane Gaudreault
Date: Monday, May 30, 2011 @ 06:34:17
  Author: stephane
Revision: 125844

db-move: moved koffice from [staging] to [testing] (i686)

Added:
  koffice/repos/testing-i686/
Deleted:
  koffice/repos/staging-i686/



[arch-commits] Commit in koffice/repos (staging-x86_64 testing-x86_64)

2011-05-30 Thread Stéphane Gaudreault
Date: Monday, May 30, 2011 @ 06:34:21
  Author: stephane
Revision: 125845

db-move: moved koffice from [staging] to [testing] (x86_64)

Added:
  koffice/repos/testing-x86_64/
Deleted:
  koffice/repos/staging-x86_64/



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

2011-05-30 Thread Andrea Scarpino
Date: Monday, May 30, 2011 @ 08:25:37
  Author: andrea
Revision: 125846

upgpkg: libgadu 1.11.0-1
upstream release

Modified:
  libgadu/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 10:34:21 UTC (rev 125845)
+++ PKGBUILD2011-05-30 12:25:37 UTC (rev 125846)
@@ -3,7 +3,7 @@
 # Contributor: Mateusz Herych heni...@gmail.com
 
 pkgname=libgadu
-pkgver=1.10.1
+pkgver=1.11.0
 pkgrel=1
 pkgdesc=This library implements the client side of the Gadu-Gadu protocol
 arch=('i686' 'x86_64')
@@ -12,10 +12,10 @@
 depends=('openssl')
 options=('!libtool')
 source=(http://toxygen.net/${pkgname}/files/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('4dd528bc0627e4bd59f79b07f0e8cdbc')
+md5sums=('c779891298ce5d081c1e871e1e5b256d')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr \
 --disable-static \
 --enable-shared \
@@ -24,6 +24,6 @@
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
 }



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

2011-05-30 Thread Andrea Scarpino
Date: Monday, May 30, 2011 @ 08:25:41
  Author: andrea
Revision: 125847

archrelease: remove extra-i686

Deleted:
  libgadu/repos/extra-i686/



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

2011-05-30 Thread Andrea Scarpino
Date: Monday, May 30, 2011 @ 08:25:54
  Author: andrea
Revision: 125848

archrelease: copy trunk to extra-i686

Added:
  libgadu/repos/extra-i686/



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

2011-05-30 Thread Andrea Scarpino
Date: Monday, May 30, 2011 @ 08:26:06
  Author: andrea
Revision: 125849

archrelease: remove extra-x86_64

Deleted:
  libgadu/repos/extra-x86_64/



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

2011-05-30 Thread Andrea Scarpino
Date: Monday, May 30, 2011 @ 08:26:19
  Author: andrea
Revision: 125850

archrelease: copy trunk to extra-x86_64

Added:
  libgadu/repos/extra-x86_64/



[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD git-fixes.patch)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 08:49:55
  Author: jgc
Revision: 125851

upgpkg: xf86-video-intel 2.15.0-2
Import latest fixes from git

Added:
  xf86-video-intel/trunk/git-fixes.patch
Modified:
  xf86-video-intel/trunk/PKGBUILD

-+
 PKGBUILD|   11 
 git-fixes.patch | 1050 ++
 2 files changed, 1058 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 12:26:19 UTC (rev 125850)
+++ PKGBUILD2011-05-30 12:49:55 UTC (rev 125851)
@@ -3,7 +3,7 @@
 
 pkgname=xf86-video-intel
 pkgver=2.15.0
-pkgrel=1
+pkgrel=2
 pkgdesc=X.org Intel i810/i830/i915/945G/G965+ video drivers
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
@@ -13,11 +13,16 @@
 conflicts=('xorg-server1.10.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('78ec39a4470cfc0bf13d269fb915f6c5a498ee62')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha1sums=('78ec39a4470cfc0bf13d269fb915f6c5a498ee62'
+  'd7a9102e58c1d6c1bcb99ff6836146bd54a18161')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+
+  autoreconf
   ./configure --prefix=/usr --enable-dri
   make
 }

Added: git-fixes.patch
===
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2011-05-30 12:49:55 UTC (rev 125851)
@@ -0,0 +1,1050 @@
+diff --git a/NEWS b/NEWS
+index ea92bcf..61866b0 100644
+--- a/NEWS
 b/NEWS
+@@ -2,9 +2,9 @@ Release 2.15.0 (2011-04-14)
+ ==
+ We are pleased to announce this major release of the xf86-video-intel
+ driver, roughly on schedule at 3 months since 2.14.0. With the many bug
+-fixes in this release, we encourage everyone to upgrade to 2.14.
++fixes in this release, we encourage everyone to upgrade to 2.15.
+ 
+-The priority for this quarter has been simply to unexciting and stabilise
++The priority for this quarter has been simply to be unexciting and stabilise
+ the driver further, seeking to capitalise upon the improvements elsewhere
+ in the stack.
+ 
+diff --git a/configure.ac b/configure.ac
+index fd5a3cf..9449e56 100644
+--- a/configure.ac
 b/configure.ac
+@@ -77,9 +77,7 @@ AC_ARG_WITH(xorg-module-dir,
+ [moduledir=$libdir/xorg/modules])
+ 
+ AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
+-  [Disable DRI support [[default=auto]]]),
+-  [DRI=$enableval],
+-  [DRI=auto])
++  [Disable DRI support [[default=auto]]]))
+ 
+ AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--disable-xvmc],
+   [Disable XvMC support [[default=yes]]]),
+@@ -106,40 +104,48 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ # Obtain compiler/linker options for the driver dependencies
+ PKG_CHECK_MODULES(XORG, [xorg-server = 1.6 xproto fontsproto 
$REQUIRED_MODULES])
+ PKG_CHECK_MODULES(DRM, [libdrm = 2.4.23])
++PKG_CHECK_MODULES(DRI, [xf86driproto], , DRI=no)
+ PKG_CHECK_MODULES(PCIACCESS, [pciaccess = 0.10])
+ 
+ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
+ 
+-save_CFLAGS=$CFLAGS
+-CFLAGS=$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS
+-CPPFLAGS=$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS
+-AC_MSG_CHECKING([whether to include DRI support])
+-if test x$DRI != xno; then
+-AC_CHECK_FILE([${sdkdir}/dri.h],
+-  [have_dri_h=yes], [have_dri_h=no])
+-AC_CHECK_FILE([${sdkdir}/sarea.h],
+-  [have_sarea_h=yes], [have_sarea_h=no])
+-AC_CHECK_FILE([${sdkdir}/dristruct.h],
+-  [have_dristruct_h=yes], [have_dristruct_h=no])
++if test x$enable_dri != xno; then
++save_CFLAGS=$CFLAGS
++save_CPPFLAGS=$CPPFLAGS
++CFLAGS=$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS
++CPPFLAGS=$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS
++AC_CHECK_HEADERS([dri.h sarea.h dristruct.h],, [DRI=no],
++[/* for dri.h */
++ #include xf86str.h
++ /* for dristruct.h */
++ #include xorg-server.h
++ #ifdef HAVE_DRI_H
++ # include dri.h
++ #endif
++ #ifdef HAVE_SAREA_H
++ # include sarea.h
++ #endif
++])
++CFLAGS=$save_CFLAGS $DEBUGFLAGS
++CPPFLAGS=$save_CPPFLAGS
++else
++DRI=no
+ fi
++
+ AC_MSG_CHECKING([whether to include DRI support])
+-if test x$DRI = xauto; then
+-if test $have_dri_h = yes -a \
+-$have_sarea_h = yes -a \
+-$have_dristruct_h = yes; then
+-DRI=yes
+-else
+-DRI=no
+-fi
+-fi

[arch-commits] Commit in xf86-video-intel/repos (extra-i686)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 08:49:56
  Author: jgc
Revision: 125852

archrelease: remove extra-i686

Deleted:
  xf86-video-intel/repos/extra-i686/



[arch-commits] Commit in xf86-video-intel/repos (extra-i686)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 08:50:08
  Author: jgc
Revision: 125853

archrelease: copy trunk to extra-i686

Added:
  xf86-video-intel/repos/extra-i686/



[arch-commits] Commit in xf86-video-intel/repos (extra-x86_64)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 08:50:11
  Author: jgc
Revision: 125854

archrelease: remove extra-x86_64

Deleted:
  xf86-video-intel/repos/extra-x86_64/



[arch-commits] Commit in xf86-video-intel/repos (extra-x86_64)

2011-05-30 Thread Jan de Groot
Date: Monday, May 30, 2011 @ 08:50:18
  Author: jgc
Revision: 125855

archrelease: copy trunk to extra-x86_64

Added:
  xf86-video-intel/repos/extra-x86_64/



[arch-commits] Commit in calligra/kde-unstable (PKGBUILD)

2011-05-30 Thread Andrea Scarpino
Date: Monday, May 30, 2011 @ 11:35:59
  Author: andrea
Revision: 125856

upgpkg: calligra 2.3.71-2
glew rebuild

Modified:
  calligra/kde-unstable/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 12:50:18 UTC (rev 125855)
+++ PKGBUILD2011-05-30 15:35:59 UTC (rev 125856)
@@ -30,7 +30,7 @@
  'calligra-braindump'
  'calligra-flow')
 pkgver=2.3.71
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org'
 license=('FDL1.2' 'GPL2' 'LGPL')



[arch-commits] Commit in calligra/repos (kde-unstable-i686)

2011-05-30 Thread Andrea Scarpino
Date: Monday, May 30, 2011 @ 11:36:03
  Author: andrea
Revision: 125857

archrelease: remove kde-unstable-i686

Deleted:
  calligra/repos/kde-unstable-i686/



[arch-commits] Commit in calligra/repos (kde-unstable-i686)

2011-05-30 Thread Andrea Scarpino
Date: Monday, May 30, 2011 @ 11:36:16
  Author: andrea
Revision: 125858

archrelease: copy kde-unstable to kde-unstable-i686

Added:
  calligra/repos/kde-unstable-i686/



[arch-commits] Commit in calligra/repos (kde-unstable-x86_64)

2011-05-30 Thread Andrea Scarpino
Date: Monday, May 30, 2011 @ 11:36:19
  Author: andrea
Revision: 125859

archrelease: remove kde-unstable-x86_64

Deleted:
  calligra/repos/kde-unstable-x86_64/



[arch-commits] Commit in calligra/repos (kde-unstable-x86_64)

2011-05-30 Thread Andrea Scarpino
Date: Monday, May 30, 2011 @ 11:36:32
  Author: andrea
Revision: 125860

archrelease: copy kde-unstable to kde-unstable-x86_64

Added:
  calligra/repos/kde-unstable-x86_64/



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

2011-05-30 Thread andyrtr
Date: Monday, May 30, 2011 @ 11:55:43
  Author: andyrtr
Revision: 125861

upgpkg: hunspell 1.3.2-1
upstream update 1.3.2

Modified:
  hunspell/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 15:36:32 UTC (rev 125860)
+++ PKGBUILD2011-05-30 15:55:43 UTC (rev 125861)
@@ -3,7 +3,7 @@
 # Contributor: Hussam Al-Tayeb ht990...@gmail.com
 
 pkgname=hunspell
-pkgver=1.2.15
+pkgver=1.3.2
 pkgrel=1
 pkgdesc=Spell checker and morphological analyzer library and program
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 optdepends=('perl: for ispellaff2myspell')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/hunspell/hunspell-$pkgver.tar.gz)
-md5sums=('3fa2644b8d48cae48cb0967ffba91c9d')
+md5sums=('3121aaf3e13e5d88dfff13fb4a5f1ab8')
 
 build() {
   cd $srcdir/hunspell-$pkgver



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

2011-05-30 Thread andyrtr
Date: Monday, May 30, 2011 @ 12:53:31
  Author: andyrtr
Revision: 125862

upgpkg: icu 4.8-1
upstream update 4.8

Modified:
  icu/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 15:55:43 UTC (rev 125861)
+++ PKGBUILD2011-05-30 16:53:31 UTC (rev 125862)
@@ -3,18 +3,17 @@
 # Contributor: Art Gramlich a...@gramlich-net.com
 
 pkgname=icu
-pkgver=4.6.1
-pkgrel=2
+pkgver=4.8
+pkgrel=1
 pkgdesc=International Components for Unicode library
 arch=(i686 x86_64)
 url=http://www.icu-project.org/;
 license=('custom:icu')
 depends=('gcc-libs' 'sh')
-source=(http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
-   
#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
-   icu.8198.revert.icu5431.patch
-)
-md5sums=('da64675d85f0c2191cef93a8cb5eea88'
+source=(http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
+   
#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
+   icu.8198.revert.icu5431.patch)
+md5sums=('e78194c49d7fd8131353aa180d11b789'
  'ebd5470fc969c75e52baf4af94a9ee82')
 
 build() {



[arch-commits] Commit in icu/repos (staging-i686)

2011-05-30 Thread andyrtr
Date: Monday, May 30, 2011 @ 12:53:51
  Author: andyrtr
Revision: 125863

archrelease: copy trunk to staging-i686

Added:
  icu/repos/staging-i686/



[arch-commits] Commit in icu/repos (staging-x86_64)

2011-05-30 Thread andyrtr
Date: Monday, May 30, 2011 @ 12:54:07
  Author: andyrtr
Revision: 125864

archrelease: copy trunk to staging-x86_64

Added:
  icu/repos/staging-x86_64/



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

2011-05-30 Thread Giovanni Scafora
Date: Monday, May 30, 2011 @ 13:15:51
  Author: giovanni
Revision: 125865

upgpkg: ccache 3.1.5-1
upstream release

Modified:
  ccache/trunk/PKGBUILD

--+
 PKGBUILD |   16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 16:54:07 UTC (rev 125864)
+++ PKGBUILD2011-05-30 17:15:51 UTC (rev 125865)
@@ -3,24 +3,30 @@
 # Contributor: Tom Newsom jeeps...@gmx.co.uk
 
 pkgname=ccache
-pkgver=3.1.4
+pkgver=3.1.5
 pkgrel=1
 pkgdesc=A compiler cache
 url=http://ccache.samba.org/;
-source=(http://samba.org/ftp/${pkgname}/$pkgname-$pkgver.tar.bz2)
+source=(http://samba.org/ftp/${pkgname}/$pkgname-$pkgver.tar.bz2;)
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('zlib')
-md5sums=('676fda8a9a5e02574435c32b22942abd')
+md5sums=('f652bd20253bb4aa1440ae50bea3c9e3')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
-  make || return 1
+
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
   install -Dm 755 ccache ${pkgdir}/usr/bin/ccache
   install -Dm 644 ccache.1 ${pkgdir}/usr/share/man/man1/ccache.1
 
-  mkdir -p ${pkgdir}/usr/lib/ccache/bin
+  install -d ${pkgdir}/usr/lib/ccache/bin
   ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/cc 
   ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/gcc
   ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/g++



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

2011-05-30 Thread Giovanni Scafora
Date: Monday, May 30, 2011 @ 13:15:57
  Author: giovanni
Revision: 125866

archrelease: remove extra-i686

Deleted:
  ccache/repos/extra-i686/



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

2011-05-30 Thread Giovanni Scafora
Date: Monday, May 30, 2011 @ 13:16:09
  Author: giovanni
Revision: 125867

archrelease: copy trunk to extra-i686

Added:
  ccache/repos/extra-i686/



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

2011-05-30 Thread Giovanni Scafora
Date: Monday, May 30, 2011 @ 13:16:11
  Author: giovanni
Revision: 125868

archrelease: remove extra-x86_64

Deleted:
  ccache/repos/extra-x86_64/



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

2011-05-30 Thread Giovanni Scafora
Date: Monday, May 30, 2011 @ 13:16:24
  Author: giovanni
Revision: 125869

archrelease: copy trunk to extra-x86_64

Added:
  ccache/repos/extra-x86_64/



[arch-commits] Commit in moc/trunk (PKGBUILD curl-streams.diff)

2011-05-30 Thread Eric Bélanger
Date: Monday, May 30, 2011 @ 16:58:06
  Author: eric
Revision: 125870

upgpkg: moc 20110528-1
Updated with recent svn snapshot

Modified:
  moc/trunk/PKGBUILD
Deleted:
  moc/trunk/curl-streams.diff

---+
 PKGBUILD  |   24 +++-
 curl-streams.diff |   28 
 2 files changed, 11 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 17:16:24 UTC (rev 125869)
+++ PKGBUILD2011-05-30 20:58:06 UTC (rev 125870)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=moc
-pkgver=2.4.4
-pkgrel=4
+pkgver=20110528
+pkgrel=1
 pkgdesc=An ncurses console audio player with support for the mp3, ogg, and 
wave formats
 arch=('i686' 'x86_64')
 url=http://moc.daper.net/;
@@ -17,22 +17,20 @@
 'wavpack: for using the wavpack plugin' 
'libmodplug: for using the modplug plugin')
 options=('!libtool')
-source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2 \
-gcc-undefined-symbols.diff curl-streams.diff)
-md5sums=('647c770a5542a4ae5437386807a89796'
- 'efacb8559e9145e15b0c25f8fa2a9d79'
- 'bb9be1e80762851c57075c99a612af2f')
-sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db'
-  'a811a4ac7e049914aab528d3f06a6be6634c2720'
-  'a58ca952d7f3b0ede19b95c53da96c090d0a94c4')
+source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \
+gcc-undefined-symbols.diff)
+md5sums=('e9394640fecb725ad8146575a3091134'
+ 'efacb8559e9145e15b0c25f8fa2a9d79')
+sha1sums=('d09c27602a60e3e9fde476e13d7c1a8b21489505'
+  'a811a4ac7e049914aab528d3f06a6be6634c2720')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}
   patch -p0 -i ../gcc-undefined-symbols.diff
-  patch -p1 -i ../curl-streams.diff
   sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' 
decoder_plugins/ffmpeg/ffmpeg.c
   sed -i 's|avcodec_decode_audio|avcodec_decode_audio2|' 
decoder_plugins/ffmpeg/ffmpeg.c
 # Disabling aac to use the external ffmpeg to play them (FS#13164)
+  ./autogen.sh
   ./configure --prefix=/usr --without-rcc --without-aac \
 --with-oss  --with-alsa  --with-jack --with-mp3 \
 --with-musepack --with-vorbis --with-flac --with-wavpack \
@@ -42,6 +40,6 @@
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}
   make DESTDIR=${pkgdir} install
 }

Deleted: curl-streams.diff
===
--- curl-streams.diff   2011-05-30 17:16:24 UTC (rev 125869)
+++ curl-streams.diff   2011-05-30 20:58:06 UTC (rev 125870)
@@ -1,28 +0,0 @@
-diff -u moc-2.4.4/io_curl.c moc-2.4.4/io_curl.c
 a/io_curl.c2007-07-08 08:54:45.0 +0200
-+++ b/io_curl.c2011-05-18 09:09:40.0 +0200
-@@ -338,6 +338,8 @@
-   fd_set read_fds, write_fds, exc_fds;
-   int max_fd;
-   int ret;
-+ long milliseconds;
-+ struct timeval timeout;
- 
-   logit (Doing select()...);
- 
-@@ -356,8 +358,14 @@
-   if (s-curl.wake_up_pipe[0]  max_fd)
-   max_fd = s-curl.wake_up_pipe[0];
- 
-+ curl_multi_timeout(s-curl.multi_handle, milliseconds);
-+ if(milliseconds = 0)
-+   milliseconds = 1000; /* just a cautionary default */
-+ timeout.tv_sec = milliseconds / 1000;
-+ timeout.tv_usec = (milliseconds % 1000) * 1000;
-+
-   ret = select (max_fd + 1, read_fds, write_fds,
--  exc_fds, NULL);
-+  exc_fds, timeout);
- 
-   if (ret  0  errno == EINTR) {
-   logit (Interrupted);



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

2011-05-30 Thread Eric Bélanger
Date: Monday, May 30, 2011 @ 16:58:25
  Author: eric
Revision: 125871

archrelease: copy trunk to testing-i686

Added:
  moc/repos/testing-i686/



[arch-commits] Commit in moc/repos (testing-x86_64)

2011-05-30 Thread Eric Bélanger
Date: Monday, May 30, 2011 @ 16:58:35
  Author: eric
Revision: 125872

archrelease: copy trunk to testing-x86_64

Added:
  moc/repos/testing-x86_64/



[arch-commits] Commit in kdebindings-python/kde-unstable (PKGBUILD)

2011-05-30 Thread Andrea Scarpino
Date: Monday, May 30, 2011 @ 18:54:29
  Author: andrea
Revision: 125873

fix checksums

Modified:
  kdebindings-python/kde-unstable/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 20:58:35 UTC (rev 125872)
+++ PKGBUILD2011-05-30 22:54:29 UTC (rev 125873)
@@ -14,7 +14,7 @@
 
source=(http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.bz2;
 'fix-build.patch')
 sha1sums=('f45e40298046ecea382f9b85c34b3e21d856a9da'
-  '3d2329981ea571d38f0354c6d1300a2743a775db')
+  '4eb8917ad922819bbea038d79a9786cf5d0e2767')
 
 build() {
   cd ${srcdir}/pykde4-${pkgver}
@@ -37,5 +37,3 @@
   # Use the python2 executable
   find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env 
python|#!/usr/bin/env python2|'
 }
-sha1sums=('f45e40298046ecea382f9b85c34b3e21d856a9da'
-  '4eb8917ad922819bbea038d79a9786cf5d0e2767')