[arch-commits] Commit in (5 files)

2011-10-21 Thread Andrea Scarpino
Date: Friday, October 21, 2011 @ 02:48:21
  Author: andrea
Revision: 141001

Add qtwebkit package

Added:
  qtwebkit/
  qtwebkit/repos/
  qtwebkit/trunk/
  qtwebkit/trunk/PKGBUILD
  qtwebkit/trunk/python2-path.patch

+
 PKGBUILD   |   36 
 python2-path.patch |   29 +
 2 files changed, 65 insertions(+)

Added: qtwebkit/trunk/PKGBUILD
===
--- qtwebkit/trunk/PKGBUILD (rev 0)
+++ qtwebkit/trunk/PKGBUILD 2011-10-21 06:48:21 UTC (rev 141001)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+
+pkgname=qtwebkit
+pkgver=2.2.0
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://trac.webkit.org/wiki/QtWebKit'
+pkgdesc='An open source web browser engine (Qt port)'
+license=('GPL3' 'LGPL')
+depends=('qt' 'gperf' 'bison' 'phonon')
+makedepends=('python2' 'mesa')
+source=(http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz;
+'python2-path.patch')
+sha1sums=('3582f3a8b593140af004a19479f5ec19693b3df7'
+  'b0ef3d5596171e3900a685df9bcfac3068ad6330')
+
+build() {
+  cd ${srcdir}/QtWebKit-${pkgver}
+
+  patch -p1 -i ${srcdir}/python2-path.patch
+
+  cd Tools/Scripts
+  ./build-webkit --qt \
+--prefix=/usr \
+--makeargs=${MAKEFLAGS} \
+--release
+}
+
+package() {
+  cd ${srcdir}/QtWebKit-${pkgver}
+  make INSTALL_ROOT=${pkgdir} -C WebKitBuild/Release install
+
+  # Fix RPATH
+  chrpath -r /usr/lib/ 
${pkgdir}/usr/lib/qt/imports/QtWebKit/libqmlwebkitplugin.so
+}


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

Added: qtwebkit/trunk/python2-path.patch
===
--- qtwebkit/trunk/python2-path.patch   (rev 0)
+++ qtwebkit/trunk/python2-path.patch   2011-10-21 06:48:21 UTC (rev 141001)
@@ -0,0 +1,29 @@
+--- QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro~   2011-10-20 
22:39:56.044519075 +
 QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro2011-10-20 
22:41:21.302047082 +
+@@ -88,5 +88,5 @@
+ retgen.output = $$JSC_GENERATED_SOURCES_DIR/RegExpJitTables.h
+ retgen.wkScript = $$PWD/create_regex_tables 
+ retgen.input = retgen.wkScript
+-retgen.commands = python $$retgen.wkScript  ${QMAKE_FILE_OUT}
++retgen.commands = python2 $$retgen.wkScript  ${QMAKE_FILE_OUT}
+ addExtraCompiler(retgen)
+--- QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri~  2011-10-20 
22:44:23.827225580 +
 QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri   2011-10-20 
22:44:38.550707819 +
+@@ -640,7 +640,7 @@
+ inspectorJSON.output = $${WC_GENERATED_SOURCES_DIR}/Inspector.idl
+ inspectorJSON.input = INSPECTOR_JSON
+ inspectorJSON.wkScript = $$PWD/inspector/generate-inspector-idl
+-inspectorJSON.commands = python $$inspectorJSON.wkScript -o 
$${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json
++inspectorJSON.commands = python2 $$inspectorJSON.wkScript -o 
$${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json
+ inspectorJSON.depends = $$PWD/inspector/generate-inspector-idl
+ inspectorJSON.wkAddOutputToSources = false
+ addExtraCompiler(inspectorJSON)
+@@ -723,7 +723,7 @@
+ entities.output = $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp
+ entities.input = HTML_ENTITIES
+ entities.wkScript = $$PWD/html/parser/create-html-entity-table
+-entities.commands = python $$entities.wkScript -o 
$${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES
++entities.commands = python2 $$entities.wkScript -o 
$${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES
+ entities.clean = ${QMAKE_FILE_OUT}
+ entities.depends = $$PWD/html/parser/create-html-entity-table
+ addExtraCompiler(entities)



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

2011-10-21 Thread Andrea Scarpino
Date: Friday, October 21, 2011 @ 02:53:43
  Author: andrea
Revision: 141002

Fix license

Modified:
  qtwebkit/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-21 06:48:21 UTC (rev 141001)
+++ PKGBUILD2011-10-21 06:53:43 UTC (rev 141002)
@@ -7,7 +7,7 @@
 arch=('i686' 'x86_64')
 url='http://trac.webkit.org/wiki/QtWebKit'
 pkgdesc='An open source web browser engine (Qt port)'
-license=('GPL3' 'LGPL')
+license=('LGPL2.1' 'GPL3')
 depends=('qt' 'gperf' 'bison' 'phonon')
 makedepends=('python2' 'mesa')
 source=(http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz;



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

2011-10-21 Thread Ionut Biru
Date: Friday, October 21, 2011 @ 04:01:16
  Author: ibiru
Revision: 141003

update to 3.2.2

Modified:
  gnome-contacts/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-21 06:53:43 UTC (rev 141002)
+++ PKGBUILD2011-10-21 08:01:16 UTC (rev 141003)
@@ -2,7 +2,7 @@
 # Maintainer: Ionut Biru ib...@archlinux.org
 
 pkgname=gnome-contacts
-pkgver=3.2.1
+pkgver=3.2.2
 pkgrel=1
 pkgdesc=Contacts Manager for GNOME
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@
 makedepends=('intltool' 'vala')
 install=
 source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('31c277a3db145c2353fffe33e613fb634e76fa5caf382e8f307a05e74a6a6eb9')
+sha256sums=('9dfd56a40f3b89512a09d9e54c18227ae4bfe9b4cff87a72f7e17f6a35367d88')
 
 build() {
   cd $srcdir/$pkgname-$pkgver



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

2011-10-21 Thread Ionut Biru
Date: Friday, October 21, 2011 @ 04:06:14
  Author: ibiru
Revision: 141004

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

Added:
  gnome-contacts/repos/extra-i686/PKGBUILD
(from rev 141003, gnome-contacts/trunk/PKGBUILD)
  gnome-contacts/repos/extra-x86_64/PKGBUILD
(from rev 141003, gnome-contacts/trunk/PKGBUILD)
Deleted:
  gnome-contacts/repos/extra-i686/PKGBUILD
  gnome-contacts/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-10-21 08:01:16 UTC (rev 141003)
+++ extra-i686/PKGBUILD 2011-10-21 08:06:14 UTC (rev 141004)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru ib...@archlinux.org
-
-pkgname=gnome-contacts
-pkgver=3.2.1
-pkgrel=1
-pkgdesc=Contacts Manager for GNOME
-arch=(i686 x86_64)
-url=http://www.gnome.org;
-license=('GPL2')
-groups=(gnome-extra)
-depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop')
-makedepends=('intltool' 'vala')
-install=
-source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('31c277a3db145c2353fffe33e613fb634e76fa5caf382e8f307a05e74a6a6eb9')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir/ install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: gnome-contacts/repos/extra-i686/PKGBUILD (from rev 141003, 
gnome-contacts/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-21 08:06:14 UTC (rev 141004)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Ionut Biru ib...@archlinux.org
+
+pkgname=gnome-contacts
+pkgver=3.2.2
+pkgrel=1
+pkgdesc=Contacts Manager for GNOME
+arch=(i686 x86_64)
+url=http://www.gnome.org;
+license=('GPL2')
+groups=(gnome-extra)
+depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop')
+makedepends=('intltool' 'vala')
+install=
+source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
+sha256sums=('9dfd56a40f3b89512a09d9e54c18227ae4bfe9b4cff87a72f7e17f6a35367d88')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir/ install
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-10-21 08:01:16 UTC (rev 141003)
+++ extra-x86_64/PKGBUILD   2011-10-21 08:06:14 UTC (rev 141004)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru ib...@archlinux.org
-
-pkgname=gnome-contacts
-pkgver=3.2.1
-pkgrel=1
-pkgdesc=Contacts Manager for GNOME
-arch=(i686 x86_64)
-url=http://www.gnome.org;
-license=('GPL2')
-groups=(gnome-extra)
-depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop')
-makedepends=('intltool' 'vala')
-install=
-source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('31c277a3db145c2353fffe33e613fb634e76fa5caf382e8f307a05e74a6a6eb9')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir/ install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: gnome-contacts/repos/extra-x86_64/PKGBUILD (from rev 141003, 
gnome-contacts/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-10-21 08:06:14 UTC (rev 141004)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Ionut Biru ib...@archlinux.org
+
+pkgname=gnome-contacts
+pkgver=3.2.2
+pkgrel=1
+pkgdesc=Contacts Manager for GNOME
+arch=(i686 x86_64)
+url=http://www.gnome.org;
+license=('GPL2')
+groups=(gnome-extra)
+depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop')
+makedepends=('intltool' 'vala')
+install=
+source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
+sha256sums=('9dfd56a40f3b89512a09d9e54c18227ae4bfe9b4cff87a72f7e17f6a35367d88')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir/ install
+}
+
+# vim:set ts=2 sw=2 et:



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

2011-10-21 Thread andyrtr
Date: Friday, October 21, 2011 @ 04:53:43
  Author: andyrtr
Revision: 141005

db-remove: java7-openjdk removed by andyrtr

Deleted:
  java7-openjdk/repos/testing-x86_64/



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

2011-10-21 Thread andyrtr
Date: Friday, October 21, 2011 @ 04:53:55
  Author: andyrtr
Revision: 141006

db-remove: java7-openjdk removed by andyrtr

Deleted:
  java7-openjdk/repos/testing-i686/



[arch-commits] Commit in libtool/repos (5 files)

2011-10-21 Thread Allan McRae
Date: Friday, October 21, 2011 @ 05:35:53
  Author: allan
Revision: 141007

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

Added:
  libtool/repos/core-i686/PKGBUILD
(from rev 141006, libtool/repos/testing-i686/PKGBUILD)
  libtool/repos/core-i686/libtool.install
(from rev 141006, libtool/repos/testing-i686/libtool.install)
Deleted:
  libtool/repos/core-i686/PKGBUILD
  libtool/repos/core-i686/libtool.install
  libtool/repos/testing-i686/

-+
 PKGBUILD|   97 +++---
 libtool.install |   40 +++---
 2 files changed, 69 insertions(+), 68 deletions(-)

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2011-10-21 08:53:55 UTC (rev 141006)
+++ core-i686/PKGBUILD  2011-10-21 09:35:53 UTC (rev 141007)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae al...@archlinux.org
-# Contributor: judd jvi...@zeroflux.org
-
-# NOTE: requires rebuilt with each new gcc version
-
-pkgname=('libtool' 'libltdl')
-pkgver=2.4
-pkgrel=5
-pkgdesc=A generic library support script
-arch=('i686' 'x86_64')
-url=http://www.gnu.org/software/libtool;
-license=('GPL')
-options=('!libtool')
-source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz)
-md5sums=('4e6144439d95d7332dc50ace6dd24c55')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make check
-}
-
-package_libtool() {
-  depends=('sh' libltdl=$pkgver 'gcc=4.6.1')
-  groups=('base-devel')
-  install=libtool.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  
-  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
- install-data-local
-  rm -rf ${pkgdir}/usr/share/libtool/libltdl/
-}
-
-package_libltdl() {
-  pkgdesc=A system independent dlopen wrapper for GNU libtool
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \
- install-ltdlincludeHEADERS install-data-local
-  rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config}
-}

Copied: libtool/repos/core-i686/PKGBUILD (from rev 141006, 
libtool/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD  (rev 0)
+++ core-i686/PKGBUILD  2011-10-21 09:35:53 UTC (rev 141007)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+# NOTE: requires rebuilt with each new gcc version
+
+pkgname=('libtool' 'libltdl')
+pkgver=2.4.2
+pkgrel=1
+pkgdesc=A generic library support script
+arch=('i686' 'x86_64')
+url=http://www.gnu.org/software/libtool;
+license=('GPL')
+options=('!libtool')
+source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
+ '1e6ba57420c82c663c85e745d11c7eed')
+
+build() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  make check
+}
+
+package_libtool() {
+  depends=('sh' libltdl=$pkgver 'tar' 'gcc=4.6.1')
+  groups=('base-devel')
+  install=libtool.install
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  
+  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
+ install-data-local
+  rm -rf ${pkgdir}/usr/share/libtool/libltdl/
+}
+
+package_libltdl() {
+  pkgdesc=A system independent dlopen wrapper for GNU libtool
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \
+ install-ltdlincludeHEADERS install-data-local
+  rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config}
+}

Deleted: core-i686/libtool.install
===
--- core-i686/libtool.install   2011-10-21 08:53:55 UTC (rev 141006)
+++ core-i686/libtool.install   2011-10-21 09:35:53 UTC (rev 141007)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(libtool.info  libtool.info-1  libtool.info-2)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-install-info $infodir/$file.gz $infodir/dir 2 /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-install-info --delete $infodir/$file.gz $infodir/dir 2 /dev/null
-  done
-}

Copied: libtool/repos/core-i686/libtool.install (from rev 141006, 
libtool/repos/testing-i686/libtool.install)
===
--- core-i686/libtool.install   (rev 0)
+++ core-i686/libtool.install   2011-10-21 09:35:53 UTC (rev 141007)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(libtool.info  libtool.info-1  libtool.info-2)
+
+post_install() {
+  [ -x 

[arch-commits] Commit in libtool/repos (5 files)

2011-10-21 Thread Allan McRae
Date: Friday, October 21, 2011 @ 05:35:54
  Author: allan
Revision: 141008

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

Added:
  libtool/repos/core-x86_64/PKGBUILD
(from rev 141006, libtool/repos/testing-x86_64/PKGBUILD)
  libtool/repos/core-x86_64/libtool.install
(from rev 141006, libtool/repos/testing-x86_64/libtool.install)
Deleted:
  libtool/repos/core-x86_64/PKGBUILD
  libtool/repos/core-x86_64/libtool.install
  libtool/repos/testing-x86_64/

-+
 PKGBUILD|   97 +++---
 libtool.install |   40 +++---
 2 files changed, 69 insertions(+), 68 deletions(-)

Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2011-10-21 09:35:53 UTC (rev 141007)
+++ core-x86_64/PKGBUILD2011-10-21 09:35:54 UTC (rev 141008)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae al...@archlinux.org
-# Contributor: judd jvi...@zeroflux.org
-
-# NOTE: requires rebuilt with each new gcc version
-
-pkgname=('libtool' 'libltdl')
-pkgver=2.4
-pkgrel=5
-pkgdesc=A generic library support script
-arch=('i686' 'x86_64')
-url=http://www.gnu.org/software/libtool;
-license=('GPL')
-options=('!libtool')
-source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz)
-md5sums=('4e6144439d95d7332dc50ace6dd24c55')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make check
-}
-
-package_libtool() {
-  depends=('sh' libltdl=$pkgver 'gcc=4.6.1')
-  groups=('base-devel')
-  install=libtool.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  
-  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
- install-data-local
-  rm -rf ${pkgdir}/usr/share/libtool/libltdl/
-}
-
-package_libltdl() {
-  pkgdesc=A system independent dlopen wrapper for GNU libtool
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \
- install-ltdlincludeHEADERS install-data-local
-  rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config}
-}

Copied: libtool/repos/core-x86_64/PKGBUILD (from rev 141006, 
libtool/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2011-10-21 09:35:54 UTC (rev 141008)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+# NOTE: requires rebuilt with each new gcc version
+
+pkgname=('libtool' 'libltdl')
+pkgver=2.4.2
+pkgrel=1
+pkgdesc=A generic library support script
+arch=('i686' 'x86_64')
+url=http://www.gnu.org/software/libtool;
+license=('GPL')
+options=('!libtool')
+source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
+ '1e6ba57420c82c663c85e745d11c7eed')
+
+build() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  make check
+}
+
+package_libtool() {
+  depends=('sh' libltdl=$pkgver 'tar' 'gcc=4.6.1')
+  groups=('base-devel')
+  install=libtool.install
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  
+  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
+ install-data-local
+  rm -rf ${pkgdir}/usr/share/libtool/libltdl/
+}
+
+package_libltdl() {
+  pkgdesc=A system independent dlopen wrapper for GNU libtool
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \
+ install-ltdlincludeHEADERS install-data-local
+  rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config}
+}

Deleted: core-x86_64/libtool.install
===
--- core-x86_64/libtool.install 2011-10-21 09:35:53 UTC (rev 141007)
+++ core-x86_64/libtool.install 2011-10-21 09:35:54 UTC (rev 141008)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(libtool.info  libtool.info-1  libtool.info-2)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-install-info $infodir/$file.gz $infodir/dir 2 /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-install-info --delete $infodir/$file.gz $infodir/dir 2 /dev/null
-  done
-}

Copied: libtool/repos/core-x86_64/libtool.install (from rev 141006, 
libtool/repos/testing-x86_64/libtool.install)
===
--- core-x86_64/libtool.install (rev 0)
+++ core-x86_64/libtool.install 2011-10-21 09:35:54 UTC (rev 141008)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(libtool.info  

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

2011-10-21 Thread Jan Steffens
Date: Friday, October 21, 2011 @ 06:24:36
  Author: heftig
Revision: 141009

typo

Modified:
  libpeas/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-21 09:35:54 UTC (rev 141008)
+++ PKGBUILD2011-10-21 10:24:36 UTC (rev 141009)
@@ -11,7 +11,7 @@
 depends=('gtk3' 'hicolor-icon-theme' 'gobject-introspection')
 makedepends=('gtk-doc' 'intltool' 'vala' 'python2-gobject' 'gjs' 'seed')
 optdepends=('gjs: gobject-based plugin engine - gjs runtime loader'
-'seed: gbject-based plugin engine - seed runtime loader')
+'seed: gobject-based plugin engine - seed runtime loader')
 options=('!libtool')
 install=libpeas.install
 
source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)



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

2011-10-21 Thread Ionut Biru
Date: Friday, October 21, 2011 @ 06:44:09
  Author: ibiru
Revision: 141010

fix crash when pdfs have images. FS#26542

Modified:
  poppler/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-21 10:24:36 UTC (rev 141009)
+++ PKGBUILD2011-10-21 10:44:09 UTC (rev 141010)
@@ -4,19 +4,24 @@
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
 pkgver=0.18.0
-pkgrel=1
+pkgrel=2
 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/;
-source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz)
-md5sums=('4cd3bf2a0a13fa8eaf00d31368915f77')
+source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
+   
fix_cairo.patch::http://cgit.freedesktop.org/poppler/poppler/patch/?id=66ab373365b8f9060ff3d117bb677520e32c7e8e)
+md5sums=('4cd3bf2a0a13fa8eaf00d31368915f77'
+ '8f4a296fdd98446858d5ea74d7c496ab')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
   sed -i -e '/AC_PATH_XTRA/d' configure.ac
   autoreconf
+
+  patch -Np1 -i ${srcdir}/fix_cairo.patch
+
   ./configure --prefix=/usr --sysconfdir=/etc \
   --localstatedir=/var --disable-static \
   --enable-cairo-output \



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

2011-10-21 Thread Ionut Biru
Date: Friday, October 21, 2011 @ 06:45:03
  Author: ibiru
Revision: 141011

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

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

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

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-10-21 10:44:09 UTC (rev 141010)
+++ extra-i686/PKGBUILD 2011-10-21 10:45:03 UTC (rev 141011)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgbase=poppler
-pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.18.0
-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/;
-source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz)
-md5sums=('4cd3bf2a0a13fa8eaf00d31368915f77')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
-  ./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
-}
-
-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 141010, 
poppler/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-21 10:45:03 UTC (rev 141011)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgbase=poppler
+pkgname=('poppler' 'poppler-glib' 'poppler-qt')
+pkgver=0.18.0
+pkgrel=2
+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/;
+source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
+   
fix_cairo.patch::http://cgit.freedesktop.org/poppler/poppler/patch/?id=66ab373365b8f9060ff3d117bb677520e32c7e8e)
+md5sums=('4cd3bf2a0a13fa8eaf00d31368915f77'
+ '8f4a296fdd98446858d5ea74d7c496ab')
+
+build() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  sed -i -e '/AC_PATH_XTRA/d' configure.ac
+  autoreconf
+
+  patch -Np1 -i ${srcdir}/fix_cairo.patch
+
+  ./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
+}
+
+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 

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

2011-10-21 Thread Dan McGee
Date: Friday, October 21, 2011 @ 10:35:28
  Author: dan
Revision: 141012

Fix FS#26543, curl in deps twice

Modified:
  pacman/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-21 10:45:03 UTC (rev 141011)
+++ PKGBUILD2011-10-21 14:35:28 UTC (rev 141012)
@@ -1,3 +1,4 @@
+# vim: set ts=2 sw=2 et:
 # $Id$
 # Maintainer: Dan McGee d...@archlinux.org
 # Maintainer: Dave Reisner d...@archlinux.org
@@ -12,8 +13,7 @@
 groups=('base')
 depends=('bash' 'glibc=2.14' 'libarchive=2.8.4' 'curl=7.19.4'
  'gpgme' 'pacman-mirrorlist')
-optdepends=('fakeroot: for makepkg usage as normal user'
-'curl: for rankmirrors usage')
+optdepends=('fakeroot: for makepkg usage as normal user')
 backup=(etc/pacman.conf etc/makepkg.conf)
 install=pacman.install
 options=(!libtool)
@@ -70,5 +70,3 @@
   mkdir -p $pkgdir/usr/share/zsh/site-functions/
   install -m644 contrib/zsh_completion 
$pkgdir/usr/share/zsh/site-functions/_pacman
 }
-
-# vim: set ts=2 sw=2 et:



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

2011-10-21 Thread Jan Steffens
Date: Friday, October 21, 2011 @ 11:47:39
  Author: heftig
Revision: 141013

0.12.6

Modified:
  tracker/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-21 14:35:28 UTC (rev 141012)
+++ PKGBUILD2011-10-21 15:47:39 UTC (rev 141013)
@@ -5,7 +5,7 @@
 
 pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
-pkgver=0.12.5
+pkgver=0.12.6
 _tver=${pkgver%.*}
 pkgrel=1
 pkgdesc=All-in-one indexer, search tool and metadata database
@@ -19,7 +19,7 @@
 url=http://www.gnome.org;
 options=('!libtool' '!emptydirs')
 
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('5fddbda9df10fada07f335751370e46b5e2b5ef971d4da8efd47ea795d7b5c5b')
+sha256sums=('4dc5fe0fe97d4095653935969b12c15888e620e5b6ef135331ce7f55af3654b8')
 
 build() {
   cd $srcdir/$pkgbase-$pkgver



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

2011-10-21 Thread Jan Steffens
Date: Friday, October 21, 2011 @ 11:49:31
  Author: heftig
Revision: 141014

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

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

--+
 extra-i686/PKGBUILD  |  164 -
 extra-i686/tracker.install   |   26 +++---
 extra-x86_64/PKGBUILD|  164 -
 extra-x86_64/tracker.install |   26 +++---
 4 files changed, 190 insertions(+), 190 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-10-21 15:47:39 UTC (rev 141013)
+++ extra-i686/PKGBUILD 2011-10-21 15:49:31 UTC (rev 141014)
@@ -1,82 +0,0 @@
-# $Id$
-# Maintainer: Jan heftig Steffens jan.steff...@gmail.com
-# Contributor: Sergej Pupykin pupykin.s+a...@gmail.com
-# Contributor: Alexander Fehr pizzapunk gmail com
-
-pkgbase=tracker
-pkgname=(tracker libtracker-sparql)
-pkgver=0.12.5
-_tver=${pkgver%.*}
-pkgrel=1
-pkgdesc=All-in-one indexer, search tool and metadata database
-arch=('i686' 'x86_64')
-license=('GPL')
-makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
- 'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3'
- 'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection'
- 'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser'
- 'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala')
-url=http://www.gnome.org;
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('5fddbda9df10fada07f335751370e46b5e2b5ef971d4da8efd47ea795d7b5c5b')
-
-build() {
-  cd $srcdir/$pkgbase-$pkgver
-
-  ./configure \
---prefix=/usr \
---sysconfdir=/etc \
---localstatedir=/var \
---libexecdir=/usr/lib/tracker \
---disable-unit-tests \
---enable-libflac \
---enable-libvorbis
-
-  make
-}
-
-package_tracker() {
-  depends=(libtracker-sparql=$pkgver-$pkgrel 'libgee' 'libgnome-keyring'
-   'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca'
-   'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
-  optdepends=('giflib: extractor for GIF data'
-  'gstreamer0.10-base: video extractor'
-  'totem-plparser: playlist support'
-  'nautilus: nautilus-extension'
-  'libvorbis: Vorbis metadata extractor'
-  'flac: FLAC metadata extractor'
-  'taglib: writeback for audio files'
-  'gnome-panel: tracker-search-bar')
-  groups=('gnome-extra')
-  install=tracker.install
-
-  cd $srcdir/$pkgbase-$pkgver
-  make DESTDIR=$pkgdir install
-
-### Split libtracker-sparql
-
-  mkdir -p $srcdir/sparql/usr/{include,lib}/tracker-$_tver
-  mkdir -p $srcdir/sparql/usr/lib/{girepository-1.0,pkgconfig}
-  mkdir -p $srcdir/sparql/usr/share/{gir-1.0,vala/vapi}
-
-  mv $pkgdir/usr/lib/libtracker-sparql-* $srcdir/sparql/usr/lib
-
-  mv $pkgdir/usr/lib/tracker-$_tver/*.so* \
-$srcdir/sparql/usr/lib/tracker-$_tver
-
-  mv $pkgdir/usr/share/vala/vapi/tracker-sparql-* \
-$srcdir/sparql/usr/share/vala/vapi
-
-  mv {$pkgdir,$srcdir/sparql}/usr/include/tracker-$_tver/libtracker-sparql
-  mv 
{$pkgdir,$srcdir/sparql}/usr/lib/girepository-1.0/Tracker-$_tver.typelib
-  mv {$pkgdir,$srcdir/sparql}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc
-  mv {$pkgdir,$srcdir/sparql}/usr/share/gir-1.0/Tracker-$_tver.gir
-}
-
-package_libtracker-sparql() {
-  pkgdesc=$pkgdesc (SPARQL library)
-  depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux')
-
-  mv $srcdir/sparql/* $pkgdir
-}

Copied: tracker/repos/extra-i686/PKGBUILD (from rev 141013, 
tracker/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-21 15:49:31 UTC (rev 141014)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Jan heftig Steffens jan.steff...@gmail.com
+# Contributor: Sergej Pupykin pupykin.s+a...@gmail.com
+# Contributor: Alexander Fehr pizzapunk gmail com
+
+pkgbase=tracker
+pkgname=(tracker libtracker-sparql)
+pkgver=0.12.6
+_tver=${pkgver%.*}
+pkgrel=1
+pkgdesc=All-in-one indexer, search tool and metadata database
+arch=('i686' 'x86_64')
+license=('GPL')
+makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
+ 'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 

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

2011-10-21 Thread Andrea Scarpino
Date: Friday, October 21, 2011 @ 14:47:37
  Author: andrea
Revision: 141015

Add chrpath to makedepends

Modified:
  qtwebkit/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-21 15:49:31 UTC (rev 141014)
+++ PKGBUILD2011-10-21 18:47:37 UTC (rev 141015)
@@ -9,7 +9,7 @@
 pkgdesc='An open source web browser engine (Qt port)'
 license=('LGPL2.1' 'GPL3')
 depends=('qt' 'gperf' 'bison' 'phonon')
-makedepends=('python2' 'mesa')
+makedepends=('python2' 'mesa' 'chrpath')
 source=(http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz;
 'python2-path.patch')
 sha1sums=('3582f3a8b593140af004a19479f5ec19693b3df7'



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

2011-10-21 Thread Andrea Scarpino
Date: Friday, October 21, 2011 @ 15:25:52
  Author: andrea
Revision: 141016

upgpkg: qt 4.8.0rc1-1

Modified:
  qt/trunk/PKGBUILD
  qt/trunk/qt.install

+
 PKGBUILD   |2 +-
 qt.install |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-21 18:47:37 UTC (rev 141015)
+++ PKGBUILD2011-10-21 19:25:52 UTC (rev 141016)
@@ -66,7 +66,7 @@
 }
 
 package_qt() {
-pkgdesc='A cross-platform application and UI framework (GUI libraries)'
+pkgdesc='A cross-platform application and UI framework'
 depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 
'dbus'
   'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
   'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')

Modified: qt.install
===
--- qt.install  2011-10-21 18:47:37 UTC (rev 141015)
+++ qt.install  2011-10-21 19:25:52 UTC (rev 141016)
@@ -1,12 +1,12 @@
 post_install() {
-   xdg-icon-resource forceupdate --theme hicolor  /dev/null
+xdg-icon-resource forceupdate --theme hicolor  /dev/null
 update-desktop-database -q
 }
 
 post_upgrade() {
-   post_install
+post_install
 }
 
 post_remove() {
-   post_install
+post_install
 }



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

2011-10-21 Thread Andrea Scarpino
Date: Friday, October 21, 2011 @ 15:27:55
  Author: andrea
Revision: 141017

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

Added:
  qt/repos/staging-i686/
  qt/repos/staging-i686/PKGBUILD
(from rev 141016, qt/trunk/PKGBUILD)
  qt/repos/staging-i686/assistant.desktop
(from rev 141016, qt/trunk/assistant.desktop)
  qt/repos/staging-i686/designer.desktop
(from rev 141016, qt/trunk/designer.desktop)
  qt/repos/staging-i686/linguist.desktop
(from rev 141016, qt/trunk/linguist.desktop)
  qt/repos/staging-i686/qt.install
(from rev 141016, qt/trunk/qt.install)
  qt/repos/staging-i686/qtconfig.desktop
(from rev 141016, qt/trunk/qtconfig.desktop)
  qt/repos/staging-x86_64/
  qt/repos/staging-x86_64/PKGBUILD
(from rev 141016, qt/trunk/PKGBUILD)
  qt/repos/staging-x86_64/assistant.desktop
(from rev 141016, qt/trunk/assistant.desktop)
  qt/repos/staging-x86_64/designer.desktop
(from rev 141016, qt/trunk/designer.desktop)
  qt/repos/staging-x86_64/linguist.desktop
(from rev 141016, qt/trunk/linguist.desktop)
  qt/repos/staging-x86_64/qt.install
(from rev 141016, qt/trunk/qt.install)
  qt/repos/staging-x86_64/qtconfig.desktop
(from rev 141016, qt/trunk/qtconfig.desktop)

--+
 staging-i686/PKGBUILD|  128 +
 staging-i686/assistant.desktop   |9 ++
 staging-i686/designer.desktop|   11 +++
 staging-i686/linguist.desktop|   10 ++
 staging-i686/qt.install  |   12 +++
 staging-i686/qtconfig.desktop|   10 ++
 staging-x86_64/PKGBUILD  |  128 +
 staging-x86_64/assistant.desktop |9 ++
 staging-x86_64/designer.desktop  |   11 +++
 staging-x86_64/linguist.desktop  |   10 ++
 staging-x86_64/qt.install|   12 +++
 staging-x86_64/qtconfig.desktop  |   10 ++
 12 files changed, 360 insertions(+)

Copied: qt/repos/staging-i686/PKGBUILD (from rev 141016, qt/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-10-21 19:27:55 UTC (rev 141017)
@@ -0,0 +1,128 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Pierre Schmitz pie...@archlinux.de
+
+pkgbase=qt
+pkgname=('qt' 'qt-private-headers')
+pkgver=4.8.0rc1
+_pkgver=4.8.0-rc1
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL')
+makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 
'dbus'
+'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
+'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 
'postgresql-libs'
+'mysql' 'unixodbc' 'cups' 'gtk2')
+options=('!libtool')
+_pkgfqn=${pkgbase}-everywhere-opensource-src-4.8.0
+source=(http://get.qt.nokia.com/qt/source/${pkgbase}-everywhere-opensource-src-${_pkgver}.tar.gz;
+'assistant.desktop' 'designer.desktop' 'linguist.desktop'
+'qtconfig.desktop')
+md5sums=('3e003b671384df8d1cb77dd6cc804934'
+ 'fc211414130ab2764132e7370f8e5caa'
+ '85179f5e0437514f8639957e1d8baf62'
+ 'f11852b97583610f3dbb669ebc3e21bc'
+ '6b771c8a81dd90b45e8a79afa0e5bbfd')
+
+build() {
+  cd ${srcdir}/${_pkgfqn}
+
+  export QT4DIR=${srcdir}/${_pkgfqn}
+  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+
+  sed -i s|-O2|${CXXFLAGS}| mkspecs/common/g++-base.conf
+  sed -i /^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g 
mkspecs/common/gcc-base-unix.conf
+  sed -i /^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g mkspecs/common/gcc-base.conf
+
+  ./configure -confirm-license -opensource \
+-prefix /usr \
+-docdir /usr/share/doc/qt \
+-plugindir /usr/lib/qt/plugins \
+-importdir /usr/lib/qt/imports \
+-datadir /usr/share/qt \
+-translationdir /usr/share/qt/translations \
+-sysconfdir /etc \
+-examplesdir /usr/share/doc/qt/examples \
+-demosdir /usr/share/doc/qt/demos \
+-plugin-sql-{psql,mysql,sqlite,odbc} \
+-system-sqlite \
+-no-phonon \
+-no-phonon-backend \
+-no-webkit \
+-no-declarative-debug \
+-graphicssystem raster \
+-openssl-linked \
+-nomake demos \
+-nomake examples \
+-nomake docs \
+-silent \
+-no-rpath \
+-optimized-qmake \
+-reduce-relocations \
+-dbus-linked \
+-no-openvg
+  make
+}
+
+package_qt() {
+pkgdesc='A cross-platform application and UI framework'
+depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 
'dbus'
+  'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
+  'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
+optdepends=('postgresql-libs: PostgreSQL driver'
+'libmysqlclient: MySQL driver'
+'unixodbc: ODBC driver'
+'libxinerama: Xinerama support'
+'libxcursor: Xcursor support'
+'libxfixes: Xfixes support')
+   

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

2011-10-21 Thread Andrea Scarpino
Date: Friday, October 21, 2011 @ 15:29:38
  Author: andrea
Revision: 141018

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

Added:
  qtwebkit/repos/staging-i686/
  qtwebkit/repos/staging-i686/PKGBUILD
(from rev 141017, qtwebkit/trunk/PKGBUILD)
  qtwebkit/repos/staging-i686/python2-path.patch
(from rev 141017, qtwebkit/trunk/python2-path.patch)
  qtwebkit/repos/staging-x86_64/
  qtwebkit/repos/staging-x86_64/PKGBUILD
(from rev 141017, qtwebkit/trunk/PKGBUILD)
  qtwebkit/repos/staging-x86_64/python2-path.patch
(from rev 141017, qtwebkit/trunk/python2-path.patch)

---+
 staging-i686/PKGBUILD |   36 
 staging-i686/python2-path.patch   |   29 +
 staging-x86_64/PKGBUILD   |   36 
 staging-x86_64/python2-path.patch |   29 +
 4 files changed, 130 insertions(+)

Copied: qtwebkit/repos/staging-i686/PKGBUILD (from rev 141017, 
qtwebkit/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-10-21 19:29:38 UTC (rev 141018)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+
+pkgname=qtwebkit
+pkgver=2.2.0
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://trac.webkit.org/wiki/QtWebKit'
+pkgdesc='An open source web browser engine (Qt port)'
+license=('LGPL2.1' 'GPL3')
+depends=('qt' 'gperf' 'bison' 'phonon')
+makedepends=('python2' 'mesa' 'chrpath')
+source=(http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz;
+'python2-path.patch')
+sha1sums=('3582f3a8b593140af004a19479f5ec19693b3df7'
+  'b0ef3d5596171e3900a685df9bcfac3068ad6330')
+
+build() {
+  cd ${srcdir}/QtWebKit-${pkgver}
+
+  patch -p1 -i ${srcdir}/python2-path.patch
+
+  cd Tools/Scripts
+  ./build-webkit --qt \
+--prefix=/usr \
+--makeargs=${MAKEFLAGS} \
+--release
+}
+
+package() {
+  cd ${srcdir}/QtWebKit-${pkgver}
+  make INSTALL_ROOT=${pkgdir} -C WebKitBuild/Release install
+
+  # Fix RPATH
+  chrpath -r /usr/lib/ 
${pkgdir}/usr/lib/qt/imports/QtWebKit/libqmlwebkitplugin.so
+}

Copied: qtwebkit/repos/staging-i686/python2-path.patch (from rev 141017, 
qtwebkit/trunk/python2-path.patch)
===
--- staging-i686/python2-path.patch (rev 0)
+++ staging-i686/python2-path.patch 2011-10-21 19:29:38 UTC (rev 141018)
@@ -0,0 +1,29 @@
+--- QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro~   2011-10-20 
22:39:56.044519075 +
 QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro2011-10-20 
22:41:21.302047082 +
+@@ -88,5 +88,5 @@
+ retgen.output = $$JSC_GENERATED_SOURCES_DIR/RegExpJitTables.h
+ retgen.wkScript = $$PWD/create_regex_tables 
+ retgen.input = retgen.wkScript
+-retgen.commands = python $$retgen.wkScript  ${QMAKE_FILE_OUT}
++retgen.commands = python2 $$retgen.wkScript  ${QMAKE_FILE_OUT}
+ addExtraCompiler(retgen)
+--- QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri~  2011-10-20 
22:44:23.827225580 +
 QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri   2011-10-20 
22:44:38.550707819 +
+@@ -640,7 +640,7 @@
+ inspectorJSON.output = $${WC_GENERATED_SOURCES_DIR}/Inspector.idl
+ inspectorJSON.input = INSPECTOR_JSON
+ inspectorJSON.wkScript = $$PWD/inspector/generate-inspector-idl
+-inspectorJSON.commands = python $$inspectorJSON.wkScript -o 
$${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json
++inspectorJSON.commands = python2 $$inspectorJSON.wkScript -o 
$${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json
+ inspectorJSON.depends = $$PWD/inspector/generate-inspector-idl
+ inspectorJSON.wkAddOutputToSources = false
+ addExtraCompiler(inspectorJSON)
+@@ -723,7 +723,7 @@
+ entities.output = $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp
+ entities.input = HTML_ENTITIES
+ entities.wkScript = $$PWD/html/parser/create-html-entity-table
+-entities.commands = python $$entities.wkScript -o 
$${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES
++entities.commands = python2 $$entities.wkScript -o 
$${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES
+ entities.clean = ${QMAKE_FILE_OUT}
+ entities.depends = $$PWD/html/parser/create-html-entity-table
+ addExtraCompiler(entities)

Copied: qtwebkit/repos/staging-x86_64/PKGBUILD (from rev 141017, 
qtwebkit/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-10-21 19:29:38 UTC (rev 141018)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+
+pkgname=qtwebkit
+pkgver=2.2.0
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://trac.webkit.org/wiki/QtWebKit'
+pkgdesc='An open source web browser 

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

2011-10-21 Thread Ray Rashif
Date: Friday, October 21, 2011 @ 16:02:46
  Author: schiv
Revision: 141019

upgpkg: lame 3.99-1

upstream release

Modified:
  lame/trunk/PKGBUILD
Deleted:
  lame/trunk/03_lame-ffmpeg.diff
  lame/trunk/shared-frontend.patch

---+
 03_lame-ffmpeg.diff   |   72 
 PKGBUILD  |   24 ++--
 shared-frontend.patch |   23 ---
 3 files changed, 16 insertions(+), 103 deletions(-)

Deleted: 03_lame-ffmpeg.diff
===
--- 03_lame-ffmpeg.diff 2011-10-21 19:29:38 UTC (rev 141018)
+++ 03_lame-ffmpeg.diff 2011-10-21 20:02:46 UTC (rev 141019)
@@ -1,72 +0,0 @@
 lame-3.98.2.orig/libmp3lame/lame.c 2009-07-07 10:52:01.0 +0200
-+++ lame-3.98.2/libmp3lame/lame.c  2009-07-07 10:52:03.0 +0200
-@@ -1602,6 +1602,13 @@
- /* update mfbuf[] counters */
- gfc-mf_size += n_out;
- assert(gfc-mf_size = MFSIZE);
-+
-+/* lame_encode_flush may have set gfc-mf_sample_to_encode to 0
-+ * so we have to reinitialize it here when that happened.
-+ */
-+if (gfc-mf_samples_to_encode  1) {
-+gfc-mf_samples_to_encode = ENCDELAY + POSTDELAY;
-+}
- gfc-mf_samples_to_encode += n_out;
- 
- 
-@@ -1931,6 +1938,10 @@
- int frames_left;
- int samples_to_encode = gfc-mf_samples_to_encode;
- 
-+/* Was flush already called? */
-+if (gfc-mf_samples_to_encode  1) {
-+return 0;
-+}
- memset(buffer, 0, sizeof(buffer));
- mp3count = 0;
- 
-@@ -1942,7 +1953,9 @@
- end_padding += pad_out_samples;
- 
- frames_left = (samples_to_encode + pad_out_samples) / gfp-framesize;
--while (frames_left  0) {
-+
-+/* send in a frame of 0 padding until all internal sample buffers are 
flushed */
-+while (frames_left  0  imp3 = 0) {
- int frame_num = gfp-frameNum;
- 
- mp3buffer_size_remaining = mp3buffer_size - mp3count;
-@@ -1951,22 +1964,23 @@
- if (mp3buffer_size == 0)
- mp3buffer_size_remaining = 0;
- 
--/* send in a frame of 0 padding until all internal sample buffers
-- * are flushed
-- */
- imp3 = lame_encode_buffer(gfp, buffer[0], buffer[1], 32,
-   mp3buffer, mp3buffer_size_remaining);
- 
--if (frame_num != gfp-frameNum) {
----frames_left;
--}
--if (imp3  0) {
--/* some type of fatal error */
--return imp3;
--}
- mp3buffer += imp3;
- mp3count += imp3;
-+frames_left -= (frame_num != gfp-frameNum) ? 1 : 0;
- }
-+/* Set gfc-mf_samples_to_encode to 0, so we may detect
-+ * and break loops calling it more than once in a row.
-+ */
-+gfc-mf_samples_to_encode = 0;
-+
-+if (imp3  0) {
-+/* some type of fatal error */
-+return imp3;
-+}
-+
- mp3buffer_size_remaining = mp3buffer_size - mp3count;
- /* if user specifed buffer size = 0, dont check size */
- if (mp3buffer_size == 0)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-21 19:29:38 UTC (rev 141018)
+++ PKGBUILD2011-10-21 20:02:46 UTC (rev 141019)
@@ -1,26 +1,34 @@
 # $Id$
-# Maintainer:  Ionut Biru ib...@archlinux.org
+# Maintainer: Ray Rashif sc...@archlinux.org
+# Contributor: Ionut Biru ib...@archlinux.org
 # Contributor: Hugo Doria h...@archlinux.org
 
 pkgname=lame
-pkgver=3.98.4
+pkgver=3.99
 pkgrel=1
-pkgdesc=An MP3 encoder and graphical frame analyzer
+pkgdesc=A high quality MPEG Audio Layer III (MP3) encoder
 arch=('i686' 'x86_64')
 url=http://lame.sourceforge.net/;
 depends=('ncurses')
 makedepends=('nasm')
 license=('LGPL')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8e9866ad6b570c6c95c8cba48060473f')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz;)
+md5sums=('7abacd1d0a65a6375786015626db')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd $srcdir/$pkgname-$pkgver
 
   ./configure --prefix=/usr \
   --enable-nasm \
   --enable-shared
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make
 }
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR=$pkgdir install
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: shared-frontend.patch
===
--- shared-frontend.patch   2011-10-21 19:29:38 UTC (rev 141018)
+++ shared-frontend.patch   2011-10-21 20:02:46 UTC (rev 141019)
@@ -1,23 +0,0 @@
 lame-3.96.1.orig/frontend/Makefile.am  2004-01-21 01:41:36.0 
-0800
-+++ lame-3.96.1/frontend/Makefile.am   2004-10-03 16:39:12.415901779 -0700
-@@ -50,7 +50,7 @@
- endif
- 
- CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@
--LDFLAGS = 

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

2011-10-21 Thread Ray Rashif
Date: Friday, October 21, 2011 @ 16:21:58
  Author: schiv
Revision: 141020

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

Added:
  lame/repos/extra-i686/PKGBUILD
(from rev 141019, lame/trunk/PKGBUILD)
  lame/repos/extra-x86_64/PKGBUILD
(from rev 141019, lame/trunk/PKGBUILD)
Deleted:
  lame/repos/extra-i686/03_lame-ffmpeg.diff
  lame/repos/extra-i686/PKGBUILD
  lame/repos/extra-i686/shared-frontend.patch
  lame/repos/extra-x86_64/03_lame-ffmpeg.diff
  lame/repos/extra-x86_64/PKGBUILD
  lame/repos/extra-x86_64/shared-frontend.patch

+
 extra-i686/03_lame-ffmpeg.diff |   72 ---
 extra-i686/PKGBUILD|   60 -
 extra-i686/shared-frontend.patch   |   23 ---
 extra-x86_64/03_lame-ffmpeg.diff   |   72 ---
 extra-x86_64/PKGBUILD  |   60 -
 extra-x86_64/shared-frontend.patch |   23 ---
 6 files changed, 68 insertions(+), 242 deletions(-)

Deleted: extra-i686/03_lame-ffmpeg.diff
===
--- extra-i686/03_lame-ffmpeg.diff  2011-10-21 20:02:46 UTC (rev 141019)
+++ extra-i686/03_lame-ffmpeg.diff  2011-10-21 20:21:58 UTC (rev 141020)
@@ -1,72 +0,0 @@
 lame-3.98.2.orig/libmp3lame/lame.c 2009-07-07 10:52:01.0 +0200
-+++ lame-3.98.2/libmp3lame/lame.c  2009-07-07 10:52:03.0 +0200
-@@ -1602,6 +1602,13 @@
- /* update mfbuf[] counters */
- gfc-mf_size += n_out;
- assert(gfc-mf_size = MFSIZE);
-+
-+/* lame_encode_flush may have set gfc-mf_sample_to_encode to 0
-+ * so we have to reinitialize it here when that happened.
-+ */
-+if (gfc-mf_samples_to_encode  1) {
-+gfc-mf_samples_to_encode = ENCDELAY + POSTDELAY;
-+}
- gfc-mf_samples_to_encode += n_out;
- 
- 
-@@ -1931,6 +1938,10 @@
- int frames_left;
- int samples_to_encode = gfc-mf_samples_to_encode;
- 
-+/* Was flush already called? */
-+if (gfc-mf_samples_to_encode  1) {
-+return 0;
-+}
- memset(buffer, 0, sizeof(buffer));
- mp3count = 0;
- 
-@@ -1942,7 +1953,9 @@
- end_padding += pad_out_samples;
- 
- frames_left = (samples_to_encode + pad_out_samples) / gfp-framesize;
--while (frames_left  0) {
-+
-+/* send in a frame of 0 padding until all internal sample buffers are 
flushed */
-+while (frames_left  0  imp3 = 0) {
- int frame_num = gfp-frameNum;
- 
- mp3buffer_size_remaining = mp3buffer_size - mp3count;
-@@ -1951,22 +1964,23 @@
- if (mp3buffer_size == 0)
- mp3buffer_size_remaining = 0;
- 
--/* send in a frame of 0 padding until all internal sample buffers
-- * are flushed
-- */
- imp3 = lame_encode_buffer(gfp, buffer[0], buffer[1], 32,
-   mp3buffer, mp3buffer_size_remaining);
- 
--if (frame_num != gfp-frameNum) {
----frames_left;
--}
--if (imp3  0) {
--/* some type of fatal error */
--return imp3;
--}
- mp3buffer += imp3;
- mp3count += imp3;
-+frames_left -= (frame_num != gfp-frameNum) ? 1 : 0;
- }
-+/* Set gfc-mf_samples_to_encode to 0, so we may detect
-+ * and break loops calling it more than once in a row.
-+ */
-+gfc-mf_samples_to_encode = 0;
-+
-+if (imp3  0) {
-+/* some type of fatal error */
-+return imp3;
-+}
-+
- mp3buffer_size_remaining = mp3buffer_size - mp3count;
- /* if user specifed buffer size = 0, dont check size */
- if (mp3buffer_size == 0)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-10-21 20:02:46 UTC (rev 141019)
+++ extra-i686/PKGBUILD 2011-10-21 20:21:58 UTC (rev 141020)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer:  Ionut Biru ib...@archlinux.org
-# Contributor: Hugo Doria h...@archlinux.org
-
-pkgname=lame
-pkgver=3.98.4
-pkgrel=1
-pkgdesc=An MP3 encoder and graphical frame analyzer
-arch=('i686' 'x86_64')
-url=http://lame.sourceforge.net/;
-depends=('ncurses')
-makedepends=('nasm')
-license=('LGPL')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8e9866ad6b570c6c95c8cba48060473f')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr \
-  --enable-nasm \
-  --enable-shared
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-}

Copied: lame/repos/extra-i686/PKGBUILD (from rev 141019, lame/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-21 20:21:58 UTC (rev 141020)
@@ -0,0 +1,34 @@
+# $Id$
+# 

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

2011-10-21 Thread Tom Gundersen
Date: Friday, October 21, 2011 @ 17:39:16
  Author: tomegun
Revision: 141021

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

Added:
  util-linux/repos/core-i686/PKGBUILD
(from rev 141020, util-linux/repos/testing-i686/PKGBUILD)
Deleted:
  util-linux/repos/core-i686/PKGBUILD
  util-linux/repos/core-i686/agetty-typo.patch
  util-linux/repos/core-i686/dmesg-non-printk.patch
  util-linux/repos/core-i686/dmesg-space.patch
  util-linux/repos/core-i686/dont-close-0.patch
  util-linux/repos/core-i686/fix-remount.patch
  util-linux/repos/core-i686/write-freopen.patch
  util-linux/repos/testing-i686/

+
 PKGBUILD   |  106 +++
 agetty-typo.patch  |   27 ---
 dmesg-non-printk.patch |   69 --
 dmesg-space.patch  |   31 -
 dont-close-0.patch |   32 --
 fix-remount.patch  |   37 
 write-freopen.patch|   27 ---
 7 files changed, 45 insertions(+), 284 deletions(-)

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2011-10-21 20:21:58 UTC (rev 141020)
+++ core-i686/PKGBUILD  2011-10-21 21:39:16 UTC (rev 141021)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen t...@jklm.no
-# Contributor: judd jvi...@zeroflux.org
-
-pkgname=util-linux
-pkgver=2.20
-pkgrel=3
-pkgdesc=Miscellaneous system utilities for Linux
-url=http://userweb.kernel.org/~kzak/util-linux-ng/;
-arch=('i686' 'x86_64')
-groups=('base')
-depends=('filesystem')
-replaces=('linux32' 'util-linux-ng')
-conflicts=('linux32' 'util-linux-ng' 'e2fsprogs1.41.8-2')
-provides=('linux32' util-linux-ng=${pkgver})
-license=('GPL2')
-options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2
-   agetty-typo.patch
-   write-freopen.patch
-   dmesg-non-printk.patch
-   dmesg-space.patch
-   dont-close-0.patch
-   fix-remount.patch)
-optdepends=('perl: for chkdupexe support')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # patches from master
-  for patch in agetty-typo.patch write-freopen.patch dmesg-non-printk.patch 
dmesg-space.patch dont-close-0.patch fix-remount.patch; do
-patch -Np1 -i ${srcdir}/${patch}
-  done
-
-  # hardware clock
-  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
-
-  ./configure --enable-arch\
-  --enable-write\
-  --enable-raw\
-  --disable-wall\
-  --enable-partx\
-  --enable-libmount-mount
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  install -dm755 ${pkgdir}/var/lib/hwclock
-
-  make DESTDIR=${pkgdir} install
-}
-md5sums=('4dcacdbdafa116635e52b977d9d0e879'
- '13838c6dd8df686e0f01ad0f236d2690'
- '465817ff8f7c08411c8011ee91b50318'
- 'f3ca75a1a22a2a739c5c22d92dc07ab0'
- 'd9768f0b42d36d72c02ac7797b922ba1'
- '37eae52af90c214dda73874c701fa246'
- '344c780b9e08826dd8befe4271b41ed3')

Copied: util-linux/repos/core-i686/PKGBUILD (from rev 141020, 
util-linux/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD  (rev 0)
+++ core-i686/PKGBUILD  2011-10-21 21:39:16 UTC (rev 141021)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Tom Gundersen t...@jklm.no
+# Contributor: judd jvi...@zeroflux.org
+
+pkgname=util-linux
+pkgver=2.20.1
+pkgrel=1
+pkgdesc=Miscellaneous system utilities for Linux
+url=http://userweb.kernel.org/~kzak/util-linux-ng/;
+arch=('i686' 'x86_64')
+groups=('base')
+depends=('filesystem')
+replaces=('linux32' 'util-linux-ng')
+conflicts=('linux32' 'util-linux-ng' 'e2fsprogs1.41.8-2')
+provides=('linux32' util-linux-ng=${pkgver})
+license=('GPL2')
+options=('!libtool')
+#source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+source=(ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2)
+optdepends=('perl: for chkdupexe support')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # hardware clock
+  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
+
+  ./configure --enable-arch\
+  --enable-write\
+  --enable-raw\
+  --disable-wall\
+  --enable-partx\
+  --enable-libmount-mount
+
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  install -dm755 ${pkgdir}/var/lib/hwclock
+
+  make DESTDIR=${pkgdir} install
+}
+md5sums=('079b37517fd4e002a2e6e992e8b4e361')

Deleted: core-i686/agetty-typo.patch
===
--- core-i686/agetty-typo.patch 2011-10-21 20:21:58 UTC (rev 141020)
+++ core-i686/agetty-typo.patch 2011-10-21 21:39:16 UTC (rev 141021)
@@ -1,27 +0,0 @@
-From 89aed1c950376d828e1e0ddef94909a028e0517d Mon Sep 17 00:00:00 2001

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

2011-10-21 Thread Tom Gundersen
Date: Friday, October 21, 2011 @ 17:39:17
  Author: tomegun
Revision: 141022

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

Added:
  util-linux/repos/core-x86_64/PKGBUILD
(from rev 141020, util-linux/repos/testing-x86_64/PKGBUILD)
Deleted:
  util-linux/repos/core-x86_64/PKGBUILD
  util-linux/repos/core-x86_64/agetty-typo.patch
  util-linux/repos/core-x86_64/dmesg-non-printk.patch
  util-linux/repos/core-x86_64/dmesg-space.patch
  util-linux/repos/core-x86_64/dont-close-0.patch
  util-linux/repos/core-x86_64/fix-remount.patch
  util-linux/repos/core-x86_64/write-freopen.patch
  util-linux/repos/testing-x86_64/

+
 PKGBUILD   |  106 +++
 agetty-typo.patch  |   27 ---
 dmesg-non-printk.patch |   69 --
 dmesg-space.patch  |   31 -
 dont-close-0.patch |   32 --
 fix-remount.patch  |   37 
 write-freopen.patch|   27 ---
 7 files changed, 45 insertions(+), 284 deletions(-)

Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2011-10-21 21:39:16 UTC (rev 141021)
+++ core-x86_64/PKGBUILD2011-10-21 21:39:17 UTC (rev 141022)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen t...@jklm.no
-# Contributor: judd jvi...@zeroflux.org
-
-pkgname=util-linux
-pkgver=2.20
-pkgrel=3
-pkgdesc=Miscellaneous system utilities for Linux
-url=http://userweb.kernel.org/~kzak/util-linux-ng/;
-arch=('i686' 'x86_64')
-groups=('base')
-depends=('filesystem')
-replaces=('linux32' 'util-linux-ng')
-conflicts=('linux32' 'util-linux-ng' 'e2fsprogs1.41.8-2')
-provides=('linux32' util-linux-ng=${pkgver})
-license=('GPL2')
-options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2
-   agetty-typo.patch
-   write-freopen.patch
-   dmesg-non-printk.patch
-   dmesg-space.patch
-   dont-close-0.patch
-   fix-remount.patch)
-optdepends=('perl: for chkdupexe support')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # patches from master
-  for patch in agetty-typo.patch write-freopen.patch dmesg-non-printk.patch 
dmesg-space.patch dont-close-0.patch fix-remount.patch; do
-patch -Np1 -i ${srcdir}/${patch}
-  done
-
-  # hardware clock
-  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
-
-  ./configure --enable-arch\
-  --enable-write\
-  --enable-raw\
-  --disable-wall\
-  --enable-partx\
-  --enable-libmount-mount
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  install -dm755 ${pkgdir}/var/lib/hwclock
-
-  make DESTDIR=${pkgdir} install
-}
-md5sums=('4dcacdbdafa116635e52b977d9d0e879'
- '13838c6dd8df686e0f01ad0f236d2690'
- '465817ff8f7c08411c8011ee91b50318'
- 'f3ca75a1a22a2a739c5c22d92dc07ab0'
- 'd9768f0b42d36d72c02ac7797b922ba1'
- '37eae52af90c214dda73874c701fa246'
- '344c780b9e08826dd8befe4271b41ed3')

Copied: util-linux/repos/core-x86_64/PKGBUILD (from rev 141020, 
util-linux/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2011-10-21 21:39:17 UTC (rev 141022)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Tom Gundersen t...@jklm.no
+# Contributor: judd jvi...@zeroflux.org
+
+pkgname=util-linux
+pkgver=2.20.1
+pkgrel=1
+pkgdesc=Miscellaneous system utilities for Linux
+url=http://userweb.kernel.org/~kzak/util-linux-ng/;
+arch=('i686' 'x86_64')
+groups=('base')
+depends=('filesystem')
+replaces=('linux32' 'util-linux-ng')
+conflicts=('linux32' 'util-linux-ng' 'e2fsprogs1.41.8-2')
+provides=('linux32' util-linux-ng=${pkgver})
+license=('GPL2')
+options=('!libtool')
+#source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+source=(ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2)
+optdepends=('perl: for chkdupexe support')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # hardware clock
+  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
+
+  ./configure --enable-arch\
+  --enable-write\
+  --enable-raw\
+  --disable-wall\
+  --enable-partx\
+  --enable-libmount-mount
+
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  install -dm755 ${pkgdir}/var/lib/hwclock
+
+  make DESTDIR=${pkgdir} install
+}
+md5sums=('079b37517fd4e002a2e6e992e8b4e361')

Deleted: core-x86_64/agetty-typo.patch
===
--- core-x86_64/agetty-typo.patch   2011-10-21 21:39:16 UTC (rev 141021)
+++ core-x86_64/agetty-typo.patch   2011-10-21 21:39:17 UTC (rev 141022)
@@ -1,27 

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

2011-10-21 Thread Gaetan Bisson
Date: Friday, October 21, 2011 @ 18:00:48
  Author: bisson
Revision: 141023

compile against qt-4.8.0rc1-1 and qtwebkit-2.2.0-1

Added:
  arora/trunk/install
(from rev 141022, arora/trunk/arora.install)
Modified:
  arora/trunk/PKGBUILD
Deleted:
  arora/trunk/arora.install

---+
 PKGBUILD  |   25 -
 arora.install |   12 
 install   |   12 
 3 files changed, 24 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-21 21:39:17 UTC (rev 141022)
+++ PKGBUILD2011-10-21 22:00:48 UTC (rev 141023)
@@ -1,29 +1,28 @@
 # $Id$
-# Maintainer:
+# Maintainer: Gaetan Bisson bis...@archlinux.org
 # Contributor: Pierre Schmitz pie...@archlinux.de
 # Contributor: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=arora
 pkgver=0.11.0
-pkgrel=2
-pkgdesc='A cross platform web browser built using Qt and WebKit'
-arch=('i686' 'x86_64')
+pkgrel=3
+pkgdesc='Lightweight cross-platform Web browser'
 url='http://www.arora-browser.org'
 license=('GPL')
-depends=('qt' 'desktop-file-utils')
-install='arora.install'
-source=(http://arora.googlecode.com/files/arora-${pkgver}.tar.gz;)
-md5sums=('64334ce4198861471cad9316d841f0cb')
+arch=('i686' 'x86_64')
+depends=('qtwebkit' 'desktop-file-utils')
+source=(http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz;)
+sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31')
 
-build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
+install=install
 
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
qmake PREFIX=/usr CONFIG-=debug -r
make
 }
 
 package() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-
-   make INSTALL_ROOT=${pkgdir} install
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make INSTALL_ROOT=${pkgdir} install
 }

Deleted: arora.install
===
--- arora.install   2011-10-21 21:39:17 UTC (rev 141022)
+++ arora.install   2011-10-21 22:00:48 UTC (rev 141023)
@@ -1,12 +0,0 @@
-post_install() {
-xdg-icon-resource forceupdate --theme hicolor  /dev/null
-update-desktop-database -q
-}
-
-post_upgrade() {
-   post_install
-}
-
-post_remove() {
-   post_install
-}

Copied: arora/trunk/install (from rev 141022, arora/trunk/arora.install)
===
--- install (rev 0)
+++ install 2011-10-21 22:00:48 UTC (rev 141023)
@@ -0,0 +1,12 @@
+post_install() {
+   xdg-icon-resource forceupdate --theme hicolor  /dev/null
+   update-desktop-database -q
+}
+
+post_upgrade() {
+   post_install
+}
+
+post_remove() {
+   post_install
+}



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

2011-10-21 Thread Gaetan Bisson
Date: Friday, October 21, 2011 @ 18:01:26
  Author: bisson
Revision: 141024

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

Added:
  arora/repos/staging-i686/
  arora/repos/staging-i686/PKGBUILD
(from rev 141023, arora/trunk/PKGBUILD)
  arora/repos/staging-i686/install
(from rev 141023, arora/trunk/install)
  arora/repos/staging-x86_64/
  arora/repos/staging-x86_64/PKGBUILD
(from rev 141023, arora/trunk/PKGBUILD)
  arora/repos/staging-x86_64/install
(from rev 141023, arora/trunk/install)

-+
 staging-i686/PKGBUILD   |   28 
 staging-i686/install|   12 
 staging-x86_64/PKGBUILD |   28 
 staging-x86_64/install  |   12 
 4 files changed, 80 insertions(+)

Copied: arora/repos/staging-i686/PKGBUILD (from rev 141023, 
arora/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-10-21 22:01:26 UTC (rev 141024)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Pierre Schmitz pie...@archlinux.de
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=arora
+pkgver=0.11.0
+pkgrel=3
+pkgdesc='Lightweight cross-platform Web browser'
+url='http://www.arora-browser.org'
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('qtwebkit' 'desktop-file-utils')
+source=(http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz;)
+sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31')
+
+install=install
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   qmake PREFIX=/usr CONFIG-=debug -r
+   make
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make INSTALL_ROOT=${pkgdir} install
+}

Copied: arora/repos/staging-i686/install (from rev 141023, arora/trunk/install)
===
--- staging-i686/install(rev 0)
+++ staging-i686/install2011-10-21 22:01:26 UTC (rev 141024)
@@ -0,0 +1,12 @@
+post_install() {
+   xdg-icon-resource forceupdate --theme hicolor  /dev/null
+   update-desktop-database -q
+}
+
+post_upgrade() {
+   post_install
+}
+
+post_remove() {
+   post_install
+}

Copied: arora/repos/staging-x86_64/PKGBUILD (from rev 141023, 
arora/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-10-21 22:01:26 UTC (rev 141024)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Pierre Schmitz pie...@archlinux.de
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=arora
+pkgver=0.11.0
+pkgrel=3
+pkgdesc='Lightweight cross-platform Web browser'
+url='http://www.arora-browser.org'
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('qtwebkit' 'desktop-file-utils')
+source=(http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz;)
+sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31')
+
+install=install
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   qmake PREFIX=/usr CONFIG-=debug -r
+   make
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make INSTALL_ROOT=${pkgdir} install
+}

Copied: arora/repos/staging-x86_64/install (from rev 141023, 
arora/trunk/install)
===
--- staging-x86_64/install  (rev 0)
+++ staging-x86_64/install  2011-10-21 22:01:26 UTC (rev 141024)
@@ -0,0 +1,12 @@
+post_install() {
+   xdg-icon-resource forceupdate --theme hicolor  /dev/null
+   update-desktop-database -q
+}
+
+post_upgrade() {
+   post_install
+}
+
+post_remove() {
+   post_install
+}



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

2011-10-21 Thread Andrea Scarpino
Date: Friday, October 21, 2011 @ 20:01:42
  Author: andrea
Revision: 141025

upgpkg: pyqt 4.8.5-2

Add qtwebkit to depends

Modified:
  pyqt/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-21 22:01:26 UTC (rev 141024)
+++ PKGBUILD2011-10-22 00:01:42 UTC (rev 141025)
@@ -6,12 +6,12 @@
 pkgbase=pyqt
 pkgname=('pyqt' 'python2-pyqt')
 pkgver=4.8.5
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url=http://riverbankcomputing.co.uk/software/pyqt/intro;
 license=('GPL')
 makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
- 'python-opengl' 'qt-assistant-compat')
+ 'python-opengl' 'qt-assistant-compat' 'qtwebkit')
 
source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;)
 md5sums=('0e4264bb912edfbda319bb236ac84407')
 
@@ -44,7 +44,7 @@
 
 package_pyqt(){
   pkgdesc=A set of Python bindings for the Qt toolkit
-  depends=('qt' 'python-sip')
+  depends=('qt' 'python-sip' 'qtwebkit')
   optdepends=('phonon: enable audio and video in PyQt applications'
   'qscintilla: QScintilla API'
   'qt-assistant-compat: add PyQt online help in Qt Assistant')



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

2011-10-21 Thread Andrea Scarpino
Date: Friday, October 21, 2011 @ 20:02:45
  Author: andrea
Revision: 141026

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

Added:
  pyqt/repos/staging-i686/
  pyqt/repos/staging-i686/PKGBUILD
(from rev 141025, pyqt/trunk/PKGBUILD)
  pyqt/repos/staging-x86_64/
  pyqt/repos/staging-x86_64/PKGBUILD
(from rev 141025, pyqt/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   77 ++
 staging-x86_64/PKGBUILD |   77 ++
 2 files changed, 154 insertions(+)

Copied: pyqt/repos/staging-i686/PKGBUILD (from rev 141025, pyqt/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-10-22 00:02:45 UTC (rev 141026)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+# Contributor: riai r...@bigfoot.com Ben b...@benmazer.net
+
+pkgbase=pyqt
+pkgname=('pyqt' 'python2-pyqt')
+pkgver=4.8.5
+pkgrel=2
+arch=('i686' 'x86_64')
+url=http://riverbankcomputing.co.uk/software/pyqt/intro;
+license=('GPL')
+makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
+ 'python-opengl' 'qt-assistant-compat' 'qtwebkit')
+source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;)
+md5sums=('0e4264bb912edfbda319bb236ac84407')
+
+build() {
+  cd ${srcdir}
+  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
+
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  python configure.py \
+--confirm-license \
+--qsci-api
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 
's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+
+  ### Python2 version ###
+  cd ${srcdir}/Py2Qt-x11-gpl-${pkgver}
+  python2 configure.py \
+--confirm-license \
+-v /usr/share/sip \
+--qsci-api
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 
's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+}
+
+package_pyqt(){
+  pkgdesc=A set of Python bindings for the Qt toolkit
+  depends=('qt' 'python-sip' 'qtwebkit')
+  optdepends=('phonon: enable audio and video in PyQt applications'
+  'qscintilla: QScintilla API'
+  'qt-assistant-compat: add PyQt online help in Qt Assistant')
+  replaces=('python-qt')
+  provides=('python-qt')
+  
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use 
DESTDIR
+  make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
+}
+
+package_python2-pyqt(){
+  pkgdesc=PyQt: A set of Python2 bindings for the Qt toolkit
+  depends=('pyqt' 'python2-sip' 'dbus-python')
+  optdepends=('phonon: enable audio and video in PyQt applications'
+  'python-opengl: enable OpenGL 3D graphics in PyQt applications'
+  'qscintilla: QScintilla API'
+  'qt-assistant-compat: add PyQt online help in Qt Assistant')
+  replaces=('python2-qt')
+  provides=('python2-qt')
+
+  cd ${srcdir}/Py2Qt-x11-gpl-${pkgver}
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use 
DESTDIR
+  make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
+
+  # Provided by pyqt
+  rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4}
+  rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so
+  rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api
+}

Copied: pyqt/repos/staging-x86_64/PKGBUILD (from rev 141025, 
pyqt/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-10-22 00:02:45 UTC (rev 141026)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+# Contributor: riai r...@bigfoot.com Ben b...@benmazer.net
+
+pkgbase=pyqt
+pkgname=('pyqt' 'python2-pyqt')
+pkgver=4.8.5
+pkgrel=2
+arch=('i686' 'x86_64')
+url=http://riverbankcomputing.co.uk/software/pyqt/intro;
+license=('GPL')
+makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
+ 'python-opengl' 'qt-assistant-compat' 'qtwebkit')
+source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;)
+md5sums=('0e4264bb912edfbda319bb236ac84407')
+
+build() {
+  cd ${srcdir}
+  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
+
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  python configure.py \
+--confirm-license \
+--qsci-api
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 
's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+
+  ### Python2 version ###
+  cd ${srcdir}/Py2Qt-x11-gpl-${pkgver}
+  python2 configure.py \
+--confirm-license \
+-v /usr/share/sip \
+--qsci-api
+
+  # Thanks Gerardo for the rpath fix
+ 

[arch-commits] Commit in lvm2/trunk (lvm2_hook)

2011-10-21 Thread Dave Reisner
Date: Friday, October 21, 2011 @ 22:15:13
  Author: dreisner
Revision: 141027

remove non-existant --sysinit flag from vgscan

Modified:
  lvm2/trunk/lvm2_hook

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

Modified: lvm2_hook
===
--- lvm2_hook   2011-10-22 00:02:45 UTC (rev 141026)
+++ lvm2_hook   2011-10-22 02:15:13 UTC (rev 141027)
@@ -19,7 +19,7 @@
 [ ${quiet} = y ]  LVMQUIET=/dev/null
 
 msg Activating logical volumes...
-[ -d /etc/lvm ]  /sbin/lvm vgscan --sysinit
+[ -d /etc/lvm ]  /sbin/lvm vgscan
 eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET
 fi
 }



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

2011-10-21 Thread Eric Bélanger
Date: Friday, October 21, 2011 @ 22:18:16
  Author: eric
Revision: 141028

upgpkg: qtcurve-gtk2 1.8.12-1

Upstream update

Modified:
  qtcurve-gtk2/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-22 02:15:13 UTC (rev 141027)
+++ PKGBUILD2011-10-22 02:18:16 UTC (rev 141028)
@@ -3,18 +3,18 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=qtcurve-gtk2
-pkgver=1.8.11
+pkgver=1.8.12
 pkgrel=1
+pkgdesc=A configurable set of widget styles for KDE and Gtk
 arch=('i686' 'x86_64')
-groups=('qtcurve')
+url=http://www.kde-look.org/content/show.php?content=40492;
 license=('GPL')
-pkgdesc='A configurable set of widget styles for KDE and Gtk'
-url='http://www.kde-look.org/content/show.php?content=40492'
 depends=('gtk2')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('cmake')
+groups=('qtcurve')
 options=('!libtool')
 
source=(http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2;)
-sha1sums=('113f2e7f5925323acbcf63977e4c71e60678b69c')
+sha1sums=('3b107aee1cf7dbd3ac47c693e82cd877a0fe2d5f')
 
 build() {
cd ${srcdir}



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

2011-10-21 Thread Eric Bélanger
Date: Friday, October 21, 2011 @ 22:18:45
  Author: eric
Revision: 141029

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

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

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

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-10-22 02:18:16 UTC (rev 141028)
+++ extra-i686/PKGBUILD 2011-10-22 02:18:45 UTC (rev 141029)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
-# Contributor: Pierre Schmitz pie...@archlinux.de
-
-pkgname=qtcurve-gtk2
-pkgver=1.8.11
-pkgrel=1
-arch=('i686' 'x86_64')
-groups=('qtcurve')
-license=('GPL')
-pkgdesc='A configurable set of widget styles for KDE and Gtk'
-url='http://www.kde-look.org/content/show.php?content=40492'
-depends=('gtk2')
-makedepends=('pkgconfig' 'cmake')
-options=('!libtool')
-source=(http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2;)
-sha1sums=('113f2e7f5925323acbcf63977e4c71e60678b69c')
-
-build() {
-   cd ${srcdir}
-   mkdir build
-   cd build
-   cmake ../QtCurve-Gtk2-${pkgver} \
-   -DCMAKE_BUILD_TYPE=Release \
-   -DCMAKE_INSTALL_PREFIX=/usr
-   make
-}
-
-package() {
-   cd ${srcdir}/build
-   make DESTDIR=${pkgdir} install
-}

Copied: qtcurve-gtk2/repos/extra-i686/PKGBUILD (from rev 141028, 
qtcurve-gtk2/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-22 02:18:45 UTC (rev 141029)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Pierre Schmitz pie...@archlinux.de
+
+pkgname=qtcurve-gtk2
+pkgver=1.8.12
+pkgrel=1
+pkgdesc=A configurable set of widget styles for KDE and Gtk
+arch=('i686' 'x86_64')
+url=http://www.kde-look.org/content/show.php?content=40492;
+license=('GPL')
+depends=('gtk2')
+makedepends=('cmake')
+groups=('qtcurve')
+options=('!libtool')
+source=(http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2;)
+sha1sums=('3b107aee1cf7dbd3ac47c693e82cd877a0fe2d5f')
+
+build() {
+   cd ${srcdir}
+   mkdir build
+   cd build
+   cmake ../QtCurve-Gtk2-${pkgver} \
+   -DCMAKE_BUILD_TYPE=Release \
+   -DCMAKE_INSTALL_PREFIX=/usr
+   make
+}
+
+package() {
+   cd ${srcdir}/build
+   make DESTDIR=${pkgdir} install
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-10-22 02:18:16 UTC (rev 141028)
+++ extra-x86_64/PKGBUILD   2011-10-22 02:18:45 UTC (rev 141029)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
-# Contributor: Pierre Schmitz pie...@archlinux.de
-
-pkgname=qtcurve-gtk2
-pkgver=1.8.11
-pkgrel=1
-arch=('i686' 'x86_64')
-groups=('qtcurve')
-license=('GPL')
-pkgdesc='A configurable set of widget styles for KDE and Gtk'
-url='http://www.kde-look.org/content/show.php?content=40492'
-depends=('gtk2')
-makedepends=('pkgconfig' 'cmake')
-options=('!libtool')
-source=(http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2;)
-sha1sums=('113f2e7f5925323acbcf63977e4c71e60678b69c')
-
-build() {
-   cd ${srcdir}
-   mkdir build
-   cd build
-   cmake ../QtCurve-Gtk2-${pkgver} \
-   -DCMAKE_BUILD_TYPE=Release \
-   -DCMAKE_INSTALL_PREFIX=/usr
-   make
-}
-
-package() {
-   cd ${srcdir}/build
-   make DESTDIR=${pkgdir} install
-}

Copied: qtcurve-gtk2/repos/extra-x86_64/PKGBUILD (from rev 141028, 
qtcurve-gtk2/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-10-22 02:18:45 UTC (rev 141029)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Pierre Schmitz pie...@archlinux.de
+
+pkgname=qtcurve-gtk2
+pkgver=1.8.12
+pkgrel=1
+pkgdesc=A configurable set of widget styles for KDE and Gtk
+arch=('i686' 'x86_64')
+url=http://www.kde-look.org/content/show.php?content=40492;
+license=('GPL')
+depends=('gtk2')
+makedepends=('cmake')
+groups=('qtcurve')
+options=('!libtool')
+source=(http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2;)
+sha1sums=('3b107aee1cf7dbd3ac47c693e82cd877a0fe2d5f')
+
+build() {
+   cd ${srcdir}
+   mkdir build
+   cd build
+   cmake ../QtCurve-Gtk2-${pkgver} \
+   

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

2011-10-21 Thread Eric Bélanger
Date: Saturday, October 22, 2011 @ 01:08:38
  Author: eric
Revision: 141030

upgpkg: gnucash 2.4.8-1

Upstream update, Remove already satisfied hicolor-icon-theme depends

Modified:
  gnucash/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-22 02:18:45 UTC (rev 141029)
+++ PKGBUILD2011-10-22 05:08:38 UTC (rev 141030)
@@ -3,14 +3,13 @@
 # Contributor: Mark Schneider queue...@gmail.com
 
 pkgname=gnucash
-pkgver=2.4.7
-pkgrel=2
+pkgver=2.4.8
+pkgrel=1
 pkgdesc=A personal and small-business financial-accounting application
 arch=('i686' 'x86_64')
 url=http://www.gnucash.org;
 license=(GPL)
-depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'hicolor-icon-theme' 
- 'libdbi-drivers' 'aqbanking' 'desktop-file-utils')
+depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'libdbi-drivers' 'aqbanking' 
'desktop-file-utils')
 makedepends=('intltool')
 optdepends=('evince: for print preview'
 'perl-finance-quote: for stock information lookups'
@@ -18,8 +17,7 @@
 options=('!libtool' '!makeflags')
 install=gnucash.install
 
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('0f85c8bfd165b2605a7853f579808823')
-sha1sums=('e99dd56949de27c19d9c3413d30c87a0f74e8ff9')
+sha1sums=('cdd8793bc8e8cbb433a0237007023f4973a51781')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}



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

2011-10-21 Thread Eric Bélanger
Date: Saturday, October 22, 2011 @ 01:09:05
  Author: eric
Revision: 141031

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

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

--+
 extra-i686/PKGBUILD  |   74 +++--
 extra-i686/gnucash.install   |   68 ++---
 extra-x86_64/PKGBUILD|   74 +++--
 extra-x86_64/gnucash.install |   68 ++---
 4 files changed, 140 insertions(+), 144 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-10-22 05:08:38 UTC (rev 141030)
+++ extra-i686/PKGBUILD 2011-10-22 05:09:05 UTC (rev 141031)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Aaron Griffin aa...@archlinux.org
-# Contributor: Mark Schneider queue...@gmail.com
-
-pkgname=gnucash
-pkgver=2.4.7
-pkgrel=2
-pkgdesc=A personal and small-business financial-accounting application
-arch=('i686' 'x86_64')
-url=http://www.gnucash.org;
-license=(GPL)
-depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'hicolor-icon-theme' 
- 'libdbi-drivers' 'aqbanking' 'desktop-file-utils')
-makedepends=('intltool')
-optdepends=('evince: for print preview'
-'perl-finance-quote: for stock information lookups'
-'perl-date-manip: for stock information lookups')
-options=('!libtool' '!makeflags')
-install=gnucash.install
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('0f85c8bfd165b2605a7853f579808823')
-sha1sums=('e99dd56949de27c19d9c3413d30c87a0f74e8ff9')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --mandir=/usr/share/man \
---sysconfdir=/etc --libexecdir=/usr/lib --enable-ofx --enable-aqbanking
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install
-
-  install -dm755 ${pkgdir}/usr/share/gconf/schemas
-  gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas 
--domain gnucash ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}

Copied: gnucash/repos/extra-i686/PKGBUILD (from rev 141030, 
gnucash/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-22 05:09:05 UTC (rev 141031)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Aaron Griffin aa...@archlinux.org
+# Contributor: Mark Schneider queue...@gmail.com
+
+pkgname=gnucash
+pkgver=2.4.8
+pkgrel=1
+pkgdesc=A personal and small-business financial-accounting application
+arch=('i686' 'x86_64')
+url=http://www.gnucash.org;
+license=(GPL)
+depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'libdbi-drivers' 'aqbanking' 
'desktop-file-utils')
+makedepends=('intltool')
+optdepends=('evince: for print preview'
+'perl-finance-quote: for stock information lookups'
+'perl-date-manip: for stock information lookups')
+options=('!libtool' '!makeflags')
+install=gnucash.install
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('cdd8793bc8e8cbb433a0237007023f4973a51781')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+--sysconfdir=/etc --libexecdir=/usr/lib --enable-ofx --enable-aqbanking
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install
+
+  install -dm755 ${pkgdir}/usr/share/gconf/schemas
+  gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas 
--domain gnucash ${pkgdir}/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+}

Deleted: extra-i686/gnucash.install
===
--- extra-i686/gnucash.install  2011-10-22 05:08:38 UTC (rev 141030)
+++ extra-i686/gnucash.install  2011-10-22 05:09:05 UTC (rev 141031)
@@ -1,34 +0,0 @@
-pkgname=gnucash
-info_dir=usr/share/info
-info_files=(gnucash-design.info)
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2