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

2011-12-19 Thread Jan de Groot
Date: Monday, December 19, 2011 @ 06:44:54
  Author: jgc
Revision: 145181

upgpkg: poppler 0.18.2-1

Update to 0.18.2, add latest fixes from git

Modified:
  poppler/trunk/PKGBUILD
  poppler/trunk/git-fixes.patch

-+
 PKGBUILD|6 -
 git-fixes.patch |  187 +++---
 2 files changed, 98 insertions(+), 95 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-19 08:38:09 UTC (rev 145180)
+++ PKGBUILD2011-12-19 11:44:54 UTC (rev 145181)
@@ -3,7 +3,7 @@
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.18.1
+pkgver=0.18.2
 pkgrel=1
 arch=(i686 x86_64)
 license=('GPL')
@@ -14,9 +14,9 @@
 source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
 
http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2
 git-fixes.patch)
-md5sums=('d30e883a27423c936ef338ce1d967e2d'
+md5sums=('38616927823ef01937aab26872e957e4'
  '9dc64c254a31e570507bdd4ad4ba629a'
- 'a73ba6515aa73cb20c480692da52c79e')
+ 'af56b7b1b24a08f7498a0c7f5e862b93')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}

Modified: git-fixes.patch
===
--- git-fixes.patch 2011-12-19 08:38:09 UTC (rev 145180)
+++ git-fixes.patch 2011-12-19 11:44:54 UTC (rev 145181)
@@ -1,107 +1,110 @@
-From e4a2adb02969e872e37e408ced4c39131c6751ea Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos carlo...@gnome.org
-Date: Sun, 30 Oct 2011 15:02:19 +
-Subject: pdftocairo: Make sure beginDocument() is always called
+From 74f4299e8f9e2d204979479f6579dd784db678a4 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid aa...@kde.org
+Date: Sun, 04 Dec 2011 16:29:45 +
+Subject: Do not fail if we are trying to save a file with Encrypt but that we 
have not modified at all
 
-This fixes a crash when rendering only odd/even pages in a printing
-format.
+Fixes KDE bug #288045
+(cherry picked from commit 63c942a45227ef28fb94ef4765171d9812fffafa)
 ---
-diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc
-index e458ee5..1b67c90 100644
 a/utils/pdftocairo.cc
-+++ b/utils/pdftocairo.cc
-@@ -903,6 +903,10 @@ int main(int argc, char *argv[]) {
- lastPage = firstPage;
-   }
+diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
+index 01d2759..2758206 100644
+--- a/poppler/PDFDoc.cc
 b/poppler/PDFDoc.cc
+@@ -707,35 +707,44 @@ int PDFDoc::saveAs(GooString *name, PDFWriteMode mode) {
  
-+  // Make sure firstPage is always used so that beginDocument() is called
-+  if ((printOnlyEven  pg % 2 == 0) || (printOnlyOdd  pg % 2 == 1))
-+firstPage++;
+ int PDFDoc::saveAs(OutStream *outStr, PDFWriteMode mode) {
+ 
+-  // we don't support files with Encrypt at the moment
++  // find if we have updated objects
++  GBool updated = gFalse;
++  for(int i=0; ixref-getNumObjects(); i++) {
++if (xref-getEntry(i)-updated) {
++  updated = gTrue;
++  break;
++}
++  }
 +
-   cairoOut = new CairoOutputDev();
-   cairoOut-startDoc(doc-getXRef(), doc-getCatalog());
-   if (sz != 0)
---
-cgit v0.9.0.2-2-gbebe
-From 61b1556d1c62bf090b2eadf93e4e7d0aff7b8015 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos carlo...@gnome.org
-Date: Sun, 30 Oct 2011 15:08:46 +
-Subject: pdftocairo: Use fisrtPage instead of uninitialized pg variable
-
-This fixes an error in my previous commit.

-diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc
-index 1b67c90..d0d1ec6 100644
 a/utils/pdftocairo.cc
-+++ b/utils/pdftocairo.cc
-@@ -904,7 +904,7 @@ int main(int argc, char *argv[]) {
++  // we don't support rewriting files with Encrypt at the moment
+   Object obj;
+   xref-getTrailerDict()-getDict()-lookupNF(Encrypt, obj);
+   if (!obj.isNull())
+   {
+ obj.free();
+-return errEncrypted;
++if (!updated  mode == writeStandard) {
++  // simply copy the original file
++  saveWithoutChangesAs (outStr);
++} else {
++  return errEncrypted;
++}
}
+-  obj.free();
++  else
++  {
++obj.free();
  
-   // Make sure firstPage is always used so that beginDocument() is called
--  if ((printOnlyEven  pg % 2 == 0) || (printOnlyOdd  pg % 2 == 1))
-+  if ((printOnlyEven  firstPage % 2 == 0) || (printOnlyOdd  firstPage % 2 
== 1))
- firstPage++;
+-  if (mode == writeForceRewrite) {
+-saveCompleteRewrite(outStr);
+-  } else if (mode == writeForceIncremental) {
+-saveIncrementalUpdate(outStr); 
+-  } else { // let poppler decide
+-// find if we have updated objects
+-GBool updated = gFalse;
+-for(int i=0; ixref-getNumObjects(); i++) {
+-  if (xref-getEntry(i)-updated) {
+-updated = gTrue;
+-break;
++if (mode == writeForceRewrite) {
++  saveCompleteRewrite(outStr);
++} else if (mode == writeForceIncremental) {
++  saveIncrementalUpdate(outStr); 
++} else { // let poppler decide
++  if(updated) { 

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

2011-12-19 Thread Jan de Groot
Date: Monday, December 19, 2011 @ 06:45:17
  Author: jgc
Revision: 145182

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

Added:
  poppler/repos/extra-i686/PKGBUILD
(from rev 145181, poppler/trunk/PKGBUILD)
  poppler/repos/extra-i686/git-fixes.patch
(from rev 145181, poppler/trunk/git-fixes.patch)
  poppler/repos/extra-x86_64/PKGBUILD
(from rev 145181, poppler/trunk/PKGBUILD)
  poppler/repos/extra-x86_64/git-fixes.patch
(from rev 145181, poppler/trunk/git-fixes.patch)
Deleted:
  poppler/repos/extra-i686/PKGBUILD
  poppler/repos/extra-i686/git-fixes.patch
  poppler/repos/extra-x86_64/PKGBUILD
  poppler/repos/extra-x86_64/git-fixes.patch

--+
 extra-i686/PKGBUILD  |  166 +++
 extra-i686/git-fixes.patch   |  217 -
 extra-x86_64/PKGBUILD|  166 +++
 extra-x86_64/git-fixes.patch |  217 -
 4 files changed, 386 insertions(+), 380 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-12-19 11:44:54 UTC (rev 145181)
+++ extra-i686/PKGBUILD 2011-12-19 11:45:17 UTC (rev 145182)
@@ -1,83 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgbase=poppler
-pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.18.1
-pkgrel=1
-arch=(i686 x86_64)
-license=('GPL')
-makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 
'pkgconfig' 'lcms' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-url=http://poppler.freedesktop.org/;
-_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
-source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
-
http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2
-git-fixes.patch)
-md5sums=('d30e883a27423c936ef338ce1d967e2d'
- '9dc64c254a31e570507bdd4ad4ba629a'
- 'a73ba6515aa73cb20c480692da52c79e')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  patch -Np1 -i ${srcdir}/git-fixes.patch
-
-  autoreconf -fi
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-  --localstatedir=/var --disable-static \
-  --enable-cairo-output \
-  --enable-xpdf-headers \
-  --enable-libjpeg --enable-zlib \
-  --enable-poppler-qt4 \
-  --enable-poppler-glib
-  make
-}
-
-check() {
-  cd ${srcdir}
-  ln -sf test-${_testtag} test
-  cd ${pkgbase}-${pkgver}
-  make check
-}
-
-package_poppler() {
-  pkgdesc=PDF rendering library based on xpdf 3.0
-  depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 
'poppler-data')
-  conflicts=(poppler-qt3${pkgver})
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  sed -e 's/^glib_subdir =.*/glib_subdir =/' \
-  -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile
-  make DESTDIR=${pkgdir} install
-
-  rm -f ${pkgdir}/usr/lib/pkgconfig/poppler-{glib,qt4}.pc
-}
-
-package_poppler-glib() {
-  pkgdesc=Poppler glib bindings
-  depends=(poppler=${pkgver} 'glib2')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/poppler
-  make DESTDIR=${pkgdir} install-libLTLIBRARIES
-  cd ${srcdir}/${pkgbase}-${pkgver}/glib
-  make DESTDIR=${pkgdir} install
-  install -m755 -d ${pkgdir}/usr/lib/pkgconfig
-  install -m644 ../poppler-glib.pc ${pkgdir}/usr/lib/pkgconfig/
-  rm -f ${pkgdir}/usr/lib/libpoppler.*
-  rm -f ${pkgdir}/usr/bin/poppler-glib-demo
-}
-
-package_poppler-qt() {
-  pkgdesc=Poppler Qt bindings
-  depends=(poppler=${pkgver} 'qt')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/poppler
-  make DESTDIR=${pkgdir} install-libLTLIBRARIES
-  cd ${srcdir}/${pkgbase}-${pkgver}/qt4
-  make DESTDIR=${pkgdir} install
-  install -m755 -d ${pkgdir}/usr/lib/pkgconfig
-  install -m644 ../poppler-qt4.pc ${pkgdir}/usr/lib/pkgconfig/
-  rm -f ${pkgdir}/usr/lib/libpoppler.*
-}

Copied: poppler/repos/extra-i686/PKGBUILD (from rev 145181, 
poppler/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-12-19 11:45:17 UTC (rev 145182)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgbase=poppler
+pkgname=('poppler' 'poppler-glib' 'poppler-qt')
+pkgver=0.18.2
+pkgrel=1
+arch=(i686 x86_64)
+license=('GPL')
+makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 
'pkgconfig' 'lcms' 'gobject-introspection')
+options=('!libtool' '!emptydirs')
+url=http://poppler.freedesktop.org/;
+_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
+source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
+
http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2
+git-fixes.patch)
+md5sums=('38616927823ef01937aab26872e957e4'
+ '9dc64c254a31e570507bdd4ad4ba629a'
+ 'af56b7b1b24a08f7498a0c7f5e862b93')
+
+build() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  sed -i

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

2011-12-19 Thread Jan de Groot
Date: Monday, December 19, 2011 @ 06:48:22
  Author: jgc
Revision: 145183

upgpkg: libdvdnav 4.2.0-2

Fix bad URL (FS#27362). I officially hate firefox for not displaying what it 
copies

Modified:
  libdvdnav/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-19 11:45:17 UTC (rev 145182)
+++ PKGBUILD2011-12-19 11:48:22 UTC (rev 145183)
@@ -5,11 +5,11 @@
 
 pkgname=libdvdnav
 pkgver=4.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc=The library for xine-dvdnav plugin.
 arch=('i686' 'x86_64')
 license=('GPL')
-url=http://http://dvdnav.mplayerhq.hu/;
+url=http://dvdnav.mplayerhq.hu/;
 depends=('libdvdread')
 options=(!libtool)
 source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2)



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

2011-12-19 Thread Jan de Groot
Date: Monday, December 19, 2011 @ 06:48:47
  Author: jgc
Revision: 145184

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

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

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

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-12-19 11:48:22 UTC (rev 145183)
+++ extra-i686/PKGBUILD 2011-12-19 11:48:47 UTC (rev 145184)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Arjan ar...@archlinux.org
-# contributor Sarah Hay sarah...@mb.sympatico.ca
-
-pkgname=libdvdnav
-pkgver=4.2.0
-pkgrel=1
-pkgdesc=The library for xine-dvdnav plugin.
-arch=('i686' 'x86_64')
-license=('GPL')
-url=http://http://dvdnav.mplayerhq.hu/;
-depends=('libdvdread')
-options=(!libtool)
-source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8c971b08276c89ddcecd26fc44204460fd250dc57346f03476d3077188c47550')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  ./autogen.sh --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}

Copied: libdvdnav/repos/extra-i686/PKGBUILD (from rev 145183, 
libdvdnav/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-12-19 11:48:47 UTC (rev 145184)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Arjan ar...@archlinux.org
+# contributor Sarah Hay sarah...@mb.sympatico.ca
+
+pkgname=libdvdnav
+pkgver=4.2.0
+pkgrel=2
+pkgdesc=The library for xine-dvdnav plugin.
+arch=('i686' 'x86_64')
+license=('GPL')
+url=http://dvdnav.mplayerhq.hu/;
+depends=('libdvdread')
+options=(!libtool)
+source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('8c971b08276c89ddcecd26fc44204460fd250dc57346f03476d3077188c47550')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
+  ./autogen.sh --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-12-19 11:48:22 UTC (rev 145183)
+++ extra-x86_64/PKGBUILD   2011-12-19 11:48:47 UTC (rev 145184)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Arjan ar...@archlinux.org
-# contributor Sarah Hay sarah...@mb.sympatico.ca
-
-pkgname=libdvdnav
-pkgver=4.2.0
-pkgrel=1
-pkgdesc=The library for xine-dvdnav plugin.
-arch=('i686' 'x86_64')
-license=('GPL')
-url=http://http://dvdnav.mplayerhq.hu/;
-depends=('libdvdread')
-options=(!libtool)
-source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8c971b08276c89ddcecd26fc44204460fd250dc57346f03476d3077188c47550')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  ./autogen.sh --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}

Copied: libdvdnav/repos/extra-x86_64/PKGBUILD (from rev 145183, 
libdvdnav/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-12-19 11:48:47 UTC (rev 145184)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Arjan ar...@archlinux.org
+# contributor Sarah Hay sarah...@mb.sympatico.ca
+
+pkgname=libdvdnav
+pkgver=4.2.0
+pkgrel=2
+pkgdesc=The library for xine-dvdnav plugin.
+arch=('i686' 'x86_64')
+license=('GPL')
+url=http://dvdnav.mplayerhq.hu/;
+depends=('libdvdread')
+options=(!libtool)
+source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('8c971b08276c89ddcecd26fc44204460fd250dc57346f03476d3077188c47550')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
+  ./autogen.sh --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+}



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

2011-12-19 Thread Jan de Groot
Date: Monday, December 19, 2011 @ 06:52:42
  Author: jgc
Revision: 145185

upgpkg: xterm 276-1

Update to 276, should partially fix FS#27500

Modified:
  xterm/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-19 11:48:47 UTC (rev 145184)
+++ PKGBUILD2011-12-19 11:52:42 UTC (rev 145185)
@@ -3,7 +3,7 @@
 # Contributor: Alexander Baldeck alexan...@archlinux.org
 
 pkgname=xterm
-pkgver=275
+pkgver=276
 pkgrel=1
 pkgdesc=X Terminal Emulator
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
 LICENSE)
-md5sums=('bbbe6a4566c04656ec21863351570ac8'
+md5sums=('50ca8ee40e8a0992019f8f35042c9abb'
  '10ecc3f8ee91e3189863a172f68282d2')
 
 build() {



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

2011-12-19 Thread Jan de Groot
)
===
--- extra-i686/LICENSE  (rev 0)
+++ extra-i686/LICENSE  2011-12-19 11:53:19 UTC (rev 145186)
@@ -0,0 +1,73 @@
+/***
+
+Copyright 2002-2008,2009 by Thomas E. Dickey
+
+All Rights Reserved
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+Software), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization.
+
+Copyright 1987, 1988  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1987, 1988 by Digital Equipment Corporation, Maynard.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be used in
+advertising or publicity pertaining to distribution of the software
+without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+**/

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-12-19 11:52:42 UTC (rev 145185)
+++ extra-i686/PKGBUILD 2011-12-19 11:53:19 UTC (rev 145186)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Alexander Baldeck alexan...@archlinux.org
-
-pkgname=xterm
-pkgver=275
-pkgrel=1
-pkgdesc=X Terminal Emulator
-arch=('i686' 'x86_64')
-url=http://invisible-island.net/xterm/;
-license=('custom')
-depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps')
-source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
-LICENSE)
-md5sums=('bbbe6a4566c04656ec21863351570ac8'
- '10ecc3f8ee91e3189863a172f68282d2')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-  --libdir=/etc \
-  --mandir=/usr/share/man \
-  --with-app-defaults=/usr/share/X11/app-defaults/ \
-  --with-x \
-  --disable-full-tgetent \
-  --disable-imake \
-  --enable-ansi-color \
-  --enable-88-color \
-  --enable-256-color \
-  --enable-broken-osc \
-  --enable-broken-st

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

2011-12-19 Thread Jan de Groot
Date: Monday, December 19, 2011 @ 06:55:36
  Author: jgc
Revision: 145187

Fix makedepends (FS#27276)

Modified:
  bcprov/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-19 11:53:19 UTC (rev 145186)
+++ PKGBUILD2011-12-19 11:55:36 UTC (rev 145187)
@@ -9,7 +9,7 @@
 url=http://www.bouncycastle.org/java.html;
 license=('custom')
 depends=('java-runtime')
-makedepends=('openjdk6' 'junit')
+makedepends=('java-environment' 'junit')
 source=(http://www.bouncycastle.org/download/bcprov-jdk16-${pkgver/./}.tar.gz)
 md5sums=('944374e9b57c9f7f6751d9c65ff62374')
 



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

2011-12-19 Thread Jan de Groot
Date: Monday, December 19, 2011 @ 06:59:15
  Author: jgc
Revision: 145188

Add inetutils dependency (FS#24811)

Modified:
  xorg-xinit/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-19 11:55:36 UTC (rev 145187)
+++ PKGBUILD2011-12-19 11:59:15 UTC (rev 145188)
@@ -4,12 +4,12 @@
 
 pkgname=xorg-xinit
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc=X.Org initialisation program 
 arch=('i686' 'x86_64')
 license=('custom')
 url=http://xorg.freedesktop.org/;
-depends=('libx11' 'xorg-xauth')
+depends=('libx11' 'xorg-xauth' 'inetutils')
 makedepends=('xorg-util-macros')
 optdepends=('xorg-twm' 'xterm')
 backup=('etc/skel/.xinitrc'



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

2011-12-19 Thread Jan de Groot
Date: Monday, December 19, 2011 @ 12:58:38
  Author: jgc
Revision: 145204

upgpkg: libgsf 1.14.22-2

Add conflicts with libgsf-gnome so pacman asks politely to remove it instead of 
bailing out

Modified:
  libgsf/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-19 17:49:20 UTC (rev 145203)
+++ PKGBUILD2011-12-19 17:58:38 UTC (rev 145204)
@@ -4,13 +4,14 @@
 
 pkgname=libgsf
 pkgver=1.14.22
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 pkgdesc=The GNOME Structured File Library is a utility library for reading 
and writing structured file formats
 url=http://www.gnome.org/;
 license=('GPL' 'LGPL')
 options=('!libtool')
 depends=('libxml2' 'gdk-pixbuf2' 'bzip2')
+conflicts=(libgsf-gnome$pkgver)
 makedepends=('intltool' 'pygtk')
 
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz)
 sha256sums=('a5f23be3cab72abd91bb443a32f41d6adc73250285b53787460750b6d60b783f')



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

2011-12-19 Thread Jan de Groot
Date: Monday, December 19, 2011 @ 12:59:06
  Author: jgc
Revision: 145205

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

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

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

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-12-19 17:58:38 UTC (rev 145204)
+++ extra-i686/PKGBUILD 2011-12-19 17:59:06 UTC (rev 145205)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Sarah Hay sarah...@mb.sympatico.ca
-
-pkgname=libgsf
-pkgver=1.14.22
-pkgrel=1
-arch=(i686 x86_64)
-pkgdesc=The GNOME Structured File Library is a utility library for reading 
and writing structured file formats
-url=http://www.gnome.org/;
-license=('GPL' 'LGPL')
-options=('!libtool')
-depends=('libxml2' 'gdk-pixbuf2' 'bzip2')
-makedepends=('intltool' 'pygtk')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz)
-sha256sums=('a5f23be3cab72abd91bb443a32f41d6adc73250285b53787460750b6d60b783f')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-  --localstatedir=/var --disable-static
-  make
-}
-
-package_libgsf() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}

Copied: libgsf/repos/extra-i686/PKGBUILD (from rev 145204, 
libgsf/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-12-19 17:59:06 UTC (rev 145205)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Sarah Hay sarah...@mb.sympatico.ca
+
+pkgname=libgsf
+pkgver=1.14.22
+pkgrel=2
+arch=(i686 x86_64)
+pkgdesc=The GNOME Structured File Library is a utility library for reading 
and writing structured file formats
+url=http://www.gnome.org/;
+license=('GPL' 'LGPL')
+options=('!libtool')
+depends=('libxml2' 'gdk-pixbuf2' 'bzip2')
+conflicts=(libgsf-gnome$pkgver)
+makedepends=('intltool' 'pygtk')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz)
+sha256sums=('a5f23be3cab72abd91bb443a32f41d6adc73250285b53787460750b6d60b783f')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+  --localstatedir=/var --disable-static
+  make
+}
+
+package_libgsf() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-12-19 17:58:38 UTC (rev 145204)
+++ extra-x86_64/PKGBUILD   2011-12-19 17:59:06 UTC (rev 145205)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Sarah Hay sarah...@mb.sympatico.ca
-
-pkgname=libgsf
-pkgver=1.14.22
-pkgrel=1
-arch=(i686 x86_64)
-pkgdesc=The GNOME Structured File Library is a utility library for reading 
and writing structured file formats
-url=http://www.gnome.org/;
-license=('GPL' 'LGPL')
-options=('!libtool')
-depends=('libxml2' 'gdk-pixbuf2' 'bzip2')
-makedepends=('intltool' 'pygtk')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz)
-sha256sums=('a5f23be3cab72abd91bb443a32f41d6adc73250285b53787460750b6d60b783f')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-  --localstatedir=/var --disable-static
-  make
-}
-
-package_libgsf() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}

Copied: libgsf/repos/extra-x86_64/PKGBUILD (from rev 145204, 
libgsf/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-12-19 17:59:06 UTC (rev 145205)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Sarah Hay sarah...@mb.sympatico.ca
+
+pkgname=libgsf
+pkgver=1.14.22
+pkgrel=2
+arch=(i686 x86_64)
+pkgdesc=The GNOME Structured File Library is a utility library for reading 
and writing structured file formats
+url=http://www.gnome.org/;
+license=('GPL' 'LGPL')
+options=('!libtool')
+depends=('libxml2' 'gdk-pixbuf2' 'bzip2')
+conflicts=(libgsf-gnome$pkgver)
+makedepends=('intltool' 'pygtk')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz)
+sha256sums=('a5f23be3cab72abd91bb443a32f41d6adc73250285b53787460750b6d60b783f')
+
+build() {
+  cd $srcdir/$pkgname

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

2011-12-19 Thread Jan de Groot
Date: Monday, December 19, 2011 @ 14:17:08
  Author: jgc
Revision: 145235

upgpkg: nss 3.13.1-1

Update to 3.13.1 with ckbi-1.88, regenerate certificates instead of patching 
the C file, makes patching easier on version updates

Modified:
  nss/trunk/PKGBUILD
  nss/trunk/add_spi+cacert_ca_certs.patch
Deleted:
  nss/trunk/distrust-diginotar.patch

---+
 PKGBUILD  |   28 
 add_spi+cacert_ca_certs.patch |  593 --
 distrust-diginotar.patch  | 1675 
 3 files changed, 19 insertions(+), 2277 deletions(-)

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


[arch-commits] Commit in nss/repos (26 files)

2011-12-19 Thread Jan de Groot
Date: Monday, December 19, 2011 @ 14:17:54
  Author: jgc
Revision: 145236

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

Added:
  nss/repos/extra-i686/PKGBUILD
(from rev 145235, nss/trunk/PKGBUILD)
  nss/repos/extra-i686/add_spi+cacert_ca_certs.patch
(from rev 145235, nss/trunk/add_spi+cacert_ca_certs.patch)
  nss/repos/extra-i686/nss-config.in
(from rev 145235, nss/trunk/nss-config.in)
  nss/repos/extra-i686/nss-no-rpath.patch
(from rev 145235, nss/trunk/nss-no-rpath.patch)
  nss/repos/extra-i686/nss.pc.in
(from rev 145235, nss/trunk/nss.pc.in)
  nss/repos/extra-i686/ssl-renegotiate-transitional.patch
(from rev 145235, nss/trunk/ssl-renegotiate-transitional.patch)
  nss/repos/extra-x86_64/PKGBUILD
(from rev 145235, nss/trunk/PKGBUILD)
  nss/repos/extra-x86_64/add_spi+cacert_ca_certs.patch
(from rev 145235, nss/trunk/add_spi+cacert_ca_certs.patch)
  nss/repos/extra-x86_64/nss-config.in
(from rev 145235, nss/trunk/nss-config.in)
  nss/repos/extra-x86_64/nss-no-rpath.patch
(from rev 145235, nss/trunk/nss-no-rpath.patch)
  nss/repos/extra-x86_64/nss.pc.in
(from rev 145235, nss/trunk/nss.pc.in)
  nss/repos/extra-x86_64/ssl-renegotiate-transitional.patch
(from rev 145235, nss/trunk/ssl-renegotiate-transitional.patch)
Deleted:
  nss/repos/extra-i686/PKGBUILD
  nss/repos/extra-i686/add_spi+cacert_ca_certs.patch
  nss/repos/extra-i686/distrust-diginotar.patch
  nss/repos/extra-i686/nss-config.in
  nss/repos/extra-i686/nss-no-rpath.patch
  nss/repos/extra-i686/nss.pc.in
  nss/repos/extra-i686/ssl-renegotiate-transitional.patch
  nss/repos/extra-x86_64/PKGBUILD
  nss/repos/extra-x86_64/add_spi+cacert_ca_certs.patch
  nss/repos/extra-x86_64/distrust-diginotar.patch
  nss/repos/extra-x86_64/nss-config.in
  nss/repos/extra-x86_64/nss-no-rpath.patch
  nss/repos/extra-x86_64/nss.pc.in
  nss/repos/extra-x86_64/ssl-renegotiate-transitional.patch

-+
 extra-i686/PKGBUILD |  212 +-
 extra-i686/add_spi+cacert_ca_certs.patch| 1717 +++---
 extra-i686/distrust-diginotar.patch | 1675 -
 extra-i686/nss-config.in|  290 +--
 extra-i686/nss-no-rpath.patch   |   28 
 extra-i686/nss.pc.in|   22 
 extra-i686/ssl-renegotiate-transitional.patch   |   42 
 extra-x86_64/PKGBUILD   |  212 +-
 extra-x86_64/add_spi+cacert_ca_certs.patch  | 1717 +++---
 extra-x86_64/distrust-diginotar.patch   | 1675 -
 extra-x86_64/nss-config.in  |  290 +--
 extra-x86_64/nss-no-rpath.patch |   28 
 extra-x86_64/nss.pc.in  |   22 
 extra-x86_64/ssl-renegotiate-transitional.patch |   42 
 14 files changed, 1728 insertions(+), 6244 deletions(-)

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


[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD fs25361.patch)

2011-12-19 Thread Jan de Groot
Date: Monday, December 19, 2011 @ 14:32:08
  Author: jgc
Revision: 145237

Fix FS#25361. Patch from user, created as suggested by Adam Jackson. Upstream 
reference: https://bugs.freedesktop.org/show_bug.cgi?id=13462

Added:
  xorg-xinit/trunk/fs25361.patch
Modified:
  xorg-xinit/trunk/PKGBUILD

---+
 PKGBUILD  |3 +++
 fs25361.patch |   16 
 2 files changed, 19 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-19 19:17:54 UTC (rev 145236)
+++ PKGBUILD2011-12-19 19:32:08 UTC (rev 145237)
@@ -18,12 +18,14 @@
 'etc/X11/xinit/xinitrc')
 source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
 06_move_serverauthfile_into_tmp.diff
+fs25361.patch
 xinitrc
 xsession
 xserverrc)
 options=(!emptydirs)
 md5sums=('ee234056d8a3dbf37b61b4bcb35b88e4'
  'abd072ec435ce084cf4e89c58f83d45c'
+ '73a597d3fb7f5b9487318ac8cfd4bedf'
  'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
  '7873d97db30d6c279ed37e3559e7c59d'
  'c5baef10fdb7239594daee72a94ddab3')
@@ -31,6 +33,7 @@
 build() {
   cd ${srcdir}/xinit-${pkgver}
   patch -Np1 -i ${srcdir}/06_move_serverauthfile_into_tmp.diff
+  patch -Np1 -i ${srcdir}/fs25361.patch
   sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
   ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
   make

Added: fs25361.patch
===
--- fs25361.patch   (rev 0)
+++ fs25361.patch   2011-12-19 19:32:08 UTC (rev 145237)
@@ -0,0 +1,16 @@
+Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx
+diff -u xinit.orig/startx.cpp xinit/startx.cpp
+--- xinit.orig/startx.cpp  2011-08-02 18:26:57.161711018 +0400
 xinit/startx.cpp   2011-08-02 19:06:39.348816866 +0400
+@@ -290,9 +290,9 @@
+ XCOMM now add the same credentials to the client authority file
+ XCOMM if '$displayname' already exists do not overwrite it as another
+ XCOMM server man need it. Add them to the '$xserverauthfile' instead.
+-for displayname in $authdisplay $hostname$authdisplay; do
++for displayname in $authdisplay $hostname/unix$authdisplay; do
+ authcookie=`XAUTH list $displayname @@
+-| sed -n s/.*$displayname[[:space:]*].*[[:space:]*]//p` 2/dev/null;
++| sed -n 
s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p` 2/dev/null;
+ if [ z${authcookie} = z ] ; then
+ XAUTH -q  EOF 
+ add $displayname . $mcookie



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

2011-12-19 Thread Jan de Groot
===
--- extra-i686/PKGBUILD 2011-12-19 21:39:45 UTC (rev 145241)
+++ extra-i686/PKGBUILD 2011-12-19 22:24:21 UTC (rev 145242)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Alexander Baldeck alexan...@archlinux.org
-
-pkgname=xorg-xinit
-pkgver=1.3.1
-pkgrel=1
-pkgdesc=X.Org initialisation program 
-arch=('i686' 'x86_64')
-license=('custom')
-url=http://xorg.freedesktop.org/;
-depends=('libx11' 'xorg-xauth')
-makedepends=('xorg-util-macros')
-optdepends=('xorg-twm' 'xterm')
-backup=('etc/skel/.xinitrc'
-'etc/skel/.xsession'
-'etc/X11/xinit/xserverrc'
-'etc/X11/xinit/xinitrc')
-source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
-06_move_serverauthfile_into_tmp.diff
-xinitrc
-xsession
-xserverrc)
-options=(!emptydirs)
-md5sums=('ee234056d8a3dbf37b61b4bcb35b88e4'
- 'abd072ec435ce084cf4e89c58f83d45c'
- 'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
- '7873d97db30d6c279ed37e3559e7c59d'
- 'c5baef10fdb7239594daee72a94ddab3')
-
-build() {
-  cd ${srcdir}/xinit-${pkgver}
-  patch -Np1 -i ${srcdir}/06_move_serverauthfile_into_tmp.diff
-  sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
-  ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
-  make
-}
-
-package() {
-  cd ${srcdir}/xinit-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -m755 -d ${pkgdir}/etc/skel
-  install -m644 ${srcdir}/xinitrc ${pkgdir}/etc/skel/.xinitrc
-  install -m644 ${srcdir}/xsession ${pkgdir}/etc/skel/.xsession
-  install -m644 ${srcdir}/xserverrc ${pkgdir}/etc/X11/xinit/xserverrc
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: xorg-xinit/repos/extra-i686/PKGBUILD (from rev 145241, 
xorg-xinit/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-12-19 22:24:21 UTC (rev 145242)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Alexander Baldeck alexan...@archlinux.org
+
+pkgname=xorg-xinit
+pkgver=1.3.1
+pkgrel=2
+pkgdesc=X.Org initialisation program 
+arch=('i686' 'x86_64')
+license=('custom')
+url=http://xorg.freedesktop.org/;
+depends=('libx11' 'xorg-xauth' 'inetutils')
+makedepends=('xorg-util-macros')
+optdepends=('xorg-twm' 'xterm')
+backup=('etc/skel/.xinitrc'
+'etc/skel/.xsession'
+'etc/X11/xinit/xserverrc'
+'etc/X11/xinit/xinitrc')
+source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
+06_move_serverauthfile_into_tmp.diff
+fs25361.patch
+xinitrc
+xsession
+xserverrc)
+options=(!emptydirs)
+md5sums=('ee234056d8a3dbf37b61b4bcb35b88e4'
+ 'abd072ec435ce084cf4e89c58f83d45c'
+ '73a597d3fb7f5b9487318ac8cfd4bedf'
+ 'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
+ '7873d97db30d6c279ed37e3559e7c59d'
+ 'c5baef10fdb7239594daee72a94ddab3')
+
+build() {
+  cd ${srcdir}/xinit-${pkgver}
+  patch -Np1 -i ${srcdir}/06_move_serverauthfile_into_tmp.diff
+  patch -Np1 -i ${srcdir}/fs25361.patch
+  sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
+  ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
+  make
+}
+
+package() {
+  cd ${srcdir}/xinit-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/etc/skel
+  install -m644 ${srcdir}/xinitrc ${pkgdir}/etc/skel/.xinitrc
+  install -m644 ${srcdir}/xsession ${pkgdir}/etc/skel/.xsession
+  install -m644 ${srcdir}/xserverrc ${pkgdir}/etc/X11/xinit/xserverrc
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Copied: xorg-xinit/repos/extra-i686/fs25361.patch (from rev 145241, 
xorg-xinit/trunk/fs25361.patch)
===
--- extra-i686/fs25361.patch(rev 0)
+++ extra-i686/fs25361.patch2011-12-19 22:24:21 UTC (rev 145242)
@@ -0,0 +1,16 @@
+Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx
+diff -u xinit.orig/startx.cpp xinit/startx.cpp
+--- xinit.orig/startx.cpp  2011-08-02 18:26:57.161711018 +0400
 xinit/startx.cpp   2011-08-02 19:06:39.348816866 +0400
+@@ -290,9 +290,9 @@
+ XCOMM now add the same credentials to the client authority file
+ XCOMM if '$displayname' already exists do not overwrite it as another
+ XCOMM server man need it. Add them to the '$xserverauthfile' instead.
+-for displayname in $authdisplay $hostname$authdisplay; do
++for displayname in $authdisplay $hostname/unix$authdisplay; do
+ authcookie=`XAUTH list $displayname @@
+-| sed -n s/.*$displayname[[:space:]*].*[[:space:]*]//p` 2/dev/null;
++| sed -n 
s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p` 2/dev/null;
+ if [ z

[arch-commits] Commit in nss/trunk (PKGBUILD bug702090.patch)

2011-12-28 Thread Jan de Groot
Date: Wednesday, December 28, 2011 @ 05:04:38
  Author: jgc
Revision: 145699

upgpkg: nss 3.13.1-2

Fix FS#27637 (upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=702090)

Added:
  nss/trunk/bug702090.patch
Modified:
  nss/trunk/PKGBUILD

-+
 PKGBUILD|5 -
 bug702090.patch |   20 
 2 files changed, 24 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-28 08:07:08 UTC (rev 145698)
+++ PKGBUILD2011-12-28 10:04:38 UTC (rev 145699)
@@ -3,7 +3,7 @@
 
 pkgname=nss
 pkgver=3.13.1
-pkgrel=1
+pkgrel=2
 pkgdesc=Mozilla Network Security Services
 arch=(i686 x86_64)
 url=http://www.mozilla.org/projects/security/pki/nss/;
@@ -14,12 +14,14 @@
 replaces=('nss-nspr')
 options=('!strip')
 
source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_WITH_CKBI_1_88_RTM/src/${pkgname}-${pkgver}.with.ckbi.1.88.tar.gz
+bug702090.patch
 nss-no-rpath.patch
 nss.pc.in
 nss-config.in
 add_spi+cacert_ca_certs.patch
 ssl-renegotiate-transitional.patch)
 sha1sums=('ebc0258c8d1a3c2fe80941bd991b766552464fc6'
+  '057dd510ba567d344e705062436a786beb5592b6'
   'c8fcdb153af9d39689243119adb475905a657284'
   'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
   'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
@@ -28,6 +30,7 @@
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}/mozilla
+  patch -Np2 -i ${srcdir}/bug702090.patch
   # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian, 
modified to apply on certdata.txt only
   patch -Np2 -i ${srcdir}/add_spi+cacert_ca_certs.patch
   # Adds transitional SSL renegotiate support - patch from Debian

Added: bug702090.patch
===
--- bug702090.patch (rev 0)
+++ bug702090.patch 2011-12-28 10:04:38 UTC (rev 145699)
@@ -0,0 +1,20 @@
+--- ./mozilla/security/nss/lib/util/pkcs11n.h.orig 2011-09-14 
10:21:10.0 +0900
 ./mozilla/security/nss/lib/util/pkcs11n.h  2011-11-19 00:45:01.131860104 
+0900
+@@ -346,7 +346,7 @@
+  * labels have never been accurate to what was really implemented.
+  * The new labels correctly reflect what the values effectively mean.
+  */
+-#if __GNUC__  3
++#if defined(__GNUC__)  (__GNUC__  3)
+ /* make GCC warn when we use these #defines */
+ /*
+  *  This is really painful because GCC doesn't allow us to mark random
+@@ -362,7 +362,7 @@
+  *  cast the resulting value to the deprecated type in the #define, thus
+  *  producting the warning when the #define is used.
+  */
+-#if (__GNUC__  == 4)  (__GNUC_MINOR  5)
++#if (__GNUC__  == 4)  (__GNUC_MINOR__  5)
+ /* The mac doesn't like the friendlier deprecate messages. I'm assuming this
+  * is a gcc version issue rather than mac or ppc specific */
+ typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated));



[arch-commits] Commit in nss/repos (26 files)

2011-12-28 Thread Jan de Groot
Date: Wednesday, December 28, 2011 @ 05:05:27
  Author: jgc
Revision: 145700

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

Added:
  nss/repos/extra-i686/PKGBUILD
(from rev 145699, nss/trunk/PKGBUILD)
  nss/repos/extra-i686/add_spi+cacert_ca_certs.patch
(from rev 145699, nss/trunk/add_spi+cacert_ca_certs.patch)
  nss/repos/extra-i686/bug702090.patch
(from rev 145699, nss/trunk/bug702090.patch)
  nss/repos/extra-i686/nss-config.in
(from rev 145699, nss/trunk/nss-config.in)
  nss/repos/extra-i686/nss-no-rpath.patch
(from rev 145699, nss/trunk/nss-no-rpath.patch)
  nss/repos/extra-i686/nss.pc.in
(from rev 145699, nss/trunk/nss.pc.in)
  nss/repos/extra-i686/ssl-renegotiate-transitional.patch
(from rev 145699, nss/trunk/ssl-renegotiate-transitional.patch)
  nss/repos/extra-x86_64/PKGBUILD
(from rev 145699, nss/trunk/PKGBUILD)
  nss/repos/extra-x86_64/add_spi+cacert_ca_certs.patch
(from rev 145699, nss/trunk/add_spi+cacert_ca_certs.patch)
  nss/repos/extra-x86_64/bug702090.patch
(from rev 145699, nss/trunk/bug702090.patch)
  nss/repos/extra-x86_64/nss-config.in
(from rev 145699, nss/trunk/nss-config.in)
  nss/repos/extra-x86_64/nss-no-rpath.patch
(from rev 145699, nss/trunk/nss-no-rpath.patch)
  nss/repos/extra-x86_64/nss.pc.in
(from rev 145699, nss/trunk/nss.pc.in)
  nss/repos/extra-x86_64/ssl-renegotiate-transitional.patch
(from rev 145699, nss/trunk/ssl-renegotiate-transitional.patch)
Deleted:
  nss/repos/extra-i686/PKGBUILD
  nss/repos/extra-i686/add_spi+cacert_ca_certs.patch
  nss/repos/extra-i686/nss-config.in
  nss/repos/extra-i686/nss-no-rpath.patch
  nss/repos/extra-i686/nss.pc.in
  nss/repos/extra-i686/ssl-renegotiate-transitional.patch
  nss/repos/extra-x86_64/PKGBUILD
  nss/repos/extra-x86_64/add_spi+cacert_ca_certs.patch
  nss/repos/extra-x86_64/nss-config.in
  nss/repos/extra-x86_64/nss-no-rpath.patch
  nss/repos/extra-x86_64/nss.pc.in
  nss/repos/extra-x86_64/ssl-renegotiate-transitional.patch

-+
 extra-i686/PKGBUILD |  215 ++--
 extra-i686/add_spi+cacert_ca_certs.patch| 1134 +++---
 extra-i686/bug702090.patch  |   20 
 extra-i686/nss-config.in|  290 ++---
 extra-i686/nss-no-rpath.patch   |   28 
 extra-i686/nss.pc.in|   22 
 extra-i686/ssl-renegotiate-transitional.patch   |   42 
 extra-x86_64/PKGBUILD   |  215 ++--
 extra-x86_64/add_spi+cacert_ca_certs.patch  | 1134 +++---
 extra-x86_64/bug702090.patch|   20 
 extra-x86_64/nss-config.in  |  290 ++---
 extra-x86_64/nss-no-rpath.patch |   28 
 extra-x86_64/nss.pc.in  |   22 
 extra-x86_64/ssl-renegotiate-transitional.patch |   42 
 14 files changed, 1774 insertions(+), 1728 deletions(-)

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


[arch-commits] Commit in desktop-file-utils/trunk (PKGBUILD)

2011-12-28 Thread Jan de Groot
Date: Wednesday, December 28, 2011 @ 05:22:33
  Author: jgc
Revision: 145703

upgpkg: desktop-file-utils 0.19-1

Update to 0.19

Modified:
  desktop-file-utils/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-28 10:18:27 UTC (rev 145702)
+++ PKGBUILD2011-12-28 10:22:33 UTC (rev 145703)
@@ -2,15 +2,15 @@
 # Maintainer: Alexander Fehr pizzapunk gmail com
 
 pkgname=desktop-file-utils
-pkgver=0.18
+pkgver=0.19
 pkgrel=1
 pkgdesc=Command line utilities for working with desktop entries
 arch=('i686' 'x86_64')
 url=http://www.freedesktop.org/wiki/Software/desktop-file-utils;
 license=('GPL')
 depends=('glib2')
-source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.bz2)
-md5sums=('d966b743eb394650f98d5dd56b9aece1')
+source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.xz)
+md5sums=('cbb2427593b7f6d36e52e9d221fce82f')
 
 build() {
   cd ${srcdir}/desktop-file-utils-${pkgver}
@@ -22,4 +22,3 @@
   cd ${srcdir}/desktop-file-utils-${pkgver}
   make DESTDIR=${pkgdir} install
 }
-



[arch-commits] Commit in desktop-file-utils/repos (8 files)

2011-12-28 Thread Jan de Groot
Date: Wednesday, December 28, 2011 @ 05:22:56
  Author: jgc
Revision: 145704

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

Added:
  desktop-file-utils/repos/extra-i686/ChangeLog
(from rev 145703, desktop-file-utils/trunk/ChangeLog)
  desktop-file-utils/repos/extra-i686/PKGBUILD
(from rev 145703, desktop-file-utils/trunk/PKGBUILD)
  desktop-file-utils/repos/extra-x86_64/ChangeLog
(from rev 145703, desktop-file-utils/trunk/ChangeLog)
  desktop-file-utils/repos/extra-x86_64/PKGBUILD
(from rev 145703, desktop-file-utils/trunk/PKGBUILD)
Deleted:
  desktop-file-utils/repos/extra-i686/ChangeLog
  desktop-file-utils/repos/extra-i686/PKGBUILD
  desktop-file-utils/repos/extra-x86_64/ChangeLog
  desktop-file-utils/repos/extra-x86_64/PKGBUILD

+
 extra-i686/ChangeLog   |   14 ++---
 extra-i686/PKGBUILD|   49 +++
 extra-x86_64/ChangeLog |   14 ++---
 extra-x86_64/PKGBUILD  |   49 +++
 4 files changed, 62 insertions(+), 64 deletions(-)

Deleted: extra-i686/ChangeLog
===
--- extra-i686/ChangeLog2011-12-28 10:22:33 UTC (rev 145703)
+++ extra-i686/ChangeLog2011-12-28 10:22:56 UTC (rev 145704)
@@ -1,7 +0,0 @@
-2008-07-22  Alexander Fehr  pizzapunk gmail com
-
-  * desktop-file-utils-0.15-1:
-  New upstream release.
-  New maintainer.
-  Changed url.
-  Added ChangeLog.

Copied: desktop-file-utils/repos/extra-i686/ChangeLog (from rev 145703, 
desktop-file-utils/trunk/ChangeLog)
===
--- extra-i686/ChangeLog(rev 0)
+++ extra-i686/ChangeLog2011-12-28 10:22:56 UTC (rev 145704)
@@ -0,0 +1,7 @@
+2008-07-22  Alexander Fehr  pizzapunk gmail com
+
+  * desktop-file-utils-0.15-1:
+  New upstream release.
+  New maintainer.
+  Changed url.
+  Added ChangeLog.

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-12-28 10:22:33 UTC (rev 145703)
+++ extra-i686/PKGBUILD 2011-12-28 10:22:56 UTC (rev 145704)
@@ -1,25 +0,0 @@
-# $Id$
-# Maintainer: Alexander Fehr pizzapunk gmail com
-
-pkgname=desktop-file-utils
-pkgver=0.18
-pkgrel=1
-pkgdesc=Command line utilities for working with desktop entries
-arch=('i686' 'x86_64')
-url=http://www.freedesktop.org/wiki/Software/desktop-file-utils;
-license=('GPL')
-depends=('glib2')
-source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.bz2)
-md5sums=('d966b743eb394650f98d5dd56b9aece1')
-
-build() {
-  cd ${srcdir}/desktop-file-utils-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/desktop-file-utils-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
-

Copied: desktop-file-utils/repos/extra-i686/PKGBUILD (from rev 145703, 
desktop-file-utils/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-12-28 10:22:56 UTC (rev 145704)
@@ -0,0 +1,24 @@
+# $Id$
+# Maintainer: Alexander Fehr pizzapunk gmail com
+
+pkgname=desktop-file-utils
+pkgver=0.19
+pkgrel=1
+pkgdesc=Command line utilities for working with desktop entries
+arch=('i686' 'x86_64')
+url=http://www.freedesktop.org/wiki/Software/desktop-file-utils;
+license=('GPL')
+depends=('glib2')
+source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.xz)
+md5sums=('cbb2427593b7f6d36e52e9d221fce82f')
+
+build() {
+  cd ${srcdir}/desktop-file-utils-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/desktop-file-utils-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Deleted: extra-x86_64/ChangeLog
===
--- extra-x86_64/ChangeLog  2011-12-28 10:22:33 UTC (rev 145703)
+++ extra-x86_64/ChangeLog  2011-12-28 10:22:56 UTC (rev 145704)
@@ -1,7 +0,0 @@
-2008-07-22  Alexander Fehr  pizzapunk gmail com
-
-  * desktop-file-utils-0.15-1:
-  New upstream release.
-  New maintainer.
-  Changed url.
-  Added ChangeLog.

Copied: desktop-file-utils/repos/extra-x86_64/ChangeLog (from rev 145703, 
desktop-file-utils/trunk/ChangeLog)
===
--- extra-x86_64/ChangeLog  (rev 0)
+++ extra-x86_64/ChangeLog  2011-12-28 10:22:56 UTC (rev 145704)
@@ -0,0 +1,7 @@
+2008-07-22  Alexander Fehr  pizzapunk gmail com
+
+  * desktop-file-utils-0.15-1:
+  New upstream release.
+  New maintainer.
+  Changed url.
+  Added ChangeLog.

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-12-28 10:22:33 UTC (rev 145703)
+++ extra-x86_64/PKGBUILD   2011-12-28 10:22:56 UTC (rev 

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

2011-12-28 Thread Jan de Groot
Date: Wednesday, December 28, 2011 @ 05:31:01
  Author: jgc
Revision: 145705

Remove invalid MIME-type, recent versions of desktop-file-utils alias this one 
to application/vnd.ms-excel anyways

Modified:
  gnumeric/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-28 10:22:56 UTC (rev 145704)
+++ PKGBUILD2011-12-28 10:31:01 UTC (rev 145705)
@@ -21,6 +21,9 @@
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  # Remove invalid mime type. (FS#26338)
+  sed -i -e 's/zz-application\/zz-winassoc-xls;//' gnumeric.desktop.in
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 --disable-schemas-install --enable-ssindex
   make



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

2011-12-28 Thread Jan de Groot
Date: Wednesday, December 28, 2011 @ 05:34:48
  Author: jgc
Revision: 145706

Fix typos (FS#27733)

Modified:
  libmpeg2/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-28 10:31:01 UTC (rev 145705)
+++ PKGBUILD2011-12-28 10:34:48 UTC (rev 145706)
@@ -10,8 +10,8 @@
 url=http://libmpeg2.sourceforge.net/;
 depends=('glibc')
 makedepends=('sdl' 'libxv')
-optdepends=('sdl:  requiered for mpeg2dec'
-'libxv:requiered for mpeg2dec')
+optdepends=('sdl: required for mpeg2dec'
+'libxv: required for mpeg2dec')
 source=(http://libmpeg2.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz
 libmpeg2-0.5.1-gcc4.6.patch)
 license=('GPL2')



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

2011-12-28 Thread Jan de Groot
Date: Wednesday, December 28, 2011 @ 09:22:41
  Author: jgc
Revision: 145707

Add testsuite

Modified:
  apr/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-28 10:34:48 UTC (rev 145706)
+++ PKGBUILD2011-12-28 14:22:41 UTC (rev 145707)
@@ -24,5 +24,14 @@
 --enable-nonportable-atomics \
 --with-devrandom=/dev/urandom
   make
+}
+
+check() {
+  cd ${srcdir}/apr-${pkgver}
+  make -j1 check
+}
+
+package() {
+  cd ${srcdir}/apr-${pkgver}
   make DESTDIR=${pkgdir} install
 }



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

2011-12-28 Thread Jan de Groot
Date: Wednesday, December 28, 2011 @ 09:24:53
  Author: jgc
Revision: 145708

upgpkg: gob2 2.0.18-1

Update to 2.0.18

Modified:
  gob2/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-28 14:22:41 UTC (rev 145707)
+++ PKGBUILD2011-12-28 14:24:53 UTC (rev 145708)
@@ -3,19 +3,23 @@
 # Maintainer: Kevin Piche ke...@archlinux.org
 
 pkgname=gob2
-pkgver=2.0.17
+pkgver=2.0.18
 pkgrel=1
 pkgdesc=GTK Object Builder (GOB) is a simple preprocessor for easily creating 
GTK objects
 arch=(i686 x86_64)
 license=('GPL')
 depends=('glib2')
 url=http://www.5z.com/jirka/gob.html;
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('e9f52fff7ada88a36da1d412f8b2b57b44cc0527e545cf2f5d873c002c0da7f4')
+source=(http://ftp.5z.com/pub/gob/${pkgname}-${pkgver}.tar.xz)
+md5sums=('cd08248762962aec88100ddaaff4f9e0')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  ./configure --prefix=/usr
+  make
 }
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}



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

2011-12-28 Thread Jan de Groot
Date: Wednesday, December 28, 2011 @ 09:25:19
  Author: jgc
Revision: 145709

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

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

---+
 extra-i686/PKGBUILD   |   46 +-
 extra-x86_64/PKGBUILD |   46 +-
 2 files changed, 50 insertions(+), 42 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-12-28 14:24:53 UTC (rev 145708)
+++ extra-i686/PKGBUILD 2011-12-28 14:25:19 UTC (rev 145709)
@@ -1,21 +0,0 @@
-# $Id$
-# Contributor: Sarah Hay sarah...@mb.sympatico.ca
-# Maintainer: Kevin Piche ke...@archlinux.org
-
-pkgname=gob2
-pkgver=2.0.17
-pkgrel=1
-pkgdesc=GTK Object Builder (GOB) is a simple preprocessor for easily creating 
GTK objects
-arch=(i686 x86_64)
-license=('GPL')
-depends=('glib2')
-url=http://www.5z.com/jirka/gob.html;
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('e9f52fff7ada88a36da1d412f8b2b57b44cc0527e545cf2f5d873c002c0da7f4')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-}

Copied: gob2/repos/extra-i686/PKGBUILD (from rev 145708, gob2/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-12-28 14:25:19 UTC (rev 145709)
@@ -0,0 +1,25 @@
+# $Id$
+# Contributor: Sarah Hay sarah...@mb.sympatico.ca
+# Maintainer: Kevin Piche ke...@archlinux.org
+
+pkgname=gob2
+pkgver=2.0.18
+pkgrel=1
+pkgdesc=GTK Object Builder (GOB) is a simple preprocessor for easily creating 
GTK objects
+arch=(i686 x86_64)
+license=('GPL')
+depends=('glib2')
+url=http://www.5z.com/jirka/gob.html;
+source=(http://ftp.5z.com/pub/gob/${pkgname}-${pkgver}.tar.xz)
+md5sums=('cd08248762962aec88100ddaaff4f9e0')
+
+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-12-28 14:24:53 UTC (rev 145708)
+++ extra-x86_64/PKGBUILD   2011-12-28 14:25:19 UTC (rev 145709)
@@ -1,21 +0,0 @@
-# $Id$
-# Contributor: Sarah Hay sarah...@mb.sympatico.ca
-# Maintainer: Kevin Piche ke...@archlinux.org
-
-pkgname=gob2
-pkgver=2.0.17
-pkgrel=1
-pkgdesc=GTK Object Builder (GOB) is a simple preprocessor for easily creating 
GTK objects
-arch=(i686 x86_64)
-license=('GPL')
-depends=('glib2')
-url=http://www.5z.com/jirka/gob.html;
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('e9f52fff7ada88a36da1d412f8b2b57b44cc0527e545cf2f5d873c002c0da7f4')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-}

Copied: gob2/repos/extra-x86_64/PKGBUILD (from rev 145708, gob2/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-12-28 14:25:19 UTC (rev 145709)
@@ -0,0 +1,25 @@
+# $Id$
+# Contributor: Sarah Hay sarah...@mb.sympatico.ca
+# Maintainer: Kevin Piche ke...@archlinux.org
+
+pkgname=gob2
+pkgver=2.0.18
+pkgrel=1
+pkgdesc=GTK Object Builder (GOB) is a simple preprocessor for easily creating 
GTK objects
+arch=(i686 x86_64)
+license=('GPL')
+depends=('glib2')
+url=http://www.5z.com/jirka/gob.html;
+source=(http://ftp.5z.com/pub/gob/${pkgname}-${pkgver}.tar.xz)
+md5sums=('cd08248762962aec88100ddaaff4f9e0')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}



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

2011-12-28 Thread Jan de Groot
Date: Wednesday, December 28, 2011 @ 09:51:59
  Author: jgc
Revision: 145710

upgpkg: libgphoto2 2.4.11-1

Update to 2.4.11, ditch hal rules, as we no longer provide hal

Modified:
  libgphoto2/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-28 14:25:19 UTC (rev 145709)
+++ PKGBUILD2011-12-28 14:51:59 UTC (rev 145710)
@@ -3,35 +3,33 @@
 # Contributor: Damir Perisa damir.per...@bluewin.ch
 
 pkgname=libgphoto2
-pkgver=2.4.10.1
-pkgrel=2
+pkgver=2.4.11
+pkgrel=1
 pkgdesc=The core library of gphoto2, designed to allow access to digital 
camera by external programs.
 arch=(i686 x86_64)
 url=http://www.gphoto.org;
 license=(LGPL)
-depends=('libexif=0.6.19' 'libjpeg=8' 'gd' 'libtool=2.4' 'libusb-compat')
+depends=('libexif' 'libjpeg=8' 'gd' 'libltdl' 'libusb-compat')
 install=libgphoto2.install
 options=('libtool')
 source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8bf2bd1e267909203ec1e7f6ea3f83a0')
+md5sums=('a2230c31e320acb7ececd90bc02fe515')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   udevscriptdir=/lib/udev ./configure --prefix=/usr --with-drivers=all 
--disable-static --disable-rpath
-  LD_PRELOAD= make
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 
   rm -f ${pkgdir}/usr/lib/libgphoto2/${pkgver}/*.a
 
-  install -m755 -d ${pkgdir}/usr/share/hal/fdi/information/20thirdparty
   install -m755 -d ${pkgdir}/lib/udev/rules.d
   LD_LIBRARY_PATH=${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH \
   CAMLIBS=${pkgdir}/usr/lib/libgphoto2/${pkgver} \
-  ${pkgdir}/usr/lib/libgphoto2/print-camera-list hal-fdi  \
-  
${pkgdir}/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
-
-  LD_LIBRARY_PATH=${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH \
-  CAMLIBS=${pkgdir}/usr/lib/libgphoto2/${pkgver} \
   ${pkgdir}/usr/lib/libgphoto2/print-camera-list udev-rules version 136 
group camera mode 0660  \
   ${pkgdir}/lib/udev/rules.d/40-gphoto.rules
 



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

2011-12-28 Thread Jan de Groot
Date: Wednesday, December 28, 2011 @ 09:52:22
  Author: jgc
Revision: 145711

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

Added:
  libgphoto2/repos/extra-i686/PKGBUILD
(from rev 145710, libgphoto2/trunk/PKGBUILD)
  libgphoto2/repos/extra-i686/libgphoto2.install
(from rev 145710, libgphoto2/trunk/libgphoto2.install)
  libgphoto2/repos/extra-x86_64/PKGBUILD
(from rev 145710, libgphoto2/trunk/PKGBUILD)
  libgphoto2/repos/extra-x86_64/libgphoto2.install
(from rev 145710, libgphoto2/trunk/libgphoto2.install)
Deleted:
  libgphoto2/repos/extra-i686/PKGBUILD
  libgphoto2/repos/extra-i686/libgphoto2.install
  libgphoto2/repos/extra-x86_64/PKGBUILD
  libgphoto2/repos/extra-x86_64/libgphoto2.install

-+
 extra-i686/PKGBUILD |   78 ++
 extra-i686/libgphoto2.install   |   32 +++
 extra-x86_64/PKGBUILD   |   78 ++
 extra-x86_64/libgphoto2.install |   32 +++
 4 files changed, 108 insertions(+), 112 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-12-28 14:51:59 UTC (rev 145710)
+++ extra-i686/PKGBUILD 2011-12-28 14:52:22 UTC (rev 145711)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Eduardo Romero edua...@archlinux.org
-# Contributor: Damir Perisa damir.per...@bluewin.ch
-
-pkgname=libgphoto2
-pkgver=2.4.10.1
-pkgrel=2
-pkgdesc=The core library of gphoto2, designed to allow access to digital 
camera by external programs.
-arch=(i686 x86_64)
-url=http://www.gphoto.org;
-license=(LGPL)
-depends=('libexif=0.6.19' 'libjpeg=8' 'gd' 'libtool=2.4' 'libusb-compat')
-install=libgphoto2.install
-options=('libtool')
-source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8bf2bd1e267909203ec1e7f6ea3f83a0')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  udevscriptdir=/lib/udev ./configure --prefix=/usr --with-drivers=all 
--disable-static --disable-rpath
-  LD_PRELOAD= make
-  make DESTDIR=${pkgdir} install
-
-  rm -f ${pkgdir}/usr/lib/libgphoto2/${pkgver}/*.a
-
-  install -m755 -d ${pkgdir}/usr/share/hal/fdi/information/20thirdparty
-  install -m755 -d ${pkgdir}/lib/udev/rules.d
-  LD_LIBRARY_PATH=${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH \
-  CAMLIBS=${pkgdir}/usr/lib/libgphoto2/${pkgver} \
-  ${pkgdir}/usr/lib/libgphoto2/print-camera-list hal-fdi  \
-  
${pkgdir}/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
-
-  LD_LIBRARY_PATH=${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH \
-  CAMLIBS=${pkgdir}/usr/lib/libgphoto2/${pkgver} \
-  ${pkgdir}/usr/lib/libgphoto2/print-camera-list udev-rules version 136 
group camera mode 0660  \
-  ${pkgdir}/lib/udev/rules.d/40-gphoto.rules
-
-  # Remove recursive symlink
-  rm -f ${pkgdir}/usr/include/gphoto2/gphoto2
-}

Copied: libgphoto2/repos/extra-i686/PKGBUILD (from rev 145710, 
libgphoto2/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-12-28 14:52:22 UTC (rev 145711)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Eduardo Romero edua...@archlinux.org
+# Contributor: Damir Perisa damir.per...@bluewin.ch
+
+pkgname=libgphoto2
+pkgver=2.4.11
+pkgrel=1
+pkgdesc=The core library of gphoto2, designed to allow access to digital 
camera by external programs.
+arch=(i686 x86_64)
+url=http://www.gphoto.org;
+license=(LGPL)
+depends=('libexif' 'libjpeg=8' 'gd' 'libltdl' 'libusb-compat')
+install=libgphoto2.install
+options=('libtool')
+source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz)
+md5sums=('a2230c31e320acb7ececd90bc02fe515')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  udevscriptdir=/lib/udev ./configure --prefix=/usr --with-drivers=all 
--disable-static --disable-rpath
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  rm -f ${pkgdir}/usr/lib/libgphoto2/${pkgver}/*.a
+
+  install -m755 -d ${pkgdir}/lib/udev/rules.d
+  LD_LIBRARY_PATH=${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH \
+  CAMLIBS=${pkgdir}/usr/lib/libgphoto2/${pkgver} \
+  ${pkgdir}/usr/lib/libgphoto2/print-camera-list udev-rules version 136 
group camera mode 0660  \
+  ${pkgdir}/lib/udev/rules.d/40-gphoto.rules
+
+  # Remove recursive symlink
+  rm -f ${pkgdir}/usr/include/gphoto2/gphoto2
+}

Deleted: extra-i686/libgphoto2.install
===
--- extra-i686/libgphoto2.install   2011-12-28 14:51:59 UTC (rev 145710)
+++ extra-i686/libgphoto2.install   2011-12-28 14:52:22 UTC (rev 145711)
@@ -1,16 +0,0 @@
-post_install() {
-  getent group camera /dev/null || usr/sbin/groupadd -g 97 camera
-  /bin/cat THEEND
-NOTE
-
-Add your user to group 'camera' to use camera devices.
-THEEND
-}
-
-post_upgrade() {
-  

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

2011-12-28 Thread Jan de Groot
Date: Wednesday, December 28, 2011 @ 10:07:49
  Author: jgc
Revision: 145712

upgpkg: gphoto2 2.4.11-1

Update to 2.4.11

Modified:
  gphoto2/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-28 14:52:22 UTC (rev 145711)
+++ PKGBUILD2011-12-28 15:07:49 UTC (rev 145712)
@@ -3,19 +3,23 @@
 # Contributor: Eduardo Romero edua...@archlinux.org
 # Contributor: Jason Chu ja...@archlinux.org
 pkgname=gphoto2
-pkgver=2.4.10
+pkgver=2.4.11
 pkgrel=1
 pkgdesc=A digital camera download and access program.
 arch=(i686 x86_64)
 url=http://www.gphoto.org;
 license=('GPL' 'LGPL')
-depends=('libgphoto2=2.4.10' 'popt' 'aalib' 'readline=6.1')
+depends=('libgphoto2=2.4.11' 'popt' 'aalib' 'readline')
 source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3c86c9824b9bfc57a52be5f84ad205f7')
+md5sums=('2635075f702b40eb2e95a80658bd4773')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }



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

2011-12-28 Thread Jan de Groot
Date: Wednesday, December 28, 2011 @ 10:08:15
  Author: jgc
Revision: 145713

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

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

---+
 extra-i686/PKGBUILD   |   46 +-
 extra-x86_64/PKGBUILD |   46 +-
 2 files changed, 50 insertions(+), 42 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-12-28 15:07:49 UTC (rev 145712)
+++ extra-i686/PKGBUILD 2011-12-28 15:08:15 UTC (rev 145713)
@@ -1,21 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Eduardo Romero edua...@archlinux.org
-# Contributor: Jason Chu ja...@archlinux.org
-pkgname=gphoto2
-pkgver=2.4.10
-pkgrel=1
-pkgdesc=A digital camera download and access program.
-arch=(i686 x86_64)
-url=http://www.gphoto.org;
-license=('GPL' 'LGPL')
-depends=('libgphoto2=2.4.10' 'popt' 'aalib' 'readline=6.1')
-source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3c86c9824b9bfc57a52be5f84ad205f7')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=${pkgdir} install
-}

Copied: gphoto2/repos/extra-i686/PKGBUILD (from rev 145712, 
gphoto2/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-12-28 15:08:15 UTC (rev 145713)
@@ -0,0 +1,25 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Eduardo Romero edua...@archlinux.org
+# Contributor: Jason Chu ja...@archlinux.org
+pkgname=gphoto2
+pkgver=2.4.11
+pkgrel=1
+pkgdesc=A digital camera download and access program.
+arch=(i686 x86_64)
+url=http://www.gphoto.org;
+license=('GPL' 'LGPL')
+depends=('libgphoto2=2.4.11' 'popt' 'aalib' 'readline')
+source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('2635075f702b40eb2e95a80658bd4773')
+
+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-12-28 15:07:49 UTC (rev 145712)
+++ extra-x86_64/PKGBUILD   2011-12-28 15:08:15 UTC (rev 145713)
@@ -1,21 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Eduardo Romero edua...@archlinux.org
-# Contributor: Jason Chu ja...@archlinux.org
-pkgname=gphoto2
-pkgver=2.4.10
-pkgrel=1
-pkgdesc=A digital camera download and access program.
-arch=(i686 x86_64)
-url=http://www.gphoto.org;
-license=('GPL' 'LGPL')
-depends=('libgphoto2=2.4.10' 'popt' 'aalib' 'readline=6.1')
-source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3c86c9824b9bfc57a52be5f84ad205f7')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=${pkgdir} install
-}

Copied: gphoto2/repos/extra-x86_64/PKGBUILD (from rev 145712, 
gphoto2/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-12-28 15:08:15 UTC (rev 145713)
@@ -0,0 +1,25 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Eduardo Romero edua...@archlinux.org
+# Contributor: Jason Chu ja...@archlinux.org
+pkgname=gphoto2
+pkgver=2.4.11
+pkgrel=1
+pkgdesc=A digital camera download and access program.
+arch=(i686 x86_64)
+url=http://www.gphoto.org;
+license=('GPL' 'LGPL')
+depends=('libgphoto2=2.4.11' 'popt' 'aalib' 'readline')
+source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('2635075f702b40eb2e95a80658bd4773')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}



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

2011-12-28 Thread Jan de Groot
Date: Wednesday, December 28, 2011 @ 10:10:09
  Author: jgc
Revision: 145714

Fix URL (FS#26802)

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-28 15:08:15 UTC (rev 145713)
+++ PKGBUILD2011-12-28 15:10:09 UTC (rev 145714)
@@ -11,7 +11,7 @@
 pkgrel=8
 pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library
 arch=('i686' 'x86_64')
-url=http://cyrusimap.web.cmu.edu/downloads.html#sasl;
+url=http://cyrusimap.web.cmu.edu/;
 license=('custom')
 options=('!makeflags' '!libtool')
 makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')



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

2011-12-28 Thread Jan de Groot
Date: Wednesday, December 28, 2011 @ 10:11:22
  Author: jgc
Revision: 145715

Merge changes from cyrus-sasl

Modified:
  libsasl/trunk/(properties)
  libsasl/trunk/PKGBUILD

+
 trunk  |2 +-
 trunk/PKGBUILD |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: libsasl/trunk
===
--- trunk   2011-12-28 15:10:09 UTC (rev 145714)
+++ trunk   2011-12-28 15:11:22 UTC (rev 145715)

Property changes on: libsasl/trunk
___
Modified: svn:mergeinfo
## -1 +1 ##
-/cyrus-sasl/trunk:134435-134446,139562
+/cyrus-sasl/trunk:134435-134446,139562,145714
Modified: trunk/PKGBUILD
===
--- trunk/PKGBUILD  2011-12-28 15:10:09 UTC (rev 145714)
+++ trunk/PKGBUILD  2011-12-28 15:11:22 UTC (rev 145715)
@@ -11,7 +11,7 @@
 pkgrel=8
 pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library
 arch=('i686' 'x86_64')
-url=http://cyrusimap.web.cmu.edu/downloads.html#sasl;
+url=http://cyrusimap.web.cmu.edu/;
 license=('custom')
 options=('!makeflags' '!libtool')
 makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')



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

2011-10-24 Thread Jan de Groot
Date: Monday, October 24, 2011 @ 04:03:07
  Author: jgc
Revision: 141106

upgpkg: freetype2 2.4.7-1

Update to 2.4.7

Modified:
  freetype2/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-24 06:35:43 UTC (rev 141105)
+++ PKGBUILD2011-10-24 08:03:07 UTC (rev 141106)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=freetype2
-pkgver=2.4.6
+pkgver=2.4.7
 pkgrel=1
 pkgdesc=TrueType font rendering library
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@
 
source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
 freetype-2.3.0-enable-spr.patch
 freetype-2.2.1-enable-valid.patch)
-md5sums=('5e6510613f612809d2d7862592b92ab7'
+md5sums=('dbadce8f0c5e70a0b7c51eadf2dd9394'
  '816dc8619a6904a7385769433c0a8653'
  '214119610444c9b02766ccee5e220680')
 



[arch-commits] Commit in freetype2/repos (12 files)

2011-10-24 Thread Jan de Groot
Date: Monday, October 24, 2011 @ 04:04:06
  Author: jgc
Revision: 141107

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

Added:
  freetype2/repos/extra-i686/PKGBUILD
(from rev 141106, freetype2/trunk/PKGBUILD)
  freetype2/repos/extra-i686/freetype-2.2.1-enable-valid.patch
(from rev 141106, freetype2/trunk/freetype-2.2.1-enable-valid.patch)
  freetype2/repos/extra-i686/freetype-2.3.0-enable-spr.patch
(from rev 141106, freetype2/trunk/freetype-2.3.0-enable-spr.patch)
  freetype2/repos/extra-x86_64/PKGBUILD
(from rev 141106, freetype2/trunk/PKGBUILD)
  freetype2/repos/extra-x86_64/freetype-2.2.1-enable-valid.patch
(from rev 141106, freetype2/trunk/freetype-2.2.1-enable-valid.patch)
  freetype2/repos/extra-x86_64/freetype-2.3.0-enable-spr.patch
(from rev 141106, freetype2/trunk/freetype-2.3.0-enable-spr.patch)
Deleted:
  freetype2/repos/extra-i686/PKGBUILD
  freetype2/repos/extra-i686/freetype-2.2.1-enable-valid.patch
  freetype2/repos/extra-i686/freetype-2.3.0-enable-spr.patch
  freetype2/repos/extra-x86_64/PKGBUILD
  freetype2/repos/extra-x86_64/freetype-2.2.1-enable-valid.patch
  freetype2/repos/extra-x86_64/freetype-2.3.0-enable-spr.patch

+
 extra-i686/PKGBUILD|   64 +++
 extra-i686/freetype-2.2.1-enable-valid.patch   |   40 +++---
 extra-i686/freetype-2.3.0-enable-spr.patch |   22 +++
 extra-x86_64/PKGBUILD  |   64 +++
 extra-x86_64/freetype-2.2.1-enable-valid.patch |   40 +++---
 extra-x86_64/freetype-2.3.0-enable-spr.patch   |   22 +++
 6 files changed, 126 insertions(+), 126 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-10-24 08:03:07 UTC (rev 141106)
+++ extra-i686/PKGBUILD 2011-10-24 08:04:06 UTC (rev 141107)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=freetype2
-pkgver=2.4.6
-pkgrel=1
-pkgdesc=TrueType font rendering library
-arch=(i686 x86_64)
-license=('GPL')
-url=http://freetype.sourceforge.net;
-depends=('zlib')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
-freetype-2.3.0-enable-spr.patch
-freetype-2.2.1-enable-valid.patch)
-md5sums=('5e6510613f612809d2d7862592b92ab7'
- '816dc8619a6904a7385769433c0a8653'
- '214119610444c9b02766ccee5e220680')
-
-build() {
-  cd ${srcdir}/freetype-${pkgver}
-  patch -Np1 -i ${srcdir}/freetype-2.3.0-enable-spr.patch
-  patch -Np1 -i ${srcdir}/freetype-2.2.1-enable-valid.patch
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/freetype-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: freetype2/repos/extra-i686/PKGBUILD (from rev 141106, 
freetype2/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-24 08:04:06 UTC (rev 141107)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=freetype2
+pkgver=2.4.7
+pkgrel=1
+pkgdesc=TrueType font rendering library
+arch=(i686 x86_64)
+license=('GPL')
+url=http://freetype.sourceforge.net;
+depends=('zlib')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
+freetype-2.3.0-enable-spr.patch
+freetype-2.2.1-enable-valid.patch)
+md5sums=('dbadce8f0c5e70a0b7c51eadf2dd9394'
+ '816dc8619a6904a7385769433c0a8653'
+ '214119610444c9b02766ccee5e220680')
+
+build() {
+  cd ${srcdir}/freetype-${pkgver}
+  patch -Np1 -i ${srcdir}/freetype-2.3.0-enable-spr.patch
+  patch -Np1 -i ${srcdir}/freetype-2.2.1-enable-valid.patch
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/freetype-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Deleted: extra-i686/freetype-2.2.1-enable-valid.patch
===
--- extra-i686/freetype-2.2.1-enable-valid.patch2011-10-24 08:03:07 UTC 
(rev 141106)
+++ extra-i686/freetype-2.2.1-enable-valid.patch2011-10-24 08:04:06 UTC 
(rev 141107)
@@ -1,20 +0,0 @@
 freetype-2.2.1/modules.cfg.orig2006-07-07 21:01:09.0 -0400
-+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.0 -0400
-@@ -110,7 +110,7 @@
- AUX_MODULES += cache
- 
- # TrueType GX/AAT table validation.  Needs ftgxval.c below.
--# AUX_MODULES += gxvalid
-+AUX_MODULES += gxvalid
- 
- # Support for streams compressed with gzip (files with suffix .gz).
- #
-@@ -124,7 +124,7 @@
- 
- # OpenType table validation.  Needs ftotval.c below.
- #
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
- 
- # Auxiliary PostScript driver component to share common code.
- #

Copied: freetype2/repos/extra-i686/freetype-2.2.1-enable-valid.patch (from rev 
141106, freetype2/trunk

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

2011-10-24 Thread Jan de Groot
Date: Monday, October 24, 2011 @ 08:15:00
  Author: jgc
Revision: 141117

upgpkg: xorg-xdpyinfo 1.3.0-1

Update to 1.3.0

Modified:
  xorg-xdpyinfo/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-24 10:42:39 UTC (rev 141116)
+++ PKGBUILD2011-10-24 12:15:00 UTC (rev 141117)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=xorg-xdpyinfo
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.3.0
+pkgrel=1
 pkgdesc=Display information utility for X
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
@@ -12,7 +12,7 @@
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 
source=(http://xorg.freedesktop.org/archive/individual/app/xdpyinfo-${pkgver}.tar.bz2)
-sha1sums=('5d53cd31afd40bdc4575b5347f2cda67f135f5f2')
+sha256sums=('23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f')
 
 build() {
   cd ${srcdir}/xdpyinfo-${pkgver}



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

2011-10-24 Thread Jan de Groot
Date: Monday, October 24, 2011 @ 08:15:25
  Author: jgc
Revision: 141118

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

Added:
  xorg-xdpyinfo/repos/extra-i686/PKGBUILD
(from rev 141117, xorg-xdpyinfo/trunk/PKGBUILD)
  xorg-xdpyinfo/repos/extra-x86_64/PKGBUILD
(from rev 141117, xorg-xdpyinfo/trunk/PKGBUILD)
Deleted:
  xorg-xdpyinfo/repos/extra-i686/PKGBUILD
  xorg-xdpyinfo/repos/extra-x86_64/PKGBUILD

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

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-10-24 12:15:00 UTC (rev 141117)
+++ extra-i686/PKGBUILD 2011-10-24 12:15:25 UTC (rev 141118)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xorg-xdpyinfo
-pkgver=1.2.0
-pkgrel=2
-pkgdesc=Display information utility for X
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('libx11' 'libxext' 'libxtst' 'libxxf86vm' 'libxxf86dga' 'libxrender' 
'libxcomposite' 'libxinerama' 'libdmx')
-makedepends=('xorg-util-macros')
-groups=('xorg-apps' 'xorg')
-source=(http://xorg.freedesktop.org/archive/individual/app/xdpyinfo-${pkgver}.tar.bz2)
-sha1sums=('5d53cd31afd40bdc4575b5347f2cda67f135f5f2')
-
-build() {
-  cd ${srcdir}/xdpyinfo-${pkgver}
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=${pkgdir} install
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: xorg-xdpyinfo/repos/extra-i686/PKGBUILD (from rev 141117, 
xorg-xdpyinfo/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-24 12:15:25 UTC (rev 141118)
@@ -0,0 +1,24 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xorg-xdpyinfo
+pkgver=1.3.0
+pkgrel=1
+pkgdesc=Display information utility for X
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('libx11' 'libxext' 'libxtst' 'libxxf86vm' 'libxxf86dga' 'libxrender' 
'libxcomposite' 'libxinerama' 'libdmx')
+makedepends=('xorg-util-macros')
+groups=('xorg-apps' 'xorg')
+source=(http://xorg.freedesktop.org/archive/individual/app/xdpyinfo-${pkgver}.tar.bz2)
+sha256sums=('23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f')
+
+build() {
+  cd ${srcdir}/xdpyinfo-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-10-24 12:15:00 UTC (rev 141117)
+++ extra-x86_64/PKGBUILD   2011-10-24 12:15:25 UTC (rev 141118)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xorg-xdpyinfo
-pkgver=1.2.0
-pkgrel=2
-pkgdesc=Display information utility for X
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('libx11' 'libxext' 'libxtst' 'libxxf86vm' 'libxxf86dga' 'libxrender' 
'libxcomposite' 'libxinerama' 'libdmx')
-makedepends=('xorg-util-macros')
-groups=('xorg-apps' 'xorg')
-source=(http://xorg.freedesktop.org/archive/individual/app/xdpyinfo-${pkgver}.tar.bz2)
-sha1sums=('5d53cd31afd40bdc4575b5347f2cda67f135f5f2')
-
-build() {
-  cd ${srcdir}/xdpyinfo-${pkgver}
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=${pkgdir} install
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: xorg-xdpyinfo/repos/extra-x86_64/PKGBUILD (from rev 141117, 
xorg-xdpyinfo/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-10-24 12:15:25 UTC (rev 141118)
@@ -0,0 +1,24 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xorg-xdpyinfo
+pkgver=1.3.0
+pkgrel=1
+pkgdesc=Display information utility for X
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('libx11' 'libxext' 'libxtst' 'libxxf86vm' 'libxxf86dga' 'libxrender' 
'libxcomposite' 'libxinerama' 'libdmx')
+makedepends=('xorg-util-macros')
+groups=('xorg-apps' 'xorg')
+source=(http://xorg.freedesktop.org/archive/individual/app/xdpyinfo-${pkgver}.tar.bz2)
+sha256sums=('23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f')
+
+build() {
+  cd ${srcdir}/xdpyinfo-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses

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

2011-10-24 Thread Jan de Groot
Date: Monday, October 24, 2011 @ 08:17:07
  Author: jgc
Revision: 141119

upgpkg: xorg-sessreg 1.0.7-1

Update to 1.0.7

Modified:
  xorg-sessreg/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-24 12:15:25 UTC (rev 141118)
+++ PKGBUILD2011-10-24 12:17:07 UTC (rev 141119)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=xorg-sessreg
-pkgver=1.0.6
-pkgrel=2
+pkgver=1.0.7
+pkgrel=1
 pkgdesc=Register X sessions in system utmp/utmpx databases
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
@@ -12,7 +12,7 @@
 makedepends=('xorg-util-macros' 'xproto')
 groups=('xorg-apps' 'xorg')
 
source=(http://xorg.freedesktop.org/archive/individual/app/sessreg-${pkgver}.tar.bz2)
-sha1sums=('6f260f1ddc366da070a6d60301b9fb64a99c119a')
+sha256sums=('8734ee580264ab92e984d8f84611dada89906d6b548334a5e7d4b0ddba7c2e52')
 
 build() {
   cd ${srcdir}/sessreg-${pkgver}



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

2011-10-24 Thread Jan de Groot
Date: Monday, October 24, 2011 @ 08:17:34
  Author: jgc
Revision: 141120

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

Added:
  xorg-sessreg/repos/extra-i686/PKGBUILD
(from rev 141119, xorg-sessreg/trunk/PKGBUILD)
  xorg-sessreg/repos/extra-x86_64/PKGBUILD
(from rev 141119, xorg-sessreg/trunk/PKGBUILD)
Deleted:
  xorg-sessreg/repos/extra-i686/PKGBUILD
  xorg-sessreg/repos/extra-x86_64/PKGBUILD

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

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-10-24 12:17:07 UTC (rev 141119)
+++ extra-i686/PKGBUILD 2011-10-24 12:17:34 UTC (rev 141120)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xorg-sessreg
-pkgver=1.0.6
-pkgrel=2
-pkgdesc=Register X sessions in system utmp/utmpx databases
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-util-macros' 'xproto')
-groups=('xorg-apps' 'xorg')
-source=(http://xorg.freedesktop.org/archive/individual/app/sessreg-${pkgver}.tar.bz2)
-sha1sums=('6f260f1ddc366da070a6d60301b9fb64a99c119a')
-
-build() {
-  cd ${srcdir}/sessreg-${pkgver}
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=${pkgdir} install
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: xorg-sessreg/repos/extra-i686/PKGBUILD (from rev 141119, 
xorg-sessreg/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-24 12:17:34 UTC (rev 141120)
@@ -0,0 +1,24 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xorg-sessreg
+pkgver=1.0.7
+pkgrel=1
+pkgdesc=Register X sessions in system utmp/utmpx databases
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-util-macros' 'xproto')
+groups=('xorg-apps' 'xorg')
+source=(http://xorg.freedesktop.org/archive/individual/app/sessreg-${pkgver}.tar.bz2)
+sha256sums=('8734ee580264ab92e984d8f84611dada89906d6b548334a5e7d4b0ddba7c2e52')
+
+build() {
+  cd ${srcdir}/sessreg-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-10-24 12:17:07 UTC (rev 141119)
+++ extra-x86_64/PKGBUILD   2011-10-24 12:17:34 UTC (rev 141120)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xorg-sessreg
-pkgver=1.0.6
-pkgrel=2
-pkgdesc=Register X sessions in system utmp/utmpx databases
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-util-macros' 'xproto')
-groups=('xorg-apps' 'xorg')
-source=(http://xorg.freedesktop.org/archive/individual/app/sessreg-${pkgver}.tar.bz2)
-sha1sums=('6f260f1ddc366da070a6d60301b9fb64a99c119a')
-
-build() {
-  cd ${srcdir}/sessreg-${pkgver}
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=${pkgdir} install
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: xorg-sessreg/repos/extra-x86_64/PKGBUILD (from rev 141119, 
xorg-sessreg/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-10-24 12:17:34 UTC (rev 141120)
@@ -0,0 +1,24 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xorg-sessreg
+pkgver=1.0.7
+pkgrel=1
+pkgdesc=Register X sessions in system utmp/utmpx databases
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-util-macros' 'xproto')
+groups=('xorg-apps' 'xorg')
+source=(http://xorg.freedesktop.org/archive/individual/app/sessreg-${pkgver}.tar.bz2)
+sha256sums=('8734ee580264ab92e984d8f84611dada89906d6b548334a5e7d4b0ddba7c2e52')
+
+build() {
+  cd ${srcdir}/sessreg-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



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

2011-10-24 Thread Jan de Groot
Date: Monday, October 24, 2011 @ 09:15:53
  Author: jgc
Revision: 141121

upgpkg: xorg-server 1.11.1.901-1

Update to 1.12 RC1, include post-release security fixes from git

Modified:
  xorg-server/trunk/PKGBUILD
  xorg-server/trunk/git-fixes.patch

-+
 PKGBUILD|   10 -
 git-fixes.patch |  322 +++---
 2 files changed, 50 insertions(+), 282 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-24 12:17:34 UTC (rev 141120)
+++ PKGBUILD2011-10-24 13:15:53 UTC (rev 141121)
@@ -3,8 +3,8 @@
 
 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.1
-pkgrel=2
+pkgver=1.11.1.901
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
 url=http://xorg.freedesktop.org;
@@ -18,11 +18,11 @@
 xvfb-run
 xvfb-run.1
 10-quirks.conf)
-sha1sums=('ed0358b61294f1283aad42cf1e609752ceeffafd'
+sha1sums=('bc72d860c34868aa6b1823230cb7f13136ceb092'
   '0249b892f27243d8fe6fe6d226bf4c2391cedf49'
   '962fecc159c128728f14e8ba231c5b00391ff4ac'
   'd9f7d9553e772c2682c15079019d30c658a4f83b'
-  'd73125bf93aea09b0beb55e75c510b9f72f5d21a'
+  'cd9291fe1fa1b497aa74675afeeb025fe6b23b95'
   'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
   '6838fc00ef4618c924a77e0fb03c05346080908a'
   '993798f3d22ad672d769dae5f48d1fa068d5578f')
@@ -42,7 +42,7 @@
   # Add post-release patches from 1.11 branch
   patch -Np1 -i ${srcdir}/git-fixes.patch
 
-  autoreconf
+  autoreconf -fi
   ./configure --prefix=/usr \
   --enable-ipv6 \
   --enable-dri \

Modified: git-fixes.patch
===
--- git-fixes.patch 2011-10-24 12:17:34 UTC (rev 141120)
+++ git-fixes.patch 2011-10-24 13:15:53 UTC (rev 141121)
@@ -1,288 +1,56 @@
-From bd6ea85209e5ab80375d4ec9994d10a89fd1374a Mon Sep 17 00:00:00 2001
-From: Jamey Sharp ja...@minilop.net
-Date: Wed, 15 Sep 2010 01:35:21 +
-Subject: Fix pixmap double-frees on error paths.
+From f80d23357874db19bc124dee70239fb182977883 Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb matthieu.he...@laas.fr
+Date: Mon, 17 Oct 2011 20:26:12 +
+Subject: Fix CVE-2011-4028: File disclosure vulnerability.
 
-If AddResource fails, it will automatically free the object that was
-passed to it by calling the appropriate deleteFunc; and of course
-FreeResource also calls the deleteFunc. In both cases it's wrong to call
-the destroy hook manually.
+use O_NOFOLLOW to open the existing lock file, so symbolic links
+aren't followed, thus avoid revealing if it point to an existing
+file.
 
-Commit by Jamey Sharp and Josh Triplett.
-
-Signed-off-by: Jamey Sharp ja...@minilop.net
-Signed-off-by: Josh Triplett j...@joshtriplett.org
-Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
-Reviewed-by: Aaron Plattner aplatt...@nvidia.com
-(cherry picked from commit 0f380a5005f800572773cd4667ce43c7459cc467)
+Signed-off-by: Matthieu Herrb matthieu.he...@laas.fr
+Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com
+(cherry picked from commit 6ba44b91e37622ef8c146d8f2ac92d708a18ed34)
 ---
-diff --git a/Xext/shm.c b/Xext/shm.c
-index b08af82..4141a8f 100644
 a/Xext/shm.c
-+++ b/Xext/shm.c
-@@ -991,7 +991,6 @@ CreatePmap:
-   pMap-drawable.serialNumber = NEXT_SERIAL_NUMBER;
-   pMap-drawable.id = newPix-info[j].id;
-   if (!AddResource(newPix-info[j].id, RT_PIXMAP, (pointer)pMap)) {
--  (*pScreen-DestroyPixmap)(pMap);
-   result = BadAlloc;
-   break;
-   }
-@@ -1002,10 +1001,8 @@ CreatePmap:
- }
- 
- if(result == BadAlloc) {
--  while(j--) {
--  (*pScreen-DestroyPixmap)(pMap);
-+  while(j--)
-   FreeResource(newPix-info[j].id, RT_NONE);
--  }
-   free(newPix);
- } else 
-   AddResource(stuff-pid, XRT_PIXMAP, newPix);
-@@ -1110,7 +1107,6 @@ CreatePmap:
-   {
-   return Success;
-   }
--  pDraw-pScreen-DestroyPixmap(pMap);
- }
- return BadAlloc;
- }
-diff --git a/dix/dispatch.c b/dix/dispatch.c
-index 192c8c3..f8200b1 100644
 a/dix/dispatch.c
-+++ b/dix/dispatch.c
-@@ -1419,7 +1419,6 @@ CreatePmap:
-   }
-   if (AddResource(stuff-pid, RT_PIXMAP, (pointer)pMap))
-   return Success;
--  (*pDraw-pScreen-DestroyPixmap)(pMap);
- }
- return BadAlloc;
- }
+diff --git a/os/utils.c b/os/utils.c
+index 36cb46f..9e0acb6 100644
+--- a/os/utils.c
 b/os/utils.c
+@@ -316,7 +316,7 @@ LockServer(void)
+   /*
+* Read the pid from the existing file
+*/
+-  lfd = open(LockFile, O_RDONLY);
++  lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
+   if (lfd  0) {
+ unlink(tmp);
+ FatalError(Can't read lock file %s\n, LockFile);
 --
 cgit 

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

2011-10-24 Thread Jan de Groot
Date: Monday, October 24, 2011 @ 09:18:15
  Author: jgc
Revision: 141122

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

Added:
  xorg-server/repos/extra-i686/10-quirks.conf
(from rev 141121, xorg-server/trunk/10-quirks.conf)
  xorg-server/repos/extra-i686/PKGBUILD
(from rev 141121, xorg-server/trunk/PKGBUILD)
  xorg-server/repos/extra-i686/autoconfig-nvidia.patch
(from rev 141121, xorg-server/trunk/autoconfig-nvidia.patch)
  xorg-server/repos/extra-i686/autoconfig-sis.patch
(from rev 141121, xorg-server/trunk/autoconfig-sis.patch)
  xorg-server/repos/extra-i686/git-fixes.patch
(from rev 141121, xorg-server/trunk/git-fixes.patch)
  xorg-server/repos/extra-i686/revert-trapezoids.patch
(from rev 141121, xorg-server/trunk/revert-trapezoids.patch)
  xorg-server/repos/extra-i686/xvfb-run
(from rev 141121, xorg-server/trunk/xvfb-run)
  xorg-server/repos/extra-i686/xvfb-run.1
(from rev 141121, xorg-server/trunk/xvfb-run.1)
  xorg-server/repos/extra-x86_64/10-quirks.conf
(from rev 141121, xorg-server/trunk/10-quirks.conf)
  xorg-server/repos/extra-x86_64/PKGBUILD
(from rev 141121, xorg-server/trunk/PKGBUILD)
  xorg-server/repos/extra-x86_64/autoconfig-nvidia.patch
(from rev 141121, xorg-server/trunk/autoconfig-nvidia.patch)
  xorg-server/repos/extra-x86_64/autoconfig-sis.patch
(from rev 141121, xorg-server/trunk/autoconfig-sis.patch)
  xorg-server/repos/extra-x86_64/git-fixes.patch
(from rev 141121, xorg-server/trunk/git-fixes.patch)
  xorg-server/repos/extra-x86_64/revert-trapezoids.patch
(from rev 141121, xorg-server/trunk/revert-trapezoids.patch)
  xorg-server/repos/extra-x86_64/xvfb-run
(from rev 141121, xorg-server/trunk/xvfb-run)
  xorg-server/repos/extra-x86_64/xvfb-run.1
(from rev 141121, xorg-server/trunk/xvfb-run.1)
Deleted:
  xorg-server/repos/extra-i686/10-quirks.conf
  xorg-server/repos/extra-i686/PKGBUILD
  xorg-server/repos/extra-i686/autoconfig-nvidia.patch
  xorg-server/repos/extra-i686/autoconfig-sis.patch
  xorg-server/repos/extra-i686/git-fixes.patch
  xorg-server/repos/extra-i686/revert-trapezoids.patch
  xorg-server/repos/extra-i686/xvfb-run
  xorg-server/repos/extra-i686/xvfb-run.1
  xorg-server/repos/extra-x86_64/10-quirks.conf
  xorg-server/repos/extra-x86_64/PKGBUILD
  xorg-server/repos/extra-x86_64/autoconfig-nvidia.patch
  xorg-server/repos/extra-x86_64/autoconfig-sis.patch
  xorg-server/repos/extra-x86_64/git-fixes.patch
  xorg-server/repos/extra-x86_64/revert-trapezoids.patch
  xorg-server/repos/extra-x86_64/xvfb-run
  xorg-server/repos/extra-x86_64/xvfb-run.1

--+
 extra-i686/10-quirks.conf|   20 -
 extra-i686/PKGBUILD  |  386 +++---
 extra-i686/autoconfig-nvidia.patch   |   58 +--
 extra-i686/autoconfig-sis.patch  |   38 +-
 extra-i686/git-fixes.patch   |  344 +++-
 extra-i686/revert-trapezoids.patch   |  358 ++--
 extra-i686/xvfb-run  |  360 ++---
 extra-i686/xvfb-run.1|  564 -
 extra-x86_64/10-quirks.conf  |   20 -
 extra-x86_64/PKGBUILD|  386 +++---
 extra-x86_64/autoconfig-nvidia.patch |   58 +--
 extra-x86_64/autoconfig-sis.patch|   38 +-
 extra-x86_64/git-fixes.patch |  344 +++-
 extra-x86_64/revert-trapezoids.patch |  358 ++--
 extra-x86_64/xvfb-run|  360 ++---
 extra-x86_64/xvfb-run.1  |  564 -
 16 files changed, 1896 insertions(+), 2360 deletions(-)

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


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

2011-11-07 Thread Jan de Groot
Date: Monday, November 7, 2011 @ 04:08:35
  Author: jgc
Revision: 142245

upgpkg: pixman 0.24.0-1

Update to 0.24.0

Modified:
  pixman/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-11-07 07:12:21 UTC (rev 142244)
+++ PKGBUILD2011-11-07 09:08:35 UTC (rev 142245)
@@ -3,7 +3,7 @@
 # Contributor: Alexander Baldeck alexan...@archlinux.org
 
 pkgname=pixman
-pkgver=0.22.2
+pkgver=0.24.0
 pkgrel=1
 pkgdesc=Pixman library
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@
 depends=('glibc')
 options=('!libtool')
 
source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('ad2b828ce4280472f5933d8bb5f0f4d583aed7f3')
+sha1sums=('a3b73c3ea6cada20d705203a394f574aa69e2177')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}



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

2011-11-07 Thread Jan de Groot
Date: Monday, November 7, 2011 @ 04:08:59
  Author: jgc
Revision: 142246

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

Added:
  pixman/repos/testing-i686/
  pixman/repos/testing-i686/PKGBUILD
(from rev 142245, pixman/trunk/PKGBUILD)
  pixman/repos/testing-x86_64/
  pixman/repos/testing-x86_64/PKGBUILD
(from rev 142245, pixman/trunk/PKGBUILD)

-+
 testing-i686/PKGBUILD   |   33 +
 testing-x86_64/PKGBUILD |   33 +
 2 files changed, 66 insertions(+)

Copied: pixman/repos/testing-i686/PKGBUILD (from rev 142245, 
pixman/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-11-07 09:08:59 UTC (rev 142246)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Alexander Baldeck alexan...@archlinux.org
+
+pkgname=pixman
+pkgver=0.24.0
+pkgrel=1
+pkgdesc=Pixman library
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org;
+license=('custom')
+depends=('glibc')
+options=('!libtool')
+source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('a3b73c3ea6cada20d705203a394f574aa69e2177')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Copied: pixman/repos/testing-x86_64/PKGBUILD (from rev 142245, 
pixman/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2011-11-07 09:08:59 UTC (rev 142246)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Alexander Baldeck alexan...@archlinux.org
+
+pkgname=pixman
+pkgver=0.24.0
+pkgrel=1
+pkgdesc=Pixman library
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org;
+license=('custom')
+depends=('glibc')
+options=('!libtool')
+source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('a3b73c3ea6cada20d705203a394f574aa69e2177')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



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

2011-11-07 Thread Jan de Groot
Date: Monday, November 7, 2011 @ 04:15:45
  Author: jgc
Revision: 142247

upgpkg: libdatrie 0.2.5-1

Update to 0.2.5, change URL

Modified:
  libdatrie/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-11-07 09:08:59 UTC (rev 142246)
+++ PKGBUILD2011-11-07 09:15:45 UTC (rev 142247)
@@ -3,20 +3,24 @@
 # Contributor: Chaiwat Suttipongsakul cwt...@gmail.com
 
 pkgname=libdatrie
-pkgver=0.2.4
+pkgver=0.2.5
 pkgrel=1
 pkgdesc=Implementation of double-array structure for representing trie, as 
proposed by Junichi Aoe.
-url=http://linux.thai.net/~thep/datrie/datrie.html;
+url=http://linux.thai.net/projects/datrie;
 license=('LGPL')
 arch=('i686' 'x86_64')
 depends=('glibc')
 options=('!libtool' '!emptydirs')
 
source=(http://linux.thai.net/pub/thailinux/software/libthai/${pkgname}-${pkgver}.tar.gz)
-md5sums=('7f7d592114f98db9e4c7171c3f2befc5')
+md5sums=('c9b057d07198d66e1ac2eff32937d3d4')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --disable-static
   make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }



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

2011-11-07 Thread Jan de Groot
Date: Monday, November 7, 2011 @ 04:16:13
  Author: jgc
Revision: 142248

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

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

---+
 extra-i686/PKGBUILD   |   48 ++--
 extra-x86_64/PKGBUILD |   48 ++--
 2 files changed, 52 insertions(+), 44 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-07 09:15:45 UTC (rev 142247)
+++ extra-i686/PKGBUILD 2011-11-07 09:16:13 UTC (rev 142248)
@@ -1,22 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Chaiwat Suttipongsakul cwt...@gmail.com
-
-pkgname=libdatrie
-pkgver=0.2.4
-pkgrel=1
-pkgdesc=Implementation of double-array structure for representing trie, as 
proposed by Junichi Aoe.
-url=http://linux.thai.net/~thep/datrie/datrie.html;
-license=('LGPL')
-arch=('i686' 'x86_64')
-depends=('glibc')
-options=('!libtool' '!emptydirs')
-source=(http://linux.thai.net/pub/thailinux/software/libthai/${pkgname}-${pkgver}.tar.gz)
-md5sums=('7f7d592114f98db9e4c7171c3f2befc5')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make
-  make DESTDIR=${pkgdir} install
-}

Copied: libdatrie/repos/extra-i686/PKGBUILD (from rev 142247, 
libdatrie/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-07 09:16:13 UTC (rev 142248)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Chaiwat Suttipongsakul cwt...@gmail.com
+
+pkgname=libdatrie
+pkgver=0.2.5
+pkgrel=1
+pkgdesc=Implementation of double-array structure for representing trie, as 
proposed by Junichi Aoe.
+url=http://linux.thai.net/projects/datrie;
+license=('LGPL')
+arch=('i686' 'x86_64')
+depends=('glibc')
+options=('!libtool' '!emptydirs')
+source=(http://linux.thai.net/pub/thailinux/software/libthai/${pkgname}-${pkgver}.tar.gz)
+md5sums=('c9b057d07198d66e1ac2eff32937d3d4')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-11-07 09:15:45 UTC (rev 142247)
+++ extra-x86_64/PKGBUILD   2011-11-07 09:16:13 UTC (rev 142248)
@@ -1,22 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Chaiwat Suttipongsakul cwt...@gmail.com
-
-pkgname=libdatrie
-pkgver=0.2.4
-pkgrel=1
-pkgdesc=Implementation of double-array structure for representing trie, as 
proposed by Junichi Aoe.
-url=http://linux.thai.net/~thep/datrie/datrie.html;
-license=('LGPL')
-arch=('i686' 'x86_64')
-depends=('glibc')
-options=('!libtool' '!emptydirs')
-source=(http://linux.thai.net/pub/thailinux/software/libthai/${pkgname}-${pkgver}.tar.gz)
-md5sums=('7f7d592114f98db9e4c7171c3f2befc5')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make
-  make DESTDIR=${pkgdir} install
-}

Copied: libdatrie/repos/extra-x86_64/PKGBUILD (from rev 142247, 
libdatrie/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-11-07 09:16:13 UTC (rev 142248)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Chaiwat Suttipongsakul cwt...@gmail.com
+
+pkgname=libdatrie
+pkgver=0.2.5
+pkgrel=1
+pkgdesc=Implementation of double-array structure for representing trie, as 
proposed by Junichi Aoe.
+url=http://linux.thai.net/projects/datrie;
+license=('LGPL')
+arch=('i686' 'x86_64')
+depends=('glibc')
+options=('!libtool' '!emptydirs')
+source=(http://linux.thai.net/pub/thailinux/software/libthai/${pkgname}-${pkgver}.tar.gz)
+md5sums=('c9b057d07198d66e1ac2eff32937d3d4')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}



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

2011-11-07 Thread Jan de Groot
Date: Monday, November 7, 2011 @ 04:20:15
  Author: jgc
Revision: 142249

upgpkg: libthai 0.1.16-1

Update to 0.1.16

Modified:
  libthai/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-11-07 09:16:13 UTC (rev 142248)
+++ PKGBUILD2011-11-07 09:20:15 UTC (rev 142249)
@@ -3,21 +3,25 @@
 # Contributor: Chaiwat Suttipongsakul cwt...@gmail.com
 
 pkgname=libthai
-pkgver=0.1.15
+pkgver=0.1.16
 pkgrel=1
 pkgdesc=Thai language support routines
 url=http://linux.thai.net/projects/libthai;
 arch=('i686' 'x86_64')
 license=('LGPL')
-depends=('libdatrie=0.2.3')
+depends=('libdatrie')
 makedepends=('pkgconfig')
 options=('!libtool' '!emptydirs')
 
source=(http://linux.thai.net/pub/thailinux/software/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3bc6d925eae36317aac8676be49a5741')
+md5sums=('631ae09f531db6c94aedcc7ce226d6a5')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --disable-static
   make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }



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

2011-11-07 Thread Jan de Groot
Date: Monday, November 7, 2011 @ 04:20:43
  Author: jgc
Revision: 142250

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

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

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

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-07 09:20:15 UTC (rev 142249)
+++ extra-i686/PKGBUILD 2011-11-07 09:20:43 UTC (rev 142250)
@@ -1,23 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Chaiwat Suttipongsakul cwt...@gmail.com
-
-pkgname=libthai
-pkgver=0.1.15
-pkgrel=1
-pkgdesc=Thai language support routines
-url=http://linux.thai.net/projects/libthai;
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libdatrie=0.2.3')
-makedepends=('pkgconfig')
-options=('!libtool' '!emptydirs')
-source=(http://linux.thai.net/pub/thailinux/software/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3bc6d925eae36317aac8676be49a5741')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make
-  make DESTDIR=${pkgdir} install
-}

Copied: libthai/repos/extra-i686/PKGBUILD (from rev 142249, 
libthai/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-07 09:20:43 UTC (rev 142250)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Chaiwat Suttipongsakul cwt...@gmail.com
+
+pkgname=libthai
+pkgver=0.1.16
+pkgrel=1
+pkgdesc=Thai language support routines
+url=http://linux.thai.net/projects/libthai;
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('libdatrie')
+makedepends=('pkgconfig')
+options=('!libtool' '!emptydirs')
+source=(http://linux.thai.net/pub/thailinux/software/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('631ae09f531db6c94aedcc7ce226d6a5')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-11-07 09:20:15 UTC (rev 142249)
+++ extra-x86_64/PKGBUILD   2011-11-07 09:20:43 UTC (rev 142250)
@@ -1,23 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Chaiwat Suttipongsakul cwt...@gmail.com
-
-pkgname=libthai
-pkgver=0.1.15
-pkgrel=1
-pkgdesc=Thai language support routines
-url=http://linux.thai.net/projects/libthai;
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libdatrie=0.2.3')
-makedepends=('pkgconfig')
-options=('!libtool' '!emptydirs')
-source=(http://linux.thai.net/pub/thailinux/software/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3bc6d925eae36317aac8676be49a5741')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make
-  make DESTDIR=${pkgdir} install
-}

Copied: libthai/repos/extra-x86_64/PKGBUILD (from rev 142249, 
libthai/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-11-07 09:20:43 UTC (rev 142250)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Chaiwat Suttipongsakul cwt...@gmail.com
+
+pkgname=libthai
+pkgver=0.1.16
+pkgrel=1
+pkgdesc=Thai language support routines
+url=http://linux.thai.net/projects/libthai;
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('libdatrie')
+makedepends=('pkgconfig')
+options=('!libtool' '!emptydirs')
+source=(http://linux.thai.net/pub/thailinux/software/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('631ae09f531db6c94aedcc7ce226d6a5')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}



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

2011-11-07 Thread Jan de Groot
Date: Monday, November 7, 2011 @ 05:15:32
  Author: jgc
Revision: 142253

upgpkg: poppler 0.18.1-1

Update to 0.18.1
Add files for test suite, add check() function
Soname bump for libpoppler.so.18, requires rebuild 
(https://www.archlinux.org/todo/108/)

Added:
  poppler/trunk/git-fixes.patch
Modified:
  poppler/trunk/PKGBUILD

-+
 PKGBUILD|   24 
 git-fixes.patch |  107 ++
 2 files changed, 124 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-07 09:31:56 UTC (rev 142252)
+++ PKGBUILD2011-11-07 10:15:32 UTC (rev 142253)
@@ -3,24 +3,27 @@
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.18.0
-pkgrel=2
+pkgver=0.18.1
+pkgrel=1
 arch=(i686 x86_64)
 license=('GPL')
 makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 
'pkgconfig' 'lcms' 'gobject-introspection')
 options=('!libtool' '!emptydirs')
 url=http://poppler.freedesktop.org/;
+_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
 source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
-   
fix_cairo.patch::http://cgit.freedesktop.org/poppler/poppler/patch/?id=66ab373365b8f9060ff3d117bb677520e32c7e8e)
-md5sums=('4cd3bf2a0a13fa8eaf00d31368915f77'
- '8f4a296fdd98446858d5ea74d7c496ab')
+
http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2
+git-fixes.patch)
+md5sums=('d30e883a27423c936ef338ce1d967e2d'
+ '9dc64c254a31e570507bdd4ad4ba629a'
+ 'a73ba6515aa73cb20c480692da52c79e')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
   sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
+  patch -Np1 -i ${srcdir}/git-fixes.patch
 
-  patch -Np1 -i ${srcdir}/fix_cairo.patch
+  autoreconf -fi
 
   ./configure --prefix=/usr --sysconfdir=/etc \
   --localstatedir=/var --disable-static \
@@ -32,6 +35,13 @@
   make
 }
 
+check() {
+  cd ${srcdir}
+  ln -sf test-${_testtag} test
+  cd ${pkgbase}-${pkgver}
+  make check
+}
+
 package_poppler() {
   pkgdesc=PDF rendering library based on xpdf 3.0
   depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 
'poppler-data')

Added: git-fixes.patch
===
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2011-11-07 10:15:32 UTC (rev 142253)
@@ -0,0 +1,107 @@
+From e4a2adb02969e872e37e408ced4c39131c6751ea Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos carlo...@gnome.org
+Date: Sun, 30 Oct 2011 15:02:19 +
+Subject: pdftocairo: Make sure beginDocument() is always called
+
+This fixes a crash when rendering only odd/even pages in a printing
+format.
+---
+diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc
+index e458ee5..1b67c90 100644
+--- a/utils/pdftocairo.cc
 b/utils/pdftocairo.cc
+@@ -903,6 +903,10 @@ int main(int argc, char *argv[]) {
+ lastPage = firstPage;
+   }
+ 
++  // Make sure firstPage is always used so that beginDocument() is called
++  if ((printOnlyEven  pg % 2 == 0) || (printOnlyOdd  pg % 2 == 1))
++firstPage++;
++
+   cairoOut = new CairoOutputDev();
+   cairoOut-startDoc(doc-getXRef(), doc-getCatalog());
+   if (sz != 0)
+--
+cgit v0.9.0.2-2-gbebe
+From 61b1556d1c62bf090b2eadf93e4e7d0aff7b8015 Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos carlo...@gnome.org
+Date: Sun, 30 Oct 2011 15:08:46 +
+Subject: pdftocairo: Use fisrtPage instead of uninitialized pg variable
+
+This fixes an error in my previous commit.
+---
+diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc
+index 1b67c90..d0d1ec6 100644
+--- a/utils/pdftocairo.cc
 b/utils/pdftocairo.cc
+@@ -904,7 +904,7 @@ int main(int argc, char *argv[]) {
+   }
+ 
+   // Make sure firstPage is always used so that beginDocument() is called
+-  if ((printOnlyEven  pg % 2 == 0) || (printOnlyOdd  pg % 2 == 1))
++  if ((printOnlyEven  firstPage % 2 == 0) || (printOnlyOdd  firstPage % 2 
== 1))
+ firstPage++;
+ 
+   cairoOut = new CairoOutputDev();
+--
+cgit v0.9.0.2-2-gbebe
+From ebf7fbc74da10d1bc423d33b26e30166870642e4 Mon Sep 17 00:00:00 2001
+From: Rex Dieter rdie...@math.unl.edu
+Date: Tue, 01 Nov 2011 08:40:53 +
+Subject: Fix pkg-config files
+
+We were using $FOO_REQUIRED instead of @FOO_REQUIRED@
+---
+diff --git a/configure.ac b/configure.ac
+index 3a120ca..c4f5b92 100644
+--- a/configure.ac
 b/configure.ac
+@@ -409,6 +409,7 @@ if test x$enable_cairo_output = xyes; then
+   POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=
+ 
+   GLIB_REQUIRED=2.18
++  AC_SUBST(GLIB_REQUIRED)
+   AC_ARG_ENABLE(poppler-glib,
+   AC_HELP_STRING([--disable-poppler-glib],
+  [Don't compile poppler glib wrapper.]),
+diff --git a/poppler-glib-uninstalled.pc.in b/poppler-glib-uninstalled.pc.in
+index 55a2278..5fcb6f2 100644
+--- a/poppler-glib-uninstalled.pc.in
 

[arch-commits] Commit in poppler/repos (6 files)

2011-11-07 Thread Jan de Groot
Date: Monday, November 7, 2011 @ 05:16:14
  Author: jgc
Revision: 142254

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

Added:
  poppler/repos/staging-i686/
  poppler/repos/staging-i686/PKGBUILD
(from rev 142253, poppler/trunk/PKGBUILD)
  poppler/repos/staging-i686/git-fixes.patch
(from rev 142253, poppler/trunk/git-fixes.patch)
  poppler/repos/staging-x86_64/
  poppler/repos/staging-x86_64/PKGBUILD
(from rev 142253, poppler/trunk/PKGBUILD)
  poppler/repos/staging-x86_64/git-fixes.patch
(from rev 142253, poppler/trunk/git-fixes.patch)

+
 staging-i686/PKGBUILD  |   83 ++
 staging-i686/git-fixes.patch   |  107 +++
 staging-x86_64/PKGBUILD|   83 ++
 staging-x86_64/git-fixes.patch |  107 +++
 4 files changed, 380 insertions(+)

Copied: poppler/repos/staging-i686/PKGBUILD (from rev 142253, 
poppler/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-11-07 10:16:14 UTC (rev 142254)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgbase=poppler
+pkgname=('poppler' 'poppler-glib' 'poppler-qt')
+pkgver=0.18.1
+pkgrel=1
+arch=(i686 x86_64)
+license=('GPL')
+makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 
'pkgconfig' 'lcms' 'gobject-introspection')
+options=('!libtool' '!emptydirs')
+url=http://poppler.freedesktop.org/;
+_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
+source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
+
http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2
+git-fixes.patch)
+md5sums=('d30e883a27423c936ef338ce1d967e2d'
+ '9dc64c254a31e570507bdd4ad4ba629a'
+ 'a73ba6515aa73cb20c480692da52c79e')
+
+build() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  sed -i -e '/AC_PATH_XTRA/d' configure.ac
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+
+  autoreconf -fi
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+  --localstatedir=/var --disable-static \
+  --enable-cairo-output \
+  --enable-xpdf-headers \
+  --enable-libjpeg --enable-zlib \
+  --enable-poppler-qt4 \
+  --enable-poppler-glib
+  make
+}
+
+check() {
+  cd ${srcdir}
+  ln -sf test-${_testtag} test
+  cd ${pkgbase}-${pkgver}
+  make check
+}
+
+package_poppler() {
+  pkgdesc=PDF rendering library based on xpdf 3.0
+  depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 
'poppler-data')
+  conflicts=(poppler-qt3${pkgver})
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  sed -e 's/^glib_subdir =.*/glib_subdir =/' \
+  -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile
+  make DESTDIR=${pkgdir} install
+
+  rm -f ${pkgdir}/usr/lib/pkgconfig/poppler-{glib,qt4}.pc
+}
+
+package_poppler-glib() {
+  pkgdesc=Poppler glib bindings
+  depends=(poppler=${pkgver} 'glib2')
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/poppler
+  make DESTDIR=${pkgdir} install-libLTLIBRARIES
+  cd ${srcdir}/${pkgbase}-${pkgver}/glib
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/lib/pkgconfig
+  install -m644 ../poppler-glib.pc ${pkgdir}/usr/lib/pkgconfig/
+  rm -f ${pkgdir}/usr/lib/libpoppler.*
+  rm -f ${pkgdir}/usr/bin/poppler-glib-demo
+}
+
+package_poppler-qt() {
+  pkgdesc=Poppler Qt bindings
+  depends=(poppler=${pkgver} 'qt')
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/poppler
+  make DESTDIR=${pkgdir} install-libLTLIBRARIES
+  cd ${srcdir}/${pkgbase}-${pkgver}/qt4
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/lib/pkgconfig
+  install -m644 ../poppler-qt4.pc ${pkgdir}/usr/lib/pkgconfig/
+  rm -f ${pkgdir}/usr/lib/libpoppler.*
+}

Copied: poppler/repos/staging-i686/git-fixes.patch (from rev 142253, 
poppler/trunk/git-fixes.patch)
===
--- staging-i686/git-fixes.patch(rev 0)
+++ staging-i686/git-fixes.patch2011-11-07 10:16:14 UTC (rev 142254)
@@ -0,0 +1,107 @@
+From e4a2adb02969e872e37e408ced4c39131c6751ea Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos carlo...@gnome.org
+Date: Sun, 30 Oct 2011 15:02:19 +
+Subject: pdftocairo: Make sure beginDocument() is always called
+
+This fixes a crash when rendering only odd/even pages in a printing
+format.
+---
+diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc
+index e458ee5..1b67c90 100644
+--- a/utils/pdftocairo.cc
 b/utils/pdftocairo.cc
+@@ -903,6 +903,10 @@ int main(int argc, char *argv[]) {
+ lastPage = firstPage;
+   }
+ 
++  // Make sure firstPage is always used so that beginDocument() is called
++  if ((printOnlyEven  pg % 2 == 0) || (printOnlyOdd  pg % 2 == 1))
++firstPage++;
++
+   cairoOut = new CairoOutputDev();
+   cairoOut-startDoc(doc-getXRef(), doc-getCatalog

[arch-commits] Commit in gtk-sharp-2/trunk (PKGBUILD)

2011-11-07 Thread Jan de Groot
Date: Monday, November 7, 2011 @ 07:48:45
  Author: jgc
Revision: 142256

upgpkg: gtk-sharp-2 2.12.11-1

Update to 2.12.11

Modified:
  gtk-sharp-2/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-11-07 11:30:12 UTC (rev 142255)
+++ PKGBUILD2011-11-07 12:48:45 UTC (rev 142256)
@@ -2,27 +2,30 @@
 # Maintainer: tobias tob...@archlinux.org
 
 pkgname=gtk-sharp-2
-pkgver=2.12.10
+pkgver=2.12.11
 pkgrel=1
 pkgdesc=gtk2 bindings for C#
 arch=(i686 x86_64)
 license=('LGPL')
 url=http://gtk-sharp.sourceforge.net;
-depends=('mono=2.4' 'libglade=2.6.4' 'gtk2=2.18.0')
+depends=('mono' 'libglade' 'gtk2')
 makedepends=('pkgconfig' 'monodoc')
 conflicts=('gtk#')
 options=('!libtool' '!makeflags')
-source=(http://ftp.gnome.org/pub/GNOME/sources/gtk-sharp/2.12/gtk-sharp-${pkgver}.tar.bz2)
-sha256sums=('aaa53f7916f25f0f83760b6ffbf0d465d13ecfa55aa645603f1ca876b7d0f770')
+source=(http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-${pkgver}.tar.bz2)
+md5sums=('c278da6a472c6c13b698af012f543c64')
 
 build() {
  # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR=${srcdir}/weird
+  export MONO_SHARED_DIR=${srcdir}/wapi
   mkdir -p ${MONO_SHARED_DIR}
 
   cd ${srcdir}/gtk-sharp-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1
-  make || return 1
-  make GACUTIL=/usr/bin/gacutil /root ${pkgdir}/usr/lib \
-DESTDIR=${pkgdir} install || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
+  make
 }
+
+package() {
+  cd ${srcdir}/gtk-sharp-${pkgver}
+  make DESTDIR=${pkgdir} install
+}



[arch-commits] Commit in gtk-sharp-2/repos (4 files)

2011-11-07 Thread Jan de Groot
Date: Monday, November 7, 2011 @ 07:49:15
  Author: jgc
Revision: 142257

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

Added:
  gtk-sharp-2/repos/extra-i686/PKGBUILD
(from rev 142256, gtk-sharp-2/trunk/PKGBUILD)
  gtk-sharp-2/repos/extra-x86_64/PKGBUILD
(from rev 142256, gtk-sharp-2/trunk/PKGBUILD)
Deleted:
  gtk-sharp-2/repos/extra-i686/PKGBUILD
  gtk-sharp-2/repos/extra-x86_64/PKGBUILD

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

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-07 12:48:45 UTC (rev 142256)
+++ extra-i686/PKGBUILD 2011-11-07 12:49:15 UTC (rev 142257)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: tobias tob...@archlinux.org
-
-pkgname=gtk-sharp-2
-pkgver=2.12.10
-pkgrel=1
-pkgdesc=gtk2 bindings for C#
-arch=(i686 x86_64)
-license=('LGPL')
-url=http://gtk-sharp.sourceforge.net;
-depends=('mono=2.4' 'libglade=2.6.4' 'gtk2=2.18.0')
-makedepends=('pkgconfig' 'monodoc')
-conflicts=('gtk#')
-options=('!libtool' '!makeflags')
-source=(http://ftp.gnome.org/pub/GNOME/sources/gtk-sharp/2.12/gtk-sharp-${pkgver}.tar.bz2)
-sha256sums=('aaa53f7916f25f0f83760b6ffbf0d465d13ecfa55aa645603f1ca876b7d0f770')
-
-build() {
- # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR=${srcdir}/weird
-  mkdir -p ${MONO_SHARED_DIR}
-
-  cd ${srcdir}/gtk-sharp-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1
-  make || return 1
-  make GACUTIL=/usr/bin/gacutil /root ${pkgdir}/usr/lib \
-DESTDIR=${pkgdir} install || return 1
-}

Copied: gtk-sharp-2/repos/extra-i686/PKGBUILD (from rev 142256, 
gtk-sharp-2/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-07 12:49:15 UTC (rev 142257)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: tobias tob...@archlinux.org
+
+pkgname=gtk-sharp-2
+pkgver=2.12.11
+pkgrel=1
+pkgdesc=gtk2 bindings for C#
+arch=(i686 x86_64)
+license=('LGPL')
+url=http://gtk-sharp.sourceforge.net;
+depends=('mono' 'libglade' 'gtk2')
+makedepends=('pkgconfig' 'monodoc')
+conflicts=('gtk#')
+options=('!libtool' '!makeflags')
+source=(http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-${pkgver}.tar.bz2)
+md5sums=('c278da6a472c6c13b698af012f543c64')
+
+build() {
+ # get rid of that .wapi errors; thanks to brice
+  export MONO_SHARED_DIR=${srcdir}/wapi
+  mkdir -p ${MONO_SHARED_DIR}
+
+  cd ${srcdir}/gtk-sharp-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/gtk-sharp-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-11-07 12:48:45 UTC (rev 142256)
+++ extra-x86_64/PKGBUILD   2011-11-07 12:49:15 UTC (rev 142257)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: tobias tob...@archlinux.org
-
-pkgname=gtk-sharp-2
-pkgver=2.12.10
-pkgrel=1
-pkgdesc=gtk2 bindings for C#
-arch=(i686 x86_64)
-license=('LGPL')
-url=http://gtk-sharp.sourceforge.net;
-depends=('mono=2.4' 'libglade=2.6.4' 'gtk2=2.18.0')
-makedepends=('pkgconfig' 'monodoc')
-conflicts=('gtk#')
-options=('!libtool' '!makeflags')
-source=(http://ftp.gnome.org/pub/GNOME/sources/gtk-sharp/2.12/gtk-sharp-${pkgver}.tar.bz2)
-sha256sums=('aaa53f7916f25f0f83760b6ffbf0d465d13ecfa55aa645603f1ca876b7d0f770')
-
-build() {
- # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR=${srcdir}/weird
-  mkdir -p ${MONO_SHARED_DIR}
-
-  cd ${srcdir}/gtk-sharp-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1
-  make || return 1
-  make GACUTIL=/usr/bin/gacutil /root ${pkgdir}/usr/lib \
-DESTDIR=${pkgdir} install || return 1
-}

Copied: gtk-sharp-2/repos/extra-x86_64/PKGBUILD (from rev 142256, 
gtk-sharp-2/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-11-07 12:49:15 UTC (rev 142257)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: tobias tob...@archlinux.org
+
+pkgname=gtk-sharp-2
+pkgver=2.12.11
+pkgrel=1
+pkgdesc=gtk2 bindings for C#
+arch=(i686 x86_64)
+license=('LGPL')
+url=http://gtk-sharp.sourceforge.net;
+depends=('mono' 'libglade' 'gtk2')
+makedepends=('pkgconfig' 'monodoc')
+conflicts=('gtk#')
+options=('!libtool' '!makeflags')
+source=(http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-${pkgver}.tar.bz2)
+md5sums=('c278da6a472c6c13b698af012f543c64')
+
+build() {
+ # get rid of that .wapi errors; thanks to brice
+  export MONO_SHARED_DIR=${srcdir}/wapi
+  mkdir -p ${MONO_SHARED_DIR}
+
+  cd 

[arch-commits] Commit in xf86-video-sisimedia/trunk (PKGBUILD fix-xv-crash.patch)

2011-11-07 Thread Jan de Groot
Date: Monday, November 7, 2011 @ 08:03:10
  Author: jgc
Revision: 142260

upgpkg: xf86-video-sisimedia 0.9.1-2

Fix crash with applications using XV (FS#26576)

Added:
  xf86-video-sisimedia/trunk/fix-xv-crash.patch
Modified:
  xf86-video-sisimedia/trunk/PKGBUILD

+
 PKGBUILD   |5 -
 fix-xv-crash.patch |   11 +++
 2 files changed, 15 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-07 12:58:22 UTC (rev 142259)
+++ PKGBUILD2011-11-07 13:03:10 UTC (rev 142260)
@@ -3,7 +3,7 @@
 
 pkgname=xf86-video-sisimedia
 pkgver=0.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc=X.org SiS 671 video driver
 arch=(i686 x86_64)
 url=http://www.linuxconsulting.ro/xorg-drivers/;
@@ -28,6 +28,7 @@
 0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch
 0005-Correct-bounds-check-of-blitClip-array-access.patch
 xserver19.patch
+fix-xv-crash.patch
 COPYING)
 sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430'
   '61715bb86180decde55a56fad9a12d841c89fbb2'
@@ -45,6 +46,7 @@
   '5e288526bfa2c534f1feabdb571da16da8a1c7a6'
   'e86d702cb0b5e9bf43ff732696229965e176db7c'
   'b5f260bed7e705808ec05620316e503ed5d52ee5'
+  '1fdd74a2aef9455ac5c37d1fe0146d81aa905d2d'
   'a64e244f274bcb155f892d0488a1a4b1b2f7d70d')
 
 build() {
@@ -64,6 +66,7 @@
   patch -Np1 -i 
${srcdir}/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch
   patch -Np1 -i 
${srcdir}/0005-Correct-bounds-check-of-blitClip-array-access.patch
   patch -Np1 -i ${srcdir}/xserver19.patch
+  patch -Np0 -i ${srcdir}/fix-xv-crash.patch
 
   sed -i -e 's,sis_drv,sisimedia_drv,g' src/Makefile.am
   sed -i -e 's,\sis\,\sisimedia\,g' src/sis.h

Added: fix-xv-crash.patch
===
--- fix-xv-crash.patch  (rev 0)
+++ fix-xv-crash.patch  2011-11-07 13:03:10 UTC (rev 142260)
@@ -0,0 +1,11 @@
+--- src/sis_video.c2008-10-01 09:44:01.0 +0200
 src/sis_video.c.new2011-10-17 14:23:07.0 +0200
+@@ -1121,7 +1121,7 @@
+ adapt-GetPortAttribute = SISGetPortAttribute;
+ adapt-QueryBestSize = SISQueryBestSize;
+ adapt-PutImage = SISPutImage;
+-adapt-ReputImage = SISReputImage;
++adapt-ReputImage = NULL;
+ adapt-QueryImageAttributes = SISQueryImageAttributes;
+ 
+ /* gotta uninit this someplace */



[arch-commits] Commit in xf86-video-sisimedia/repos (70 files)

2011-11-07 Thread Jan de Groot
Date: Monday, November 7, 2011 @ 08:08:57
  Author: jgc
Revision: 142261

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

Added:
  
xf86-video-sisimedia/repos/extra-i686/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch)
  
xf86-video-sisimedia/repos/extra-i686/0002-Remove-XFree86-Misc-PassMessage-support.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0002-Remove-XFree86-Misc-PassMessage-support.patch)
  
xf86-video-sisimedia/repos/extra-i686/0003-Fix-build-with-Werror-format-security.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0003-Fix-build-with-Werror-format-security.patch)
  
xf86-video-sisimedia/repos/extra-i686/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch)
  
xf86-video-sisimedia/repos/extra-i686/0005-Correct-bounds-check-of-blitClip-array-access.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0005-Correct-bounds-check-of-blitClip-array-access.patch)
  
xf86-video-sisimedia/repos/extra-i686/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch)
  
xf86-video-sisimedia/repos/extra-i686/0006-Add-IgnoreHotkeyFlag-driver-option.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0006-Add-IgnoreHotkeyFlag-driver-option.patch)
  
xf86-video-sisimedia/repos/extra-i686/0007-Remove-useless-loader-symbol-lists.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0007-Remove-useless-loader-symbol-lists.patch)
  
xf86-video-sisimedia/repos/extra-i686/0008-update-to-xextproto-7-1-support.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0008-update-to-xextproto-7-1-support.patch)
  xf86-video-sisimedia/repos/extra-i686/0009-update-for-rac-removal.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0009-update-for-rac-removal.patch)
  
xf86-video-sisimedia/repos/extra-i686/0010-change-to-use-abi-version-check.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0010-change-to-use-abi-version-check.patch)
  xf86-video-sisimedia/repos/extra-i686/0011-more-rac-removal.patch
(from rev 142260, xf86-video-sisimedia/trunk/0011-more-rac-removal.patch)
  xf86-video-sisimedia/repos/extra-i686/COPYING
(from rev 142260, xf86-video-sisimedia/trunk/COPYING)
  xf86-video-sisimedia/repos/extra-i686/PKGBUILD
(from rev 142260, xf86-video-sisimedia/trunk/PKGBUILD)
  xf86-video-sisimedia/repos/extra-i686/fix-xv-crash.patch
(from rev 142260, xf86-video-sisimedia/trunk/fix-xv-crash.patch)
  xf86-video-sisimedia/repos/extra-i686/xf86-video-sis-0.9.1-20102701.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/xf86-video-sis-0.9.1-20102701.patch)
  
xf86-video-sisimedia/repos/extra-i686/xf86-video-sis-0.9.1-dump-regs-after-video-init.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/xf86-video-sis-0.9.1-dump-regs-after-video-init.patch)
  xf86-video-sisimedia/repos/extra-i686/xserver19.patch
(from rev 142260, xf86-video-sisimedia/trunk/xserver19.patch)
  
xf86-video-sisimedia/repos/extra-x86_64/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch)
  
xf86-video-sisimedia/repos/extra-x86_64/0002-Remove-XFree86-Misc-PassMessage-support.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0002-Remove-XFree86-Misc-PassMessage-support.patch)
  
xf86-video-sisimedia/repos/extra-x86_64/0003-Fix-build-with-Werror-format-security.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0003-Fix-build-with-Werror-format-security.patch)
  
xf86-video-sisimedia/repos/extra-x86_64/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch)
  
xf86-video-sisimedia/repos/extra-x86_64/0005-Correct-bounds-check-of-blitClip-array-access.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0005-Correct-bounds-check-of-blitClip-array-access.patch)
  
xf86-video-sisimedia/repos/extra-x86_64/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch)
  
xf86-video-sisimedia/repos/extra-x86_64/0006-Add-IgnoreHotkeyFlag-driver-option.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0006-Add-IgnoreHotkeyFlag-driver-option.patch)
  
xf86-video-sisimedia/repos/extra-x86_64/0007-Remove-useless-loader-symbol-lists.patch
(from rev 142260, 
xf86-video-sisimedia/trunk/0007-Remove-useless-loader-symbol-lists.patch)
  
xf86-video-sisimedia/repos/extra-x86_64/0008-update-to-xextproto-7-1-support.patch
(from rev 142260, 

[arch-commits] Commit in archlinux-menus/trunk (14 files)

2011-11-07 Thread Jan de Groot
Date: Monday, November 7, 2011 @ 09:14:58
  Author: jgc
Revision: 142262

upgpkg: archlinux-menus 2.5-1

Add SVG icon, move icons to hicolor theme instead of pixmaps.

Added:
  archlinux-menus/trunk/arch-logo.svg
  archlinux-menus/trunk/archlinux-menus.install
Modified:
  archlinux-menus/trunk/Arch-AUR.desktop
  archlinux-menus/trunk/Arch-Bugs.desktop
  archlinux-menus/trunk/Arch-Developers.desktop
  archlinux-menus/trunk/Arch-Documentation.desktop
  archlinux-menus/trunk/Arch-Donate.desktop
  archlinux-menus/trunk/Arch-Forum.desktop
  archlinux-menus/trunk/Arch-Homepage.desktop
  archlinux-menus/trunk/Arch-SVN.desktop
  archlinux-menus/trunk/Arch-Schwag.desktop
  archlinux-menus/trunk/Arch-Wiki.desktop
  archlinux-menus/trunk/Archlinux.directory
  archlinux-menus/trunk/PKGBUILD

+
 Arch-AUR.desktop   |2 
 Arch-Bugs.desktop  |2 
 Arch-Developers.desktop|2 
 Arch-Documentation.desktop |2 
 Arch-Donate.desktop|2 
 Arch-Forum.desktop |2 
 Arch-Homepage.desktop  |2 
 Arch-SVN.desktop   |2 
 Arch-Schwag.desktop|2 
 Arch-Wiki.desktop  |2 
 Archlinux.directory|2 
 PKGBUILD   |   41 ++--
 arch-logo.svg  |  425 +++
 archlinux-menus.install|   11 +
 14 files changed, 470 insertions(+), 29 deletions(-)

Modified: Arch-AUR.desktop
===
--- Arch-AUR.desktop2011-11-07 13:08:57 UTC (rev 142261)
+++ Arch-AUR.desktop2011-11-07 14:14:58 UTC (rev 142262)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Comment=Archlinux AUR
 Exec=xdg-open https://aur.archlinux.org
-Icon=arch-logo.png
+Icon=arch-logo
 Name=AUR
 StartupNotify=true
 Terminal=false

Modified: Arch-Bugs.desktop
===
--- Arch-Bugs.desktop   2011-11-07 13:08:57 UTC (rev 142261)
+++ Arch-Bugs.desktop   2011-11-07 14:14:58 UTC (rev 142262)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Comment=Archlinux Bugtracker
 Exec=xdg-open https://bugs.archlinux.org
-Icon=arch-logo.png
+Icon=arch-logo
 Name=Bugs
 StartupNotify=true
 Terminal=false

Modified: Arch-Developers.desktop
===
--- Arch-Developers.desktop 2011-11-07 13:08:57 UTC (rev 142261)
+++ Arch-Developers.desktop 2011-11-07 14:14:58 UTC (rev 142262)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Comment=Archlinux development team
 Exec=xdg-open http://www.archlinux.org/developers/
-Icon=arch-logo.png
+Icon=arch-logo
 Name=Developers
 StartupNotify=true
 Terminal=false

Modified: Arch-Documentation.desktop
===
--- Arch-Documentation.desktop  2011-11-07 13:08:57 UTC (rev 142261)
+++ Arch-Documentation.desktop  2011-11-07 14:14:58 UTC (rev 142262)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Comment=Archlinux Documentation
 Exec=xdg-open 
https://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide
-Icon=arch-logo.png
+Icon=arch-logo
 Name=Documentation
 StartupNotify=true
 Terminal=false

Modified: Arch-Donate.desktop
===
--- Arch-Donate.desktop 2011-11-07 13:08:57 UTC (rev 142261)
+++ Arch-Donate.desktop 2011-11-07 14:14:58 UTC (rev 142262)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Comment=Archlinux Donations
 Exec=xdg-open http://www.archlinux.org/donate/
-Icon=arch-logo.png
+Icon=arch-logo
 Name=Donate
 StartupNotify=true
 Terminal=false

Modified: Arch-Forum.desktop
===
--- Arch-Forum.desktop  2011-11-07 13:08:57 UTC (rev 142261)
+++ Arch-Forum.desktop  2011-11-07 14:14:58 UTC (rev 142262)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Comment=Archlinux Forum
 Exec=xdg-open https://bbs.archlinux.org
-Icon=arch-logo.png
+Icon=arch-logo
 Name=Forum
 StartupNotify=true
 Terminal=false

Modified: Arch-Homepage.desktop
===
--- Arch-Homepage.desktop   2011-11-07 13:08:57 UTC (rev 142261)
+++ Arch-Homepage.desktop   2011-11-07 14:14:58 UTC (rev 142262)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Comment=Archlinux homepage
 Exec=xdg-open http://www.archlinux.org
-Icon=arch-logo.png
+Icon=arch-logo
 Name=Homepage
 StartupNotify=true
 Terminal=false

Modified: Arch-SVN.desktop
===
--- Arch-SVN.desktop2011-11-07 13:08:57 UTC (rev 142261)
+++ Arch-SVN.desktop2011-11-07 14:14:58 UTC (rev 142262)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Comment=Archlinux SVN
 Exec=xdg-open http://projects.archlinux.org/svntogit/
-Icon=arch-logo.png
+Icon=arch-logo
 Name=SVN
 StartupNotify=true
 Terminal=false

Modified: Arch-Schwag.desktop
===
--- Arch-Schwag.desktop 2011-11-07 13:08:57 UTC (rev 142261)
+++ 

[arch-commits] Commit in archlinux-menus/repos/extra-any (28 files)

2011-11-07 Thread Jan de Groot
-open http://www.archlinux.org
+Icon=arch-logo
+Name=Homepage
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Archlinux;

Deleted: Arch-SVN.desktop
===
--- Arch-SVN.desktop2011-11-07 14:14:58 UTC (rev 142262)
+++ Arch-SVN.desktop2011-11-07 14:18:14 UTC (rev 142263)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Comment=Archlinux SVN
-Exec=xdg-open http://projects.archlinux.org/svntogit/
-Icon=arch-logo.png
-Name=SVN
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Archlinux;

Copied: archlinux-menus/repos/extra-any/Arch-SVN.desktop (from rev 142262, 
archlinux-menus/trunk/Arch-SVN.desktop)
===
--- Arch-SVN.desktop(rev 0)
+++ Arch-SVN.desktop2011-11-07 14:18:14 UTC (rev 142263)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Comment=Archlinux SVN
+Exec=xdg-open http://projects.archlinux.org/svntogit/
+Icon=arch-logo
+Name=SVN
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Archlinux;

Deleted: Arch-Schwag.desktop
===
--- Arch-Schwag.desktop 2011-11-07 14:14:58 UTC (rev 142262)
+++ Arch-Schwag.desktop 2011-11-07 14:18:14 UTC (rev 142263)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Comment=Archlinux goodie shopping
-Exec=xdg-open http://www.zazzle.com/archlinux/
-Icon=arch-logo.png
-Name=Schwag
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Archlinux;

Copied: archlinux-menus/repos/extra-any/Arch-Schwag.desktop (from rev 142262, 
archlinux-menus/trunk/Arch-Schwag.desktop)
===
--- Arch-Schwag.desktop (rev 0)
+++ Arch-Schwag.desktop 2011-11-07 14:18:14 UTC (rev 142263)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Comment=Archlinux goodie shopping
+Exec=xdg-open http://www.zazzle.com/archlinux/
+Icon=arch-logo
+Name=Schwag
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Archlinux;

Deleted: Arch-Wiki.desktop
===
--- Arch-Wiki.desktop   2011-11-07 14:14:58 UTC (rev 142262)
+++ Arch-Wiki.desktop   2011-11-07 14:18:14 UTC (rev 142263)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Comment=Archlinux Wiki
-Exec=xdg-open https://wiki.archlinux.org
-Icon=arch-logo.png
-Name=Wiki
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Archlinux;

Copied: archlinux-menus/repos/extra-any/Arch-Wiki.desktop (from rev 142262, 
archlinux-menus/trunk/Arch-Wiki.desktop)
===
--- Arch-Wiki.desktop   (rev 0)
+++ Arch-Wiki.desktop   2011-11-07 14:18:14 UTC (rev 142263)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Comment=Archlinux Wiki
+Exec=xdg-open https://wiki.archlinux.org
+Icon=arch-logo
+Name=Wiki
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Archlinux;

Deleted: Archlinux.directory
===
--- Archlinux.directory 2011-11-07 14:14:58 UTC (rev 142262)
+++ Archlinux.directory 2011-11-07 14:18:14 UTC (rev 142263)
@@ -1,4 +0,0 @@
-[Desktop Entry]
-Name=Archlinux
-Icon=arch-logo.png
-Type=Directory

Copied: archlinux-menus/repos/extra-any/Archlinux.directory (from rev 142262, 
archlinux-menus/trunk/Archlinux.directory)
===
--- Archlinux.directory (rev 0)
+++ Archlinux.directory 2011-11-07 14:18:14 UTC (rev 142263)
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Name=Archlinux
+Icon=arch-logo
+Type=Directory

Deleted: PKGBUILD
===
--- PKGBUILD2011-11-07 14:14:58 UTC (rev 142262)
+++ PKGBUILD2011-11-07 14:18:14 UTC (rev 142263)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Thayer Williams tha...@archlinux.org
-
-pkgname=archlinux-menus
-pkgver=2.4
-pkgrel=1
-pkgdesc=Arch Linux specific XDG-compliant menu
-arch=('any')
-url=http://www.archlinux.org/;
-license=('GPL')
-depends=('xdg-utils')
-source=(Arch-AUR.desktop
-Arch-Bugs.desktop
-Arch-Developers.desktop
-Arch-Documentation.desktop
-Arch-Donate.desktop
-Arch-Forum.desktop
-Arch-Homepage.desktop
-Arch-Schwag.desktop
-Arch-SVN.desktop
-Arch-Wiki.desktop
-arch-logo.png
-Archlinux.directory)
-md5sums=('4db7328b173c4d7a2a648f020ae5a297'
- 'edafdc6c405570e42a4299f5d445e589'
- 'dcc6c6d7aa37ab64ce7d57838e4587e4'
- 'f428ef5d3463bc0d10ef236286728cf0'
- 'b8b31b2f7a72c561566fc215e8f78b8d'
- 'bad4311cc730d5a073af6101dba63b7e'
- 'aa8557e757c07e79789818161d95cad2'
- '96a351c0eff7337d02f3bf0f1f051f45'
- '0f1fce0e9772dc0e76fa964b7102f582'
- '72f3ad65a7d8abbd1ab53c7518357a2f

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

2011-11-07 Thread Jan de Groot
Date: Monday, November 7, 2011 @ 11:00:11
  Author: jgc
Revision: 142264

upgpkg: evince 3.2.1-2

Rebuild for poppler soname bump

Modified:
  evince/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-11-07 14:18:14 UTC (rev 142263)
+++ PKGBUILD2011-11-07 16:00:11 UTC (rev 142264)
@@ -3,7 +3,7 @@
 
 pkgname=evince
 pkgver=3.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc=Simply a document viewer
 url=http://projects.gnome.org/evince/;
 arch=('i686' 'x86_64')



[arch-commits] Commit in evince/repos (6 files)

2011-11-07 Thread Jan de Groot
Date: Monday, November 7, 2011 @ 11:00:54
  Author: jgc
Revision: 142265

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

Added:
  evince/repos/staging-i686/
  evince/repos/staging-i686/PKGBUILD
(from rev 142264, evince/trunk/PKGBUILD)
  evince/repos/staging-i686/evince.install
(from rev 142264, evince/trunk/evince.install)
  evince/repos/staging-x86_64/
  evince/repos/staging-x86_64/PKGBUILD
(from rev 142264, evince/trunk/PKGBUILD)
  evince/repos/staging-x86_64/evince.install
(from rev 142264, evince/trunk/evince.install)

---+
 staging-i686/PKGBUILD |   36 
 staging-i686/evince.install   |   19 +++
 staging-x86_64/PKGBUILD   |   36 
 staging-x86_64/evince.install |   19 +++
 4 files changed, 110 insertions(+)

Copied: evince/repos/staging-i686/PKGBUILD (from rev 142264, 
evince/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-11-07 16:00:54 UTC (rev 142265)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=evince
+pkgver=3.2.1
+pkgrel=2
+pkgdesc=Simply a document viewer
+url=http://projects.gnome.org/evince/;
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 
'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 
'gsettings-desktop-schemas')
+makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 
'gobject-introspection')
+optdepends=('texlive-bin: DVI support')
+groups=('gnome-extra')
+install=evince.install
+options=('!libtool' '!emptydirs')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr   --sysconfdir=/etc \
+  --localstatedir=/var--libexecdir=/usr/lib/evince \
+  --disable-static--enable-nautilus \
+  --enable-pdf--enable-tiff \
+  --enable-djvu   --enable-dvi \
+  --enable-t1lib  --enable-comics \
+  --disable-scrollkeeper  --disable-schemas-compile \
+  --enable-introspection
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Copied: evince/repos/staging-i686/evince.install (from rev 142264, 
evince/trunk/evince.install)
===
--- staging-i686/evince.install (rev 0)
+++ staging-i686/evince.install 2011-11-07 16:00:54 UTC (rev 142265)
@@ -0,0 +1,19 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.90.0)  0 )); then
+usr/sbin/gconfpkg --uninstall evince
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Copied: evince/repos/staging-x86_64/PKGBUILD (from rev 142264, 
evince/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-11-07 16:00:54 UTC (rev 142265)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=evince
+pkgver=3.2.1
+pkgrel=2
+pkgdesc=Simply a document viewer
+url=http://projects.gnome.org/evince/;
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 
'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 
'gsettings-desktop-schemas')
+makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 
'gobject-introspection')
+optdepends=('texlive-bin: DVI support')
+groups=('gnome-extra')
+install=evince.install
+options=('!libtool' '!emptydirs')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr   --sysconfdir=/etc \
+  --localstatedir=/var--libexecdir=/usr/lib/evince \
+  --disable-static--enable-nautilus \
+  --enable-pdf--enable-tiff \
+  --enable-djvu   --enable-dvi \
+  --enable-t1lib  --enable-comics \
+  --disable-scrollkeeper  --disable-schemas-compile \
+  --enable-introspection
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Copied: evince/repos/staging-x86_64/evince.install (from rev 142264, 
evince/trunk/evince.install

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

2011-11-09 Thread Jan de Groot
Date: Wednesday, November 9, 2011 @ 05:25:23
  Author: jgc
Revision: 142422

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

Added:
  pixman/repos/extra-i686/PKGBUILD
(from rev 142421, pixman/repos/testing-i686/PKGBUILD)
Deleted:
  pixman/repos/extra-i686/PKGBUILD
  pixman/repos/testing-i686/

--+
 PKGBUILD |   66 ++---
 1 file changed, 33 insertions(+), 33 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-09 09:27:32 UTC (rev 142421)
+++ extra-i686/PKGBUILD 2011-11-09 10:25:23 UTC (rev 142422)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Alexander Baldeck alexan...@archlinux.org
-
-pkgname=pixman
-pkgver=0.22.2
-pkgrel=1
-pkgdesc=Pixman library
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org;
-license=('custom')
-depends=('glibc')
-options=('!libtool')
-source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('ad2b828ce4280472f5933d8bb5f0f4d583aed7f3')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: pixman/repos/extra-i686/PKGBUILD (from rev 142421, 
pixman/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-09 10:25:23 UTC (rev 142422)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Alexander Baldeck alexan...@archlinux.org
+
+pkgname=pixman
+pkgver=0.24.0
+pkgrel=1
+pkgdesc=Pixman library
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org;
+license=('custom')
+depends=('glibc')
+options=('!libtool')
+source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('a3b73c3ea6cada20d705203a394f574aa69e2177')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



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

2011-11-09 Thread Jan de Groot
Date: Wednesday, November 9, 2011 @ 05:25:24
  Author: jgc
Revision: 142423

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

Added:
  pixman/repos/extra-x86_64/PKGBUILD
(from rev 142421, pixman/repos/testing-x86_64/PKGBUILD)
Deleted:
  pixman/repos/extra-x86_64/PKGBUILD
  pixman/repos/testing-x86_64/

--+
 PKGBUILD |   66 ++---
 1 file changed, 33 insertions(+), 33 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-11-09 10:25:23 UTC (rev 142422)
+++ extra-x86_64/PKGBUILD   2011-11-09 10:25:24 UTC (rev 142423)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Alexander Baldeck alexan...@archlinux.org
-
-pkgname=pixman
-pkgver=0.22.2
-pkgrel=1
-pkgdesc=Pixman library
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org;
-license=('custom')
-depends=('glibc')
-options=('!libtool')
-source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('ad2b828ce4280472f5933d8bb5f0f4d583aed7f3')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: pixman/repos/extra-x86_64/PKGBUILD (from rev 142421, 
pixman/repos/testing-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-11-09 10:25:24 UTC (rev 142423)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Alexander Baldeck alexan...@archlinux.org
+
+pkgname=pixman
+pkgver=0.24.0
+pkgrel=1
+pkgdesc=Pixman library
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org;
+license=('custom')
+depends=('glibc')
+options=('!libtool')
+source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('a3b73c3ea6cada20d705203a394f574aa69e2177')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[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 xorg-server/repos (19 files)

2011-11-18 Thread Jan de Groot
Date: Friday, November 18, 2011 @ 04:17:24
  Author: jgc
Revision: 142917

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

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

+
 10-quirks.conf |   20 
 PKGBUILD   |  398 +++
 Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch |   31 
 autoconfig-nvidia.patch|   58 -
 autoconfig-sis.patch   |   38 
 git-fixes.patch|  278 +++--
 revert-trapezoids.patch|  358 +++---
 xserver-1.11.2-record-crasher.patch|  241 
 xvfb-run   |  360 +++
 xvfb-run.1 |  564 +--
 10 files changed, 1337 insertions(+), 1009 deletions(-)

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


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

2011-11-18 Thread Jan de Groot
Date: Friday, November 18, 2011 @ 04:17:26
  Author: jgc
Revision: 142918

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

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

+
 10-quirks.conf |   20 
 PKGBUILD   |  398 +++
 Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch |   31 
 autoconfig-nvidia.patch|   58 -
 autoconfig-sis.patch   |   38 
 git-fixes.patch|  278 +++--
 revert-trapezoids.patch|  358 +++---
 xserver-1.11.2-record-crasher.patch|  241 
 xvfb-run   |  360 +++
 xvfb-run.1 |  564 +--
 10 files changed, 1337 insertions(+), 1009 deletions(-)

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


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

2011-11-18 Thread Jan de Groot
Date: Friday, November 18, 2011 @ 04:17:27
  Author: jgc
Revision: 142919

db-move: moved xkeyboard-config from [testing] to [extra] (any)

Added:
  xkeyboard-config/repos/extra-any/PKGBUILD
(from rev 142916, xkeyboard-config/repos/testing-any/PKGBUILD)
  xkeyboard-config/repos/extra-any/git-fixes.patch
(from rev 142916, xkeyboard-config/repos/testing-any/git-fixes.patch)
Deleted:
  xkeyboard-config/repos/extra-any/PKGBUILD
  xkeyboard-config/repos/testing-any/

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

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


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

2011-11-18 Thread Jan de Groot
Date: Friday, November 18, 2011 @ 04:36:18
  Author: jgc
Revision: 142922

upgpkg: xf86-input-joystick 1.6.0-3

Add latest fixes from git, fixes FS#23577

Added:
  xf86-input-joystick/trunk/git-fixes.patch
Modified:
  xf86-input-joystick/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-11-18 09:26:09 UTC (rev 142921)
+++ PKGBUILD2011-11-18 09:36:18 UTC (rev 142922)
@@ -3,23 +3,26 @@
 
 pkgname=xf86-input-joystick
 pkgver=1.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc=X.Org Joystick input driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel=1.10.99.902')
-conflicts=('xorg-server1.10.99.902')
+makedepends=('xorg-server-devel=1.11.0')
+conflicts=('xorg-server1.11.0')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch
 50-joystick.conf)
 sha1sums=('3b9aed1b8128e1fbd947fdcdd5e16efccad1c780'
+  '7812a34013a2333641bd7c5d044c46179490cb32'
   'e1ff3699a0470c6bb78a53f718df9d8521621e11')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr
   make
 }

Added: git-fixes.patch
===
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2011-11-18 09:36:18 UTC (rev 142922)
@@ -0,0 +1,399 @@
+From 204dcb86368b011824fc5006f87b9e394d03a394 Mon Sep 17 00:00:00 2001
+From: Terry Lambert tlamb...@chromium.org
+Date: Sat, 16 Jul 2011 00:23:22 +
+Subject: Return proper default for unknown values in pInfo-device_control.
+
+Signed-off-by: Terry Lambert tlamb...@chromium.org
+Reviewed-by: Stephane Marchesin marc...@chromium.org
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+---
+diff --git a/src/jstk.c b/src/jstk.c
+index ec6b79a..6db0e7c 100644
+--- a/src/jstk.c
 b/src/jstk.c
+@@ -419,8 +419,7 @@ jstkDeviceControlProc(DeviceIntPtr   pJstk,
+ 
+ default:
+ ErrorF(unsupported mode=%d\n, what);
+-return !Success;
+-break;
++return BadValue;
+ } /* switch (what) */
+ return Success;
+ }
+diff --git a/src/jstk_key.c b/src/jstk_key.c
+index 3c471ce..d699dcd 100644
+--- a/src/jstk_key.c
 b/src/jstk_key.c
+@@ -169,6 +169,8 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr   dev,
+ DBG(2, ErrorF(jstkKeyboardDeviceControlProc what=DEVICE_CLOSE\n));
+ dev-public.on = FALSE;
+ break;
++default:
++return BadValue;
+ }
+ 
+ return Success;
+--
+cgit v0.9.0.2-2-gbebe
+From b3b62328cf3f36c20c54a298f8a921e6eef42c4d Mon Sep 17 00:00:00 2001
+From: Devin J. Pohly djpohly+x...@gmail.com
+Date: Sat, 03 Sep 2011 23:00:07 +
+Subject: unify capitalization of joystick properties
+
+the axis keys high/low properties were inconsistently capitalized,
+leading to potential confusion as to why one works but not the other.
+
+Signed-off-by: Devin J. Pohly djpohly+x...@gmail.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+---
+diff --git a/include/joystick-properties.h b/include/joystick-properties.h
+index 49ef800..36f4082 100644
+--- a/include/joystick-properties.h
 b/include/joystick-properties.h
+@@ -99,7 +99,7 @@ typedef enum _JSTK_MAPPING {
+ 
+ /** Scancodes for axis in high position */
+ /* 8 bit, 4 per axis */
+-#define JSTK_PROP_AXIS_KEYS_HIGH Axis keys (high)
++#define JSTK_PROP_AXIS_KEYS_HIGH Axis Keys (high)
+ 
+ /** Set the mapping of each button to
+ none, x, y, zx, zy, button, key, speed_multiply,
+--
+cgit v0.9.0.2-2-gbebe
+From b607c4ebeea4122694f02ba87f06e4cdb23114f1 Mon Sep 17 00:00:00 2001
+From: Sascha Hlusiak saschahlus...@arcor.de
+Date: Sat, 15 Oct 2011 22:47:52 +
+Subject: label buttons and axes
+
+Buttons are labeled Button %d, starting with 0 and representing the button 
in X _after_ mapping.
+Mapping can be changed while running so the labels will be constant.
+
+Axes are labeled Axis %d, starting with 1, representing the _physical_ axis 
that reports the valuator
+data. The raw valuators can't be dynamically mapped, the first two valuators 
always are labeled Rel X
+and Rel Y, representing the aggregated post-calculation data from all axes.
+
+Signed-off-by: Sascha Hlusiak saschahlus...@arcor.de
+---
+diff --git a/man/joystick.man b/man/joystick.man
+index da92ceb..b401de5 100644
+--- a/man/joystick.man
 b/man/joystick.man
+@@ -140,7 +140,11 @@ Neither
+ .B mode
+ nor
+ .B axis
+-needs to be set to generate extra valuator events.
++needs to be set to generate extra valuator events. The axis will be labelled 
according to it's physical axis number, beginning with 
++.I 1
++, i.e.
++.I 

[arch-commits] Commit in xf86-input-joystick/repos (10 files)

2011-11-18 Thread Jan de Groot
Date: Friday, November 18, 2011 @ 04:36:49
  Author: jgc
Revision: 142923

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

Added:
  xf86-input-joystick/repos/extra-i686/50-joystick.conf
(from rev 142922, xf86-input-joystick/trunk/50-joystick.conf)
  xf86-input-joystick/repos/extra-i686/PKGBUILD
(from rev 142922, xf86-input-joystick/trunk/PKGBUILD)
  xf86-input-joystick/repos/extra-i686/git-fixes.patch
(from rev 142922, xf86-input-joystick/trunk/git-fixes.patch)
  xf86-input-joystick/repos/extra-x86_64/50-joystick.conf
(from rev 142922, xf86-input-joystick/trunk/50-joystick.conf)
  xf86-input-joystick/repos/extra-x86_64/PKGBUILD
(from rev 142922, xf86-input-joystick/trunk/PKGBUILD)
  xf86-input-joystick/repos/extra-x86_64/git-fixes.patch
(from rev 142922, xf86-input-joystick/trunk/git-fixes.patch)
Deleted:
  xf86-input-joystick/repos/extra-i686/50-joystick.conf
  xf86-input-joystick/repos/extra-i686/PKGBUILD
  xf86-input-joystick/repos/extra-x86_64/50-joystick.conf
  xf86-input-joystick/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/50-joystick.conf   |   12 -
 extra-i686/PKGBUILD   |   77 ---
 extra-i686/git-fixes.patch|  399 
 extra-x86_64/50-joystick.conf |   12 -
 extra-x86_64/PKGBUILD |   77 ---
 extra-x86_64/git-fixes.patch  |  399 
 6 files changed, 890 insertions(+), 86 deletions(-)

Deleted: extra-i686/50-joystick.conf
===
--- extra-i686/50-joystick.conf 2011-11-18 09:36:18 UTC (rev 142922)
+++ extra-i686/50-joystick.conf 2011-11-18 09:36:49 UTC (rev 142923)
@@ -1,6 +0,0 @@
-Section InputClass
-   Identifier joystick catchall
-   MatchIsJoystick on
-   MatchDevicePath /dev/input/event*
-   Driver joystick
-EndSection

Copied: xf86-input-joystick/repos/extra-i686/50-joystick.conf (from rev 142922, 
xf86-input-joystick/trunk/50-joystick.conf)
===
--- extra-i686/50-joystick.conf (rev 0)
+++ extra-i686/50-joystick.conf 2011-11-18 09:36:49 UTC (rev 142923)
@@ -0,0 +1,6 @@
+Section InputClass
+   Identifier joystick catchall
+   MatchIsJoystick on
+   MatchDevicePath /dev/input/event*
+   Driver joystick
+EndSection

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-18 09:36:18 UTC (rev 142922)
+++ extra-i686/PKGBUILD 2011-11-18 09:36:49 UTC (rev 142923)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xf86-input-joystick
-pkgver=1.6.0
-pkgrel=2
-pkgdesc=X.Org Joystick input driver
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel=1.10.99.902')
-conflicts=('xorg-server1.10.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-50-joystick.conf)
-sha1sums=('3b9aed1b8128e1fbd947fdcdd5e16efccad1c780'
-  'e1ff3699a0470c6bb78a53f718df9d8521621e11')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  make DESTDIR=${pkgdir} install
-
-  install -m755 -d ${pkgdir}/etc/X11/xorg.conf.d
-  install -m644 ${srcdir}/50-joystick.conf ${pkgdir}/etc/X11/xorg.conf.d/
-
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: xf86-input-joystick/repos/extra-i686/PKGBUILD (from rev 142922, 
xf86-input-joystick/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-18 09:36:49 UTC (rev 142923)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-input-joystick
+pkgver=1.6.0
+pkgrel=3
+pkgdesc=X.Org Joystick input driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.11.0')
+conflicts=('xorg-server1.11.0')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch
+50-joystick.conf)
+sha1sums=('3b9aed1b8128e1fbd947fdcdd5e16efccad1c780'
+  '7812a34013a2333641bd7c5d044c46179490cb32'
+  'e1ff3699a0470c6bb78a53f718df9d8521621e11')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/etc/X11/xorg.conf.d
+  install -m644 ${srcdir}/50-joystick.conf ${pkgdir}/etc/X11/xorg.conf.d

[arch-commits] Commit in xf86-video-intel/repos (3 files)

2011-11-21 Thread Jan de Groot
Date: Monday, November 21, 2011 @ 10:50:16
  Author: jgc
Revision: 143034

db-move: moved xf86-video-intel from [testing] to [extra] (i686)

Added:
  xf86-video-intel/repos/extra-i686/PKGBUILD
(from rev 143033, xf86-video-intel/repos/testing-i686/PKGBUILD)
Deleted:
  xf86-video-intel/repos/extra-i686/PKGBUILD
  xf86-video-intel/repos/testing-i686/

--+
 PKGBUILD |   62 ++---
 1 file changed, 31 insertions(+), 31 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-21 14:04:58 UTC (rev 143033)
+++ extra-i686/PKGBUILD 2011-11-21 15:50:16 UTC (rev 143034)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-intel
-pkgver=2.16.0
-pkgrel=1
-pkgdesc=X.org Intel i810/i830/i915/945G/G965+ video drivers
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev)
-makedepends=('xorg-server-devel=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 
'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender')
-conflicts=('xorg-server1.10.99.902' 'xf86-video-i810' 
'xf86-video-intel-legacy')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('53441ea4d4335b501d32809b6b92593cbb1f79cf')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --enable-dri
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: xf86-video-intel/repos/extra-i686/PKGBUILD (from rev 143033, 
xf86-video-intel/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-21 15:50:16 UTC (rev 143034)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-intel
+pkgver=2.17.0
+pkgrel=1
+pkgdesc=X.org Intel i810/i830/i915/945G/G965+ video drivers
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev)
+makedepends=('xorg-server-devel=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 
'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender')
+conflicts=('xorg-server1.10.99.902' 'xf86-video-i810' 
'xf86-video-intel-legacy')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('04ad9fa1f4c4e0a90f48752a709bf14700c864af')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --enable-dri
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-intel/repos (3 files)

2011-11-21 Thread Jan de Groot
Date: Monday, November 21, 2011 @ 10:50:17
  Author: jgc
Revision: 143035

db-move: moved xf86-video-intel from [testing] to [extra] (x86_64)

Added:
  xf86-video-intel/repos/extra-x86_64/PKGBUILD
(from rev 143033, xf86-video-intel/repos/testing-x86_64/PKGBUILD)
Deleted:
  xf86-video-intel/repos/extra-x86_64/PKGBUILD
  xf86-video-intel/repos/testing-x86_64/

--+
 PKGBUILD |   62 ++---
 1 file changed, 31 insertions(+), 31 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-11-21 15:50:16 UTC (rev 143034)
+++ extra-x86_64/PKGBUILD   2011-11-21 15:50:17 UTC (rev 143035)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-intel
-pkgver=2.16.0
-pkgrel=1
-pkgdesc=X.org Intel i810/i830/i915/945G/G965+ video drivers
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev)
-makedepends=('xorg-server-devel=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 
'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender')
-conflicts=('xorg-server1.10.99.902' 'xf86-video-i810' 
'xf86-video-intel-legacy')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('53441ea4d4335b501d32809b6b92593cbb1f79cf')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --enable-dri
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: xf86-video-intel/repos/extra-x86_64/PKGBUILD (from rev 143033, 
xf86-video-intel/repos/testing-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-11-21 15:50:17 UTC (rev 143035)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-intel
+pkgver=2.17.0
+pkgrel=1
+pkgdesc=X.org Intel i810/i830/i915/945G/G965+ video drivers
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev)
+makedepends=('xorg-server-devel=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 
'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender')
+conflicts=('xorg-server1.10.99.902' 'xf86-video-i810' 
'xf86-video-intel-legacy')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('04ad9fa1f4c4e0a90f48752a709bf14700c864af')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --enable-dri
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



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

2011-11-28 Thread Jan de Groot
Date: Monday, November 28, 2011 @ 06:06:46
  Author: jgc
Revision: 143680

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

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

---+
 extra-i686/PKGBUILD   |   70 ++--
 extra-x86_64/PKGBUILD |   70 ++--
 2 files changed, 66 insertions(+), 74 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-28 11:06:20 UTC (rev 143679)
+++ extra-i686/PKGBUILD 2011-11-28 11:06:46 UTC (rev 143680)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Eduardo Lopes (ed...@gmx.net)
-
-pkgname=gksu
-pkgver=2.0.2
-pkgrel=3
-pkgdesc=A graphical frontend for su
-arch=('i686' 'x86_64')
-url=http://www.nongnu.org/gksu/index.html;
-license=('GPL')
-depends=('libgksu=2.0.12' 'xorg-xauth')
-makedepends=('gtk-doc' 'nautilus=2.26.0' 'intltool')
-optdepends=('nautilus')
-options=('!libtool')
-source=(http://people.debian.org/~kov/gksu/${pkgname}-${pkgver}.tar.gz)
-md5sums=('cacbcac3fc272dce01c6ea38354489e2')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  sed -i -e 's|/usr/bin/x-terminal-emulator|-l gnome-terminal|g' gksu.desktop
-  echo TryExec=gnome-terminal  gksu.desktop
-#  libtoolize --force
-#  aclocal
-#  autoconf
-#  automake
-  ./configure --prefix=/usr \
-   --sysconfdir=/etc \
-   --localstatedir=/var \
-   --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: gksu/repos/extra-i686/PKGBUILD (from rev 143679, gksu/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-28 11:06:46 UTC (rev 143680)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Eduardo Lopes (ed...@gmx.net)
+
+pkgname=gksu
+pkgver=2.0.2
+pkgrel=4
+pkgdesc=A graphical frontend for su
+arch=('i686' 'x86_64')
+url=http://www.nongnu.org/gksu/index.html;
+license=('GPL')
+depends=('libgksu=2.0.12' 'xorg-xauth')
+makedepends=('gtk-doc' 'intltool')
+options=('!libtool')
+source=(http://people.debian.org/~kov/gksu/${pkgname}-${pkgver}.tar.gz)
+md5sums=('cacbcac3fc272dce01c6ea38354489e2')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  sed -i -e 's|/usr/bin/x-terminal-emulator|-l gnome-terminal|g' gksu.desktop
+  echo TryExec=gnome-terminal  gksu.desktop
+  ./configure --prefix=/usr \
+--sysconfdir=/etc \
+--localstatedir=/var \
+--disable-static \
+--disable-nautilus-extension
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-11-28 11:06:20 UTC (rev 143679)
+++ extra-x86_64/PKGBUILD   2011-11-28 11:06:46 UTC (rev 143680)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Eduardo Lopes (ed...@gmx.net)
-
-pkgname=gksu
-pkgver=2.0.2
-pkgrel=3
-pkgdesc=A graphical frontend for su
-arch=('i686' 'x86_64')
-url=http://www.nongnu.org/gksu/index.html;
-license=('GPL')
-depends=('libgksu=2.0.12' 'xorg-xauth')
-makedepends=('gtk-doc' 'nautilus=2.26.0' 'intltool')
-optdepends=('nautilus')
-options=('!libtool')
-source=(http://people.debian.org/~kov/gksu/${pkgname}-${pkgver}.tar.gz)
-md5sums=('cacbcac3fc272dce01c6ea38354489e2')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  sed -i -e 's|/usr/bin/x-terminal-emulator|-l gnome-terminal|g' gksu.desktop
-  echo TryExec=gnome-terminal  gksu.desktop
-#  libtoolize --force
-#  aclocal
-#  autoconf
-#  automake
-  ./configure --prefix=/usr \
-   --sysconfdir=/etc \
-   --localstatedir=/var \
-   --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: gksu/repos/extra-x86_64/PKGBUILD (from rev 143679, gksu/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-11-28 11:06:46 UTC (rev 143680)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Eduardo Lopes (ed...@gmx.net)
+
+pkgname=gksu
+pkgver=2.0.2
+pkgrel=4
+pkgdesc=A graphical frontend for su
+arch=('i686' 'x86_64')
+url=http://www.nongnu.org/gksu/index.html;
+license=('GPL')
+depends=('libgksu=2.0.12' 'xorg-xauth')
+makedepends=('gtk-doc' 'intltool')
+options=('!libtool')
+source=(http://people.debian.org/~kov/gksu/${pkgname}-${pkgver}.tar.gz)
+md5sums

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

2011-11-28 Thread Jan de Groot
Date: Monday, November 28, 2011 @ 06:19:06
  Author: jgc
Revision: 143682

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

Added:
  glib-perl/repos/extra-i686/PKGBUILD
(from rev 143681, glib-perl/trunk/PKGBUILD)
  glib-perl/repos/extra-x86_64/PKGBUILD
(from rev 143681, glib-perl/trunk/PKGBUILD)
Deleted:
  glib-perl/repos/extra-i686/PKGBUILD
  glib-perl/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |   65 +++-
 extra-x86_64/PKGBUILD |   65 +++-
 2 files changed, 64 insertions(+), 66 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-28 11:18:41 UTC (rev 143681)
+++ extra-i686/PKGBUILD 2011-11-28 11:19:06 UTC (rev 143682)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Sarah Hay sa...@archlinux.org
-
-pkgname=glib-perl
-_realname=Glib
-pkgver=1.223
-pkgrel=3
-pkgdesc=Perl wrappers for glib 2.x, including GObject
-arch=(i686 x86_64)
-license=('LGPL')
-url=http://gtk2-perl.sourceforge.net/;
-options=('!emptydirs')
-depends=('glib2=2.24.1' 'perl=5.14')
-makedepends=('perl-extutils-depends=0.302' 'perl-extutils-pkgconfig=1.12')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('cfdeaa8c95448f86c30b505e4701abf1')
-
-build() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  make test
-}
-
-package() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: glib-perl/repos/extra-i686/PKGBUILD (from rev 143681, 
glib-perl/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-28 11:19:06 UTC (rev 143682)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Sarah Hay sa...@archlinux.org
+
+pkgname=glib-perl
+pkgver=1.241
+pkgrel=1
+pkgdesc=Perl wrappers for glib 2.x, including GObject
+arch=(i686 x86_64)
+license=('LGPL')
+url=http://gtk2-perl.sourceforge.net/;
+options=('!emptydirs')
+depends=('glib2=2.24.1' 'perl=5.14')
+makedepends=('perl-extutils-depends=0.302' 'perl-extutils-pkgconfig=1.12')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz)
+md5sums=('412118238a372041b130c27d7992f5c3')
+
+build() {
+  cd ${srcdir}/Glib-${pkgver}
+  perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+check() {
+  cd ${srcdir}/Glib-${pkgver}
+  make test
+}
+
+package() {
+  cd ${srcdir}/Glib-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-11-28 11:18:41 UTC (rev 143681)
+++ extra-x86_64/PKGBUILD   2011-11-28 11:19:06 UTC (rev 143682)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Sarah Hay sa...@archlinux.org
-
-pkgname=glib-perl
-_realname=Glib
-pkgver=1.223
-pkgrel=3
-pkgdesc=Perl wrappers for glib 2.x, including GObject
-arch=(i686 x86_64)
-license=('LGPL')
-url=http://gtk2-perl.sourceforge.net/;
-options=('!emptydirs')
-depends=('glib2=2.24.1' 'perl=5.14')
-makedepends=('perl-extutils-depends=0.302' 'perl-extutils-pkgconfig=1.12')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('cfdeaa8c95448f86c30b505e4701abf1')
-
-build() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  make test
-}
-
-package() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: glib-perl/repos/extra-x86_64/PKGBUILD (from rev 143681, 
glib-perl/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-11-28 11:19:06 UTC (rev 143682)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Sarah Hay sa...@archlinux.org
+
+pkgname=glib-perl
+pkgver=1.241
+pkgrel=1
+pkgdesc=Perl wrappers for glib 2.x, including GObject
+arch=(i686 x86_64)
+license=('LGPL')
+url=http://gtk2-perl.sourceforge.net/;
+options=('!emptydirs')
+depends=('glib2=2.24.1' 'perl=5.14')
+makedepends=('perl-extutils-depends=0.302' 'perl-extutils-pkgconfig=1.12')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz)
+md5sums=('412118238a372041b130c27d7992f5c3')
+
+build() {
+  cd ${srcdir}/Glib-${pkgver}
+  perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+check() {
+  cd ${srcdir}/Glib-${pkgver}
+  make test
+}
+
+package() {
+  cd ${srcdir}/Glib-${pkgver}
+  make DESTDIR=${pkgdir} install
+}



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

2011-11-28 Thread Jan de Groot
Date: Monday, November 28, 2011 @ 06:39:04
  Author: jgc
Revision: 143687

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

Added:
  cairo-perl/repos/extra-i686/PKGBUILD
(from rev 143686, cairo-perl/trunk/PKGBUILD)
  cairo-perl/repos/extra-x86_64/PKGBUILD
(from rev 143686, cairo-perl/trunk/PKGBUILD)
Deleted:
  cairo-perl/repos/extra-i686/PKGBUILD
  cairo-perl/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |   63 +++-
 extra-x86_64/PKGBUILD |   63 +++-
 2 files changed, 62 insertions(+), 64 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-28 11:38:38 UTC (rev 143686)
+++ extra-i686/PKGBUILD 2011-11-28 11:39:04 UTC (rev 143687)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=cairo-perl
-_realname=Cairo
-pkgver=1.061
-pkgrel=4
-pkgdesc=Perl wrappers for cairo
-arch=(i686 x86_64)
-license=('LGPL')
-url=http://gtk2-perl.sourceforge.net/;
-options=('!emptydirs')
-depends=('cairo=1.8.10' 'perl=5.14')
-makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('08cd5e847f61858651fc4de769066e88')
-
-build() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  make test || true
-}
-
-package() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: cairo-perl/repos/extra-i686/PKGBUILD (from rev 143686, 
cairo-perl/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-28 11:39:04 UTC (rev 143687)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=cairo-perl
+pkgver=1.081
+pkgrel=1
+pkgdesc=Perl wrappers for cairo
+arch=(i686 x86_64)
+license=('LGPL')
+url=http://gtk2-perl.sourceforge.net/;
+options=('!emptydirs')
+depends=('cairo' 'perl')
+makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Cairo-${pkgver}.tar.gz)
+md5sums=('52c712b0f749f2fe232ae6e18880fe7d')
+
+build() {
+  cd ${srcdir}/Cairo-${pkgver}
+  perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+check() {
+  cd ${srcdir}/Cairo-${pkgver}
+  make test
+}
+
+package() {
+  cd ${srcdir}/Cairo-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-11-28 11:38:38 UTC (rev 143686)
+++ extra-x86_64/PKGBUILD   2011-11-28 11:39:04 UTC (rev 143687)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=cairo-perl
-_realname=Cairo
-pkgver=1.061
-pkgrel=4
-pkgdesc=Perl wrappers for cairo
-arch=(i686 x86_64)
-license=('LGPL')
-url=http://gtk2-perl.sourceforge.net/;
-options=('!emptydirs')
-depends=('cairo=1.8.10' 'perl=5.14')
-makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('08cd5e847f61858651fc4de769066e88')
-
-build() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  make test || true
-}
-
-package() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: cairo-perl/repos/extra-x86_64/PKGBUILD (from rev 143686, 
cairo-perl/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-11-28 11:39:04 UTC (rev 143687)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=cairo-perl
+pkgver=1.081
+pkgrel=1
+pkgdesc=Perl wrappers for cairo
+arch=(i686 x86_64)
+license=('LGPL')
+url=http://gtk2-perl.sourceforge.net/;
+options=('!emptydirs')
+depends=('cairo' 'perl')
+makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Cairo-${pkgver}.tar.gz)
+md5sums=('52c712b0f749f2fe232ae6e18880fe7d')
+
+build() {
+  cd ${srcdir}/Cairo-${pkgver}
+  perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+check() {
+  cd ${srcdir}/Cairo-${pkgver}
+  make test
+}
+
+package() {
+  cd ${srcdir}/Cairo-${pkgver}
+  make DESTDIR=${pkgdir} install
+}



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

2011-11-28 Thread Jan de Groot
Date: Monday, November 28, 2011 @ 07:08:27
  Author: jgc
Revision: 143688

upgpkg: pango-perl 1.223-1

Update to 1.22.3

Modified:
  pango-perl/trunk/PKGBUILD

--+
 PKGBUILD |   21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-28 11:39:04 UTC (rev 143687)
+++ PKGBUILD2011-11-28 12:08:27 UTC (rev 143688)
@@ -2,9 +2,8 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=pango-perl
-_realname=Pango
-pkgver=1.221
-pkgrel=4
+pkgver=1.223
+pkgrel=1
 pkgdesc=Perl bindings for Pango
 arch=(i686 x86_64)
 license=('LGPL')
@@ -12,13 +11,21 @@
 makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
 depends=('pango' 'glib-perl' 'cairo-perl')
 options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('8d257209aa11bd6c3a2beb235c2f103f')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Pango-${pkgver}.tar.gz)
+md5sums=('628a6de54f47b6791c6b45edfb835215')
 
 build() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  # install module in vendor directories.
+  cd ${srcdir}/Pango-${pkgver}
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
   make
+}
+
+check() {
+  cd ${srcdir}/Pango-${pkgver}
+  make test
+}
+
+package() { 
+  cd ${srcdir}/Pango-${pkgver}
   make install DESTDIR=${pkgdir}
 }



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

2011-11-28 Thread Jan de Groot
Date: Monday, November 28, 2011 @ 08:04:58
  Author: jgc
Revision: 143695

upgpkg: gtk2-perl 1.241-1

Update to 1.24.1, add checkdepends

Modified:
  gtk2-perl/trunk/PKGBUILD

--+
 PKGBUILD |   26 ++
 1 file changed, 18 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-28 12:48:34 UTC (rev 143694)
+++ PKGBUILD2011-11-28 13:04:58 UTC (rev 143695)
@@ -3,23 +3,33 @@
 # Contributor: Sarah Hay sa...@archlinux.org
 
 pkgname=gtk2-perl
-_realname=Gtk2
-pkgver=1.222
-pkgrel=3
-pkgdesc=Gtk2-Perl allows Perl developers to write GTK+ 2.x applications.
+pkgver=1.241
+pkgrel=1
+pkgdesc=Perl bindings for GTK+ 2.x
 arch=(i686 x86_64)
 license=('LGPL')
 url=http://gtk2-perl.sourceforge.net/;
 makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
 depends=('gtk2' 'pango-perl')
+checkdepends=('ttf-dejavu' 'xorg-server-xvfb')
 options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('8f8a170b33dc2cf4e69769e97c05185a')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gtk2-${pkgver}.tar.gz)
+md5sums=('82ee2af46ef9ab7b560601e3ae6f8f7a')
 
 build() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  # install module in vendor directories.
+  cd ${srcdir}/Gtk2-${pkgver}
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
   make
+}
+
+check() {
+  cd ${srcdir}/Gtk2-${pkgver}
+  LD_PRELOAD= Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 
+  LD_PRELOAD= DISPLAY=:99 make test
+  kill $!
+}
+
+package() {
+  cd ${srcdir}/Gtk2-${pkgver}
   make install DESTDIR=${pkgdir}
 }



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

2011-11-28 Thread Jan de Groot
Date: Monday, November 28, 2011 @ 08:05:23
  Author: jgc
Revision: 143696

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

Added:
  gtk2-perl/repos/extra-i686/PKGBUILD
(from rev 143695, gtk2-perl/trunk/PKGBUILD)
  gtk2-perl/repos/extra-x86_64/PKGBUILD
(from rev 143695, gtk2-perl/trunk/PKGBUILD)
Deleted:
  gtk2-perl/repos/extra-i686/PKGBUILD
  gtk2-perl/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |   60 
 extra-x86_64/PKGBUILD |   60 
 2 files changed, 70 insertions(+), 50 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-28 13:04:58 UTC (rev 143695)
+++ extra-i686/PKGBUILD 2011-11-28 13:05:23 UTC (rev 143696)
@@ -1,25 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Sarah Hay sa...@archlinux.org
-
-pkgname=gtk2-perl
-_realname=Gtk2
-pkgver=1.222
-pkgrel=3
-pkgdesc=Gtk2-Perl allows Perl developers to write GTK+ 2.x applications.
-arch=(i686 x86_64)
-license=('LGPL')
-url=http://gtk2-perl.sourceforge.net/;
-makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
-depends=('gtk2' 'pango-perl')
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('8f8a170b33dc2cf4e69769e97c05185a')
-
-build() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-  make install DESTDIR=${pkgdir}
-}

Copied: gtk2-perl/repos/extra-i686/PKGBUILD (from rev 143695, 
gtk2-perl/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-28 13:05:23 UTC (rev 143696)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Sarah Hay sa...@archlinux.org
+
+pkgname=gtk2-perl
+pkgver=1.241
+pkgrel=1
+pkgdesc=Perl bindings for GTK+ 2.x
+arch=(i686 x86_64)
+license=('LGPL')
+url=http://gtk2-perl.sourceforge.net/;
+makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
+depends=('gtk2' 'pango-perl')
+checkdepends=('ttf-dejavu' 'xorg-server-xvfb')
+options=('!emptydirs')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gtk2-${pkgver}.tar.gz)
+md5sums=('82ee2af46ef9ab7b560601e3ae6f8f7a')
+
+build() {
+  cd ${srcdir}/Gtk2-${pkgver}
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+check() {
+  cd ${srcdir}/Gtk2-${pkgver}
+  LD_PRELOAD= Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 
+  LD_PRELOAD= DISPLAY=:99 make test
+  kill $!
+}
+
+package() {
+  cd ${srcdir}/Gtk2-${pkgver}
+  make install DESTDIR=${pkgdir}
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-11-28 13:04:58 UTC (rev 143695)
+++ extra-x86_64/PKGBUILD   2011-11-28 13:05:23 UTC (rev 143696)
@@ -1,25 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Sarah Hay sa...@archlinux.org
-
-pkgname=gtk2-perl
-_realname=Gtk2
-pkgver=1.222
-pkgrel=3
-pkgdesc=Gtk2-Perl allows Perl developers to write GTK+ 2.x applications.
-arch=(i686 x86_64)
-license=('LGPL')
-url=http://gtk2-perl.sourceforge.net/;
-makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
-depends=('gtk2' 'pango-perl')
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('8f8a170b33dc2cf4e69769e97c05185a')
-
-build() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-  make install DESTDIR=${pkgdir}
-}

Copied: gtk2-perl/repos/extra-x86_64/PKGBUILD (from rev 143695, 
gtk2-perl/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-11-28 13:05:23 UTC (rev 143696)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Sarah Hay sa...@archlinux.org
+
+pkgname=gtk2-perl
+pkgver=1.241
+pkgrel=1
+pkgdesc=Perl bindings for GTK+ 2.x
+arch=(i686 x86_64)
+license=('LGPL')
+url=http://gtk2-perl.sourceforge.net/;
+makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
+depends=('gtk2' 'pango-perl')
+checkdepends=('ttf-dejavu' 'xorg-server-xvfb')
+options=('!emptydirs')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gtk2-${pkgver}.tar.gz)
+md5sums=('82ee2af46ef9ab7b560601e3ae6f8f7a')
+
+build() {
+  cd ${srcdir}/Gtk2-${pkgver}
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+check() {
+  cd ${srcdir}/Gtk2-${pkgver}
+  LD_PRELOAD= Xvfb -nolisten tcp -extension GLX -screen 0

[arch-commits] Commit in gconf-perl/trunk (PKGBUILD disable-orbit.patch)

2011-11-28 Thread Jan de Groot
Date: Monday, November 28, 2011 @ 08:19:53
  Author: jgc
Revision: 143699

upgpkg: gconf-perl 1.044-6

Disable gconf_engine_key_is_writable: not available when GConf is compiled 
without ORBit

Added:
  gconf-perl/trunk/disable-orbit.patch
Modified:
  gconf-perl/trunk/PKGBUILD

-+
 PKGBUILD|   18 ++
 disable-orbit.patch |   30 ++
 2 files changed, 40 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-28 13:17:55 UTC (rev 143698)
+++ PKGBUILD2011-11-28 13:19:53 UTC (rev 143699)
@@ -2,31 +2,33 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=gconf-perl
-_realname=Gnome2-GConf
 pkgver=1.044
-pkgrel=5
+pkgrel=6
 pkgdesc=Gnome2-GConf perl bindings for gconf
 arch=('i686' 'x86_64')
 license=('LGPL')
 url=http://gtk2-perl.sourceforge.net/;
 makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
-depends=('glib-perl' 'gconf' 'perl=5.14')
+depends=('glib-perl' 'gconf' 'perl')
 options=(!emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('ea386003b18f067524833b0eeb271330')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gnome2-GConf-${pkgver}.tar.gz
+disable-orbit.patch)
+md5sums=('ea386003b18f067524833b0eeb271330'
+ '14852fc936ce7b552eb204913d55fd1c')
 
 build() {
-  cd ${srcdir}/${_realname}-${pkgver}
+  cd ${srcdir}/Gnome2-GConf-${pkgver}
+  patch -Np1 -i ${srcdir}/disable-orbit.patch
   perl Makefile.PL INSTALLDIRS=vendor
   make
 }
 
 check() {
-  cd ${srcdir}/${_realname}-${pkgver}
+  cd ${srcdir}/Gnome2-GConf-${pkgver}
   dbus-launch --exit-with-session make test
 }
 
 package() {
-  cd ${srcdir}/${_realname}-${pkgver}
+  cd ${srcdir}/Gnome2-GConf-${pkgver}
   make DESTDIR=${pkgdir} install
 }

Added: disable-orbit.patch
===
--- disable-orbit.patch (rev 0)
+++ disable-orbit.patch 2011-11-28 13:19:53 UTC (rev 143699)
@@ -0,0 +1,30 @@
+Description: Disable gconf_engine_key_is_writable
+ This symbol is not available in libgconf when it is configured without
+ ORBit support, which is currently the case in Debian.
+Author: Colin Watson cjwat...@ubuntu.com
+Bug-Debian: http://bugs.debian.org/649055
+Forwarded: no
+Last-Update: 2011-11-17
+
+Index: b/xs/GConfEngine.xs
+===
+--- a/xs/GConfEngine.xs
 b/xs/GConfEngine.xs
+@@ -350,6 +350,8 @@
+   if (err)
+   gperl_croak_gerror (NULL, err);
+ 
++#if 0 /* requires gconf to be configured with ORBit support */
++
+ ##gboolean gconf_engine_key_is_writable  (GConfEngine *conf,
+ ##const gchar *key,
+ ##GError **err);
+@@ -366,6 +368,8 @@
+ OUTPUT:
+ RETVAL
+ 
++#endif
++
+ guint
+ gconf_engine_notify_add (engine, namespace_section, func, data=NULL)
+   GConfEngine * engine



[arch-commits] Commit in gconf-perl/repos (6 files)

2011-11-28 Thread Jan de Groot
Date: Monday, November 28, 2011 @ 08:20:17
  Author: jgc
Revision: 143700

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

Added:
  gconf-perl/repos/extra-i686/PKGBUILD
(from rev 143699, gconf-perl/trunk/PKGBUILD)
  gconf-perl/repos/extra-i686/disable-orbit.patch
(from rev 143699, gconf-perl/trunk/disable-orbit.patch)
  gconf-perl/repos/extra-x86_64/PKGBUILD
(from rev 143699, gconf-perl/trunk/PKGBUILD)
  gconf-perl/repos/extra-x86_64/disable-orbit.patch
(from rev 143699, gconf-perl/trunk/disable-orbit.patch)
Deleted:
  gconf-perl/repos/extra-i686/PKGBUILD
  gconf-perl/repos/extra-x86_64/PKGBUILD

--+
 extra-i686/PKGBUILD  |   66 +++--
 extra-i686/disable-orbit.patch   |   30 
 extra-x86_64/PKGBUILD|   66 +++--
 extra-x86_64/disable-orbit.patch |   30 
 4 files changed, 128 insertions(+), 64 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-28 13:19:53 UTC (rev 143699)
+++ extra-i686/PKGBUILD 2011-11-28 13:20:17 UTC (rev 143700)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=gconf-perl
-_realname=Gnome2-GConf
-pkgver=1.044
-pkgrel=5
-pkgdesc=Gnome2-GConf perl bindings for gconf
-arch=('i686' 'x86_64')
-license=('LGPL')
-url=http://gtk2-perl.sourceforge.net/;
-makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
-depends=('glib-perl' 'gconf' 'perl=5.14')
-options=(!emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('ea386003b18f067524833b0eeb271330')
-
-build() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  dbus-launch --exit-with-session make test
-}
-
-package() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: gconf-perl/repos/extra-i686/PKGBUILD (from rev 143699, 
gconf-perl/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-28 13:20:17 UTC (rev 143700)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=gconf-perl
+pkgver=1.044
+pkgrel=6
+pkgdesc=Gnome2-GConf perl bindings for gconf
+arch=('i686' 'x86_64')
+license=('LGPL')
+url=http://gtk2-perl.sourceforge.net/;
+makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
+depends=('glib-perl' 'gconf' 'perl')
+options=(!emptydirs)
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gnome2-GConf-${pkgver}.tar.gz
+disable-orbit.patch)
+md5sums=('ea386003b18f067524833b0eeb271330'
+ '14852fc936ce7b552eb204913d55fd1c')
+
+build() {
+  cd ${srcdir}/Gnome2-GConf-${pkgver}
+  patch -Np1 -i ${srcdir}/disable-orbit.patch
+  perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+check() {
+  cd ${srcdir}/Gnome2-GConf-${pkgver}
+  dbus-launch --exit-with-session make test
+}
+
+package() {
+  cd ${srcdir}/Gnome2-GConf-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Copied: gconf-perl/repos/extra-i686/disable-orbit.patch (from rev 143699, 
gconf-perl/trunk/disable-orbit.patch)
===
--- extra-i686/disable-orbit.patch  (rev 0)
+++ extra-i686/disable-orbit.patch  2011-11-28 13:20:17 UTC (rev 143700)
@@ -0,0 +1,30 @@
+Description: Disable gconf_engine_key_is_writable
+ This symbol is not available in libgconf when it is configured without
+ ORBit support, which is currently the case in Debian.
+Author: Colin Watson cjwat...@ubuntu.com
+Bug-Debian: http://bugs.debian.org/649055
+Forwarded: no
+Last-Update: 2011-11-17
+
+Index: b/xs/GConfEngine.xs
+===
+--- a/xs/GConfEngine.xs
 b/xs/GConfEngine.xs
+@@ -350,6 +350,8 @@
+   if (err)
+   gperl_croak_gerror (NULL, err);
+ 
++#if 0 /* requires gconf to be configured with ORBit support */
++
+ ##gboolean gconf_engine_key_is_writable  (GConfEngine *conf,
+ ##const gchar *key,
+ ##GError **err);
+@@ -366,6 +368,8 @@
+ OUTPUT:
+ RETVAL
+ 
++#endif
++
+ guint
+ gconf_engine_notify_add (engine, namespace_section, func, data=NULL)
+   GConfEngine * engine

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-11-28 13:19:53 UTC (rev 143699)
+++ extra-x86_64/PKGBUILD   2011-11-28 13:20:17 UTC (rev 143700)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=gconf-perl
-_realname=Gnome2-GConf
-pkgver=1.044
-pkgrel=5
-pkgdesc=Gnome2-GConf perl bindings for gconf

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

2011-11-28 Thread Jan de Groot
Date: Monday, November 28, 2011 @ 08:35:28
  Author: jgc
Revision: 143701

db-remove: gsf-sharp removed by jgc

Deleted:
  gsf-sharp/repos/extra-i686/



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

2011-11-28 Thread Jan de Groot
Date: Monday, November 28, 2011 @ 08:35:51
  Author: jgc
Revision: 143702

db-remove: gsf-sharp removed by jgc

Deleted:
  gsf-sharp/repos/extra-x86_64/



[arch-commits] Commit in (gsf-sharp)

2011-11-28 Thread Jan de Groot
Date: Monday, November 28, 2011 @ 08:36:36
  Author: jgc
Revision: 143703

Remove dead package. Upstream source is dead, no development since 2006, 
nothing is using it...

Deleted:
  gsf-sharp/



[arch-commits] Commit in djvulibre/repos (10 files)

2011-11-28 Thread Jan de Groot
Date: Monday, November 28, 2011 @ 08:56:50
  Author: jgc
Revision: 143707

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

Added:
  djvulibre/repos/extra-i686/PKGBUILD
(from rev 143706, djvulibre/trunk/PKGBUILD)
  djvulibre/repos/extra-i686/djvulibre.install
(from rev 143706, djvulibre/trunk/djvulibre.install)
  djvulibre/repos/extra-i686/git-fixes.patch
(from rev 143706, djvulibre/trunk/git-fixes.patch)
  djvulibre/repos/extra-x86_64/PKGBUILD
(from rev 143706, djvulibre/trunk/PKGBUILD)
  djvulibre/repos/extra-x86_64/djvulibre.install
(from rev 143706, djvulibre/trunk/djvulibre.install)
  djvulibre/repos/extra-x86_64/git-fixes.patch
(from rev 143706, djvulibre/trunk/git-fixes.patch)
Deleted:
  djvulibre/repos/extra-i686/PKGBUILD
  djvulibre/repos/extra-i686/djvulibre.install
  djvulibre/repos/extra-x86_64/PKGBUILD
  djvulibre/repos/extra-x86_64/djvulibre.install

+
 extra-i686/PKGBUILD|   75 -
 extra-i686/djvulibre.install   |   26 
 extra-i686/git-fixes.patch | 1607 +++
 extra-x86_64/PKGBUILD  |   75 -
 extra-x86_64/djvulibre.install |   26 
 extra-x86_64/git-fixes.patch   | 1607 +++
 6 files changed, 3322 insertions(+), 94 deletions(-)

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


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

2011-12-01 Thread Jan de Groot
Date: Thursday, December 1, 2011 @ 13:23:39
  Author: jgc
Revision: 144010

Force UTF8 locale for make check. Qt cannot find files with utf8 chars 
otherwise and fails the testsuite

Modified:
  poppler/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-01 18:11:01 UTC (rev 144009)
+++ PKGBUILD2011-12-01 18:23:39 UTC (rev 144010)
@@ -39,7 +39,7 @@
   cd ${srcdir}
   ln -sf test-${_testtag} test
   cd ${pkgbase}-${pkgver}
-  make check
+  LANG=en_US.UTF8 make check
 }
 
 package_poppler() {



[arch-commits] Commit in libdvdread/trunk (DVDFileStat.patch PKGBUILD)

2011-12-05 Thread Jan de Groot
 ) {
-+if( UDFFindFile( dvd, filename, size ) ) {
-+  statbuf-size = size;
-+  statbuf-nr_parts = 1;
-+  statbuf-parts_size[0] = size;
-+  return 0;
-+}
-+  } else {
-+if( findDVDFile( dvd, filename, full_path ) )  {
-+  if( stat( full_path, fileinfo )  0 ) {
-+fprintf( stderr, libdvdread: Can't stat() %s.\n, filename );
-+  } else {
-+statbuf-size = fileinfo.st_size;
-+statbuf-nr_parts = 1;
-+statbuf-parts_size[0] = statbuf-size;
-+return 0;
-+  }
-+}
-+  }
-+  return -1;
-+}
-+
- /* Internal, but used from dvd_udf.c */
- int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number,
-size_t block_count, unsigned char *data,
-diff -pruN libdvdread-4.1.3/src/dvd_reader.h 
libdvdread-4.1.3.new/src/dvd_reader.h
 libdvdread-4.1.3/src/dvd_reader.h  2008-09-06 23:55:51.0 +0200
-+++ libdvdread-4.1.3.new/src/dvd_reader.h  2009-02-28 01:36:49.0 
+0100
-@@ -115,6 +115,42 @@ typedef enum {
- } dvd_read_domain_t;
- 
- /**
-+ *
-+ */
-+typedef struct {
-+  off_t size;  /** Total size of file in bytes */
-+  int nr_parts;/** Number of file parts */
-+  off_t parts_size[9]; /** Size of each part in bytes */
-+} dvd_stat_t;
-+
-+/**
-+ * Stats a file on the DVD given the title number and domain.
-+ * The information about the file is stored in a dvd_stat_t
-+ * which contains information about the size of the file and
-+ * the number of parts in case of a multipart file and the respective
-+ * sizes of the parts.
-+ * A multipart file is for instance VTS_02_1.VOB, VTS_02_2.VOB, VTS_02_3.VOB
-+ * The size of VTS_02_1.VOB will be stored in stat-parts_size[0],
-+ * VTS_02_2.VOB in stat-parts_size[1], ...
-+ * The total size (sum of all parts) is stored in stat-size and
-+ * stat-nr_parts will hold the number of parts.
-+ * Only DVD_READ_TITLE_VOBS (VTS_??_[1-9].VOB) can be multipart files.
-+ * 
-+ * This function is only of use if you want to get the size of each file
-+ * in the filesystem. These sizes are not needed to use any other
-+ * functions in libdvdread. 
-+ *
-+ * @param dvd  A dvd read handle.
-+ * @param titlenum Which Video Title Set should be used, VIDEO_TS is 0.
-+ * @param domain Which domain. 
-+ * @param stat Pointer to where the result is stored.
-+ * @return If successful 0, otherwise -1.
-+ *
-+ * int DVDFileStat(dvd, titlenum, domain, stat);
-+ */
-+int DVDFileStat(dvd_reader_t *, int, dvd_read_domain_t, dvd_stat_t *);
-+  
-+/**
-  * Opens a file on the DVD given the title number and domain.
-  *
-  * If the title number is 0, the video manager information is opened

Modified: PKGBUILD
===
--- PKGBUILD2011-12-05 12:44:46 UTC (rev 144375)
+++ PKGBUILD2011-12-05 12:48:59 UTC (rev 144376)
@@ -1,35 +1,32 @@
 # $Id$
-# Maintainer:
+# Maintainer: Jan de Groot j...@archlinux.org
 # Contributor: Thomas Baechler tho...@archlinux.org
 # Contributor: Tom Newsom jeeps...@gmx.co.uk
 
 pkgname=libdvdread
-pkgver=4.1.3
-pkgrel=2
+pkgver=4.2.0
+pkgrel=1
 pkgdesc=Provides a simple foundation for reading DVD video disks
 arch=(i686 x86_64)
-url=http://www.mplayerhq.hu/MPlayer/releases/dvdnav/;
+url=http://dvdnav.mplayerhq.hu;
 license=('GPL')
 depends=('glibc')
 makedepends=('libdvdcss')
 optdepends=('libdvdcss: for decoding encrypted DVDs')
 options=('!libtool')
-source=(http://www.mplayerhq.hu/MPlayer/releases/dvdnav/${pkgname}-${pkgver}.tar.bz2;
-   'DVDFileStat.patch')
-md5sums=('6dc068d442c85a3cdd5ad3da75f6c6e8'
-   '7314874e246634019be929a96340437a')
+source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('0bea15da842a4b04a482b009d72dcc6d9c9524ccc1bf67e5748319ec5ada8097')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   # 
http://lists.mplayerhq.hu/pipermail/dvdnav-discuss/2009-February/000986.html 
(FS#19324)
-  patch -Np1 -i ${srcdir}/DVDFileStat.patch || return 1
 
-  ./autogen.sh --prefix=/usr || return 1
-  make || return 1
+  ./autogen.sh --prefix=/usr
+  make
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 }



[arch-commits] Commit in libdvdread/repos (6 files)

2011-12-05 Thread Jan de Groot
( dvd, titlenum, 1, statbuf );
-+}
-+break;
-+  case DVD_READ_TITLE_VOBS:
-+if( titlenum == 0 ) {
-+  return -1;
-+}
-+if( dvd-isImageFile ) {
-+  return DVDFileStatVOBUDF( dvd, titlenum, 0, statbuf );
-+} else {
-+  return DVDFileStatVOBPath( dvd, titlenum, 0, statbuf );
-+}
-+break;
-+  default:
-+fprintf( stderr, libdvdread: Invalid domain for file stat.\n );
-+errno = EINVAL;
-+return -1;
-+  }
-+  
-+  if( dvd-isImageFile ) {
-+if( UDFFindFile( dvd, filename, size ) ) {
-+  statbuf-size = size;
-+  statbuf-nr_parts = 1;
-+  statbuf-parts_size[0] = size;
-+  return 0;
-+}
-+  } else {
-+if( findDVDFile( dvd, filename, full_path ) )  {
-+  if( stat( full_path, fileinfo )  0 ) {
-+fprintf( stderr, libdvdread: Can't stat() %s.\n, filename );
-+  } else {
-+statbuf-size = fileinfo.st_size;
-+statbuf-nr_parts = 1;
-+statbuf-parts_size[0] = statbuf-size;
-+return 0;
-+  }
-+}
-+  }
-+  return -1;
-+}
-+
- /* Internal, but used from dvd_udf.c */
- int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number,
-size_t block_count, unsigned char *data,
-diff -pruN libdvdread-4.1.3/src/dvd_reader.h 
libdvdread-4.1.3.new/src/dvd_reader.h
 libdvdread-4.1.3/src/dvd_reader.h  2008-09-06 23:55:51.0 +0200
-+++ libdvdread-4.1.3.new/src/dvd_reader.h  2009-02-28 01:36:49.0 
+0100
-@@ -115,6 +115,42 @@ typedef enum {
- } dvd_read_domain_t;
- 
- /**
-+ *
-+ */
-+typedef struct {
-+  off_t size;  /** Total size of file in bytes */
-+  int nr_parts;/** Number of file parts */
-+  off_t parts_size[9]; /** Size of each part in bytes */
-+} dvd_stat_t;
-+
-+/**
-+ * Stats a file on the DVD given the title number and domain.
-+ * The information about the file is stored in a dvd_stat_t
-+ * which contains information about the size of the file and
-+ * the number of parts in case of a multipart file and the respective
-+ * sizes of the parts.
-+ * A multipart file is for instance VTS_02_1.VOB, VTS_02_2.VOB, VTS_02_3.VOB
-+ * The size of VTS_02_1.VOB will be stored in stat-parts_size[0],
-+ * VTS_02_2.VOB in stat-parts_size[1], ...
-+ * The total size (sum of all parts) is stored in stat-size and
-+ * stat-nr_parts will hold the number of parts.
-+ * Only DVD_READ_TITLE_VOBS (VTS_??_[1-9].VOB) can be multipart files.
-+ * 
-+ * This function is only of use if you want to get the size of each file
-+ * in the filesystem. These sizes are not needed to use any other
-+ * functions in libdvdread. 
-+ *
-+ * @param dvd  A dvd read handle.
-+ * @param titlenum Which Video Title Set should be used, VIDEO_TS is 0.
-+ * @param domain Which domain. 
-+ * @param stat Pointer to where the result is stored.
-+ * @return If successful 0, otherwise -1.
-+ *
-+ * int DVDFileStat(dvd, titlenum, domain, stat);
-+ */
-+int DVDFileStat(dvd_reader_t *, int, dvd_read_domain_t, dvd_stat_t *);
-+  
-+/**
-  * Opens a file on the DVD given the title number and domain.
-  *
-  * If the title number is 0, the video manager information is opened

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-12-05 12:48:59 UTC (rev 144376)
+++ extra-i686/PKGBUILD 2011-12-05 12:49:24 UTC (rev 144377)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Thomas Baechler tho...@archlinux.org
-# Contributor: Tom Newsom jeeps...@gmx.co.uk
-
-pkgname=libdvdread
-pkgver=4.1.3
-pkgrel=2
-pkgdesc=Provides a simple foundation for reading DVD video disks
-arch=(i686 x86_64)
-url=http://www.mplayerhq.hu/MPlayer/releases/dvdnav/;
-license=('GPL')
-depends=('glibc')
-makedepends=('libdvdcss')
-optdepends=('libdvdcss: for decoding encrypted DVDs')
-options=('!libtool')
-source=(http://www.mplayerhq.hu/MPlayer/releases/dvdnav/${pkgname}-${pkgver}.tar.bz2;
-   'DVDFileStat.patch')
-md5sums=('6dc068d442c85a3cdd5ad3da75f6c6e8'
-   '7314874e246634019be929a96340437a')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # 
http://lists.mplayerhq.hu/pipermail/dvdnav-discuss/2009-February/000986.html 
(FS#19324)
-  patch -Np1 -i ${srcdir}/DVDFileStat.patch || return 1
-
-  ./autogen.sh --prefix=/usr || return 1
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
-}

Copied: libdvdread/repos/extra-i686/PKGBUILD (from rev 144376, 
libdvdread/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-12-05 12:49:24 UTC (rev 144377)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Thomas Baechler tho...@archlinux.org
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+
+pkgname=libdvdread
+pkgver=4.2.0
+pkgrel=1
+pkgdesc=Provides a simple foundation for reading DVD video disks
+arch=(i686 x86_64)
+url

[arch-commits] Commit in libdvdnav/trunk (PKGBUILD deadlock.patch)

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 08:00:40
  Author: jgc
Revision: 144383

upgpkg: libdvdnav 4.2.0-1

Update to 4.2.0

Modified:
  libdvdnav/trunk/PKGBUILD
Deleted:
  libdvdnav/trunk/deadlock.patch

+
 PKGBUILD   |   17 +++--
 deadlock.patch |   17 -
 2 files changed, 7 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-05 12:59:46 UTC (rev 144382)
+++ PKGBUILD2011-12-05 13:00:40 UTC (rev 144383)
@@ -1,26 +1,23 @@
 # $Id$
-# Maintainer: arjan ar...@archlinux.org
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Arjan ar...@archlinux.org
 # contributor Sarah Hay sarah...@mb.sympatico.ca
 
 pkgname=libdvdnav
-pkgver=4.1.3
-pkgrel=3
+pkgver=4.2.0
+pkgrel=1
 pkgdesc=The library for xine-dvdnav plugin.
 arch=('i686' 'x86_64')
 license=('GPL')
-url=http://www.mplayerhq.hu/MPlayer/releases/dvdnav/;
+url=http://http://dvdnav.mplayerhq.hu/;
 depends=('libdvdread')
 options=(!libtool)
-source=(http://www.mplayerhq.hu/MPlayer/releases/dvdnav-old/${pkgname}-${pkgver}.tar.bz2;
-'deadlock.patch')
-md5sums=('d62383c45b28816771e283515f2c27fa'
- '864529165a1136ae4c1ccbc7b43cdb1a')
+source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('8c971b08276c89ddcecd26fc44204460fd250dc57346f03476d3077188c47550')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   
-  patch -Np1 -i ${srcdir}/deadlock.patch
-
   ./autogen.sh --prefix=/usr
   make
 }

Deleted: deadlock.patch
===
--- deadlock.patch  2011-12-05 12:59:46 UTC (rev 144382)
+++ deadlock.patch  2011-12-05 13:00:40 UTC (rev 144383)
@@ -1,17 +0,0 @@
 a/src/dvdnav.c 2009-11-08 16:58:25.0 +0300
-+++ b/src/dvdnav.c 2009-11-08 16:58:52.0 +0300
-@@ -180,12 +180,13 @@
- pthread_mutex_unlock(this-vm_lock);
- return DVDNAV_STATUS_ERR;
-   }
-+  pthread_mutex_unlock(this-vm_lock);
-+
- #ifdef LOG_DEBUG
-   fprintf(MSG_OUT, libdvdnav: clearing dvdnav\n);
- #endif
-   result = dvdnav_clear(this);
- 
--  pthread_mutex_unlock(this-vm_lock);
-   return result;
- }
- 



[arch-commits] Commit in libdvdnav/repos (6 files)

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 08:01:06
  Author: jgc
Revision: 144385

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

Added:
  libdvdnav/repos/extra-i686/PKGBUILD
(from rev 144383, libdvdnav/trunk/PKGBUILD)
  libdvdnav/repos/extra-x86_64/PKGBUILD
(from rev 144383, libdvdnav/trunk/PKGBUILD)
Deleted:
  libdvdnav/repos/extra-i686/PKGBUILD
  libdvdnav/repos/extra-i686/deadlock.patch
  libdvdnav/repos/extra-x86_64/PKGBUILD
  libdvdnav/repos/extra-x86_64/deadlock.patch

-+
 extra-i686/PKGBUILD |   61 +++---
 extra-i686/deadlock.patch   |   17 ---
 extra-x86_64/PKGBUILD   |   61 +++---
 extra-x86_64/deadlock.patch |   17 ---
 4 files changed, 58 insertions(+), 98 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-12-05 13:01:04 UTC (rev 144384)
+++ extra-i686/PKGBUILD 2011-12-05 13:01:06 UTC (rev 144385)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: arjan ar...@archlinux.org
-# contributor Sarah Hay sarah...@mb.sympatico.ca
-
-pkgname=libdvdnav
-pkgver=4.1.3
-pkgrel=3
-pkgdesc=The library for xine-dvdnav plugin.
-arch=('i686' 'x86_64')
-license=('GPL')
-url=http://www.mplayerhq.hu/MPlayer/releases/dvdnav/;
-depends=('libdvdread')
-options=(!libtool)
-source=(http://www.mplayerhq.hu/MPlayer/releases/dvdnav-old/${pkgname}-${pkgver}.tar.bz2;
-'deadlock.patch')
-md5sums=('d62383c45b28816771e283515f2c27fa'
- '864529165a1136ae4c1ccbc7b43cdb1a')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  patch -Np1 -i ${srcdir}/deadlock.patch
-
-  ./autogen.sh --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}

Copied: libdvdnav/repos/extra-i686/PKGBUILD (from rev 144383, 
libdvdnav/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-12-05 13:01:06 UTC (rev 144385)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Arjan ar...@archlinux.org
+# contributor Sarah Hay sarah...@mb.sympatico.ca
+
+pkgname=libdvdnav
+pkgver=4.2.0
+pkgrel=1
+pkgdesc=The library for xine-dvdnav plugin.
+arch=('i686' 'x86_64')
+license=('GPL')
+url=http://http://dvdnav.mplayerhq.hu/;
+depends=('libdvdread')
+options=(!libtool)
+source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('8c971b08276c89ddcecd26fc44204460fd250dc57346f03476d3077188c47550')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
+  ./autogen.sh --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+}

Deleted: extra-i686/deadlock.patch
===
--- extra-i686/deadlock.patch   2011-12-05 13:01:04 UTC (rev 144384)
+++ extra-i686/deadlock.patch   2011-12-05 13:01:06 UTC (rev 144385)
@@ -1,17 +0,0 @@
 a/src/dvdnav.c 2009-11-08 16:58:25.0 +0300
-+++ b/src/dvdnav.c 2009-11-08 16:58:52.0 +0300
-@@ -180,12 +180,13 @@
- pthread_mutex_unlock(this-vm_lock);
- return DVDNAV_STATUS_ERR;
-   }
-+  pthread_mutex_unlock(this-vm_lock);
-+
- #ifdef LOG_DEBUG
-   fprintf(MSG_OUT, libdvdnav: clearing dvdnav\n);
- #endif
-   result = dvdnav_clear(this);
- 
--  pthread_mutex_unlock(this-vm_lock);
-   return result;
- }
- 

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-12-05 13:01:04 UTC (rev 144384)
+++ extra-x86_64/PKGBUILD   2011-12-05 13:01:06 UTC (rev 144385)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: arjan ar...@archlinux.org
-# contributor Sarah Hay sarah...@mb.sympatico.ca
-
-pkgname=libdvdnav
-pkgver=4.1.3
-pkgrel=3
-pkgdesc=The library for xine-dvdnav plugin.
-arch=('i686' 'x86_64')
-license=('GPL')
-url=http://www.mplayerhq.hu/MPlayer/releases/dvdnav/;
-depends=('libdvdread')
-options=(!libtool)
-source=(http://www.mplayerhq.hu/MPlayer/releases/dvdnav-old/${pkgname}-${pkgver}.tar.bz2;
-'deadlock.patch')
-md5sums=('d62383c45b28816771e283515f2c27fa'
- '864529165a1136ae4c1ccbc7b43cdb1a')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  patch -Np1 -i ${srcdir}/deadlock.patch
-
-  ./autogen.sh --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}

Copied: libdvdnav/repos/extra-x86_64/PKGBUILD (from rev 144383, 
libdvdnav/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-12-05 13:01:06 UTC (rev 144385)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Arjan ar...@archlinux.org
+# contributor Sarah Hay sarah

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

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 08:06:25
  Author: jgc
Revision: 144387

upgpkg: pm-quirks 0.20100619-2

Fix FS#27378

Modified:
  pm-quirks/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-05 13:05:53 UTC (rev 144386)
+++ PKGBUILD2011-12-05 13:06:25 UTC (rev 144387)
@@ -4,7 +4,7 @@
 pkgname=pm-quirks
 _date=20100619
 pkgver=0.${_date}
-pkgrel=1
+pkgrel=2
 pkgdesc=Quirks data for pm-utils
 arch=(any)
 license=('GPL')
@@ -15,5 +15,5 @@
 build() {
   cd ${srcdir}
   install -m755 -d ${pkgdir}/usr/lib/pm-utils/video-quirks
-  install -m644 *.quirkdb ${pkgdir}/usr/lib/pm-utils/video-quirks/ || return 
1
+  install -m644 video-quirks/*.quirkdb 
${pkgdir}/usr/lib/pm-utils/video-quirks/
 }



[arch-commits] Commit in pm-quirks/repos/extra-any (PKGBUILD PKGBUILD)

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 08:06:40
  Author: jgc
Revision: 144388

archrelease: copy trunk to extra-any

Added:
  pm-quirks/repos/extra-any/PKGBUILD
(from rev 144387, pm-quirks/trunk/PKGBUILD)
Deleted:
  pm-quirks/repos/extra-any/PKGBUILD

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

Deleted: PKGBUILD
===
--- PKGBUILD2011-12-05 13:06:25 UTC (rev 144387)
+++ PKGBUILD2011-12-05 13:06:40 UTC (rev 144388)
@@ -1,19 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=pm-quirks
-_date=20100619
-pkgver=0.${_date}
-pkgrel=1
-pkgdesc=Quirks data for pm-utils
-arch=(any)
-license=('GPL')
-url=http://pm-utils.freedesktop.org/wiki/;
-source=(http://pm-utils.freedesktop.org/releases/${pkgname}-${_date}.tar.gz)
-md5sums=('3b6ee39056b9ece0cd5e073a4c272b05')
-
-build() {
-  cd ${srcdir}
-  install -m755 -d ${pkgdir}/usr/lib/pm-utils/video-quirks
-  install -m644 *.quirkdb ${pkgdir}/usr/lib/pm-utils/video-quirks/ || return 
1
-}

Copied: pm-quirks/repos/extra-any/PKGBUILD (from rev 144387, 
pm-quirks/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-12-05 13:06:40 UTC (rev 144388)
@@ -0,0 +1,19 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=pm-quirks
+_date=20100619
+pkgver=0.${_date}
+pkgrel=2
+pkgdesc=Quirks data for pm-utils
+arch=(any)
+license=('GPL')
+url=http://pm-utils.freedesktop.org/wiki/;
+source=(http://pm-utils.freedesktop.org/releases/${pkgname}-${_date}.tar.gz)
+md5sums=('3b6ee39056b9ece0cd5e073a4c272b05')
+
+build() {
+  cd ${srcdir}
+  install -m755 -d ${pkgdir}/usr/lib/pm-utils/video-quirks
+  install -m644 video-quirks/*.quirkdb 
${pkgdir}/usr/lib/pm-utils/video-quirks/
+}



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

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 08:20:55
  Author: jgc
Revision: 144390

Fix build, project moved to Attic

Modified:
  opencdk/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-05 13:07:33 UTC (rev 144389)
+++ PKGBUILD2011-12-05 13:20:55 UTC (rev 144390)
@@ -3,19 +3,23 @@
 
 pkgname=opencdk
 pkgver=0.6.6
-pkgrel=2
+pkgrel=3
 pkgdesc=The Open Crypto Development Kit provides basic parts of the OpenPGP 
message format
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/gnutls/;
 license=('GPL')
-depends=('libgcrypt=1.2.4' 'zlib')
+depends=('libgcrypt' 'zlib')
 options=('!libtool')
-source=(ftp://ftp.gnutls.org/pub/gnutls/opencdk/opencdk-${pkgver}.tar.bz2)
+source=(ftp://ftp.gnutls.org/pub/gnutls/attic/opencdk/opencdk-${pkgver}.tar.bz2)
 md5sums=('813d62d7afe7b2c2d8f3df0a6c9d9331')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }



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

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 08:22:32
  Author: jgc
Revision: 144391

db-remove: opencdk removed by jgc

Deleted:
  opencdk/repos/extra-i686/



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

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 08:22:45
  Author: jgc
Revision: 144392

db-remove: opencdk removed by jgc

Deleted:
  opencdk/repos/extra-x86_64/



[arch-commits] Commit in (opencdk)

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 08:23:55
  Author: jgc
Revision: 144393

Remove package, not needed anymore and abandoned upstream. Moved to AUR: 
https://aur.archlinux.org/packages.php?ID=54576

Deleted:
  opencdk/



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

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 09:02:39
  Author: jgc
Revision: 144394

upgpkg: mjpegtools 2.0.0-1

Update to 2.0.0:
- Remove patches merged upstream
- Add patch from OpenSuSE to build with v4l-utils instead of the 
removed-from-kernel v4l headers

Added:
  mjpegtools/trunk/mjpegtools-v4l-2.6.38.patch
Modified:
  mjpegtools/trunk/PKGBUILD
  mjpegtools/trunk/mjpegtools.install
Deleted:
  mjpegtools/trunk/mjpegtools-1.9.0-glibc-2.10.patch
  mjpegtools/trunk/mjpegtools-1.9.0-jpeg-7.patch
  mjpegtools/trunk/png2yuv-fix-memleak.patch

---+
 PKGBUILD  |   23 +++-
 mjpegtools-1.9.0-glibc-2.10.patch |   11 ---
 mjpegtools-1.9.0-jpeg-7.patch |   24 
 mjpegtools-v4l-2.6.38.patch   |  100 
 mjpegtools.install|2 
 png2yuv-fix-memleak.patch |   10 ---
 6 files changed, 109 insertions(+), 61 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-05 13:23:55 UTC (rev 144393)
+++ PKGBUILD2011-12-05 14:02:39 UTC (rev 144394)
@@ -3,32 +3,25 @@
 # Mantainer: Roberto Carvajal robe...@archlinux.org
 
 pkgname=mjpegtools
-pkgver=1.9.0
-pkgrel=4
+pkgver=2.0.0
+pkgrel=1
 pkgdesc=Set of tools that can do recording of videos and playback, simple 
cut-and-paste editing and the MPEG compression of audio and video
 arch=(i686 x86_64)
 license=('GPL')
 url=http://mjpeg.sourceforge.net/;
-depends=('libjpeg=8' 'libpng=1.4.0' 'sdl' 'gcc-libs' 'libdv')
-makedepends=('gtk2=2.18.6')
+depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv' 'texinfo')
+makedepends=('gtk2' 'v4l-utils')
 optdepends=('gtk2: glav GUI')
 options=('!makeflags' '!libtool')
 install=mjpegtools.install
 
source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz
-mjpegtools-1.9.0-glibc-2.10.patch
-png2yuv-fix-memleak.patch
-mjpegtools-1.9.0-jpeg-7.patch)
-md5sums=('309a6fcf0900a010d6a9c1e91afc2f5c' 'b8ae66237d83be533db8eea166fd3357'\
- '39e1def8fb0f7c58a217b22dc251a86a' 'ccc7562a3933877d3362da7cf4695ea0')
-sha1sums=('1701233354c7ea86b5b7808c4dd5d03a71118e48' 
'3029f0e835e693b144298ed9f8143c9566be26f3'\
- '8af5c3747756353bef56d03bafbdd086ff15c02c' 
'2bdb1b3b8591cede11d4a133a758e8ead35db4dd')
+mjpegtools-v4l-2.6.38.patch)
+md5sums=('903e1e3b967eebcc5fe5626d7517dc46')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np0 -i ${srcdir}/mjpegtools-v4l-2.6.38.patch
   sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-  patch -Np1 -i $srcdir/mjpegtools-1.9.0-glibc-2.10.patch
-  patch -Np1 -i ${srcdir}/png2yuv-fix-memleak.patch
-  patch -Np0 -i ${srcdir}/mjpegtools-1.9.0-jpeg-7.patch
   ./configure --prefix=/usr --enable-largefile
   make
 }
@@ -38,3 +31,5 @@
   make DESTDIR=${pkgdir} install
   install -m644 mpeg2enc/mpeg2syntaxcodes.h 
${pkgdir}/usr/include/mjpegtools/mpeg2enc/
 }
+md5sums=('903e1e3b967eebcc5fe5626d7517dc46'
+ '44006d6f844017fe57aa123aa43f4508')

Deleted: mjpegtools-1.9.0-glibc-2.10.patch
===
--- mjpegtools-1.9.0-glibc-2.10.patch   2011-12-05 13:23:55 UTC (rev 144393)
+++ mjpegtools-1.9.0-glibc-2.10.patch   2011-12-05 14:02:39 UTC (rev 144394)
@@ -1,11 +0,0 @@
 mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp.orig2009-05-27 
01:31:46.0 -0700
-+++ mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp 2009-05-27 01:33:09.0 
-0700
-@@ -53,7 +53,7 @@
- 
- bool LPCMStream::Probe(IBitStream bs )
- {
--char *last_dot = strrchr( bs.StreamName(), '.' );
-+const char *last_dot = strrchr( bs.StreamName(), '.' );
- return 
- last_dot != NULL 
-  strcmp( last_dot+1, lpcm) == 0;

Deleted: mjpegtools-1.9.0-jpeg-7.patch
===
--- mjpegtools-1.9.0-jpeg-7.patch   2011-12-05 13:23:55 UTC (rev 144393)
+++ mjpegtools-1.9.0-jpeg-7.patch   2011-12-05 14:02:39 UTC (rev 144394)
@@ -1,24 +0,0 @@
-Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling 
isn't set by default to FALSE anymore.
-
-Patch by: Salah Coronya
-
-http://bugs.gentoo.org/show_bug.cgi?id=293919
-
 lavtools/jpegutils.c
-+++ lavtools/jpegutils.c
-@@ -502,6 +502,7 @@
- 
-jpeg_read_header (dinfo, TRUE);
-dinfo.raw_data_out = TRUE;
-+   dinfo.do_fancy_upsampling = FALSE;
-dinfo.out_color_space = JCS_YCbCr;
-dinfo.dct_method = JDCT_IFAST;
-guarantee_huff_tables(dinfo);
-@@ -599,6 +600,7 @@
-   if (field  0) {
-  jpeg_read_header (dinfo, TRUE);
-  dinfo.raw_data_out = TRUE;
-+ dinfo.do_fancy_upsampling = FALSE;
-  dinfo.out_color_space = JCS_YCbCr;
-  dinfo.dct_method = JDCT_IFAST;
-  jpeg_start_decompress (dinfo);

Added: mjpegtools-v4l-2.6.38.patch
===
--- mjpegtools-v4l-2.6.38.patch 

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

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 09:03:03
  Author: jgc
Revision: 144395

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

Added:
  mjpegtools/repos/testing-i686/
  mjpegtools/repos/testing-i686/PKGBUILD
(from rev 144394, mjpegtools/trunk/PKGBUILD)
  mjpegtools/repos/testing-i686/mjpegtools-v4l-2.6.38.patch
(from rev 144394, mjpegtools/trunk/mjpegtools-v4l-2.6.38.patch)
  mjpegtools/repos/testing-i686/mjpegtools.install
(from rev 144394, mjpegtools/trunk/mjpegtools.install)
  mjpegtools/repos/testing-x86_64/
  mjpegtools/repos/testing-x86_64/PKGBUILD
(from rev 144394, mjpegtools/trunk/PKGBUILD)
  mjpegtools/repos/testing-x86_64/mjpegtools-v4l-2.6.38.patch
(from rev 144394, mjpegtools/trunk/mjpegtools-v4l-2.6.38.patch)
  mjpegtools/repos/testing-x86_64/mjpegtools.install
(from rev 144394, mjpegtools/trunk/mjpegtools.install)

+
 testing-i686/PKGBUILD  |   35 +
 testing-i686/mjpegtools-v4l-2.6.38.patch   |  100 +++
 testing-i686/mjpegtools.install|   14 +++
 testing-x86_64/PKGBUILD|   35 +
 testing-x86_64/mjpegtools-v4l-2.6.38.patch |  100 +++
 testing-x86_64/mjpegtools.install  |   14 +++
 6 files changed, 298 insertions(+)

Copied: mjpegtools/repos/testing-i686/PKGBUILD (from rev 144394, 
mjpegtools/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-12-05 14:03:03 UTC (rev 144395)
@@ -0,0 +1,35 @@
+# $Id$
+# Contributor: Damir Perisa damir.per...@bluewin.ch
+# Mantainer: Roberto Carvajal robe...@archlinux.org
+
+pkgname=mjpegtools
+pkgver=2.0.0
+pkgrel=1
+pkgdesc=Set of tools that can do recording of videos and playback, simple 
cut-and-paste editing and the MPEG compression of audio and video
+arch=(i686 x86_64)
+license=('GPL')
+url=http://mjpeg.sourceforge.net/;
+depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv' 'texinfo')
+makedepends=('gtk2' 'v4l-utils')
+optdepends=('gtk2: glav GUI')
+options=('!makeflags' '!libtool')
+install=mjpegtools.install
+source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz
+mjpegtools-v4l-2.6.38.patch)
+md5sums=('903e1e3b967eebcc5fe5626d7517dc46')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np0 -i ${srcdir}/mjpegtools-v4l-2.6.38.patch
+  sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+  ./configure --prefix=/usr --enable-largefile
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -m644 mpeg2enc/mpeg2syntaxcodes.h 
${pkgdir}/usr/include/mjpegtools/mpeg2enc/
+}
+md5sums=('903e1e3b967eebcc5fe5626d7517dc46'
+ '44006d6f844017fe57aa123aa43f4508')

Copied: mjpegtools/repos/testing-i686/mjpegtools-v4l-2.6.38.patch (from rev 
144394, mjpegtools/trunk/mjpegtools-v4l-2.6.38.patch)
===
--- testing-i686/mjpegtools-v4l-2.6.38.patch(rev 0)
+++ testing-i686/mjpegtools-v4l-2.6.38.patch2011-12-05 14:03:03 UTC (rev 
144395)
@@ -0,0 +1,100 @@
+Index: lavtools/lavvideo.c
+===
+--- lavtools/lavvideo.c.orig
 lavtools/lavvideo.c
+@@ -63,7 +63,7 @@ Copyright by Gernot Ziegler.
+  * errors here, check your linux/time.h  sys/time.h header setup.
+  */
+ #define _LINUX_TIME_H
+-#include linux/videodev.h
++#include libv4l1-videodev.h
+ 
+ #include videodev_mjpeg.h
+ #include frequencies.h
+Index: lavtools/liblavplay.c
+===
+--- lavtools/liblavplay.c.orig
 lavtools/liblavplay.c
+@@ -68,7 +68,8 @@
+  * errors here, check your linux/time.h  sys/time.h header setup.
+  */
+ #define _LINUX_TIME_H
+-#include linux/videodev.h
++#include libv4l1-videodev.h
++#define BASE_VIDIOCPRIVATE  192 /* 192-255 are private */
+ #else
+ #define VIDEO_MODE_PAL0
+ #define VIDEO_MODE_NTSC   1
+Index: lavtools/liblavrec.c
+===
+--- lavtools/liblavrec.c.orig
 lavtools/liblavrec.c
+@@ -63,7 +63,8 @@
+  * errors here, check your linux/time.h  sys/time.h header setup.
+  */
+ #define _LINUX_TIME_H
+-#include linux/videodev.h
++#include libv4l1-videodev.h
++#define BASE_VIDIOCPRIVATE  192 /* 192-255 are private */
+ #ifdef HAVE_SYS_SOUNDCARD_H
+ #include sys/soundcard.h
+ #endif
+Index: lavtools/testrec.c
+===
+--- lavtools/testrec.c.orig
 lavtools/testrec.c
+@@ -89,7 +89,7 @@
+  * errors here, check your linux/time.h  sys/time.h header setup.
+  */
+ #define _LINUX_TIME_H
+-#include linux/videodev.h
++#include libv4l1-videodev.h
+ #include linux/soundcard.h
+ 
+ /* These are 

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

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 09:18:16
  Author: jgc
Revision: 144396

upgpkg: transcode 1.1.7-1

Update to 1.1.7, build with new mjpegtools

Modified:
  transcode/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-05 14:03:03 UTC (rev 144395)
+++ PKGBUILD2011-12-05 14:18:16 UTC (rev 144396)
@@ -5,7 +5,7 @@
 
 pkgname=transcode
 _sripver=0.3-4
-pkgver=1.1.6
+pkgver=1.1.7
 pkgrel=1
 pkgdesc=A video/DVD ripper and encoder for the terminal/console
 arch=('i686' 'x86_64')
@@ -13,19 +13,18 @@
 license=('GPL')
 depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
-makedepends=('nasm' 'v4l-utils')
+makedepends=('nasm')
 options=('!libtool')
 
source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2

http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
 subtitleripper-0.3.4-linkingorder.patch 
subtitleripper-0.3.4-respect-ldflags.patch)
-sha1sums=('e176622b2c2834b006cda3c368ab521407d375c4'
+sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
   'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
   'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
   '591943a33235342a66c3df0625a164a1479c09ae')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  sed -i 's|linux/videodev.h|libv4l1-videodev.h|' configure 
   ./configure --prefix=/usr \
 --disable-sse --disable-sse2 --disable-altivec --enable-mmx \
 --enable-lame --enable-ogg --enable-vorbis --enable-theora \



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

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 09:18:40
  Author: jgc
Revision: 144397

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

Added:
  transcode/repos/testing-i686/
  transcode/repos/testing-i686/PKGBUILD
(from rev 144396, transcode/trunk/PKGBUILD)
  transcode/repos/testing-i686/subtitleripper-0.3.4-linkingorder.patch
(from rev 144396, transcode/trunk/subtitleripper-0.3.4-linkingorder.patch)
  transcode/repos/testing-i686/subtitleripper-0.3.4-respect-ldflags.patch
(from rev 144396, 
transcode/trunk/subtitleripper-0.3.4-respect-ldflags.patch)
  transcode/repos/testing-x86_64/
  transcode/repos/testing-x86_64/PKGBUILD
(from rev 144396, transcode/trunk/PKGBUILD)
  transcode/repos/testing-x86_64/subtitleripper-0.3.4-linkingorder.patch
(from rev 144396, transcode/trunk/subtitleripper-0.3.4-linkingorder.patch)
  transcode/repos/testing-x86_64/subtitleripper-0.3.4-respect-ldflags.patch
(from rev 144396, 
transcode/trunk/subtitleripper-0.3.4-respect-ldflags.patch)

---+
 testing-i686/PKGBUILD |   57 
 testing-i686/subtitleripper-0.3.4-linkingorder.patch  |   28 +
 testing-i686/subtitleripper-0.3.4-respect-ldflags.patch   |   28 +
 testing-x86_64/PKGBUILD   |   57 
 testing-x86_64/subtitleripper-0.3.4-linkingorder.patch|   28 +
 testing-x86_64/subtitleripper-0.3.4-respect-ldflags.patch |   28 +
 6 files changed, 226 insertions(+)

Copied: transcode/repos/testing-i686/PKGBUILD (from rev 144396, 
transcode/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-12-05 14:18:40 UTC (rev 144397)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer:
+# Contributor: Sarah Hay sarah...@mb.sympatico.ca
+# Contributor: roberto robe...@archlinux.org
+
+pkgname=transcode
+_sripver=0.3-4
+pkgver=1.1.7
+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')
+source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2
+   
http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
+subtitleripper-0.3.4-linkingorder.patch 
subtitleripper-0.3.4-respect-ldflags.patch)
+sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
+  'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
+  'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
+  '591943a33235342a66c3df0625a164a1479c09ae')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+--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
+  make
+
+  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/' \
+  -i Makefile
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  cd ${srcdir}/subtitleripper
+  install -m 755 pgm2txt ${pkgdir}/usr/bin/
+  install -m 755 srttool ${pkgdir}/usr/bin/
+  install -m 755 subtitle2pgm ${pkgdir}/usr/bin/
+  install -m 755 subtitle2vobsub ${pkgdir}/usr/bin/
+  install -m 755 vobsub2pgm ${pkgdir}/usr/bin/
+}

Copied: transcode/repos/testing-i686/subtitleripper-0.3.4-linkingorder.patch 
(from rev 144396, transcode/trunk/subtitleripper-0.3.4-linkingorder.patch)
===
--- testing-i686/subtitleripper-0.3.4-linkingorder.patch
(rev 0)
+++ testing-i686/subtitleripper-0.3.4-linkingorder.patch2011-12-05 
14:18:40 UTC (rev 144397)
@@ -0,0 +1,28 @@
+Index: subtitleripper/Makefile
+===
+--- subtitleripper.orig/Makefile
 subtitleripper/Makefile
+@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
+ # Target
+ subtitle2pgm: subtitle2pgm.o spudec.o
+   @echo Linking $@
+-  @$(CC) $(LIBS) $^ -o $@  
++  @$(CC) $^ -o $@ $(LIBS)
+ 
+ subtitle2vobsub: subtitle2vobsub.o vobsub.o 
+   @echo Linking $@
+-  @$(CC) $(LIBS) $^ -o $@  
++  

[arch-commits] Commit in gstreamer0.10-bad/trunk (PKGBUILD mjpeg-2.0.patch)

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 09:32:41
  Author: jgc
Revision: 144398

upgpkg: gstreamer0.10-bad 0.10.22-3

Rebuild for mjpegtools 2.0

Added:
  gstreamer0.10-bad/trunk/mjpeg-2.0.patch
Modified:
  gstreamer0.10-bad/trunk/PKGBUILD

-+
 PKGBUILD|   10 ++
 mjpeg-2.0.patch |   28 
 2 files changed, 34 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-05 14:18:40 UTC (rev 144397)
+++ PKGBUILD2011-12-05 14:32:41 UTC (rev 144398)
@@ -4,21 +4,23 @@
 pkgbase=gstreamer0.10-bad
 pkgname=('gstreamer0.10-bad' 'gstreamer0.10-bad-plugins')
 pkgver=0.10.22
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('LGPL' 'GPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base=0.10.34' 'xvidcore' 'libdca' 
'bzip2' 'libdc1394' 'neon' 'faac' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 
'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 
'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 
'rtmpdump' 'libsndfile' 'librsvg')
 url=http://gstreamer.freedesktop.org/;
 options=(!libtool !emptydirs)
-source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.bz2)
-md5sums=('9a2acee1f386f71247003d0d7090fb1c')
+source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.bz2
+mjpeg-2.0.patch)
+md5sums=('9a2acee1f386f71247003d0d7090fb1c' '9415bdab8eb9cfba95df37aaf41c1172')
 
 build() {
   cd ${srcdir}/gst-plugins-bad-${pkgver}
+  patch -Np1 -i ${srcdir}/mjpeg-2.0.patch
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 --disable-static --enable-experimental \
 --with-package-name=GStreamer Bad Plugins (Archlinux) \
---with-package-origin=http://www.archlinux.org/; || return 1
+--with-package-origin=http://www.archlinux.org/;
 
   make || return 1
   sed -e 's/gst sys ext/gst/' -i Makefile

Added: mjpeg-2.0.patch
===
--- mjpeg-2.0.patch (rev 0)
+++ mjpeg-2.0.patch 2011-12-05 14:32:41 UTC (rev 144398)
@@ -0,0 +1,28 @@
+From 407b02578689804dc6bc47e53be9e87cc1b25597 Mon Sep 17 00:00:00 2001
+From: Götz Waschk was...@mandriva.org
+Date: Tue, 24 May 2011 13:42:44 +
+Subject: mpeg2enc: support mjpegtools 2.0
+
+This adds conditional includes for the renamed headers in mjpegtools 2.0.
+Fixes: #650970.
+---
+(limited to 'ext/mpeg2enc')
+
+diff --git a/ext/mpeg2enc/gstmpeg2encoder.cc b/ext/mpeg2enc/gstmpeg2encoder.cc
+index acfda50..31f1a30 100644
+--- a/ext/mpeg2enc/gstmpeg2encoder.cc
 b/ext/mpeg2enc/gstmpeg2encoder.cc
+@@ -26,7 +26,10 @@
+ 
+ #include mpegconsts.h
+ #include quantize.hh
+-#if GST_MJPEGTOOLS_API = 10900
++#if GST_MJPEGTOOLS_API = 10903
++#include ontheflyratectlpass1.hh
++#include ontheflyratectlpass2.hh
++#elif GST_MJPEGTOOLS_API = 10900
+ #include ontheflyratectl.hh
+ #include pass1ratectl.hh
+ #include pass2ratectl.hh
+--
+cgit v0.9.0.2-2-gbebe



[arch-commits] Commit in gstreamer0.10-bad/repos (8 files)

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 09:33:06
  Author: jgc
Revision: 144399

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

Added:
  gstreamer0.10-bad/repos/testing-i686/
  gstreamer0.10-bad/repos/testing-i686/PKGBUILD
(from rev 144398, gstreamer0.10-bad/trunk/PKGBUILD)
  gstreamer0.10-bad/repos/testing-i686/gstreamer0.10-bad-plugins.install
(from rev 144398, gstreamer0.10-bad/trunk/gstreamer0.10-bad-plugins.install)
  gstreamer0.10-bad/repos/testing-i686/mjpeg-2.0.patch
(from rev 144398, gstreamer0.10-bad/trunk/mjpeg-2.0.patch)
  gstreamer0.10-bad/repos/testing-x86_64/
  gstreamer0.10-bad/repos/testing-x86_64/PKGBUILD
(from rev 144398, gstreamer0.10-bad/trunk/PKGBUILD)
  gstreamer0.10-bad/repos/testing-x86_64/gstreamer0.10-bad-plugins.install
(from rev 144398, gstreamer0.10-bad/trunk/gstreamer0.10-bad-plugins.install)
  gstreamer0.10-bad/repos/testing-x86_64/mjpeg-2.0.patch
(from rev 144398, gstreamer0.10-bad/trunk/mjpeg-2.0.patch)

--+
 testing-i686/PKGBUILD|   49 +
 testing-i686/gstreamer0.10-bad-plugins.install   |   11 
 testing-i686/mjpeg-2.0.patch |   28 
 testing-x86_64/PKGBUILD  |   49 +
 testing-x86_64/gstreamer0.10-bad-plugins.install |   11 
 testing-x86_64/mjpeg-2.0.patch   |   28 
 6 files changed, 176 insertions(+)

Copied: gstreamer0.10-bad/repos/testing-i686/PKGBUILD (from rev 144398, 
gstreamer0.10-bad/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-12-05 14:33:06 UTC (rev 144399)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgbase=gstreamer0.10-bad
+pkgname=('gstreamer0.10-bad' 'gstreamer0.10-bad-plugins')
+pkgver=0.10.22
+pkgrel=3
+arch=('i686' 'x86_64')
+license=('LGPL' 'GPL')
+makedepends=('pkgconfig' 'gstreamer0.10-base=0.10.34' 'xvidcore' 'libdca' 
'bzip2' 'libdc1394' 'neon' 'faac' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 
'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 
'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 
'rtmpdump' 'libsndfile' 'librsvg')
+url=http://gstreamer.freedesktop.org/;
+options=(!libtool !emptydirs)
+source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.bz2
+mjpeg-2.0.patch)
+md5sums=('9a2acee1f386f71247003d0d7090fb1c' '9415bdab8eb9cfba95df37aaf41c1172')
+
+build() {
+  cd ${srcdir}/gst-plugins-bad-${pkgver}
+  patch -Np1 -i ${srcdir}/mjpeg-2.0.patch
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+--disable-static --enable-experimental \
+--with-package-name=GStreamer Bad Plugins (Archlinux) \
+--with-package-origin=http://www.archlinux.org/;
+
+  make || return 1
+  sed -e 's/gst sys ext/gst/' -i Makefile
+}
+
+package_gstreamer0.10-bad() {
+  pkgdesc=GStreamer Multimedia Framework Bad Plugin libraries 
(gst-plugins-bad)
+  depends=('gstreamer0.10-base=0.10.34')
+  groups=('gstreamer0.10-plugins')
+
+  cd ${srcdir}/gst-plugins-bad-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
+
+package_gstreamer0.10-bad-plugins() {
+  pkgdesc=GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad)
+  depends=(gstreamer0.10-bad=${pkgver} 'xvidcore' 'libdca' 'bzip2' 
'libdc1394' 'neon' 'faac' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 
'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 
'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 
'libgme' 'libsndfile' 'librsvg')
+  groups=('gstreamer0.10-plugins')
+  install=gstreamer0.10-bad-plugins.install
+
+  cd ${srcdir}/gst-plugins-bad-${pkgver}
+  make -C gst-libs DESTDIR=${pkgdir} install
+  make -C ext DESTDIR=${pkgdir} install
+  make -C sys DESTDIR=${pkgdir} install
+  make -C gst-libs DESTDIR=${pkgdir} uninstall
+}

Copied: gstreamer0.10-bad/repos/testing-i686/gstreamer0.10-bad-plugins.install 
(from rev 144398, gstreamer0.10-bad/trunk/gstreamer0.10-bad-plugins.install)
===
--- testing-i686/gstreamer0.10-bad-plugins.install  
(rev 0)
+++ testing-i686/gstreamer0.10-bad-plugins.install  2011-12-05 14:33:06 UTC 
(rev 144399)
@@ -0,0 +1,11 @@
+post_install() {
+usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+post_install
+}
+
+post_remove() {
+post_install
+}

Copied: gstreamer0.10-bad/repos/testing-i686/mjpeg-2.0.patch (from rev 144398, 
gstreamer0.10-bad/trunk/mjpeg-2.0.patch)
===
--- testing-i686/mjpeg-2.0.patch(rev 0)
+++ testing-i686/mjpeg-2.0.patch2011-12-05 14:33:06 UTC (rev 144399)
@@ -0,0 +1,28 @@
+From

[arch-commits] Commit in gnome-python-desktop/trunk (PKGBUILD)

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 09:48:00
  Author: jgc
Revision: 144400

upgpkg: gnome-python-desktop 2.32.0-9

Build without gnomeprint bindings, nothing that we know of needs it

Modified:
  gnome-python-desktop/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-05 14:33:06 UTC (rev 144399)
+++ PKGBUILD2011-12-05 14:48:00 UTC (rev 144400)
@@ -4,13 +4,13 @@
 # Contributor: Wael Nasreddine gand...@siemens-mobiles.org
 
 pkgbase=gnome-python-desktop
-pkgname=('gnome-python-desktop' 'python-evolution' 'python-gnomedesktop' 
'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 
'python-totem-plparser' 'python-wnck' 'python-gnomeprint')
+pkgname=('gnome-python-desktop' 'python-evolution' 'python-gnomedesktop' 
'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 
'python-totem-plparser' 'python-wnck')
 pkgver=2.32.0
-pkgrel=8
+pkgrel=9
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
 options=('!libtool')
-makedepends=('intltool' 'pkg-config' 'gnome-python' 'evolution-data-server' 
'libgnomeprintui' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' 
'librsvg')
+makedepends=('intltool' 'pkg-config' 'gnome-python' 'evolution-data-server' 
'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' 'librsvg')
 url=http://www.gnome.org;
 
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2)
 sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9')
@@ -22,7 +22,7 @@
 }
 
 package_gnome-python-desktop() {
-  depends=('python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 
'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 
'python-wnck' 'python-gnomeprint' 'gnome-python')
+  depends=('python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 
'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 
'python-wnck' 'gnome-python')
   pkgdesc=Python bindings for the GNOME desktop environment
 
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -98,13 +98,3 @@
   cd ${srcdir}/${pkgbase}-${pkgver}
   make -C wnck install DESTDIR=${pkgdir}
 }
-
-package_python-gnomeprint() {
-  depends=('pygtk' 'libgnomeprintui')
-  pkgdesc=Python bindings for libgnomeprintui
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  for dir in gnomeprint docs/gnomeprint docs/gnomeprintui; do
-make -C ${dir} install DESTDIR=${pkgdir}
-  done
-}



[arch-commits] Commit in gnome-python-desktop/repos (4 files)

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 09:48:25
  Author: jgc
Revision: 144401

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

Added:
  gnome-python-desktop/repos/extra-i686/PKGBUILD
(from rev 144400, gnome-python-desktop/trunk/PKGBUILD)
  gnome-python-desktop/repos/extra-x86_64/PKGBUILD
(from rev 144400, gnome-python-desktop/trunk/PKGBUILD)
Deleted:
  gnome-python-desktop/repos/extra-i686/PKGBUILD
  gnome-python-desktop/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |  210 ++--
 extra-x86_64/PKGBUILD |  210 ++--
 2 files changed, 200 insertions(+), 220 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-12-05 14:48:00 UTC (rev 144400)
+++ extra-i686/PKGBUILD 2011-12-05 14:48:25 UTC (rev 144401)
@@ -1,110 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Arjan Timmerman ar...@soulfly.nl
-# Contributor: Wael Nasreddine gand...@siemens-mobiles.org
-
-pkgbase=gnome-python-desktop
-pkgname=('gnome-python-desktop' 'python-evolution' 'python-gnomedesktop' 
'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 
'python-totem-plparser' 'python-wnck' 'python-gnomeprint')
-pkgver=2.32.0
-pkgrel=8
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-options=('!libtool')
-makedepends=('intltool' 'pkg-config' 'gnome-python' 'evolution-data-server' 
'libgnomeprintui' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' 
'librsvg')
-url=http://www.gnome.org;
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-metacity
-  make
-}
-
-package_gnome-python-desktop() {
-  depends=('python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 
'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 
'python-wnck' 'python-gnomeprint' 'gnome-python')
-  pkgdesc=Python bindings for the GNOME desktop environment
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make install-pkgconfigDATA DESTDIR=${pkgdir}
-}
-
-package_python-evolution() {
-  depends=('pygtk' 'evolution-data-server' 'python2-bonobo')
-  pkgdesc=Python bindings for evolution
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make -C evolution install DESTDIR=${pkgdir}
-  PYTHON=/usr/bin/python2 ./py-compile --destdir ${pkgdir} --basedir 
/usr/lib/python2.7/site-packages/gtk-2.0 evolution/__init__.py
-  install -m644 evolution/ecal.defs ${pkgdir}/usr/share/pygtk/2.0/defs/
-}
-
-package_python-gnomedesktop() {
-  depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs')
-  pkgdesc=Python bindings for gnome-desktop 2.x
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make -C gnomedesktop install DESTDIR=${pkgdir}
-}
-
-package_python-gnomekeyring() {
-  depends=('pygtk' 'libgnome-keyring')
-  pkgdesc=Python bindings for libgnome-keyring
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make -C gnomekeyring install DESTDIR=${pkgdir}
-}
-
-package_python-gtop() {
-  depends=('pygtk' 'libgtop')
-  pkgdesc=Python bindings for libgtop
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make -C gtop install DESTDIR=${pkgdir}
-}
-
-package_python-metacity() {
-  depends=('pygtk' 'metacity')
-  pkgdesc=Python bindings for metacity
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make -C metacity install DESTDIR=${pkgdir}
-}
-
-package_python-rsvg() {
-  depends=('pygtk' 'librsvg')
-  pkgdesc=Python bindings for librsvg
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make -C rsvg install DESTDIR=${pkgdir}
-  install -m755 -d ${pkgdir}/usr/share/pygtk/2.0/defs
-  install -m644 rsvg/rsvg.defs ${pkgdir}/usr/share/pygtk/2.0/defs/
-}
-
-package_python-totem-plparser() {
-  depends=('pygtk' 'totem-plparser' 'python2-gnomevfs')
-  pkgdesc=Python bindings for totem-plparser
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make -C totem install DESTDIR=${pkgdir}
-  install -m755 -d ${pkgdir}/usr/share/pygtk/2.0/defs
-  install -m644 totem/plparser.defs ${pkgdir}/usr/share/pygtk/2.0/defs/
-}
-
-package_python-wnck() {
-  depends=('pygtk' 'libwnck')
-  pkgdesc=Python bindings for libwnck
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make -C wnck install DESTDIR=${pkgdir}
-}
-
-package_python-gnomeprint() {
-  depends=('pygtk' 'libgnomeprintui')
-  pkgdesc=Python bindings for libgnomeprintui
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  for dir in gnomeprint docs/gnomeprint docs/gnomeprintui; do
-make -C ${dir} install DESTDIR=${pkgdir}
-  done
-}

Copied: gnome-python-desktop/repos/extra-i686/PKGBUILD (from rev 144400, 
gnome-python-desktop/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-12-05 14:48:25 UTC (rev 144401)
@@ -0,0 +1,100

[arch-commits] Commit in gnome-desktop-sharp/trunk (PKGBUILD)

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 09:56:39
  Author: jgc
Revision: 144402

upgpkg: gnome-desktop-sharp 2.26.0-8

Kill gnomeprint bindings

Modified:
  gnome-desktop-sharp/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-05 14:48:25 UTC (rev 144401)
+++ PKGBUILD2011-12-05 14:56:39 UTC (rev 144402)
@@ -2,13 +2,13 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgbase=gnome-desktop-sharp
-pkgname=('gnome-desktop-sharp' 'libgnome-desktop-sharp' 'gnome-print-sharp' 
'gtkhtml-sharp' 'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp')
+pkgname=('gnome-desktop-sharp' 'libgnome-desktop-sharp' 'gtkhtml-sharp' 
'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp')
 pkgver=2.26.0
-pkgrel=7
+pkgrel=8
 arch=('i686' 'x86_64')
 license=(LGPL)
 url=http://gtk-sharp.sourceforge.net;
-makedepends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libgnomeprintui' 
'libwnck' 'gtkhtml' 'gtksourceview2' 'monodoc')
+makedepends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libwnck' 
'gtkhtml' 'gtksourceview2' 'monodoc')
 options=('!libtool')
 
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
gnome-desktop-sharp-lib-target.patch)
@@ -27,7 +27,7 @@
 
 package_gnome-desktop-sharp() {
 pkgdesc=GNOME desktop bindings for C#
-depends=('libgnome-desktop-sharp' 'gnome-print-sharp' 'gtkhtml-sharp' 
'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp')
+depends=('libgnome-desktop-sharp' 'gtkhtml-sharp' 'gtksourceview2-sharp' 
'rsvg2-sharp' 'vte-sharp' 'wnck-sharp')
 }
 
 package_libgnome-desktop-sharp() {
@@ -38,14 +38,6 @@
 make -C gnomedesktop install DESTDIR=$pkgdir
 }
 
-package_gnome-print-sharp() {
-pkgdesc=Mono bindings for libgnomeprint and libgnomeprintui
-depends=('art-sharp' 'libgnomeprintui')
-
-cd $srcdir/$pkgbase-$pkgver
-make -C gnomeprint install DESTDIR=$pkgdir
-}
-
 package_gtkhtml-sharp() {
 pkgdesc=Mono bindings for gtkhtml
 depends=('gtk-sharp-2' 'gtkhtml')



[arch-commits] Commit in gnome-desktop-sharp/repos (8 files)

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 09:57:02
  Author: jgc
Revision: 144403

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

Added:
  gnome-desktop-sharp/repos/extra-i686/PKGBUILD
(from rev 144402, gnome-desktop-sharp/trunk/PKGBUILD)
  gnome-desktop-sharp/repos/extra-i686/gnome-desktop-sharp-lib-target.patch
(from rev 144402, 
gnome-desktop-sharp/trunk/gnome-desktop-sharp-lib-target.patch)
  gnome-desktop-sharp/repos/extra-x86_64/PKGBUILD
(from rev 144402, gnome-desktop-sharp/trunk/PKGBUILD)
  gnome-desktop-sharp/repos/extra-x86_64/gnome-desktop-sharp-lib-target.patch
(from rev 144402, 
gnome-desktop-sharp/trunk/gnome-desktop-sharp-lib-target.patch)
Deleted:
  gnome-desktop-sharp/repos/extra-i686/PKGBUILD
  gnome-desktop-sharp/repos/extra-i686/gnome-desktop-sharp-lib-target.patch
  gnome-desktop-sharp/repos/extra-x86_64/PKGBUILD
  gnome-desktop-sharp/repos/extra-x86_64/gnome-desktop-sharp-lib-target.patch

---+
 extra-i686/PKGBUILD   |  166 +---
 extra-i686/gnome-desktop-sharp-lib-target.patch   |   18 +-
 extra-x86_64/PKGBUILD |  166 +---
 extra-x86_64/gnome-desktop-sharp-lib-target.patch |   18 +-
 4 files changed, 176 insertions(+), 192 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-12-05 14:56:39 UTC (rev 144402)
+++ extra-i686/PKGBUILD 2011-12-05 14:57:02 UTC (rev 144403)
@@ -1,87 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgbase=gnome-desktop-sharp
-pkgname=('gnome-desktop-sharp' 'libgnome-desktop-sharp' 'gnome-print-sharp' 
'gtkhtml-sharp' 'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp')
-pkgver=2.26.0
-pkgrel=7
-arch=('i686' 'x86_64')
-license=(LGPL)
-url=http://gtk-sharp.sourceforge.net;
-makedepends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libgnomeprintui' 
'libwnck' 'gtkhtml' 'gtksourceview2' 'monodoc')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
-   gnome-desktop-sharp-lib-target.patch)
-md5sums=('4bc990900bb318b2ba0b0e7998bb47d1'
- '980cd3adf5e745f4caee0a172a51dcc3')
-
-build() {
-export MONO_SHARED_DIR=$srcdir/wapi
-mkdir -p $MONO_SHARED_DIR
-
-cd $srcdir/$pkgname-$pkgver
-patch -Np1 -i $srcdir/gnome-desktop-sharp-lib-target.patch
-./configure --prefix=/usr --sysconfdir=/etc
-make
-}
-
-package_gnome-desktop-sharp() {
-pkgdesc=GNOME desktop bindings for C#
-depends=('libgnome-desktop-sharp' 'gnome-print-sharp' 'gtkhtml-sharp' 
'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp')
-}
-
-package_libgnome-desktop-sharp() {
-pkgdesc=Mono bindings for libgnome-desktop
-depends=('gtk-sharp-2' 'gnome-desktop2')
-
-cd $srcdir/$pkgbase-$pkgver
-make -C gnomedesktop install DESTDIR=$pkgdir
-}
-
-package_gnome-print-sharp() {
-pkgdesc=Mono bindings for libgnomeprint and libgnomeprintui
-depends=('art-sharp' 'libgnomeprintui')
-
-cd $srcdir/$pkgbase-$pkgver
-make -C gnomeprint install DESTDIR=$pkgdir
-}
-
-package_gtkhtml-sharp() {
-pkgdesc=Mono bindings for gtkhtml
-depends=('gtk-sharp-2' 'gtkhtml')
-
-cd $srcdir/$pkgbase-$pkgver
-make -C gtkhtml install DESTDIR=$pkgdir
-}
-
-package_gtksourceview2-sharp() {
-pkgdesc=Mono bindings for gtksourceview2
-depends=('gtk-sharp-2' 'gtksourceview2')
-
-cd $srcdir/$pkgbase-$pkgver
-make -C gtksourceview install DESTDIR=$pkgdir
-}
-
-package_rsvg2-sharp() {
-pkgdesc=Mono bindings for librsvg
-depends=('gtk-sharp-2' 'librsvg')
-
-cd $srcdir/$pkgbase-$pkgver
-make -C rsvg install DESTDIR=$pkgdir
-}
-
-package_vte-sharp() {
-pkgdesc=Mono bindings for libvte
-depends=('gtk-sharp-2' 'vte')
-
-cd $srcdir/$pkgbase-$pkgver
-make -C vte install DESTDIR=$pkgdir
-}
-
-package_wnck-sharp() {
-pkgdesc=Mono bindings for libwnck
-depends=('gtk-sharp-2' 'libwnck')
-
-cd $srcdir/$pkgbase-$pkgver
-make -C wnck install DESTDIR=$pkgdir
-}

Copied: gnome-desktop-sharp/repos/extra-i686/PKGBUILD (from rev 144402, 
gnome-desktop-sharp/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-12-05 14:57:02 UTC (rev 144403)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgbase=gnome-desktop-sharp
+pkgname=('gnome-desktop-sharp' 'libgnome-desktop-sharp' 'gtkhtml-sharp' 
'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp')
+pkgver=2.26.0
+pkgrel=8
+arch=('i686' 'x86_64')
+license=(LGPL)
+url=http://gtk-sharp.sourceforge.net;
+makedepends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libwnck' 
'gtkhtml' 'gtksourceview2' 'monodoc')
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname

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

2011-12-05 Thread Jan de Groot
Date: Monday, December 5, 2011 @ 10:02:00
  Author: jgc
Revision: 144404

db-remove: libgnomeprintui removed by jgc

Deleted:
  libgnomeprintui/repos/extra-i686/



  1   2   3   4   5   6   7   8   9   10   >