[arch-commits] Commit in dnsutils/trunk (PKGBUILD trusted-key.key)

2012-01-19 Thread Gaetan Bisson
Date: Friday, January 20, 2012 @ 01:47:36
  Author: bisson
Revision: 146996

add trusted-key with root anchor for default dnssec support

Added:
  dnsutils/trunk/trusted-key.key
Modified:
  dnsutils/trunk/PKGBUILD

-+
 PKGBUILD|   12 ++--
 trusted-key.key |2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 06:04:00 UTC (rev 146995)
+++ PKGBUILD2012-01-20 06:47:36 UTC (rev 146996)
@@ -17,9 +17,11 @@
 options=('!makeflags')
 depends=('openssl' 'krb5' 'idnkit')
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz";
-'remove-bind.patch')
+'remove-bind.patch'
+'trusted-key.key')
 sha1sums=('7e6ed6ebc896b1de33a9f440233066c60539de4c'
-  'b465ef6160b004838f04de9978fe1be8422af777')
+  'b465ef6160b004838f04de9978fe1be8422af777'
+  'ca93da30c89de4365b846325d6ec4674a3e4fc02')
 
 replaces=('bind-tools' 'host')
 
@@ -47,9 +49,7 @@
 
 package() {
cd "${srcdir}/bind-${_pkgver}"
-
+   install -Dm644 ../trusted-key.key "${pkgdir}"/etc/trusted-key.key
install -Dm644 COPYRIGHT 
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-   cd bin
-   make DESTDIR="${pkgdir}" install
+   cd bin; make DESTDIR="${pkgdir}" install
 }

Added: trusted-key.key
===
--- trusted-key.key (rev 0)
+++ trusted-key.key 2012-01-20 06:47:36 UTC (rev 146996)
@@ -0,0 +1,2 @@
+.  172800  IN  DNSKEY  256 3 8 
AwEAAZ/NErKzyMlImJ+2HTmK9qeH2sLUywlsF+mJbTP5GKoYFHoU2vn2 
Zqr261Lk7a6jfBKYny5GX7BDRJcVvig36TgOinE9QP5KVS0RxdrOl98g 
KLwFMORfNf/wjCwjPdEl1GgaGYl0npJ4c+x+o6aa/xmDKJo9zUlpvb7B LxbJ7HwF
+.  172800  IN  DNSKEY  257 3 8 
AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF 
FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX 
bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD 
X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz 
W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS 
Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq QxA+Uk1ihz0=



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

2012-01-19 Thread Rémy Oudompheng
Date: Friday, January 20, 2012 @ 01:04:00
  Author: remy
Revision: 146995

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

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

--+
 extra-i686/PKGBUILD  |   96 -
 extra-i686/scribus.install   |   26 +--
 extra-x86_64/PKGBUILD|   96 -
 extra-x86_64/scribus.install |   26 +--
 4 files changed, 122 insertions(+), 122 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-20 05:57:27 UTC (rev 146994)
+++ extra-i686/PKGBUILD 2012-01-20 06:04:00 UTC (rev 146995)
@@ -1,48 +0,0 @@
-# $Id$
-# Contributor: Ronald van Haren 
-# Contributor: tobias 
-# Contributor: Ben 
-# Maintainer: Daniel J Griffiths 
-
-pkgname=scribus
-pkgver=1.3.9
-pkgrel=1
-pkgdesc="A desktop publishing program"
-arch=('i686' 'x86_64')
-url="http://www.scribus.net";
-license=('GPL')
-install=scribus.install
-depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \
- 'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \
- 'desktop-file-utils' 'shared-mime-info')
-makedepends=('cmake')
-options=(!libtool !makeflags)
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a54dbf2e10cd88d683d0d34565d29378')
-sha1sums=('86bc4db2d8fbb91fe94f8535327991e9128c5862')
-
-build() {
-   cd "${srcdir}"
-   sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' 
${pkgname}-${pkgver}/scribus/plugins/scriptplugin/scripts/ColorChart.py
-   mkdir build
-   cd build
-   cmake ../${pkgname}-${pkgver} \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_SKIP_RPATH=ON \
-  -DWANT_CAIRO=1 \
-  -DLIB_SUFFIX=""
-   make
-}
-
-package() {
-   cd "${srcdir}/build"
-   make DESTDIR="${pkgdir}" install
-
-   # fix icon path in .desktop file
-   sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \
-  "${srcdir}/${pkgname}-${pkgver}/scribus.desktop"
-
-   install -Dm644 "${srcdir}/${pkgname}-${pkgver}/scribus.desktop" \
-  "${pkgdir}/usr/share/applications/scribus.desktop"
-}

Copied: scribus/repos/extra-i686/PKGBUILD (from rev 146994, 
scribus/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-20 06:04:00 UTC (rev 146995)
@@ -0,0 +1,48 @@
+# $Id$
+# Contributor: Ronald van Haren 
+# Contributor: tobias 
+# Contributor: Ben 
+# Maintainer: Daniel J Griffiths 
+
+pkgname=scribus
+pkgver=1.4.0
+pkgrel=1
+pkgdesc="A desktop publishing program"
+arch=('i686' 'x86_64')
+url="http://www.scribus.net";
+license=('GPL')
+install=scribus.install
+depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \
+ 'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \
+ 'desktop-file-utils' 'shared-mime-info')
+makedepends=('cmake')
+options=(!libtool)
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+md5sums=('ae19e62399941fb8e868d8e762caf494')
+sha1sums=('0e3afb98a56084c2938a8402df2d89214c42b809')
+
+build() {
+   cd "${srcdir}"
+   sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' 
${pkgname}-${pkgver}/scribus/plugins/scriptplugin/scripts/ColorChart.py
+   mkdir build
+   cd build
+   cmake ../${pkgname}-${pkgver} \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_SKIP_RPATH=ON \
+  -DWANT_CAIRO=1 \
+  -DLIB_SUFFIX=""
+   make
+}
+
+package() {
+   cd "${srcdir}/build"
+   make DESTDIR="${pkgdir}" install
+
+   # fix icon path in .desktop file
+   sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \
+  "${srcdir}/${pkgname}-${pkgver}/scribus.desktop"
+
+   install -Dm644 "${srcdir}/${pkgname}-${pkgver}/scribus.desktop" \
+  "${pkgdir}/usr/share/applications/scribus.desktop"
+}

Deleted: extra-i686/scribus.install
===
--- extra-i686/scribus.install  2012-01-20 05:57:27 UTC (rev 146994)
+++ extra-i686/scribus.install  2012-01-20 06:04:00 UTC (rev 146995)
@@ -1,13 +0,0 @@
-
-post_install() {
-  echo "update desktop mime database..."
-  update-mime-database

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

2012-01-19 Thread Rémy Oudompheng
Date: Friday, January 20, 2012 @ 00:57:27
  Author: remy
Revision: 146994

upgpkg: scribus 1.4.0-1

Upstream update.

Modified:
  scribus/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 05:40:57 UTC (rev 146993)
+++ PKGBUILD2012-01-20 05:57:27 UTC (rev 146994)
@@ -5,7 +5,7 @@
 # Maintainer: Daniel J Griffiths 
 
 pkgname=scribus
-pkgver=1.3.9
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64')
@@ -16,10 +16,10 @@
  'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \
  'desktop-file-utils' 'shared-mime-info')
 makedepends=('cmake')
-options=(!libtool !makeflags)
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a54dbf2e10cd88d683d0d34565d29378')
-sha1sums=('86bc4db2d8fbb91fe94f8535327991e9128c5862')
+options=(!libtool)
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+md5sums=('ae19e62399941fb8e868d8e762caf494')
+sha1sums=('0e3afb98a56084c2938a8402df2d89214c42b809')
 
 build() {
cd "${srcdir}"



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

2012-01-19 Thread Eric Bélanger
Date: Friday, January 20, 2012 @ 00:40:57
  Author: eric
Revision: 146993

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

Added:
  perl-tk/repos/staging-i686/
  perl-tk/repos/staging-i686/PKGBUILD
(from rev 146992, perl-tk/trunk/PKGBUILD)
  perl-tk/repos/staging-x86_64/
  perl-tk/repos/staging-x86_64/PKGBUILD
(from rev 146992, perl-tk/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   41 +
 staging-x86_64/PKGBUILD |   41 +
 2 files changed, 82 insertions(+)

Copied: perl-tk/repos/staging-i686/PKGBUILD (from rev 146992, 
perl-tk/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-20 05:40:57 UTC (rev 146993)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: François Charette 
+# Contributor: Jason Chu 
+# Contributor: Juergen Hoetzel 
+
+pkgname=perl-tk
+_cpanname=Tk
+pkgver=804.030
+pkgrel=2
+pkgdesc="A graphical user interface toolkit for Perl"
+arch=('i686' 'x86_64')
+url="http://search.cpan.org/dist/${_cpanname}";
+license=('PerlArtistic' 'GPL' 'custom')
+depends=('libpng' 'libjpeg' 'tk' 'perl')
+options=('!emptydirs')
+replaces=('perltk')
+provides=('perltk')
+source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz)
+md5sums=('13275e85f99ee467a86d9598a437abff')
+
+build() {
+  cd "$srcdir/${_cpanname}-$pkgver"
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+#check() {
+#  cd "$srcdir/${_cpanname}-$pkgver"
+#  make test
+#}
+
+package() {
+  cd "$srcdir/${_cpanname}-$pkgver"
+  make install DESTDIR="$pkgdir"
+
+  # license
+  install -D -m644 pTk/license.terms \
+   "${pkgdir}/usr/share/licenses/${pkgname}/tk.license"
+  install -D -m644 pTk/Tix.license \
+   "${pkgdir}/usr/share/licenses/${pkgname}/tix.license"
+}

Copied: perl-tk/repos/staging-x86_64/PKGBUILD (from rev 146992, 
perl-tk/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-20 05:40:57 UTC (rev 146993)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: François Charette 
+# Contributor: Jason Chu 
+# Contributor: Juergen Hoetzel 
+
+pkgname=perl-tk
+_cpanname=Tk
+pkgver=804.030
+pkgrel=2
+pkgdesc="A graphical user interface toolkit for Perl"
+arch=('i686' 'x86_64')
+url="http://search.cpan.org/dist/${_cpanname}";
+license=('PerlArtistic' 'GPL' 'custom')
+depends=('libpng' 'libjpeg' 'tk' 'perl')
+options=('!emptydirs')
+replaces=('perltk')
+provides=('perltk')
+source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz)
+md5sums=('13275e85f99ee467a86d9598a437abff')
+
+build() {
+  cd "$srcdir/${_cpanname}-$pkgver"
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+#check() {
+#  cd "$srcdir/${_cpanname}-$pkgver"
+#  make test
+#}
+
+package() {
+  cd "$srcdir/${_cpanname}-$pkgver"
+  make install DESTDIR="$pkgdir"
+
+  # license
+  install -D -m644 pTk/license.terms \
+   "${pkgdir}/usr/share/licenses/${pkgname}/tk.license"
+  install -D -m644 pTk/Tix.license \
+   "${pkgdir}/usr/share/licenses/${pkgname}/tix.license"
+}



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

2012-01-19 Thread Eric Bélanger
Date: Friday, January 20, 2012 @ 00:40:33
  Author: eric
Revision: 146992

upgpkg: perl-tk 804.030-2

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  perl-tk/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 03:12:53 UTC (rev 146991)
+++ PKGBUILD2012-01-20 05:40:33 UTC (rev 146992)
@@ -6,7 +6,7 @@
 pkgname=perl-tk
 _cpanname=Tk
 pkgver=804.030
-pkgrel=1
+pkgrel=2
 pkgdesc="A graphical user interface toolkit for Perl"
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/${_cpanname}";



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

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 22:12:53
  Author: eric
Revision: 146991

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

Added:
  povray/repos/staging-i686/
  povray/repos/staging-i686/LICENSE
(from rev 146990, povray/trunk/LICENSE)
  povray/repos/staging-i686/PKGBUILD
(from rev 146990, povray/trunk/PKGBUILD)
  povray/repos/staging-i686/distribution-license.txt
(from rev 146990, povray/trunk/distribution-license.txt)
  povray/repos/staging-i686/povray3.7.0_rc3-user-conf.patch
(from rev 146990, povray/trunk/povray3.7.0_rc3-user-conf.patch)
  povray/repos/staging-i686/source-license.txt
(from rev 146990, povray/trunk/source-license.txt)
  povray/repos/staging-x86_64/
  povray/repos/staging-x86_64/LICENSE
(from rev 146990, povray/trunk/LICENSE)
  povray/repos/staging-x86_64/PKGBUILD
(from rev 146990, povray/trunk/PKGBUILD)
  povray/repos/staging-x86_64/distribution-license.txt
(from rev 146990, povray/trunk/distribution-license.txt)
  povray/repos/staging-x86_64/povray3.7.0_rc3-user-conf.patch
(from rev 146990, povray/trunk/povray3.7.0_rc3-user-conf.patch)
  povray/repos/staging-x86_64/source-license.txt
(from rev 146990, povray/trunk/source-license.txt)

+
 staging-i686/LICENSE   |  237 ++
 staging-i686/PKGBUILD  |   42 +
 staging-i686/distribution-license.txt  |  532 +++
 staging-i686/povray3.7.0_rc3-user-conf.patch   |   27 +
 staging-i686/source-license.txt|  360 +++
 staging-x86_64/LICENSE |  237 ++
 staging-x86_64/PKGBUILD|   42 +
 staging-x86_64/distribution-license.txt|  532 +++
 staging-x86_64/povray3.7.0_rc3-user-conf.patch |   27 +
 staging-x86_64/source-license.txt  |  360 +++
 10 files changed, 2396 insertions(+)

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


[arch-commits] Commit in povray/trunk (7 files)

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 22:12:23
  Author: eric
Revision: 146990

upgpkg: povray 3.7.0.RC3-1

Rebuild against libpng 1.5 and libtiff 4.0, Upstream update, Remove old patches

Added:
  povray/trunk/LICENSE
  povray/trunk/distribution-license.txt
  povray/trunk/povray3.7.0_rc3-user-conf.patch
  povray/trunk/source-license.txt
Modified:
  povray/trunk/PKGBUILD
Deleted:
  povray/trunk/libpng-1.4.patch
  povray/trunk/povray-3.6.1-use-system-libpng.patch

--+
 LICENSE  |  237 ++
 PKGBUILD |   51 +--
 distribution-license.txt |  532 +
 libpng-1.4.patch |   21 -
 povray-3.6.1-use-system-libpng.patch |   51 ---
 povray3.7.0_rc3-user-conf.patch  |   27 +
 source-license.txt   |  360 ++
 7 files changed, 1179 insertions(+), 100 deletions(-)

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


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

2012-01-19 Thread Evangelos Foutras
Date: Thursday, January 19, 2012 @ 17:34:27
  Author: foutrelis
Revision: 146989

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

Added:
  tumbler/repos/staging-i686/PKGBUILD
(from rev 146988, tumbler/trunk/PKGBUILD)
  tumbler/repos/staging-x86_64/PKGBUILD
(from rev 146988, tumbler/trunk/PKGBUILD)
Deleted:
  tumbler/repos/staging-i686/PKGBUILD
  tumbler/repos/staging-x86_64/PKGBUILD

-+
 staging-i686/PKGBUILD   |   83 --
 staging-x86_64/PKGBUILD |   83 --
 2 files changed, 88 insertions(+), 78 deletions(-)

Deleted: staging-i686/PKGBUILD
===
--- staging-i686/PKGBUILD   2012-01-19 22:34:08 UTC (rev 146988)
+++ staging-i686/PKGBUILD   2012-01-19 22:34:27 UTC (rev 146989)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras 
-# Contributor: Andreas Radke 
-# Contributor: Jan Jezek 
-
-pkgname=tumbler
-pkgver=0.1.23
-pkgrel=2
-pkgdesc="D-Bus service for applications to request thumbnails"
-arch=('i686' 'x86_64')
-url="http://git.xfce.org/xfce/tumbler/";
-license=('GPL2' 'LGPL')
-groups=('xfce4')
-depends=('poppler-glib' 'dbus-glib' 'gdk-pixbuf2')
-makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10')
-optdepends=('ffmpegthumbnailer: for video thumbnails'
-'gstreamer0.10: for video thumbnails')
-options=('!libtool')
-source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2)
-sha256sums=('b3066d17b7e1fee5135eb876a7c2c50a1221bd0d447c3dd7c36efe6d7f3874cb')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
---prefix=/usr \
---sysconfdir=/etc \
---libexecdir=/usr/lib/xfce4 \
---disable-static \
---disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: tumbler/repos/staging-i686/PKGBUILD (from rev 146988, 
tumbler/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 22:34:27 UTC (rev 146989)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Evangelos Foutras 
+# Contributor: Andreas Radke 
+# Contributor: Jan Jezek 
+
+pkgname=tumbler
+pkgver=0.1.23
+pkgrel=4
+pkgdesc="D-Bus service for applications to request thumbnails"
+arch=('i686' 'x86_64')
+url="http://git.xfce.org/xfce/tumbler/";
+license=('GPL2' 'LGPL')
+groups=('xfce4')
+depends=('dbus-glib' 'gdk-pixbuf2')
+makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10' 'poppler-glib'
+ 'libgsf' 'libopenraw' 'freetype2')
+optdepends=('ffmpegthumbnailer: for video thumbnails'
+'gstreamer0.10: for video thumbnails'
+'poppler-glib: for PDF thumbnails'
+'libgsf: for ODF thumbnails'
+'libopenraw: for RAW thumbnails'
+'freetype2: for font thumbnails')
+options=('!libtool')
+source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2)
+sha256sums=('b3066d17b7e1fee5135eb876a7c2c50a1221bd0d447c3dd7c36efe6d7f3874cb')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+--prefix=/usr \
+--sysconfdir=/etc \
+--libexecdir=/usr/lib/xfce4 \
+--disable-static \
+--disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: staging-x86_64/PKGBUILD
===
--- staging-x86_64/PKGBUILD 2012-01-19 22:34:08 UTC (rev 146988)
+++ staging-x86_64/PKGBUILD 2012-01-19 22:34:27 UTC (rev 146989)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras 
-# Contributor: Andreas Radke 
-# Contributor: Jan Jezek 
-
-pkgname=tumbler
-pkgver=0.1.23
-pkgrel=2
-pkgdesc="D-Bus service for applications to request thumbnails"
-arch=('i686' 'x86_64')
-url="http://git.xfce.org/xfce/tumbler/";
-license=('GPL2' 'LGPL')
-groups=('xfce4')
-depends=('poppler-glib' 'dbus-glib' 'gdk-pixbuf2')
-makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10')
-optdepends=('ffmpegthumbnailer: for video thumbnails'
-'gstreamer0.10: for video thumbnails')
-options=('!libtool')
-source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2)
-sha256sums=('b3066d17b7e1fee5135eb876a7c2c50a1221bd0d447c3dd7c36efe6d7f3874cb')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
---prefix=/usr \
---sysconfdir=/etc \
---libexecdir=/usr/lib/xfce4 \
---disable-static \
---disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: tumbler/repos/staging-x86_64/PKGBUILD (from rev 146988, 
tumbler/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD 

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

2012-01-19 Thread Evangelos Foutras
Date: Thursday, January 19, 2012 @ 17:34:08
  Author: foutrelis
Revision: 146988

upgpkg: tumbler 0.1.23-4

libpng 1.5 rebuild.

Modified:
  tumbler/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 22:31:36 UTC (rev 146987)
+++ PKGBUILD2012-01-19 22:34:08 UTC (rev 146988)
@@ -5,7 +5,7 @@
 
 pkgname=tumbler
 pkgver=0.1.23
-pkgrel=3
+pkgrel=4
 pkgdesc="D-Bus service for applications to request thumbnails"
 arch=('i686' 'x86_64')
 url="http://git.xfce.org/xfce/tumbler/";



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

2012-01-19 Thread Evangelos Foutras
Date: Thursday, January 19, 2012 @ 17:31:36
  Author: foutrelis
Revision: 146987

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

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

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

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-19 22:31:15 UTC (rev 146986)
+++ extra-i686/PKGBUILD 2012-01-19 22:31:36 UTC (rev 146987)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke 
-# Contributor: Jan Jezek 
-
-pkgname=tumbler
-pkgver=0.1.23
-pkgrel=1
-pkgdesc="D-Bus service for applications to request thumbnails"
-url="http://git.xfce.org/xfce/tumbler/";
-license=('GPL2' 'LGPL')
-arch=('i686' 'x86_64')
-groups=('xfce4')
-depends=('poppler-glib' 'dbus-glib' 'gdk-pixbuf2')
-makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10')
-optdepends=('ffmpegthumbnailer:for video thumbnails'
-'gstreamer0.10: for video thumbnails')
-options=('!libtool')
-source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('c6cf6821f5d884cbf2c26f45f2fecc74')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-   --sysconfdir=/etc \
-   --libexecdir=/usr/lib/xfce4 \
-   --disable-static \
-   --disable-debug
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}

Copied: tumbler/repos/extra-i686/PKGBUILD (from rev 146986, 
tumbler/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-19 22:31:36 UTC (rev 146987)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Evangelos Foutras 
+# Contributor: Andreas Radke 
+# Contributor: Jan Jezek 
+
+pkgname=tumbler
+pkgver=0.1.23
+pkgrel=3
+pkgdesc="D-Bus service for applications to request thumbnails"
+arch=('i686' 'x86_64')
+url="http://git.xfce.org/xfce/tumbler/";
+license=('GPL2' 'LGPL')
+groups=('xfce4')
+depends=('dbus-glib' 'gdk-pixbuf2')
+makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10' 'poppler-glib'
+ 'libgsf' 'libopenraw' 'freetype2')
+optdepends=('ffmpegthumbnailer: for video thumbnails'
+'gstreamer0.10: for video thumbnails'
+'poppler-glib: for PDF thumbnails'
+'libgsf: for ODF thumbnails'
+'libopenraw: for RAW thumbnails'
+'freetype2: for font thumbnails')
+options=('!libtool')
+source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2)
+sha256sums=('b3066d17b7e1fee5135eb876a7c2c50a1221bd0d447c3dd7c36efe6d7f3874cb')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+--prefix=/usr \
+--sysconfdir=/etc \
+--libexecdir=/usr/lib/xfce4 \
+--disable-static \
+--disable-debug
+  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   2012-01-19 22:31:15 UTC (rev 146986)
+++ extra-x86_64/PKGBUILD   2012-01-19 22:31:36 UTC (rev 146987)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke 
-# Contributor: Jan Jezek 
-
-pkgname=tumbler
-pkgver=0.1.23
-pkgrel=1
-pkgdesc="D-Bus service for applications to request thumbnails"
-url="http://git.xfce.org/xfce/tumbler/";
-license=('GPL2' 'LGPL')
-arch=('i686' 'x86_64')
-groups=('xfce4')
-depends=('poppler-glib' 'dbus-glib' 'gdk-pixbuf2')
-makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10')
-optdepends=('ffmpegthumbnailer:for video thumbnails'
-'gstreamer0.10: for video thumbnails')
-options=('!libtool')
-source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('c6cf6821f5d884cbf2c26f45f2fecc74')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-   --sysconfdir=/etc \
-   --libexecdir=/usr/lib/xfce4 \
-   --disable-static \
-   --disable-debug
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}

Copied: tumbler/repos/extra-x86_64/PKGBUILD (from rev 146986, 
tumbler/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-01-19 22:31:36 UTC (rev 146987)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Evangelos Foutras 
+# Contributor: An

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

2012-01-19 Thread Evangelos Foutras
Date: Thursday, January 19, 2012 @ 17:31:15
  Author: foutrelis
Revision: 146986

upgpkg: tumbler 0.1.23-3

Fix FS#27700. Build ODF and RAW thumbnailers and move poppler-glib to 
optdepends.

Modified:
  tumbler/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 22:25:27 UTC (rev 146985)
+++ PKGBUILD2012-01-19 22:31:15 UTC (rev 146986)
@@ -5,16 +5,21 @@
 
 pkgname=tumbler
 pkgver=0.1.23
-pkgrel=2
+pkgrel=3
 pkgdesc="D-Bus service for applications to request thumbnails"
 arch=('i686' 'x86_64')
 url="http://git.xfce.org/xfce/tumbler/";
 license=('GPL2' 'LGPL')
 groups=('xfce4')
-depends=('poppler-glib' 'dbus-glib' 'gdk-pixbuf2')
-makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10')
+depends=('dbus-glib' 'gdk-pixbuf2')
+makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10' 'poppler-glib'
+ 'libgsf' 'libopenraw' 'freetype2')
 optdepends=('ffmpegthumbnailer: for video thumbnails'
-'gstreamer0.10: for video thumbnails')
+'gstreamer0.10: for video thumbnails'
+'poppler-glib: for PDF thumbnails'
+'libgsf: for ODF thumbnails'
+'libopenraw: for RAW thumbnails'
+'freetype2: for font thumbnails')
 options=('!libtool')
 source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2)
 sha256sums=('b3066d17b7e1fee5135eb876a7c2c50a1221bd0d447c3dd7c36efe6d7f3874cb')



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

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 17:25:27
  Author: giovanni
Revision: 146985

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

Added:
  dvdauthor/repos/staging-i686/
  dvdauthor/repos/staging-i686/PKGBUILD
(from rev 146984, dvdauthor/trunk/PKGBUILD)
  dvdauthor/repos/staging-i686/dvdauthor-0.7.0-libpng15.patch
(from rev 146984, dvdauthor/trunk/dvdauthor-0.7.0-libpng15.patch)
  dvdauthor/repos/staging-x86_64/
  dvdauthor/repos/staging-x86_64/PKGBUILD
(from rev 146984, dvdauthor/trunk/PKGBUILD)
  dvdauthor/repos/staging-x86_64/dvdauthor-0.7.0-libpng15.patch
(from rev 146984, dvdauthor/trunk/dvdauthor-0.7.0-libpng15.patch)

---+
 staging-i686/PKGBUILD |   35 
 staging-i686/dvdauthor-0.7.0-libpng15.patch   |   19 +
 staging-x86_64/PKGBUILD   |   35 
 staging-x86_64/dvdauthor-0.7.0-libpng15.patch |   19 +
 4 files changed, 108 insertions(+)

Copied: dvdauthor/repos/staging-i686/PKGBUILD (from rev 146984, 
dvdauthor/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 22:25:27 UTC (rev 146985)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Giovanni Scafora 
+# Contributor: Travis Willard  
+# Contributor: Jaroslaw Swierczynski 
+# Contributor: Nicolai Lissner 
+
+pkgname=dvdauthor
+pkgver=0.7.0
+pkgrel=4
+pkgdesc="DVD authoring tools"
+arch=('i686' 'x86_64')
+url="http://dvdauthor.sourceforge.net/";
+license=('GPL')
+depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi')
+options=('!makeflags')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz";
+'dvdauthor-0.7.0-libpng15.patch')
+md5sums=('33a447fb98ab3293ac40f869eedc17ff'
+ '9ea90bbea6adb0469c8c1b2f7d033f11')
+
+build() {
+  cd "${srcdir}/${pkgname}"
+
+  patch -Np0 -i "${srcdir}/dvdauthor-0.7.0-libpng15.patch"
+
+  ./configure --prefix=/usr \
+  --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+
+  make DESTDIR="${pkgdir}" install
+}

Copied: dvdauthor/repos/staging-i686/dvdauthor-0.7.0-libpng15.patch (from rev 
146984, dvdauthor/trunk/dvdauthor-0.7.0-libpng15.patch)
===
--- staging-i686/dvdauthor-0.7.0-libpng15.patch (rev 0)
+++ staging-i686/dvdauthor-0.7.0-libpng15.patch 2012-01-19 22:25:27 UTC (rev 
146985)
@@ -0,0 +1,19 @@
+--- src/spuunmux.c
 src/spuunmux.c
+@@ -39,6 +39,7 @@
+ #include 
+ 
+ #include 
++#include 
+ 
+ #include "rgb.h"
+ #include "common.h"
+@@ -610,7 +611,7 @@
+ png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+ return -1;
+   } /*if*/
+-if (setjmp(png_ptr->jmpbuf))
++if (setjmp(png_jmpbuf(png_ptr)))
+   {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ fclose(fp);

Copied: dvdauthor/repos/staging-x86_64/PKGBUILD (from rev 146984, 
dvdauthor/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-19 22:25:27 UTC (rev 146985)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Giovanni Scafora 
+# Contributor: Travis Willard  
+# Contributor: Jaroslaw Swierczynski 
+# Contributor: Nicolai Lissner 
+
+pkgname=dvdauthor
+pkgver=0.7.0
+pkgrel=4
+pkgdesc="DVD authoring tools"
+arch=('i686' 'x86_64')
+url="http://dvdauthor.sourceforge.net/";
+license=('GPL')
+depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi')
+options=('!makeflags')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz";
+'dvdauthor-0.7.0-libpng15.patch')
+md5sums=('33a447fb98ab3293ac40f869eedc17ff'
+ '9ea90bbea6adb0469c8c1b2f7d033f11')
+
+build() {
+  cd "${srcdir}/${pkgname}"
+
+  patch -Np0 -i "${srcdir}/dvdauthor-0.7.0-libpng15.patch"
+
+  ./configure --prefix=/usr \
+  --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+
+  make DESTDIR="${pkgdir}" install
+}

Copied: dvdauthor/repos/staging-x86_64/dvdauthor-0.7.0-libpng15.patch (from rev 
146984, dvdauthor/trunk/dvdauthor-0.7.0-libpng15.patch)
===
--- staging-x86_64/dvdauthor-0.7.0-libpng15.patch   
(rev 0)
+++ staging-x86_64/dvdauthor-0.7.0-libpng15.patch   2012-01-19 22:25:27 UTC 
(rev 146985)
@@ -0,0 +1,19 @@
+--- src/spuunmux.c
 src/spuunmux.c
+@@ -39,6 +39,7 @@
+ #include 
+ 
+ #include 
++#include 
+ 
+ #include "rgb.h"
+ #include "common.h"
+@@ -610,7 +611,7 @@
+ png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+ return -1;
+   } /*if*/
+-if (setjmp(png_ptr->jmpbuf))
++if (setjmp(png_jmpbuf(png_ptr)))
+   {
+   

[arch-commits] Commit in dvdauthor/trunk (PKGBUILD dvdauthor-0.7.0-libpng15.patch)

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 17:25:08
  Author: giovanni
Revision: 146984

upgpkg: dvdauthor 0.7.0-4

libpng 1.5 rebuild

Added:
  dvdauthor/trunk/dvdauthor-0.7.0-libpng15.patch
Modified:
  dvdauthor/trunk/PKGBUILD

+
 PKGBUILD   |   10 +++---
 dvdauthor-0.7.0-libpng15.patch |   19 +++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 22:19:37 UTC (rev 146983)
+++ PKGBUILD2012-01-19 22:25:08 UTC (rev 146984)
@@ -6,19 +6,23 @@
 
 pkgname=dvdauthor
 pkgver=0.7.0
-pkgrel=3
+pkgrel=4
 pkgdesc="DVD authoring tools"
 arch=('i686' 'x86_64')
 url="http://dvdauthor.sourceforge.net/";
 license=('GPL')
 depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi')
 options=('!makeflags')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz";)
-md5sums=('33a447fb98ab3293ac40f869eedc17ff')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz";
+'dvdauthor-0.7.0-libpng15.patch')
+md5sums=('33a447fb98ab3293ac40f869eedc17ff'
+ '9ea90bbea6adb0469c8c1b2f7d033f11')
 
 build() {
   cd "${srcdir}/${pkgname}"
 
+  patch -Np0 -i "${srcdir}/dvdauthor-0.7.0-libpng15.patch"
+
   ./configure --prefix=/usr \
   --sysconfdir=/etc
   make

Added: dvdauthor-0.7.0-libpng15.patch
===
--- dvdauthor-0.7.0-libpng15.patch  (rev 0)
+++ dvdauthor-0.7.0-libpng15.patch  2012-01-19 22:25:08 UTC (rev 146984)
@@ -0,0 +1,19 @@
+--- src/spuunmux.c
 src/spuunmux.c
+@@ -39,6 +39,7 @@
+ #include 
+ 
+ #include 
++#include 
+ 
+ #include "rgb.h"
+ #include "common.h"
+@@ -610,7 +611,7 @@
+ png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+ return -1;
+   } /*if*/
+-if (setjmp(png_ptr->jmpbuf))
++if (setjmp(png_jmpbuf(png_ptr)))
+   {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ fclose(fp);



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

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 17:19:37
  Author: eric
Revision: 146983

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

Added:
  fvwm/repos/staging-i686/
  fvwm/repos/staging-i686/PKGBUILD
(from rev 146982, fvwm/trunk/PKGBUILD)
  fvwm/repos/staging-i686/fvwm.desktop
(from rev 146982, fvwm/trunk/fvwm.desktop)
  fvwm/repos/staging-x86_64/
  fvwm/repos/staging-x86_64/PKGBUILD
(from rev 146982, fvwm/trunk/PKGBUILD)
  fvwm/repos/staging-x86_64/fvwm.desktop
(from rev 146982, fvwm/trunk/fvwm.desktop)

-+
 staging-i686/PKGBUILD   |   33 +
 staging-i686/fvwm.desktop   |7 +++
 staging-x86_64/PKGBUILD |   33 +
 staging-x86_64/fvwm.desktop |7 +++
 4 files changed, 80 insertions(+)

Copied: fvwm/repos/staging-i686/PKGBUILD (from rev 146982, fvwm/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 22:19:37 UTC (rev 146983)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=fvwm
+pkgver=2.6.3
+pkgrel=2
+pkgdesc="A multiple large virtual desktop window manager originally derived 
from twm"
+arch=('i686' 'x86_64')
+url="http://www.fvwm.org";
+license=('GPL' 'custom')
+depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 
'libxcursor')
+makedepends=('libxslt')
+provides=('fvwm-devel')
+conflicts=('fvwm-devel')
+replaces=('fvwm-devel')
+options=('!emptydirs' '!makeflags')
+source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2
 fvwm.desktop)
+sha1sums=('7a04dae0e4a17f4d908589e704b48246b7c05e39'
+  '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib 
--with-stroke-library
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 
sample.fvwmrc/{decor_examples,DecorMwm,DecorWin95,new-features,system.*} 
"${pkgdir}/usr/share/doc/fvwm"
+  install -D -m644 ../fvwm.desktop "${pkgdir}/usr/share/xsessions/fvwm.desktop"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}

Copied: fvwm/repos/staging-i686/fvwm.desktop (from rev 146982, 
fvwm/trunk/fvwm.desktop)
===
--- staging-i686/fvwm.desktop   (rev 0)
+++ staging-i686/fvwm.desktop   2012-01-19 22:19:37 UTC (rev 146983)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=FVWM
+Comment=The fvwm window manager
+Type=XSession
+Exec=/usr/bin/fvwm
+TryExec=/usr/bin/fvwm

Copied: fvwm/repos/staging-x86_64/PKGBUILD (from rev 146982, 
fvwm/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-19 22:19:37 UTC (rev 146983)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=fvwm
+pkgver=2.6.3
+pkgrel=2
+pkgdesc="A multiple large virtual desktop window manager originally derived 
from twm"
+arch=('i686' 'x86_64')
+url="http://www.fvwm.org";
+license=('GPL' 'custom')
+depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 
'libxcursor')
+makedepends=('libxslt')
+provides=('fvwm-devel')
+conflicts=('fvwm-devel')
+replaces=('fvwm-devel')
+options=('!emptydirs' '!makeflags')
+source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2
 fvwm.desktop)
+sha1sums=('7a04dae0e4a17f4d908589e704b48246b7c05e39'
+  '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib 
--with-stroke-library
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 
sample.fvwmrc/{decor_examples,DecorMwm,DecorWin95,new-features,system.*} 
"${pkgdir}/usr/share/doc/fvwm"
+  install -D -m644 ../fvwm.desktop "${pkgdir}/usr/share/xsessions/fvwm.desktop"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}

Copied: fvwm/repos/staging-x86_64/fvwm.desktop (from rev 146982, 
fvwm/trunk/fvwm.desktop)
===
--- staging-x86_64/fvwm.desktop (rev 0)
+++ staging-x86_64/fvwm.desktop 2012-01-19 22:19:37 UTC (rev 146983)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=FVWM
+Comment=The fvwm window manager
+Type=XSession
+Exec=/usr/bin/fvwm
+TryExec=/usr/bin/fvwm



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

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 17:19:12
  Author: eric
Revision: 146982

upgpkg: fvwm 2.6.3-2

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  fvwm/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 21:57:20 UTC (rev 146981)
+++ PKGBUILD2012-01-19 22:19:12 UTC (rev 146982)
@@ -3,7 +3,7 @@
 
 pkgname=fvwm
 pkgver=2.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A multiple large virtual desktop window manager originally derived 
from twm"
 arch=('i686' 'x86_64')
 url="http://www.fvwm.org";



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

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 16:57:20
  Author: giovanni
Revision: 146981

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

Added:
  celestia/repos/staging-i686/
  celestia/repos/staging-i686/PKGBUILD
(from rev 146980, celestia/trunk/PKGBUILD)
  celestia/repos/staging-i686/celestia-1.5.1-gcc44.patch
(from rev 146980, celestia/trunk/celestia-1.5.1-gcc44.patch)
  celestia/repos/staging-i686/celestia-1.6.1-gcc46.patch
(from rev 146980, celestia/trunk/celestia-1.6.1-gcc46.patch)
  celestia/repos/staging-i686/celestia-1.6.1-gentoo.patch
(from rev 146980, celestia/trunk/celestia-1.6.1-gentoo.patch)
  celestia/repos/staging-i686/celestia-1.6.1-libpng15.patch
(from rev 146980, celestia/trunk/celestia-1.6.1-libpng15.patch)
  celestia/repos/staging-i686/celestia-1.6.1-linking.patch
(from rev 146980, celestia/trunk/celestia-1.6.1-linking.patch)
  celestia/repos/staging-x86_64/
  celestia/repos/staging-x86_64/PKGBUILD
(from rev 146980, celestia/trunk/PKGBUILD)
  celestia/repos/staging-x86_64/celestia-1.5.1-gcc44.patch
(from rev 146980, celestia/trunk/celestia-1.5.1-gcc44.patch)
  celestia/repos/staging-x86_64/celestia-1.6.1-gcc46.patch
(from rev 146980, celestia/trunk/celestia-1.6.1-gcc46.patch)
  celestia/repos/staging-x86_64/celestia-1.6.1-gentoo.patch
(from rev 146980, celestia/trunk/celestia-1.6.1-gentoo.patch)
  celestia/repos/staging-x86_64/celestia-1.6.1-libpng15.patch
(from rev 146980, celestia/trunk/celestia-1.6.1-libpng15.patch)
  celestia/repos/staging-x86_64/celestia-1.6.1-linking.patch
(from rev 146980, celestia/trunk/celestia-1.6.1-linking.patch)

--+
 staging-i686/PKGBUILD|   50 +++
 staging-i686/celestia-1.5.1-gcc44.patch  |   20 +
 staging-i686/celestia-1.6.1-gcc46.patch  |   13 ++
 staging-i686/celestia-1.6.1-gentoo.patch |   23 ++
 staging-i686/celestia-1.6.1-libpng15.patch   |   14 ++
 staging-i686/celestia-1.6.1-linking.patch|   54 +
 staging-x86_64/PKGBUILD  |   50 +++
 staging-x86_64/celestia-1.5.1-gcc44.patch|   20 +
 staging-x86_64/celestia-1.6.1-gcc46.patch|   13 ++
 staging-x86_64/celestia-1.6.1-gentoo.patch   |   23 ++
 staging-x86_64/celestia-1.6.1-libpng15.patch |   14 ++
 staging-x86_64/celestia-1.6.1-linking.patch  |   54 +
 12 files changed, 348 insertions(+)

Copied: celestia/repos/staging-i686/PKGBUILD (from rev 146980, 
celestia/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 21:57:20 UTC (rev 146981)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Ronald van Haren 
+# Contributor : Damir Perisa 
+
+pkgname=celestia
+pkgver=1.6.1
+pkgrel=2
+pkgdesc="Real-time space simulation"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.shatters.net/celestia/";
+depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg')
+options=('!makeflags')
+source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz";
+'celestia-1.6.1-gcc46.patch' 
+'celestia-1.6.1-libpng15.patch'
+'celestia-1.6.1-linking.patch')
+sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
+  '7c08ca391603806d788cb8f3342acedafc924eef'
+  '46ecc4e10b24191384bc848c206652498843adf0'
+  '534c8eee18d13a868c91f0b870ebecc05f3e7ae1')
+
+build() {
+cd ${srcdir}/${pkgname}-${pkgver}
+
+# build patch
+patch -Np0 -i "${srcdir}/celestia-1.6.1-gcc46.patch"
+patch -Np0 -i "${srcdir}/celestia-1.6.1-libpng15.patch"
+patch -Np1 -i "${srcdir}/celestia-1.6.1-linking.patch"
+
+# This version of Celestia has a bug in the font rendering and requires 
-fsigned-char 
+export CFLAGS="$CFLAGS -fsigned-char"
+export CXXFLAGS="$CXXFLAGS -fsigned-char"
+
+autoreconf
+./configure --prefix=/usr \
+--with-lua=/usr \
+   --datadir=/usr/share \
+--with-gtk \
+--disable-rpath \
+--with-lua
+make
+}
+
+package() {
+cd ${srcdir}/${pkgname}-${pkgver}
+
+make DESTDIR=${pkgdir} install
+}
+

Copied: celestia/repos/staging-i686/celestia-1.5.1-gcc44.patch (from rev 
146980, celestia/trunk/celestia-1.5.1-gcc44.patch)
===
--- staging-i686/celestia-1.5.1-gcc44.patch (rev 0)
+++ staging-i686/celestia-1.5.1-gcc44.patch 2012-01-19 21:57:20 UTC (rev 
146981)
@@ -0,0 +1,20 @@
+--- src/celengine/overlay.h.orig   2009-07-08 02:27:08.0 -0400
 src/celengine/overlay.h2009-07-08 02:27:28.0 -0400
+@@ -10,6 +10,7 @@
+ #ifndef _OVERLAY_H_
+ #define _OVERLAY_H_
+ 
++#include 
+ #include 
+ #includ

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

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 16:56:40
  Author: giovanni
Revision: 146980

upgpkg: celestia 1.6.1-2

libpng 1.5 rebuild

Added:
  celestia/trunk/celestia-1.6.1-gcc46.patch
  celestia/trunk/celestia-1.6.1-libpng15.patch
  celestia/trunk/celestia-1.6.1-linking.patch
Modified:
  celestia/trunk/PKGBUILD

---+
 PKGBUILD  |   28 ++--
 celestia-1.6.1-gcc46.patch|   13 +
 celestia-1.6.1-libpng15.patch |   14 ++
 celestia-1.6.1-linking.patch  |   54 
 4 files changed, 101 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 21:29:09 UTC (rev 146979)
+++ PKGBUILD2012-01-19 21:56:40 UTC (rev 146980)
@@ -4,35 +4,47 @@
 
 pkgname=celestia
 pkgver=1.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Real-time space simulation"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.shatters.net/celestia/";
 depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz
-   celestia-1.5.1-gcc44.patch celestia-1.6.1-gentoo.patch)
+source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz";
+'celestia-1.6.1-gcc46.patch' 
+'celestia-1.6.1-libpng15.patch'
+'celestia-1.6.1-linking.patch')
 sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
-  '5ab2769e239a89468bb8ffb5740cbeec6018143c'
-  'aebf894630fdba4c4d429622f5e2b8da56d8b61e')
+  '7c08ca391603806d788cb8f3342acedafc924eef'
+  '46ecc4e10b24191384bc848c206652498843adf0'
+  '534c8eee18d13a868c91f0b870ebecc05f3e7ae1')
 
 build() {
 cd ${srcdir}/${pkgname}-${pkgver}
 
 # build patch
-patch -Np0 < ${srcdir}/celestia-1.5.1-gcc44.patch
-patch -Np0 -i ${srcdir}/celestia-1.6.1-gentoo.patch
+patch -Np0 -i "${srcdir}/celestia-1.6.1-gcc46.patch"
+patch -Np0 -i "${srcdir}/celestia-1.6.1-libpng15.patch"
+patch -Np1 -i "${srcdir}/celestia-1.6.1-linking.patch"
 
+# This version of Celestia has a bug in the font rendering and requires 
-fsigned-char 
+export CFLAGS="$CFLAGS -fsigned-char"
+export CXXFLAGS="$CXXFLAGS -fsigned-char"
+
+autoreconf
 ./configure --prefix=/usr \
 --with-lua=/usr \
--datadir=/usr/share \
---with-gtk
+--with-gtk \
+--disable-rpath \
+--with-lua
 make
 }
 
 package() {
 cd ${srcdir}/${pkgname}-${pkgver}
+
 make DESTDIR=${pkgdir} install
 }
 

Added: celestia-1.6.1-gcc46.patch
===
--- celestia-1.6.1-gcc46.patch  (rev 0)
+++ celestia-1.6.1-gcc46.patch  2012-01-19 21:56:40 UTC (rev 146980)
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/show_bug.cgi?id=366073
+
+Patch written by Nils Larsson 
+--- src/celengine/frametree.h
 src/celengine/frametree.h
+@@ -14,6 +14,7 @@
+ #define _CELENGINE_FRAMETREE_H_
+ 
+ #include 
++#include 
+ 
+ class Star;
+ class Body;

Added: celestia-1.6.1-libpng15.patch
===
--- celestia-1.6.1-libpng15.patch   (rev 0)
+++ celestia-1.6.1-libpng15.patch   2012-01-19 21:56:40 UTC (rev 146980)
@@ -0,0 +1,14 @@
+imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this 
scope
+
+--- src/celestia/imagecapture.cpp
 src/celestia/imagecapture.cpp
+@@ -31,6 +31,9 @@
+ #include "png.h"
+ #endif
+ 
++// Z_BEST_COMPRESSION
++#include 
++
+ // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
+ #ifndef png_jmpbuf
+ #define png_jmpbuf(png_ptr) png_ptr->jmpbuf

Added: celestia-1.6.1-linking.patch
===
--- celestia-1.6.1-linking.patch(rev 0)
+++ celestia-1.6.1-linking.patch2012-01-19 21:56:40 UTC (rev 146980)
@@ -0,0 +1,54 @@
+Fix linking issues:
+ * underlinking GLUT (bug #372123, #387609)
+ * as-needed (bug #281258)
+
+--- a/src/celestia/Makefile.am
 b/src/celestia/Makefile.am
+@@ -7,14 +7,15 @@
+ 
+ if ENABLE_KDE
+ SUBDIRS += kde
+-celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
+-  $(LIBSOCKET) -lDCOP kde/libkdegui.a
++celestiaKDELIBS = kde/libkdegui.a
+ celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP
+ endif
+ 
+ if ENABLE_GTK
+ SUBDIRS += gtk
+-celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
++celestiaGTKLIBS = gtk/libgtkgui.a
++LIBS += $(GTK_LIBS)
+ endif
+ 
+ COMMONSOURCES = \
+@@ -62,6 +63,7 @@
+ 
+ if ENABLE_GLUT
+ GLUTSOURCES = glutmain.cpp
++GLUTLIBS = -lGL
+ endif
+ 
+ if ENABLE_THEORA
+@@ -80,15 +82,16 @@
+ cel

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

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 16:29:09
  Author: eric
Revision: 146979

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

Added:
  fltk/repos/staging-i686/
  fltk/repos/staging-i686/PKGBUILD
(from rev 146978, fltk/trunk/PKGBUILD)
  fltk/repos/staging-i686/fltk-games.install
(from rev 146978, fltk/trunk/fltk-games.install)
  fltk/repos/staging-i686/fltk.install
(from rev 146978, fltk/trunk/fltk.install)
  fltk/repos/staging-x86_64/
  fltk/repos/staging-x86_64/PKGBUILD
(from rev 146978, fltk/trunk/PKGBUILD)
  fltk/repos/staging-x86_64/fltk-games.install
(from rev 146978, fltk/trunk/fltk-games.install)
  fltk/repos/staging-x86_64/fltk.install
(from rev 146978, fltk/trunk/fltk.install)

---+
 staging-i686/PKGBUILD |   62 
 staging-i686/fltk-games.install   |   11 ++
 staging-i686/fltk.install |   12 ++
 staging-x86_64/PKGBUILD   |   62 
 staging-x86_64/fltk-games.install |   11 ++
 staging-x86_64/fltk.install   |   12 ++
 6 files changed, 170 insertions(+)

Copied: fltk/repos/staging-i686/PKGBUILD (from rev 146978, fltk/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 21:29:09 UTC (rev 146979)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer:
+
+pkgbase=fltk
+pkgname=('fltk' 'fltk-docs' 'fltk-games')
+pkgver=1.3.0
+pkgrel=3
+arch=('i686' 'x86_64')
+license=('custom:LGPL')
+url="http://www.fltk.org/";
+makedepends=('mesa' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
+ 'alsa-lib' 'desktop-file-utils')
+source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz)
+md5sums=('44d5d7ba06afdd36ea17da6b4b703ca3')
+
+build() {
+  cd "$srcdir/$pkgbase-$pkgver"
+  sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' \
+ -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile
+  ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
+  make
+  cd documentation
+  make html
+}
+
+package_fltk() {
+  pkgdesc="Graphical user interface toolkit for X"
+  depends=('libjpeg' 'libpng' 'libxft' 'libxinerama' 'hicolor-icon-theme' \
+   'desktop-file-utils' 'xdg-utils')
+  options=('!docs')
+  install=fltk.install
+
+  cd "$srcdir/$pkgbase-$pkgver"
+  make DESTDIR="$pkgdir" install
+  (cd fluid; make DESTDIR="$pkgdir" install install-linux)
+  chmod 644 "$pkgdir"/usr/lib/*.a
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_fltk-docs() {
+  pkgdesc="Graphical user interface toolkit for X (documentation)"
+
+  cd "$srcdir/$pkgbase-$pkgver/documentation"
+  install -d "$pkgdir"/usr/share/doc/fltk/
+  for _file in html/* ; do
+install -m644 $_file "$pkgdir"/usr/share/doc/fltk/
+  done
+  cd ../test
+  make DESTDIR="$pkgdir" install
+  install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_fltk-games() {
+  pkgdesc="Example games that accompany FLTK: blocks, checkers and sudoku"
+  depends=('alsa-lib' 'fltk')
+  install=fltk-games.install
+
+  cd "$srcdir/$pkgbase-$pkgver/test"
+  make DESTDIR="$pkgdir" install-linux
+  (cd ../documentation;  make DESTDIR="$pkgdir" install-linux)
+  install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Copied: fltk/repos/staging-i686/fltk-games.install (from rev 146978, 
fltk/trunk/fltk-games.install)
===
--- staging-i686/fltk-games.install (rev 0)
+++ staging-i686/fltk-games.install 2012-01-19 21:29:09 UTC (rev 146979)
@@ -0,0 +1,11 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install 
+}

Copied: fltk/repos/staging-i686/fltk.install (from rev 146978, 
fltk/trunk/fltk.install)
===
--- staging-i686/fltk.install   (rev 0)
+++ staging-i686/fltk.install   2012-01-19 21:29:09 UTC (rev 146979)
@@ -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: fltk/repos/staging-x86_64/PKGBUILD (from rev 146978, 
fltk/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-19 21:29:09 UTC (rev 146979)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer:
+
+pkgbase=fltk
+pkgname=('fltk' 'fltk-docs' 'fltk-games')
+pkgver=1.3.0
+pkgrel=3
+arch=('i686' 'x86_64')
+license=('custom:LGPL')
+url="http://www.fltk.org/";
+makedepends=('mesa' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxi

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

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 16:28:49
  Author: eric
Revision: 146978

upgpkg: fltk 1.3.0-3

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  fltk/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 20:58:08 UTC (rev 146977)
+++ PKGBUILD2012-01-19 21:28:49 UTC (rev 146978)
@@ -4,7 +4,7 @@
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url="http://www.fltk.org/";



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

2012-01-19 Thread andyrtr
Date: Thursday, January 19, 2012 @ 15:58:08
  Author: andyrtr
Revision: 146977

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

Added:
  ghostscript/repos/staging-i686/
  ghostscript/repos/staging-i686/PKGBUILD
(from rev 146976, ghostscript/trunk/PKGBUILD)
  ghostscript/repos/staging-i686/ghostscript-cups-rgbw.patch
(from rev 146976, ghostscript/trunk/ghostscript-cups-rgbw.patch)
  
ghostscript/repos/staging-i686/ghostscript-gpl-9.04-freetype-underlinking.patch
(from rev 146976, 
ghostscript/trunk/ghostscript-gpl-9.04-freetype-underlinking.patch)
  ghostscript/repos/staging-i686/gs_bug691759and691760.diff
(from rev 146976, ghostscript/trunk/gs_bug691759and691760.diff)
  ghostscript/repos/staging-i686/svn_rev11948.diff
(from rev 146976, ghostscript/trunk/svn_rev11948.diff)
  ghostscript/repos/staging-x86_64/
  ghostscript/repos/staging-x86_64/PKGBUILD
(from rev 146976, ghostscript/trunk/PKGBUILD)
  ghostscript/repos/staging-x86_64/ghostscript-cups-rgbw.patch
(from rev 146976, ghostscript/trunk/ghostscript-cups-rgbw.patch)
  
ghostscript/repos/staging-x86_64/ghostscript-gpl-9.04-freetype-underlinking.patch
(from rev 146976, 
ghostscript/trunk/ghostscript-gpl-9.04-freetype-underlinking.patch)
  ghostscript/repos/staging-x86_64/gs_bug691759and691760.diff
(from rev 146976, ghostscript/trunk/gs_bug691759and691760.diff)
  ghostscript/repos/staging-x86_64/svn_rev11948.diff
(from rev 146976, ghostscript/trunk/svn_rev11948.diff)

-+
 staging-i686/PKGBUILD   |   74 ++
 staging-i686/ghostscript-cups-rgbw.patch|  263 
++
 staging-i686/ghostscript-gpl-9.04-freetype-underlinking.patch   |   12 
 staging-i686/gs_bug691759and691760.diff |  215 
 staging-i686/svn_rev11948.diff  |   16 
 staging-x86_64/PKGBUILD |   74 ++
 staging-x86_64/ghostscript-cups-rgbw.patch  |  263 
++
 staging-x86_64/ghostscript-gpl-9.04-freetype-underlinking.patch |   12 
 staging-x86_64/gs_bug691759and691760.diff   |  215 
 staging-x86_64/svn_rev11948.diff|   16 
 10 files changed, 1160 insertions(+)

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


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

2012-01-19 Thread andyrtr
Date: Thursday, January 19, 2012 @ 15:56:52
  Author: andyrtr
Revision: 146976

upgpkg: ghostscript 9.04-6

libtiff/libpng rebuild; add a patch now needed to link system freetype

Added:
  ghostscript/trunk/ghostscript-gpl-9.04-freetype-underlinking.patch
Modified:
  ghostscript/trunk/PKGBUILD

--+
 PKGBUILD |   20 
 ghostscript-gpl-9.04-freetype-underlinking.patch |   12 
 2 files changed, 24 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 20:40:48 UTC (rev 146975)
+++ PKGBUILD2012-01-19 20:56:52 UTC (rev 146976)
@@ -3,30 +3,34 @@
 
 pkgname=ghostscript
 pkgver=9.04
-pkgrel=5
+pkgrel=6
 pkgdesc="An interpreter for the PostScript language"
 arch=('i686' 'x86_64')
 license=('GPL3' 'custom')
-depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng' 'libjpeg' 
'libtiff' 'lcms') # 'lcms2' won't get used) # move in libpaper from community?
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 
'libjpeg' 'libtiff>=4.0.0' 'lcms') # 'lcms2' won't get used) # move in libpaper 
from community?
 makedepends=('gtk2' 'gnutls')
 optdepends=('texlive-core:  needed for dvipdf'
 'gtk2:  needed for gsx')
 url="http://www.ghostscript.com/";
 source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2
-   ghostscript-cups-rgbw.patch)
+   ghostscript-cups-rgbw.patch
+   ghostscript-gpl-9.04-freetype-underlinking.patch)
 options=('!libtool' '!makeflags')
 md5sums=('9f6899e821ab6d78ab2c856f10fa3023'
- 'bc56eb8c5fef0ecf964f6b3e9b7e65ae')
+ 'bc56eb8c5fef0ecf964f6b3e9b7e65ae'
+ 'a1928c3e4459dcfee0aaa4b38fadba57')
 
 build() {
   cd ${srcdir}/ghostscript-${pkgver}
   
   # fix broken color printing https://bugs.archlinux.org/task/25519
   patch -Np1 -i ${srcdir}/ghostscript-cups-rgbw.patch
-
+  # fix a linking issue
+  patch -Np1 -i ${srcdir}/ghostscript-gpl-9.04-freetype-underlinking.patch
+  
   # force it to use system-libs
-  rm -rf jpeg libpng zlib jasper expat tiff freetype lcms
-
+  rm -rf jpeg libpng zlib jasper expat tiff lcms freetype 
+  
   ./configure --prefix=/usr \
--enable-dynamic \
--with-ijs \
@@ -41,7 +45,7 @@
--without-luratech \
--disable-compile-inits #--help # needed for linking with system-zlib
   make
-  
+
   # Build IJS
   cd ${srcdir}/ghostscript-${pkgver}/ijs
   ./autogen.sh

Added: ghostscript-gpl-9.04-freetype-underlinking.patch
===
--- ghostscript-gpl-9.04-freetype-underlinking.patch
(rev 0)
+++ ghostscript-gpl-9.04-freetype-underlinking.patch2012-01-19 20:56:52 UTC 
(rev 146976)
@@ -0,0 +1,12 @@
+diff -Naur ghostscript-9.04/base/Makefile.in 
ghostscript-9.04.new/base/Makefile.in
+--- ghostscript-9.04/base/Makefile.in  2011-08-05 13:12:20.0 +0200
 ghostscript-9.04.new/base/Makefile.in  2011-08-16 16:06:50.487377337 
+0200
+@@ -375,7 +375,7 @@
+ # Solaris may need -lnsl -lsocket -lposix4.
+ # (Libraries required by individual drivers are handled automatically.)
+ 
+-EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@
++EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @FT_LIBS@
+ 
+ # Define the standard libraries to search at the end of linking.
+ # Most platforms require -lpthread for the POSIX threads library;



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

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 15:40:48
  Author: eric
Revision: 146975

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

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

--+
 staging-i686/PKGBUILD|   34 ++
 staging-i686/hugin.install   |   15 +++
 staging-x86_64/PKGBUILD  |   34 ++
 staging-x86_64/hugin.install |   15 +++
 4 files changed, 98 insertions(+)

Copied: hugin/repos/staging-i686/PKGBUILD (from rev 146974, 
hugin/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 20:40:48 UTC (rev 146975)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Tobias Kieslich 
+# Contributor: Giovanni Scafora 
+# Contributor: Dominik Ryba 
+
+pkgname=hugin
+pkgver=2011.4.0
+pkgrel=1
+pkgdesc="A frontend to the panorama-tools"
+arch=('i686' 'x86_64')
+url="http://hugin.sourceforge.net/";
+license=('GPL')
+depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c'
+ 'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool')
+makedepends=('zip' 'cmake' 'boost' 'tclap')
+install=hugin.install
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b')
+
+build() {
+  cd "${srcdir}"
+  mkdir build && cd build
+  cmake "${srcdir}/${pkgname}-${pkgver}" \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
+-DENABLE_LAPACK=yes
+  make
+}
+
+package(){
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
+}

Copied: hugin/repos/staging-i686/hugin.install (from rev 146974, 
hugin/trunk/hugin.install)
===
--- staging-i686/hugin.install  (rev 0)
+++ staging-i686/hugin.install  2012-01-19 20:40:48 UTC (rev 146975)
@@ -0,0 +1,15 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
+  update-desktop-database -q
+  update-mime-database usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
+  update-desktop-database -q
+  update-mime-database usr/share/mime > /dev/null
+}

Copied: hugin/repos/staging-x86_64/PKGBUILD (from rev 146974, 
hugin/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-19 20:40:48 UTC (rev 146975)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Tobias Kieslich 
+# Contributor: Giovanni Scafora 
+# Contributor: Dominik Ryba 
+
+pkgname=hugin
+pkgver=2011.4.0
+pkgrel=1
+pkgdesc="A frontend to the panorama-tools"
+arch=('i686' 'x86_64')
+url="http://hugin.sourceforge.net/";
+license=('GPL')
+depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c'
+ 'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool')
+makedepends=('zip' 'cmake' 'boost' 'tclap')
+install=hugin.install
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b')
+
+build() {
+  cd "${srcdir}"
+  mkdir build && cd build
+  cmake "${srcdir}/${pkgname}-${pkgver}" \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
+-DENABLE_LAPACK=yes
+  make
+}
+
+package(){
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
+}

Copied: hugin/repos/staging-x86_64/hugin.install (from rev 146974, 
hugin/trunk/hugin.install)
===
--- staging-x86_64/hugin.install(rev 0)
+++ staging-x86_64/hugin.install2012-01-19 20:40:48 UTC (rev 146975)
@@ -0,0 +1,15 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
+  update-desktop-database -q
+  update-mime-database usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
+  update-desktop-database -q
+  update-mime-database usr/share/mime > /dev/null
+}



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

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 15:40:31
  Author: eric
Revision: 146974

upgpkg: hugin 2011.4.0-1

Rebuild against libpng 1.5 and libtiff 4.0, Upstream update

Modified:
  hugin/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 20:16:27 UTC (rev 146973)
+++ PKGBUILD2012-01-19 20:40:31 UTC (rev 146974)
@@ -4,8 +4,8 @@
 # Contributor: Dominik Ryba 
 
 pkgname=hugin
-pkgver=2011.2.0
-pkgrel=2
+pkgver=2011.4.0
+pkgrel=1
 pkgdesc="A frontend to the panorama-tools"
 arch=('i686' 'x86_64')
 url="http://hugin.sourceforge.net/";
@@ -15,7 +15,7 @@
 makedepends=('zip' 'cmake' 'boost' 'tclap')
 install=hugin.install
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('79dfdac229b4e58f50c893c1238bdd0921ad9da6')
+sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b')
 
 build() {
   cd "${srcdir}"



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

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 15:16:27
  Author: eric
Revision: 146973

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

Added:
  imagemagick/repos/staging-i686/
  imagemagick/repos/staging-i686/PKGBUILD
(from rev 146972, imagemagick/trunk/PKGBUILD)
  imagemagick/repos/staging-i686/perlmagick.rpath.patch
(from rev 146972, imagemagick/trunk/perlmagick.rpath.patch)
  imagemagick/repos/staging-x86_64/
  imagemagick/repos/staging-x86_64/PKGBUILD
(from rev 146972, imagemagick/trunk/PKGBUILD)
  imagemagick/repos/staging-x86_64/perlmagick.rpath.patch
(from rev 146972, imagemagick/trunk/perlmagick.rpath.patch)

---+
 staging-i686/PKGBUILD |   84 
 staging-i686/perlmagick.rpath.patch   |   10 +++
 staging-x86_64/PKGBUILD   |   84 
 staging-x86_64/perlmagick.rpath.patch |   10 +++
 4 files changed, 188 insertions(+)

Copied: imagemagick/repos/staging-i686/PKGBUILD (from rev 146972, 
imagemagick/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 20:16:27 UTC (rev 146973)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgbase=imagemagick
+pkgname=('imagemagick' 'imagemagick-doc')
+pkgver=6.7.4.7
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.imagemagick.org/";
+license=('custom')
+depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 
'libjpeg-turbo')
+makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 
'libpng')
+source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz
 \
+perlmagick.rpath.patch)
+sha1sums=('87cde464a569d8b34ef8edae817fbe4f51f8c2d0'
+  '23405f80904b1de94ebd7bd6fe2a332471b8c283')
+
+build() {
+  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
+
+  sed '/AC_PATH_XTRA/d' -i configure.ac
+  autoreconf
+  patch -p0 -i ../perlmagick.rpath.patch
+
+  LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" \
+./configure --prefix=/usr --sysconfdir=/etc --with-modules 
--disable-static \
+--enable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 
--with-jp2 \
+--with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
+--with-perl --with-perl-options="INSTALLDIRS=vendor" \
+--without-gvc --without-djvu --without-autotrace --without-webp \
+--without-jbig --without-fpx --without-dps --without-fftw --without-lqr
+  make
+}
+
+check() {
+  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
+  make check
+}
+
+package_imagemagick() {
+  pkgdesc="An image viewing/manipulation program"
+  optdepends=('ghostscript: for Ghostscript support' 
+  'openexr: for OpenEXR support' 
+  'libwmf: for WMF support' 
+  'librsvg: for SVG support' 
+  'libxml2: for XML support' 
+  'jasper: for JPEG-2000 support' 
+  'libpng: for PNG support')
+  backup=('etc/ImageMagick/coder.xml'
+  'etc/ImageMagick/colors.xml'
+  'etc/ImageMagick/delegates.xml'
+  'etc/ImageMagick/log.xml'
+  'etc/ImageMagick/magic.xml'
+  'etc/ImageMagick/mime.xml'
+  'etc/ImageMagick/policy.xml'
+  'etc/ImageMagick/sRGB.icc'
+  'etc/ImageMagick/thresholds.xml'
+  'etc/ImageMagick/type.xml'
+  'etc/ImageMagick/type-dejavu.xml'
+  'etc/ImageMagick/type-ghostscript.xml'
+  'etc/ImageMagick/type-windows.xml')
+  options=('!makeflags' '!docs' 'libtool')
+
+  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
+  make DESTDIR="${pkgdir}" install
+  chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" 
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
+  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
+
+#Cleaning
+  find "${pkgdir}" -name '*.bs' -delete
+  rm -f "${pkgdir}"/usr/lib/*.la
+}
+
+package_imagemagick-doc() {
+  pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)"
+  depends=()
+  options=('!makeflags')
+
+  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
+  make DESTDIR="${pkgdir}" install-data-html
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE"
+  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE"
+}

Copied: imagemagick/repos/staging-i686/perlmagick.rpath.patch (from rev 146972, 
imagemagick/trunk/perlmagick.rpath.patch)
===
--- staging-i686/perlmagick.rpath.patch (rev 0)
+++ staging-i686/perlmagick.rpath.patch 2012-01-19 20:16:27 UTC (rev 146973)
@@ -0,0 +1,10 @@
+--- Makefile.in.orig   2009-05-26 16:22:11.0 -0300
 Makefile.in2009-05-26 16:23:27.0 -0300
+@@ -10067,6 +10067,7 

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

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 15:15:08
  Author: eric
Revision: 146972

upgpkg: imagemagick 6.7.4.7-1

Rebuild against libpng 1.5 and libtiff 4.0, Upstream update, Add perl depends

Modified:
  imagemagick/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 19:43:46 UTC (rev 146971)
+++ PKGBUILD2012-01-19 20:15:08 UTC (rev 146972)
@@ -3,16 +3,16 @@
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.4.0
+pkgver=6.7.4.7
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/";
 license=('custom')
-depends=('libltdl' 'lcms2' 'libxt' 'xz' 'fontconfig' 'libxext' 'libjpeg-turbo')
+depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 
'libjpeg-turbo')
 makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 
'libpng')
 
source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz
 \
 perlmagick.rpath.patch)
-sha1sums=('f0310885972341b74670925b503ad8a8b05ad75d'
+sha1sums=('87cde464a569d8b34ef8edae817fbe4f51f8c2d0'
   '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {



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

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 14:43:46
  Author: giovanni
Revision: 146971

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

Added:
  gtkglext/repos/staging-i686/
  gtkglext/repos/staging-i686/PKGBUILD
(from rev 146970, gtkglext/trunk/PKGBUILD)
  gtkglext/repos/staging-i686/gtk2.20.patch
(from rev 146970, gtkglext/trunk/gtk2.20.patch)
  gtkglext/repos/staging-x86_64/
  gtkglext/repos/staging-x86_64/PKGBUILD
(from rev 146970, gtkglext/trunk/PKGBUILD)
  gtkglext/repos/staging-x86_64/gtk2.20.patch
(from rev 146970, gtkglext/trunk/gtk2.20.patch)

--+
 staging-i686/PKGBUILD|   35 ++
 staging-i686/gtk2.20.patch   |   77 +
 staging-x86_64/PKGBUILD  |   35 ++
 staging-x86_64/gtk2.20.patch |   77 +
 4 files changed, 224 insertions(+)

Copied: gtkglext/repos/staging-i686/PKGBUILD (from rev 146970, 
gtkglext/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 19:43:46 UTC (rev 146971)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer:
+# Contributor: Ben 
+
+pkgname=gtkglext
+pkgver=1.2.0
+pkgrel=7
+pkgdesc="opengl extensions for gtk2"
+arch=('i686' 'x86_64')
+url="http://gtkglext.sourceforge.net/";
+license=('LGPL')
+depends=('gtk2' 'mesa' 'libxmu')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2";
+   'gtk2.20.patch')
+md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4'
+ 'e5a87ec3f2d0e616c6f32f90c3f7237f')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/gtk2.20.patch"
+  sed '/AC_PATH_XTRA/d' -i configure.in
+
+  autoreconf --force --install
+  ./configure --prefix=/usr \
+  --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+}

Copied: gtkglext/repos/staging-i686/gtk2.20.patch (from rev 146970, 
gtkglext/trunk/gtk2.20.patch)
===
--- staging-i686/gtk2.20.patch  (rev 0)
+++ staging-i686/gtk2.20.patch  2012-01-19 19:43:46 UTC (rev 146971)
@@ -0,0 +1,77 @@
+diff -Nur gtkglext-1.2.0.orig/gtk/gtkglwidget.c 
gtkglext-1.2.0/gtk/gtkglwidget.c
+--- gtkglext-1.2.0.orig/gtk/gtkglwidget.c  2004-02-20 11:38:36.0 
+0200
 gtkglext-1.2.0/gtk/gtkglwidget.c   2010-04-20 19:29:42.941917275 +0300
+@@ -127,7 +127,7 @@
+* Synchronize OpenGL and window resizing request streams.
+*/
+ 
+-  if (GTK_WIDGET_REALIZED (widget) && private->is_realized)
++  if (gtk_widget_get_realized (widget) && private->is_realized)
+ {
+   gldrawable = gdk_window_get_gl_drawable (widget->window);
+   gdk_gl_drawable_wait_gdk (gldrawable);
+@@ -154,7 +154,7 @@
+* Remove OpenGL-capability from widget->window.
+*/
+ 
+-  if (GTK_WIDGET_REALIZED (widget))
++  if (gtk_widget_get_realized (widget))
+ gdk_window_unset_gl_capability (widget->window);
+ 
+   private->is_realized = FALSE;
+@@ -174,7 +174,7 @@
+*/
+ 
+   toplevel = gtk_widget_get_toplevel (widget);
+-  if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel))
++  if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized 
(toplevel))
+ {
+   GTK_GL_NOTE (MISC,
+ g_message (" - Install colormap to the top-level window."));
+@@ -194,7 +194,7 @@
+* Set a background of "None" on window to avoid AIX X server crash.
+*/
+ 
+-  if (GTK_WIDGET_REALIZED (widget))
++  if (gtk_widget_get_realized (widget))
+ {
+   GTK_GL_NOTE (MISC,
+ g_message (" - window->bg_pixmap = %p",
+@@ -250,8 +250,8 @@
+   GTK_GL_NOTE_FUNC ();
+ 
+   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+-  g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE);
+-  g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE);
++  g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE);
++  g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE);
+   g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE);
+ 
+   /* 
+@@ -432,7 +432,7 @@
+   GTK_GL_NOTE_FUNC ();
+ 
+   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
++  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
+ 
+   gldrawable = gdk_window_get_gl_drawable (widget->window);
+   if (gldrawable == NULL)
+@@ -474,7 +474,7 @@
+   GLWidgetPrivate *private;
+ 
+   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
++  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
+ 
+   private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private);
+   if (private == NULL)
+@@ -501,7 +501,7 @@
+ gtk_widget_get_gl_window (GtkWid

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

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 14:43:27
  Author: giovanni
Revision: 146970

upgpkg: gtkglext 1.2.0-7

libpng 1.5 rebuild

Modified:
  gtkglext/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 19:16:11 UTC (rev 146969)
+++ PKGBUILD2012-01-19 19:43:27 UTC (rev 146970)
@@ -1,10 +1,10 @@
 # $Id$
-# Maintainer: damir 
+# Maintainer:
 # Contributor: Ben 
 
 pkgname=gtkglext
 pkgver=1.2.0
-pkgrel=6
+pkgrel=7
 pkgdesc="opengl extensions for gtk2"
 arch=('i686' 'x86_64')
 url="http://gtkglext.sourceforge.net/";
@@ -12,16 +12,24 @@
 depends=('gtk2' 'mesa' 'libxmu')
 options=('!libtool')
 
source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2";
-   gtk2.20.patch)
+   'gtk2.20.patch')
 md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4'
  'e5a87ec3f2d0e616c6f32f90c3f7237f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   patch -Np1 -i "${srcdir}/gtk2.20.patch"
   sed '/AC_PATH_XTRA/d' -i configure.in
+
   autoreconf --force --install
-  ./configure --prefix=/usr --disable-static
+  ./configure --prefix=/usr \
+  --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   make DESTDIR="${pkgdir}" install
 }



[arch-commits] Commit in autopano-sift-c/repos (4 files)

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 14:16:11
  Author: eric
Revision: 146969

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

Added:
  autopano-sift-c/repos/staging-i686/
  autopano-sift-c/repos/staging-i686/PKGBUILD
(from rev 146968, autopano-sift-c/trunk/PKGBUILD)
  autopano-sift-c/repos/staging-x86_64/
  autopano-sift-c/repos/staging-x86_64/PKGBUILD
(from rev 146968, autopano-sift-c/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   31 +++
 staging-x86_64/PKGBUILD |   31 +++
 2 files changed, 62 insertions(+)

Copied: autopano-sift-c/repos/staging-i686/PKGBUILD (from rev 146968, 
autopano-sift-c/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 19:16:11 UTC (rev 146969)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Tobias Kieslich 
+# Contributor: Giovanni Scafora 
+# Contributor: Lukas Jirkovsky 
+
+pkgname=autopano-sift-c
+pkgver=2.5.1
+pkgrel=3
+pkgdesc="Identify key feature points within arbitrary images"
+arch=('i686' 'x86_64')
+url="http://hugin.sourceforge.net/";
+license=('GPL2')
+depends=('libxml2' 'libpano13' 'gcc-libs')
+makedepends=('cmake')
+provides=('autopano-sift')
+conflicts=('autopano-sift')
+replaces=('autopano-sift')
+source=(http://downloads.sourceforge.net/sourceforge/hugin/autopano-sift-C-${pkgver}.tar.gz)
+md5sums=('b9bade07e8c4f2ea383c22a082c260e0')
+
+build() {
+  cd "${srcdir}/autopano-sift-C-${pkgver}"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .
+  sed -i 's/-lz/-lz -lm/' CMakeFiles/{autopano,generatekeys}.dir/link.txt
+  make
+}
+
+package() {
+  cd "${srcdir}/autopano-sift-C-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

Copied: autopano-sift-c/repos/staging-x86_64/PKGBUILD (from rev 146968, 
autopano-sift-c/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-19 19:16:11 UTC (rev 146969)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Tobias Kieslich 
+# Contributor: Giovanni Scafora 
+# Contributor: Lukas Jirkovsky 
+
+pkgname=autopano-sift-c
+pkgver=2.5.1
+pkgrel=3
+pkgdesc="Identify key feature points within arbitrary images"
+arch=('i686' 'x86_64')
+url="http://hugin.sourceforge.net/";
+license=('GPL2')
+depends=('libxml2' 'libpano13' 'gcc-libs')
+makedepends=('cmake')
+provides=('autopano-sift')
+conflicts=('autopano-sift')
+replaces=('autopano-sift')
+source=(http://downloads.sourceforge.net/sourceforge/hugin/autopano-sift-C-${pkgver}.tar.gz)
+md5sums=('b9bade07e8c4f2ea383c22a082c260e0')
+
+build() {
+  cd "${srcdir}/autopano-sift-C-${pkgver}"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .
+  sed -i 's/-lz/-lz -lm/' CMakeFiles/{autopano,generatekeys}.dir/link.txt
+  make
+}
+
+package() {
+  cd "${srcdir}/autopano-sift-C-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}



[arch-commits] Commit in autopano-sift-c/trunk (PKGBUILD)

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 14:15:55
  Author: eric
Revision: 146968

upgpkg: autopano-sift-c 2.5.1-3

Rebuild against libpng 1.5 and libtiff 4.0, Fix underlinking bug

Modified:
  autopano-sift-c/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 18:38:17 UTC (rev 146967)
+++ PKGBUILD2012-01-19 19:15:55 UTC (rev 146968)
@@ -5,12 +5,12 @@
 
 pkgname=autopano-sift-c
 pkgver=2.5.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Identify key feature points within arbitrary images"
 arch=('i686' 'x86_64')
 url="http://hugin.sourceforge.net/";
 license=('GPL2')
-depends=('libxml2' 'libpano13>=2.9.17' 'gcc-libs')
+depends=('libxml2' 'libpano13' 'gcc-libs')
 makedepends=('cmake')
 provides=('autopano-sift')
 conflicts=('autopano-sift')
@@ -20,8 +20,12 @@
 
 build() {
   cd "${srcdir}/autopano-sift-C-${pkgver}"
-
   cmake -DCMAKE_INSTALL_PREFIX=/usr .
+  sed -i 's/-lz/-lz -lm/' CMakeFiles/{autopano,generatekeys}.dir/link.txt
   make
-  make DESTDIR=${pkgdir} install
 }
+
+package() {
+  cd "${srcdir}/autopano-sift-C-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}



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

2012-01-19 Thread Tom Gundersen
Date: Thursday, January 19, 2012 @ 13:38:17
  Author: tomegun
Revision: 146967

archrelease: copy trunk to testing-any

Added:
  initscripts/repos/testing-any/
  initscripts/repos/testing-any/PKGBUILD
(from rev 146966, initscripts/trunk/PKGBUILD)
  initscripts/repos/testing-any/initscripts.install
(from rev 146966, initscripts/trunk/initscripts.install)
  initscripts/repos/testing-any/wireless.conf.d
(from rev 146966, initscripts/trunk/wireless.conf.d)

-+
 PKGBUILD|   32 
 initscripts.install |   19 +++
 wireless.conf.d |   12 
 3 files changed, 63 insertions(+)

Copied: initscripts/repos/testing-any/PKGBUILD (from rev 146966, 
initscripts/trunk/PKGBUILD)
===
--- testing-any/PKGBUILD(rev 0)
+++ testing-any/PKGBUILD2012-01-19 18:38:17 UTC (rev 146967)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Tom Gundersen 
+# Contributor: Thomas Bächler 
+# Contributor: Aaron Griffin 
+
+pkgname=initscripts
+pkgver=2012.01.3
+pkgrel=1
+pkgdesc="System initialization/bootup scripts"
+arch=('any')
+url="http://www.archlinux.org";
+license=('GPL2')
+groups=('base')
+backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown 
etc/conf.d/wireless)
+depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=174' 'iproute2'
+ 'ncurses' 'kbd' 'findutils' 'sysvinit')
+optdepends=('bridge-utils: Network bridging support'
+'dhcpcd: DHCP network configuration'
+'net-tools: legacy network support'
+'wireless_tools: Wireless networking')
+makedepends=(asciidoc)
+install=initscripts.install
+source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz";
+'wireless.conf.d')
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
+}
+md5sums=('3d4e02ddefb0c7e8ae7000161ae89448'
+ '027576534885b8d5dded9be546057b12')

Copied: initscripts/repos/testing-any/initscripts.install (from rev 146966, 
initscripts/trunk/initscripts.install)
===
--- testing-any/initscripts.install (rev 0)
+++ testing-any/initscripts.install 2012-01-19 18:38:17 UTC (rev 146967)
@@ -0,0 +1,19 @@
+post_upgrade() {
+  if [ "$(vercmp $2 2009.07)" -lt 0 ]; then
+echo "==> Adjusting /etc/inittab for transition to /dev/tty standard."
+echo "==> Original file saved as /etc/inittab.pacsave"
+sed -i'.pacsave' 's#vc/\([0-9]\)#tty\1#' /etc/inittab
+  fi
+  if [ "$(vercmp $2 2011.06.1)" -lt 0 ]; then
+echo "Blacklisting of modules is no longer supported in rc.conf,"
+echo "please add blacklist entries to /etc/modprobe.d/ instead."
+  fi
+  if [ "$(vercmp $2 2011.07.2)" -lt 0 ]; then
+echo "VERBOSE= in rc.conf no longer has any effect."
+echo "Please append 'quiet' to your kernel command line."
+  fi
+  if [ "$(vercmp $2 2011.10.1)" -lt 0 ]; then
+echo "If using non-bash-compatible shell, please set LANG in 
/etc/locale.conf,"
+echo "as LOCALE in /etc/rc.conf no longer works."
+  fi
+}

Copied: initscripts/repos/testing-any/wireless.conf.d (from rev 146966, 
initscripts/trunk/wireless.conf.d)
===
--- testing-any/wireless.conf.d (rev 0)
+++ testing-any/wireless.conf.d 2012-01-19 18:38:17 UTC (rev 146967)
@@ -0,0 +1,12 @@
+#
+# Settings for wireless cards
+#
+# For each wireless interface declared in INTERFACES (in rc.conf), declare
+# a wlan_${IF} variable that contains the arguments to be passed to
+# iwconfig(8).  Then list the original interface name in the
+# WLAN_INTERFACES array.
+#
+
+#wlan_eth0="eth0 mode managed essid default"
+#WLAN_INTERFACES=(eth0)
+



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

2012-01-19 Thread Tom Gundersen
Date: Thursday, January 19, 2012 @ 13:36:40
  Author: tomegun
Revision: 146966

upgpkg: initscripts 2012.01.3-1

fix nilfs and udev-177

Modified:
  initscripts/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 18:31:50 UTC (rev 146965)
+++ PKGBUILD2012-01-19 18:36:40 UTC (rev 146966)
@@ -4,7 +4,7 @@
 # Contributor: Aaron Griffin 
 
 pkgname=initscripts
-pkgver=2012.01.2
+pkgver=2012.01.3
 pkgrel=1
 pkgdesc="System initialization/bootup scripts"
 arch=('any')
@@ -28,5 +28,5 @@
   make DESTDIR=${pkgdir} install
   install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
 }
-md5sums=('14bb875e1d733e1fca4e61480ba71b4e'
+md5sums=('3d4e02ddefb0c7e8ae7000161ae89448'
  '027576534885b8d5dded9be546057b12')



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

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 13:31:50
  Author: eric
Revision: 146965

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

Added:
  enblend-enfuse/repos/staging-i686/
  enblend-enfuse/repos/staging-i686/PKGBUILD
(from rev 146964, enblend-enfuse/trunk/PKGBUILD)
  enblend-enfuse/repos/staging-i686/enblend-4.0-libpng15.patch
(from rev 146964, enblend-enfuse/trunk/enblend-4.0-libpng15.patch)
  enblend-enfuse/repos/staging-i686/enblend-enfuse.install
(from rev 146964, enblend-enfuse/trunk/enblend-enfuse.install)
  enblend-enfuse/repos/staging-i686/libpng-1.4.patch
(from rev 146964, enblend-enfuse/trunk/libpng-1.4.patch)
  enblend-enfuse/repos/staging-x86_64/
  enblend-enfuse/repos/staging-x86_64/PKGBUILD
(from rev 146964, enblend-enfuse/trunk/PKGBUILD)
  enblend-enfuse/repos/staging-x86_64/enblend-4.0-libpng15.patch
(from rev 146964, enblend-enfuse/trunk/enblend-4.0-libpng15.patch)
  enblend-enfuse/repos/staging-x86_64/enblend-enfuse.install
(from rev 146964, enblend-enfuse/trunk/enblend-enfuse.install)
  enblend-enfuse/repos/staging-x86_64/libpng-1.4.patch
(from rev 146964, enblend-enfuse/trunk/libpng-1.4.patch)

---+
 staging-i686/PKGBUILD |   39 
 staging-i686/enblend-4.0-libpng15.patch   |  220 
 staging-i686/enblend-enfuse.install   |   22 ++
 staging-i686/libpng-1.4.patch |   14 +
 staging-x86_64/PKGBUILD   |   39 
 staging-x86_64/enblend-4.0-libpng15.patch |  220 
 staging-x86_64/enblend-enfuse.install |   22 ++
 staging-x86_64/libpng-1.4.patch   |   14 +
 8 files changed, 590 insertions(+)

Copied: enblend-enfuse/repos/staging-i686/PKGBUILD (from rev 146964, 
enblend-enfuse/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 18:31:50 UTC (rev 146965)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: tobias 
+# Contributor: Dominik Ryba 
+
+pkgname=enblend-enfuse
+pkgver=4.0
+pkgrel=5
+pkgdesc="Intelligent blend tool for overlapping picture"
+arch=("i686" "x86_64")
+license=('GPL')
+url="http://enblend.sourceforge.net";
+depends=('openexr' 'glew>=1.5' 'libxmi' 'freeglut' 'lcms' 'libpng')
+makedepends=('boost')
+replaces=('enblend')
+conflicts=('enblend')
+provides=('enblend')
+install=${pkgname}.install
+source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz{,.asc}
 \
+libpng-1.4.patch enblend-4.0-libpng15.patch)
+sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033'
+  'aac6364b29b0a9d6c61c3db0982f52ce1579e934'
+  'eae6cf48ea082865130302d0b4d1ca0b884a563b'
+  '71e961d90be842eafe9d473d8d70b04b29077036')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
+  sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' 
src/vigra_impex/jpeg.cxx
+  patch -p1 -i ../libpng-1.4.patch
+  patch -p0 -i ../enblend-4.0-libpng15.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info"
+  install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info"
+}

Copied: enblend-enfuse/repos/staging-i686/enblend-4.0-libpng15.patch (from rev 
146964, enblend-enfuse/trunk/enblend-4.0-libpng15.patch)
===
--- staging-i686/enblend-4.0-libpng15.patch (rev 0)
+++ staging-i686/enblend-4.0-libpng15.patch 2012-01-19 18:31:50 UTC (rev 
146965)
@@ -0,0 +1,220 @@
+--- src/vigra_impex/png.cxx
 src/vigra_impex/png.cxx
+@@ -81,7 +81,7 @@
+ static void PngError( png_structp png_ptr, png_const_charp error_msg )
+ {
+ png_error_message = std::string(error_msg);
+-longjmp( png_ptr->jmpbuf, 1 );
++longjmp( png_jmpbuf( png_ptr ), 1 );
+ }
+ 
+ // called on non-fatal errors
+@@ -213,7 +213,7 @@
+ vigra_postcondition( png != 0, "could not create the read struct." );
+ 
+ // create info struct
+-if (setjmp(png->jmpbuf)) {
++if (setjmp(png_jmpbuf( png ))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in 
png_create_info_struct(): ").c_str() );
+ }
+@@ -221,14 +221,14 @@
+ vigra_postcondition( info != 0, "could not create the info struct." );
+ 
+ // init png i/o
+-if (setjmp(png->jmpbuf)) {
++if (setjmp(png_jmpbuf( png ))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in 
png_init_io(): ").c_str() );
+ }
+ png_init_io( png, file.get() );
+ 
+ // specify that the signature was al

[arch-commits] Commit in enblend-enfuse/trunk (PKGBUILD enblend-4.0-libpng15.patch)

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 13:31:26
  Author: eric
Revision: 146964

upgpkg: enblend-enfuse 4.0-5

Rebuild against libpng 1.5 and libtiff 4.0

Added:
  enblend-enfuse/trunk/enblend-4.0-libpng15.patch
Modified:
  enblend-enfuse/trunk/PKGBUILD

+
 PKGBUILD   |   11 +-
 enblend-4.0-libpng15.patch |  220 +++
 2 files changed, 227 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 18:03:44 UTC (rev 146963)
+++ PKGBUILD2012-01-19 18:31:26 UTC (rev 146964)
@@ -4,7 +4,7 @@
 
 pkgname=enblend-enfuse
 pkgver=4.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Intelligent blend tool for overlapping picture"
 arch=("i686" "x86_64")
 license=('GPL')
@@ -15,15 +15,18 @@
 conflicts=('enblend')
 provides=('enblend')
 install=${pkgname}.install
-source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz{,.asc}
 libpng-1.4.patch)
+source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz{,.asc}
 \
+libpng-1.4.patch enblend-4.0-libpng15.patch)
 sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033'
   'aac6364b29b0a9d6c61c3db0982f52ce1579e934'
-  'eae6cf48ea082865130302d0b4d1ca0b884a563b')
+  'eae6cf48ea082865130302d0b4d1ca0b884a563b'
+  '71e961d90be842eafe9d473d8d70b04b29077036')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
   sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' 
src/vigra_impex/jpeg.cxx
-  patch -Np1 -i ../libpng-1.4.patch
+  patch -p1 -i ../libpng-1.4.patch
+  patch -p0 -i ../enblend-4.0-libpng15.patch
   ./configure --prefix=/usr
   make
 }

Added: enblend-4.0-libpng15.patch
===
--- enblend-4.0-libpng15.patch  (rev 0)
+++ enblend-4.0-libpng15.patch  2012-01-19 18:31:26 UTC (rev 146964)
@@ -0,0 +1,220 @@
+--- src/vigra_impex/png.cxx
 src/vigra_impex/png.cxx
+@@ -81,7 +81,7 @@
+ static void PngError( png_structp png_ptr, png_const_charp error_msg )
+ {
+ png_error_message = std::string(error_msg);
+-longjmp( png_ptr->jmpbuf, 1 );
++longjmp( png_jmpbuf( png_ptr ), 1 );
+ }
+ 
+ // called on non-fatal errors
+@@ -213,7 +213,7 @@
+ vigra_postcondition( png != 0, "could not create the read struct." );
+ 
+ // create info struct
+-if (setjmp(png->jmpbuf)) {
++if (setjmp(png_jmpbuf( png ))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in 
png_create_info_struct(): ").c_str() );
+ }
+@@ -221,14 +221,14 @@
+ vigra_postcondition( info != 0, "could not create the info struct." );
+ 
+ // init png i/o
+-if (setjmp(png->jmpbuf)) {
++if (setjmp(png_jmpbuf( png ))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in 
png_init_io(): ").c_str() );
+ }
+ png_init_io( png, file.get() );
+ 
+ // specify that the signature was already read
+-if (setjmp(png->jmpbuf)) {
++if (setjmp(png_jmpbuf( png ))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in 
png_set_sig_bytes(): ").c_str() );
+ }
+@@ -244,13 +244,13 @@
+ void PngDecoderImpl::init()
+ {
+ // read all chunks up to the image data
+-if (setjmp(png->jmpbuf))
++if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, "error in 
png_read_info(): ").c_str() );
+ png_read_info( png, info );
+ 
+ // pull over the header fields
+ int interlace_method, compression_method, filter_method;
+-if (setjmp(png->jmpbuf))
++if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, "error in 
png_get_IHDR(): ").c_str() );
+ png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
+   &interlace_method, &compression_method, &filter_method 
);
+@@ -264,7 +264,7 @@
+ 
+ // transform palette to rgb
+ if ( color_type == PNG_COLOR_TYPE_PALETTE) {
+-if (setjmp(png->jmpbuf))
++if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, 
"error in png_palette_to_rgb(): ").c_str() );
+ png_set_palette_to_rgb(png);
+ color_type = PNG_COLOR_TYPE_RGB;
+@@ -273,7 +273,7 @@
+ 
+ // expand gray values to at least one byte size
+ if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+-if (setjmp(png->jmpbuf))
++if (setjmp(png_jmpbuf( png )))
+ vigra_postcondi

[arch-commits] Commit in lighttpd/repos (16 files)

2012-01-19 Thread Pierre Schmitz
Date: Thursday, January 19, 2012 @ 13:03:44
  Author: pierre
Revision: 146963

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

Added:
  lighttpd/repos/extra-i686/PKGBUILD
(from rev 146962, lighttpd/trunk/PKGBUILD)
  lighttpd/repos/extra-i686/lighttpd.conf
(from rev 146962, lighttpd/trunk/lighttpd.conf)
  lighttpd/repos/extra-i686/lighttpd.logrotate.d
(from rev 146962, lighttpd/trunk/lighttpd.logrotate.d)
  lighttpd/repos/extra-i686/lighttpd.rc.d
(from rev 146962, lighttpd/trunk/lighttpd.rc.d)
  lighttpd/repos/extra-x86_64/PKGBUILD
(from rev 146962, lighttpd/trunk/PKGBUILD)
  lighttpd/repos/extra-x86_64/lighttpd.conf
(from rev 146962, lighttpd/trunk/lighttpd.conf)
  lighttpd/repos/extra-x86_64/lighttpd.logrotate.d
(from rev 146962, lighttpd/trunk/lighttpd.logrotate.d)
  lighttpd/repos/extra-x86_64/lighttpd.rc.d
(from rev 146962, lighttpd/trunk/lighttpd.rc.d)
Deleted:
  lighttpd/repos/extra-i686/PKGBUILD
  lighttpd/repos/extra-i686/lighttpd.conf
  lighttpd/repos/extra-i686/lighttpd.logrotate.d
  lighttpd/repos/extra-i686/lighttpd.rc.d
  lighttpd/repos/extra-x86_64/PKGBUILD
  lighttpd/repos/extra-x86_64/lighttpd.conf
  lighttpd/repos/extra-x86_64/lighttpd.logrotate.d
  lighttpd/repos/extra-x86_64/lighttpd.rc.d

---+
 extra-i686/PKGBUILD   |  134 +-
 extra-i686/lighttpd.conf  |   24 +--
 extra-i686/lighttpd.logrotate.d   |   15 +-
 extra-i686/lighttpd.rc.d  |  264 ++--
 extra-x86_64/PKGBUILD |  134 +-
 extra-x86_64/lighttpd.conf|   24 +--
 extra-x86_64/lighttpd.logrotate.d |   15 +-
 extra-x86_64/lighttpd.rc.d|  264 ++--
 8 files changed, 440 insertions(+), 434 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-19 18:03:05 UTC (rev 146962)
+++ extra-i686/PKGBUILD 2012-01-19 18:03:44 UTC (rev 146963)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz 
-
-pkgname=lighttpd
-pkgver=1.4.30
-pkgrel=1
-pkgdesc='a secure, fast, compliant and very flexible web-server'
-license=('custom')
-arch=('i686' 'x86_64')
-url="http://www.lighttpd.net/";
-depends=('pcre' 'bzip2' 'libldap' 'util-linux')
-makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite3' 
'gdbm' 'pkgconfig')
-optdepends=('libxml2: mod_webdav'
-'lua: mod_cml/mod_magnet'
-'libmysqlclient: mod_mysql_vhost'
-'sqlite3: mod_webdav')
-backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
-options=('!libtool' 'emptydirs')
-source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz";
-
"http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc";
-'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf')
-sha256sums=('c237692366935b19ef8a6a600b2f3c9b259a9c3107271594c081a45902bd9c9b'
-'941ab747aeb97ca111fb670d21eefecdf745debc5e139bc5bd6881ee66b2742a'
-'ceff3a88e876f6104c094379d507b89bc504777d0f98a0930406a70624fcf024'
-'6c5892830e77731d27e3ebb64a0d87ab9139c68eb703aec6741c591814cef26f'
-'44267e8b670faaf5712ad0bc9fd84b8c52281ddd22ef2c22d4b474dbb1cf5d2a')
-
-build() {
-   cd $srcdir/$pkgname-$pkgver
-
-   ./configure --prefix=/usr \
-   --libexecdir=/usr/lib/lighttpd/modules \
-   --sysconfdir=/etc/lighttpd \
-   --with-mysql \
-   --with-ldap \
-   --with-attr \
-   --with-openssl \
-   --with-kerberos5 \
-   --without-fam \
-   --with-webdav-props \
-   --with-webdav-locks \
-   --with-gdbm \
-   --with-memcache \
-   --with-lua
-   make
-}
-
-check() {
-   cd $srcdir/$pkgname-$pkgver
-   make check
-}
-
-package() {
-   cd $srcdir/$pkgname-$pkgver
-   make DESTDIR=$pkgdir install
-
-   install -D -m755 $srcdir/lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd
-   install -D -m644 $srcdir/lighttpd.logrotate.d 
$pkgdir/etc/logrotate.d/lighttpd
-   install -D -m644 $srcdir/lighttpd.conf 
$pkgdir/etc/lighttpd/lighttpd.conf
-   install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/
-
-   pushd doc/config >/dev/null
-   find . -type f ! -name 'Makefile*' -exec install -D -m644 {} 
${pkgdir}/usr/share/doc/lighttpd/config/{} \;
-   popd >/dev/null
-
-   install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-}

Copied: lighttpd/repos/extra-i686/PKGBUILD (from rev 146962, 
lighttpd/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-19 18:03:44 UTC (rev 146963)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Pierre Schmitz 
+
+pkgname=lighttpd
+pkgv

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

2012-01-19 Thread Pierre Schmitz
Date: Thursday, January 19, 2012 @ 13:03:05
  Author: pierre
Revision: 146962

upgpkg: lighttpd 1.4.30-2

rebuild with recent config fixes

Modified:
  lighttpd/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 17:54:16 UTC (rev 146961)
+++ PKGBUILD2012-01-19 18:03:05 UTC (rev 146962)
@@ -3,7 +3,7 @@
 
 pkgname=lighttpd
 pkgver=1.4.30
-pkgrel=1
+pkgrel=2
 pkgdesc='a secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')



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

2012-01-19 Thread Pierre Schmitz
Date: Thursday, January 19, 2012 @ 12:54:16
  Author: pierre
Revision: 146961

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

Added:
  php-suhosin/repos/extra-i686/PKGBUILD
(from rev 146960, php-suhosin/trunk/PKGBUILD)
  php-suhosin/repos/extra-x86_64/PKGBUILD
(from rev 146960, php-suhosin/trunk/PKGBUILD)
Deleted:
  php-suhosin/repos/extra-i686/PKGBUILD
  php-suhosin/repos/extra-x86_64/PKGBUILD

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

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-19 17:53:37 UTC (rev 146960)
+++ extra-i686/PKGBUILD 2012-01-19 17:54:16 UTC (rev 146961)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz 
-
-pkgname=php-suhosin
-pkgver=0.9.32.1
-pkgrel=3
-arch=('i686' 'x86_64')
-pkgdesc='An advanced protection system for PHP installations'
-url='http://www.hardened-php.net/suhosin/'
-license='PHP'
-source=("http://download.suhosin.org/suhosin-${pkgver}.tar.gz";)
-depends=('php')
-conflicts=('php-suhosin-extension')
-replaces=('php-suhosin-extension')
-backup=('etc/php/conf.d/suhosin.ini')
-md5sums=('26a86f0f684a656c3e789e3eb4ec1db3')
-
-build() {
-   cd ${srcdir}/suhosin-${pkgver}
-   phpize
-   ./configure --prefix=/usr --enable-suhosin
-   make
-}
-
-package() {
-   cd ${srcdir}/suhosin-${pkgver}
-   make INSTALL_ROOT=${pkgdir} install
-   # disable by default
-   sed -i 's|extension = suhosin.so|;extension=suhosin.so|g' suhosin.ini
-   install -D -m644 suhosin.ini ${pkgdir}/etc/php/conf.d/suhosin.ini
-}

Copied: php-suhosin/repos/extra-i686/PKGBUILD (from rev 146960, 
php-suhosin/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-19 17:54:16 UTC (rev 146961)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Pierre Schmitz 
+
+pkgname=php-suhosin
+pkgver=0.9.33
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc='An advanced protection system for PHP installations'
+url='http://www.hardened-php.net/suhosin/'
+license='PHP'
+source=("http://download.suhosin.org/suhosin-${pkgver}.tgz";
+"http://download.suhosin.org/suhosin-${pkgver}.tgz.sig";)
+depends=('php')
+conflicts=('php-suhosin-extension')
+replaces=('php-suhosin-extension')
+backup=('etc/php/conf.d/suhosin.ini')
+md5sums=('0ce498a02a8281e4274ea8e390c2b487'
+ '6e9536cc71342bab0efb1e9a84f688a6')
+
+build() {
+   cd ${srcdir}/suhosin-${pkgver}
+   phpize
+   ./configure --prefix=/usr --enable-suhosin
+   make
+}
+
+package() {
+   cd ${srcdir}/suhosin-${pkgver}
+   make INSTALL_ROOT=${pkgdir} install
+   # disable by default
+   sed -i 's|extension = suhosin.so|;extension=suhosin.so|g' suhosin.ini
+   install -D -m644 suhosin.ini ${pkgdir}/etc/php/conf.d/suhosin.ini
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-01-19 17:53:37 UTC (rev 146960)
+++ extra-x86_64/PKGBUILD   2012-01-19 17:54:16 UTC (rev 146961)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz 
-
-pkgname=php-suhosin
-pkgver=0.9.32.1
-pkgrel=3
-arch=('i686' 'x86_64')
-pkgdesc='An advanced protection system for PHP installations'
-url='http://www.hardened-php.net/suhosin/'
-license='PHP'
-source=("http://download.suhosin.org/suhosin-${pkgver}.tar.gz";)
-depends=('php')
-conflicts=('php-suhosin-extension')
-replaces=('php-suhosin-extension')
-backup=('etc/php/conf.d/suhosin.ini')
-md5sums=('26a86f0f684a656c3e789e3eb4ec1db3')
-
-build() {
-   cd ${srcdir}/suhosin-${pkgver}
-   phpize
-   ./configure --prefix=/usr --enable-suhosin
-   make
-}
-
-package() {
-   cd ${srcdir}/suhosin-${pkgver}
-   make INSTALL_ROOT=${pkgdir} install
-   # disable by default
-   sed -i 's|extension = suhosin.so|;extension=suhosin.so|g' suhosin.ini
-   install -D -m644 suhosin.ini ${pkgdir}/etc/php/conf.d/suhosin.ini
-}

Copied: php-suhosin/repos/extra-x86_64/PKGBUILD (from rev 146960, 
php-suhosin/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-01-19 17:54:16 UTC (rev 146961)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Pierre Schmitz 
+
+pkgname=php-suhosin
+pkgver=0.9.33
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc='An advanced protection system for PHP installations'
+url='http://www.hardened-php.net/suhosin/'
+license='PHP'
+source=("http://download.suhosin.org/suhosin-${pkgver}.tgz";
+"http://download.suhosin.org/suhosin-${pkgver}.tgz.sig";)
+depends=('php')
+conflicts=('php-suhosin-extension')
+replaces=('php-suhosin-extension')
+backup=('e

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

2012-01-19 Thread Pierre Schmitz
Date: Thursday, January 19, 2012 @ 12:53:37
  Author: pierre
Revision: 146960

upgpkg: php-suhosin 0.9.33-1

upstream update

Modified:
  php-suhosin/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 17:50:13 UTC (rev 146959)
+++ PKGBUILD2012-01-19 17:53:37 UTC (rev 146960)
@@ -2,20 +2,20 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=php-suhosin
-pkgver=0.9.32.1
-pkgrel=3
+pkgver=0.9.33
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='An advanced protection system for PHP installations'
 url='http://www.hardened-php.net/suhosin/'
 license='PHP'
-source=("http://download.suhosin.org/suhosin-${pkgver}.tar.gz";
-"http://download.suhosin.org/suhosin-${pkgver}.tar.gz.sig";)
+source=("http://download.suhosin.org/suhosin-${pkgver}.tgz";
+"http://download.suhosin.org/suhosin-${pkgver}.tgz.sig";)
 depends=('php')
 conflicts=('php-suhosin-extension')
 replaces=('php-suhosin-extension')
 backup=('etc/php/conf.d/suhosin.ini')
-md5sums=('26a86f0f684a656c3e789e3eb4ec1db3'
- 'c897587122489b39a8c10725cec1751f')
+md5sums=('0ce498a02a8281e4274ea8e390c2b487'
+ '6e9536cc71342bab0efb1e9a84f688a6')
 
 build() {
cd ${srcdir}/suhosin-${pkgver}



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

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 12:50:13
  Author: eric
Revision: 146959

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

Added:
  libpano13/repos/staging-i686/
  libpano13/repos/staging-i686/PKGBUILD
(from rev 146958, libpano13/trunk/PKGBUILD)
  libpano13/repos/staging-x86_64/
  libpano13/repos/staging-x86_64/PKGBUILD
(from rev 146958, libpano13/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   27 +++
 staging-x86_64/PKGBUILD |   27 +++
 2 files changed, 54 insertions(+)

Copied: libpano13/repos/staging-i686/PKGBUILD (from rev 146958, 
libpano13/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 17:50:13 UTC (rev 146959)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: tobias 
+# Contributor: Tobias Kieslich 
+
+pkgname=libpano13
+pkgver=2.9.18
+pkgrel=2
+pkgdesc="Basic library to calculate panoramical pictures - core functions of 
the panotools"
+arch=('i686' 'x86_64')
+url="http://panotools.sourceforge.net/";
+license=('GPL2')
+depends=('libpng' 'libtiff')
+makedepends=('openjdk6')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/panotools/${pkgname}-${pkgver}.tar.gz)
+md5sums=('9c3a4fce8b6f1d79e395896ce5d8776e')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --mandir=/usr/share/man --with-java=${JAVA_HOME}
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

Copied: libpano13/repos/staging-x86_64/PKGBUILD (from rev 146958, 
libpano13/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-19 17:50:13 UTC (rev 146959)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: tobias 
+# Contributor: Tobias Kieslich 
+
+pkgname=libpano13
+pkgver=2.9.18
+pkgrel=2
+pkgdesc="Basic library to calculate panoramical pictures - core functions of 
the panotools"
+arch=('i686' 'x86_64')
+url="http://panotools.sourceforge.net/";
+license=('GPL2')
+depends=('libpng' 'libtiff')
+makedepends=('openjdk6')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/panotools/${pkgname}-${pkgver}.tar.gz)
+md5sums=('9c3a4fce8b6f1d79e395896ce5d8776e')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --mandir=/usr/share/man --with-java=${JAVA_HOME}
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}



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

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 12:49:56
  Author: eric
Revision: 146958

upgpkg: libpano13 2.9.18-2

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  libpano13/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 17:48:26 UTC (rev 146957)
+++ PKGBUILD2012-01-19 17:49:56 UTC (rev 146958)
@@ -4,7 +4,7 @@
 
 pkgname=libpano13
 pkgver=2.9.18
-pkgrel=1
+pkgrel=2
 pkgdesc="Basic library to calculate panoramical pictures - core functions of 
the panotools"
 arch=('i686' 'x86_64')
 url="http://panotools.sourceforge.net/";



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

2012-01-19 Thread Pierre Schmitz
Date: Thursday, January 19, 2012 @ 12:48:26
  Author: pierre
Revision: 146957

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

Added:
  openssl/repos/core-x86_64/PKGBUILD
(from rev 146955, openssl/repos/testing-x86_64/PKGBUILD)
  openssl/repos/core-x86_64/ca-dir.patch
(from rev 146955, openssl/repos/testing-x86_64/ca-dir.patch)
  openssl/repos/core-x86_64/fix-manpages.patch
(from rev 146955, openssl/repos/testing-x86_64/fix-manpages.patch)
  openssl/repos/core-x86_64/no-rpath.patch
(from rev 146955, openssl/repos/testing-x86_64/no-rpath.patch)
Deleted:
  openssl/repos/core-x86_64/PKGBUILD
  openssl/repos/core-x86_64/ca-dir.patch
  openssl/repos/core-x86_64/fix-manpages.patch
  openssl/repos/core-x86_64/no-rpath.patch
  openssl/repos/testing-x86_64/

+
 PKGBUILD   |  140 -
 ca-dir.patch   |   66 
 fix-manpages.patch | 3840 +--
 no-rpath.patch |   22 
 4 files changed, 2034 insertions(+), 2034 deletions(-)

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


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

2012-01-19 Thread Pierre Schmitz
Date: Thursday, January 19, 2012 @ 12:48:25
  Author: pierre
Revision: 146956

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

Added:
  openssl/repos/core-i686/PKGBUILD
(from rev 146955, openssl/repos/testing-i686/PKGBUILD)
  openssl/repos/core-i686/ca-dir.patch
(from rev 146955, openssl/repos/testing-i686/ca-dir.patch)
  openssl/repos/core-i686/fix-manpages.patch
(from rev 146955, openssl/repos/testing-i686/fix-manpages.patch)
  openssl/repos/core-i686/no-rpath.patch
(from rev 146955, openssl/repos/testing-i686/no-rpath.patch)
Deleted:
  openssl/repos/core-i686/PKGBUILD
  openssl/repos/core-i686/ca-dir.patch
  openssl/repos/core-i686/fix-manpages.patch
  openssl/repos/core-i686/no-rpath.patch
  openssl/repos/testing-i686/

+
 PKGBUILD   |  140 -
 ca-dir.patch   |   66 
 fix-manpages.patch | 3840 +--
 no-rpath.patch |   22 
 4 files changed, 2034 insertions(+), 2034 deletions(-)

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


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

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 12:30:11
  Author: eric
Revision: 146955

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

Added:
  lcms/repos/staging-i686/
  lcms/repos/staging-i686/PKGBUILD
(from rev 146954, lcms/trunk/PKGBUILD)
  lcms/repos/staging-x86_64/
  lcms/repos/staging-x86_64/PKGBUILD
(from rev 146954, lcms/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   28 
 staging-x86_64/PKGBUILD |   28 
 2 files changed, 56 insertions(+)

Copied: lcms/repos/staging-i686/PKGBUILD (from rev 146954, lcms/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 17:30:11 UTC (rev 146955)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Tobias Kieslich 
+# Contributor: Ben 
+
+pkgname=lcms
+pkgver=1.19
+pkgrel=2
+pkgdesc="Lightweight color management development library/engine"
+arch=('i686' 'x86_64')
+license=('custom')
+depends=('libtiff')
+url="http://www.littlecms.com";
+options=('!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('8af94611baf20d9646c7c2c285859818')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm 644 COPYING \
+"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Copied: lcms/repos/staging-x86_64/PKGBUILD (from rev 146954, 
lcms/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-19 17:30:11 UTC (rev 146955)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Tobias Kieslich 
+# Contributor: Ben 
+
+pkgname=lcms
+pkgver=1.19
+pkgrel=2
+pkgdesc="Lightweight color management development library/engine"
+arch=('i686' 'x86_64')
+license=('custom')
+depends=('libtiff')
+url="http://www.littlecms.com";
+options=('!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('8af94611baf20d9646c7c2c285859818')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm 644 COPYING \
+"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}



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

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 12:29:48
  Author: eric
Revision: 146954

upgpkg: lcms 1.19-2

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  lcms/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 16:22:30 UTC (rev 146953)
+++ PKGBUILD2012-01-19 17:29:48 UTC (rev 146954)
@@ -4,21 +4,25 @@
 
 pkgname=lcms
 pkgver=1.19
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight color management development library/engine"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('custom')
-depends=('libtiff>=3.9.4')
+depends=('libtiff')
 url="http://www.littlecms.com";
 options=('!libtool')
 
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('8af94611baf20d9646c7c2c285859818')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
   make
-  make DESTDIR=${pkgdir} install
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   install -Dm 644 COPYING \
-${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }



[arch-commits] Commit in cups/repos (18 files)

2012-01-19 Thread andyrtr
Date: Thursday, January 19, 2012 @ 11:22:30
  Author: andyrtr
Revision: 146953

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

Added:
  cups/repos/staging-i686/
  cups/repos/staging-i686/PKGBUILD
(from rev 146952, cups/trunk/PKGBUILD)
  cups/repos/staging-i686/cups
(from rev 146952, cups/trunk/cups)
  cups/repos/staging-i686/cups-avahi.patch
(from rev 146952, cups/trunk/cups-avahi.patch)
  cups/repos/staging-i686/cups-no-export-ssllibs.patch
(from rev 146952, cups/trunk/cups-no-export-ssllibs.patch)
  cups/repos/staging-i686/cups-no-gcrypt.patch
(from rev 146952, cups/trunk/cups-no-gcrypt.patch)
  cups/repos/staging-i686/cups.install
(from rev 146952, cups/trunk/cups.install)
  cups/repos/staging-i686/cups.logrotate
(from rev 146952, cups/trunk/cups.logrotate)
  cups/repos/staging-i686/cups.pam
(from rev 146952, cups/trunk/cups.pam)
  cups/repos/staging-x86_64/
  cups/repos/staging-x86_64/PKGBUILD
(from rev 146952, cups/trunk/PKGBUILD)
  cups/repos/staging-x86_64/cups
(from rev 146952, cups/trunk/cups)
  cups/repos/staging-x86_64/cups-avahi.patch
(from rev 146952, cups/trunk/cups-avahi.patch)
  cups/repos/staging-x86_64/cups-no-export-ssllibs.patch
(from rev 146952, cups/trunk/cups-no-export-ssllibs.patch)
  cups/repos/staging-x86_64/cups-no-gcrypt.patch
(from rev 146952, cups/trunk/cups-no-gcrypt.patch)
  cups/repos/staging-x86_64/cups.install
(from rev 146952, cups/trunk/cups.install)
  cups/repos/staging-x86_64/cups.logrotate
(from rev 146952, cups/trunk/cups.logrotate)
  cups/repos/staging-x86_64/cups.pam
(from rev 146952, cups/trunk/cups.pam)

-+
 staging-i686/PKGBUILD   |  144 +
 staging-i686/cups   |   68 
 staging-i686/cups-avahi.patch   | 3156 ++
 staging-i686/cups-no-export-ssllibs.patch   |   12 
 staging-i686/cups-no-gcrypt.patch   |   38 
 staging-i686/cups.install   |   26 
 staging-i686/cups.logrotate |8 
 staging-i686/cups.pam   |3 
 staging-x86_64/PKGBUILD |  144 +
 staging-x86_64/cups |   68 
 staging-x86_64/cups-avahi.patch | 3156 ++
 staging-x86_64/cups-no-export-ssllibs.patch |   12 
 staging-x86_64/cups-no-gcrypt.patch |   38 
 staging-x86_64/cups.install |   26 
 staging-x86_64/cups.logrotate   |8 
 staging-x86_64/cups.pam |3 
 16 files changed, 6910 insertions(+)

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


[arch-commits] Commit in util-linux/trunk (2 files)

2012-01-19 Thread Tom Gundersen
Date: Thursday, January 19, 2012 @ 11:00:21
  Author: tomegun
Revision: 146952

2.21-rc1

Modified:
  util-linux/trunk/PKGBUILD
Deleted:
  util-linux/trunk/0001-findmnt-support-alternative-location-of-fstab.patch

--+
 0001-findmnt-support-alternative-location-of-fstab.patch |   77 -
 PKGBUILD |   31 +
 2 files changed, 11 insertions(+), 97 deletions(-)

Deleted: 0001-findmnt-support-alternative-location-of-fstab.patch
===
--- 0001-findmnt-support-alternative-location-of-fstab.patch2012-01-19 
15:49:41 UTC (rev 146951)
+++ 0001-findmnt-support-alternative-location-of-fstab.patch2012-01-19 
16:00:21 UTC (rev 146952)
@@ -1,77 +0,0 @@
-From d466c6a1fe66603227b3ff73a21a45abd77ee826 Mon Sep 17 00:00:00 2001
-From: Dave Reisner 
-Date: Sun, 11 Dec 2011 13:58:05 -0500
-Subject: [PATCH] findmnt: support alternative location of fstab
-
-Signed-off-by: Dave Reisner 
-Signed-off-by: Karel Zak 

- misc-utils/findmnt.8 |6 --
- misc-utils/findmnt.c |9 +
- 2 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8
-index 24e3a52..7f3dc6c 100644
 a/misc-utils/findmnt.8
-+++ b/misc-utils/findmnt.8
-@@ -36,12 +36,14 @@ The command prints all mounted filesystems in the 
tree-like format by default.
- .SH OPTIONS
- .IP "\fB\-h, \-\-help\fP"
- Print help and exit.
--.IP "\fB\-s, \-\-fstab\fP"
-+.IP "\fB\-s, \-\-fstab\fR[\fI=fstab\fR]\fP"
- Search in
- .IR /etc/fstab
- and
- .IR /etc/fstab.d .
--The output is in the list format (see --list).
-+The output is in the list format (see --list). Optionally, search the file
-+specified by
-+.IR fstab .
- .IP "\fB\-m, \-\-mtab\fP"
- Search in
- .IR /etc/mtab .
-diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
-index 4577dc6..5502a87 100644
 a/misc-utils/findmnt.c
-+++ b/misc-utils/findmnt.c
-@@ -770,7 +770,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
- 
-   fprintf(out, _(
-   "\nOptions:\n"
--  " -s, --fstabsearch in static table of filesystems\n"
-+  " -s, --fstab[=]  search in static table of filesystems\n"
-   " -m, --mtab search in table of mounted filesystems\n"
-   " -k, --kernel   search in kernel table of mounted\n"
- "  filesystems (default)\n\n"));
-@@ -839,7 +839,7 @@ int main(int argc, char *argv[])
-   { "direction",1, 0, 'd' },
-   { "evaluate", 0, 0, 'e' },
-   { "first-only",   0, 0, 'f' },
--  { "fstab",0, 0, 's' },
-+  { "fstab",2, 0, 's' },
-   { "help", 0, 0, 'h' },
-   { "invert",   0, 0, 'i' },
-   { "kernel",   0, 0, 'k' },
-@@ -872,7 +872,8 @@ int main(int argc, char *argv[])
-   tt_flags |= TT_FL_TREE;
- 
-   while ((c = getopt_long(argc, argv,
--  "acd:ehifo:O:p::Pklmnrst:uvRS:T:w:", longopts, 
NULL)) != -1) {
-+  "acd:ehifo:O:p::Pklmnrs::t:uvRS:T:w:",
-+  longopts, NULL)) != -1) {
-   switch(c) {
-   case 'a':
-   tt_flags |= TT_FL_ASCII;
-@@ -938,7 +939,7 @@ int main(int argc, char *argv[])
-   case 's':   /* fstab */
-   if (tabfile)
-   
errx_mutually_exclusive("--{fstab,mtab,kernel}");
--  tabfile = _PATH_MNTTAB;
-+  tabfile = optarg ? optarg : _PATH_MNTTAB;
-   tt_flags &= ~TT_FL_TREE;
-   break;
-   case 'k':   /* kernel (mountinfo) */
--- 
-1.7.8.1
-

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 15:49:41 UTC (rev 146951)
+++ PKGBUILD2012-01-19 16:00:21 UTC (rev 146952)
@@ -3,48 +3,39 @@
 # Contributor: judd 
 
 pkgname=util-linux
-pkgver=2.20.1
-pkgrel=2
+pkgver=2.21
+pkgrel=0.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' 'e2fsprogs<1.41.8-2')
-provides=('linux32' "util-linux-ng=${pkgver}")
+depends=('udev')
+conflicts=('util-linux-ng')
+provides=("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
-   0001-findmnt-support-alternative-location-of-fstab.patch)
+source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}-rc1.tar.xz)
 optdepends=('perl: for chkdupe

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

2012-01-19 Thread andyrtr
Date: Thursday, January 19, 2012 @ 10:49:41
  Author: andyrtr
Revision: 146951

upgpkg: cups 1.5.0-2

libtiff/libpng rebuild

Modified:
  cups/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 15:31:00 UTC (rev 146950)
+++ PKGBUILD2012-01-19 15:49:41 UTC (rev 146951)
@@ -4,11 +4,11 @@
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.5.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/";
-makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 
'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3'
+makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 
'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3'
  'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 
'avahi'  'hicolor-icon-theme')
 source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
cups-avahi.patch
@@ -69,7 +69,7 @@
 
 package_libcups() {
 pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'krb5' 'avahi')
+depends=('gnutls>=2.8.3' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
 
   cd ${srcdir}/${pkgbase}-${pkgver}
   make BUILDROOT=${pkgdir} install-headers install-libs



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

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 10:31:00
  Author: giovanni
Revision: 146950

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

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

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

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-19 15:30:34 UTC (rev 146949)
+++ extra-i686/PKGBUILD 2012-01-19 15:31:00 UTC (rev 146950)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora 
-# Contributor: G_Syme 
-
-pkgname=libass
-pkgver=0.10.0
-pkgrel=2
-pkgdesc="A portable library for SSA/ASS subtitles rendering"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/libass/";
-license=('BSD')
-depends=('enca' 'fontconfig' 'libpng' 'fribidi')
-makedepends=('pkg-config')
-options=(!libtool)
-source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz";)
-md5sums=('1855bddc4c167f96968dddeeda0eb45c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: libass/repos/extra-i686/PKGBUILD (from rev 146949, 
libass/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-19 15:31:00 UTC (rev 146950)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Giovanni Scafora 
+# Contributor: G_Syme 
+
+pkgname=libass
+pkgver=0.10.0
+pkgrel=3
+pkgdesc="A portable library for SSA/ASS subtitles rendering"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/libass/";
+license=('BSD')
+depends=('enca' 'fontconfig' 'fribidi')
+makedepends=('pkg-config')
+options=(!libtool)
+source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz";)
+md5sums=('1855bddc4c167f96968dddeeda0eb45c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-01-19 15:30:34 UTC (rev 146949)
+++ extra-x86_64/PKGBUILD   2012-01-19 15:31:00 UTC (rev 146950)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora 
-# Contributor: G_Syme 
-
-pkgname=libass
-pkgver=0.10.0
-pkgrel=2
-pkgdesc="A portable library for SSA/ASS subtitles rendering"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/libass/";
-license=('BSD')
-depends=('enca' 'fontconfig' 'libpng' 'fribidi')
-makedepends=('pkg-config')
-options=(!libtool)
-source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz";)
-md5sums=('1855bddc4c167f96968dddeeda0eb45c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: libass/repos/extra-x86_64/PKGBUILD (from rev 146949, 
libass/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-01-19 15:31:00 UTC (rev 146950)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Giovanni Scafora 
+# Contributor: G_Syme 
+
+pkgname=libass
+pkgver=0.10.0
+pkgrel=3
+pkgdesc="A portable library for SSA/ASS subtitles rendering"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/libass/";
+license=('BSD')
+depends=('enca' 'fontconfig' 'fribidi')
+makedepends=('pkg-config')
+options=(!libtool)
+source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz";)
+md5sums=('1855bddc4c167f96968dddeeda0eb45c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}



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

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 10:30:34
  Author: giovanni
Revision: 146949

upgpkg: libass 0.10.0-3

libass is not requested, it's only for tests and it's disabled by default

Modified:
  libass/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 15:15:14 UTC (rev 146948)
+++ PKGBUILD2012-01-19 15:30:34 UTC (rev 146949)
@@ -4,12 +4,12 @@
 
 pkgname=libass
 pkgver=0.10.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A portable library for SSA/ASS subtitles rendering"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/libass/";
 license=('BSD')
-depends=('enca' 'fontconfig' 'libpng' 'fribidi')
+depends=('enca' 'fontconfig' 'fribidi')
 makedepends=('pkg-config')
 options=(!libtool)
 source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz";)



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

2012-01-19 Thread Ionut Biru
Date: Thursday, January 19, 2012 @ 10:15:14
  Author: ibiru
Revision: 146948

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

Added:
  nilfs-utils/repos/testing-i686/
  nilfs-utils/repos/testing-i686/PKGBUILD
(from rev 146947, nilfs-utils/trunk/PKGBUILD)
  nilfs-utils/repos/testing-x86_64/
  nilfs-utils/repos/testing-x86_64/PKGBUILD
(from rev 146947, nilfs-utils/trunk/PKGBUILD)

-+
 testing-i686/PKGBUILD   |   27 +++
 testing-x86_64/PKGBUILD |   27 +++
 2 files changed, 54 insertions(+)

Copied: nilfs-utils/repos/testing-i686/PKGBUILD (from rev 146947, 
nilfs-utils/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-01-19 15:15:14 UTC (rev 146948)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer : Ionut Biru 
+# Contributor: Geoffroy Carrier 
+
+pkgname=nilfs-utils
+pkgver=2.1.1
+pkgrel=1
+pkgdesc="A log-structured file system supporting continuous snapshotting 
(userspace utils)"
+arch=('i686' 'x86_64')
+url="http://www.nilfs.org/";
+license=('GPL2' 'LGPL2.1')
+backup=('etc/nilfs_cleanerd.conf')
+depends=('util-linux')
+options=(!libtool)
+source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2)
+md5sums=('caa7d8b7121311bd978120e2f0c45d81')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --libdir=/lib --enable-libmount
+  make
+}
+
+package() {
+   cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install LDCONFIG=/bin/true
+}

Copied: nilfs-utils/repos/testing-x86_64/PKGBUILD (from rev 146947, 
nilfs-utils/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-01-19 15:15:14 UTC (rev 146948)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer : Ionut Biru 
+# Contributor: Geoffroy Carrier 
+
+pkgname=nilfs-utils
+pkgver=2.1.1
+pkgrel=1
+pkgdesc="A log-structured file system supporting continuous snapshotting 
(userspace utils)"
+arch=('i686' 'x86_64')
+url="http://www.nilfs.org/";
+license=('GPL2' 'LGPL2.1')
+backup=('etc/nilfs_cleanerd.conf')
+depends=('util-linux')
+options=(!libtool)
+source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2)
+md5sums=('caa7d8b7121311bd978120e2f0c45d81')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --libdir=/lib --enable-libmount
+  make
+}
+
+package() {
+   cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install LDCONFIG=/bin/true
+}



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

2012-01-19 Thread Ionut Biru
Date: Thursday, January 19, 2012 @ 10:12:28
  Author: ibiru
Revision: 146947

update to 2.1.1

Modified:
  nilfs-utils/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 14:59:03 UTC (rev 146946)
+++ PKGBUILD2012-01-19 15:12:28 UTC (rev 146947)
@@ -1,9 +1,10 @@
 # $Id$
 # Maintainer : Ionut Biru 
-# Contributor: Geoffroy Carrier  
+# Contributor: Geoffroy Carrier 
+
 pkgname=nilfs-utils
-pkgver=2.1.0
-pkgrel=2
+pkgver=2.1.1
+pkgrel=1
 pkgdesc="A log-structured file system supporting continuous snapshotting 
(userspace utils)"
 arch=('i686' 'x86_64')
 url="http://www.nilfs.org/";
@@ -12,7 +13,7 @@
 depends=('util-linux')
 options=(!libtool)
 source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2)
-md5sums=('738f7bee062051c14dcff444bb17ada7')
+md5sums=('caa7d8b7121311bd978120e2f0c45d81')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"



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

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 09:59:03
  Author: giovanni
Revision: 146946

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

Added:
  abiword/repos/staging-i686/
  abiword/repos/staging-i686/PKGBUILD
(from rev 146945, abiword/trunk/PKGBUILD)
  abiword/repos/staging-i686/abiword-2.8.6-libpng15.patch
(from rev 146945, abiword/trunk/abiword-2.8.6-libpng15.patch)
  abiword/repos/staging-i686/abiword-2.8.6-no-undefined.patch
(from rev 146945, abiword/trunk/abiword-2.8.6-no-undefined.patch)
  abiword/repos/staging-i686/abiword.install
(from rev 146945, abiword/trunk/abiword.install)
  abiword/repos/staging-i686/compat_libwpg_0_9.patch
(from rev 146945, abiword/trunk/compat_libwpg_0_9.patch)
  abiword/repos/staging-x86_64/
  abiword/repos/staging-x86_64/PKGBUILD
(from rev 146945, abiword/trunk/PKGBUILD)
  abiword/repos/staging-x86_64/abiword-2.8.6-libpng15.patch
(from rev 146945, abiword/trunk/abiword-2.8.6-libpng15.patch)
  abiword/repos/staging-x86_64/abiword-2.8.6-no-undefined.patch
(from rev 146945, abiword/trunk/abiword-2.8.6-no-undefined.patch)
  abiword/repos/staging-x86_64/abiword.install
(from rev 146945, abiword/trunk/abiword.install)
  abiword/repos/staging-x86_64/compat_libwpg_0_9.patch
(from rev 146945, abiword/trunk/compat_libwpg_0_9.patch)

-+
 staging-i686/PKGBUILD   |   80 
 staging-i686/abiword-2.8.6-libpng15.patch   |  100 +
 staging-i686/abiword-2.8.6-no-undefined.patch   |   21 +
 staging-i686/abiword.install|   11 
 staging-i686/compat_libwpg_0_9.patch|  371 ++
 staging-x86_64/PKGBUILD |   80 
 staging-x86_64/abiword-2.8.6-libpng15.patch |  100 +
 staging-x86_64/abiword-2.8.6-no-undefined.patch |   21 +
 staging-x86_64/abiword.install  |   11 
 staging-x86_64/compat_libwpg_0_9.patch  |  371 ++
 10 files changed, 1166 insertions(+)

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


[arch-commits] Commit in abiword/trunk (PKGBUILD abiword-2.8.6-libpng15.patch)

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 09:58:28
  Author: giovanni
Revision: 146945

upgpkg: abiword 2.8.6-7

libpng 1.5 rebuild

Added:
  abiword/trunk/abiword-2.8.6-libpng15.patch
Modified:
  abiword/trunk/PKGBUILD

--+
 PKGBUILD |   35 ++
 abiword-2.8.6-libpng15.patch |  100 +
 2 files changed, 126 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 13:58:47 UTC (rev 146944)
+++ PKGBUILD2012-01-19 14:58:28 UTC (rev 146945)
@@ -5,18 +5,21 @@
 pkgbase=abiword
 pkgname=('abiword' 'abiword-plugins')
 pkgver=2.8.6
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.abisource.com";
-makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 
'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 
'librsvg' 'loudmouth' 'libsoup')
+makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 
'link-grammar' 'gtkmathview' 
+ 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 
'loudmouth' 'libsoup')
 options=('!makeflags' '!libtool')
 
source=("http://www.abisource.com/downloads/${pkgbase}/${pkgver}/source/${pkgbase}-${pkgver}.tar.gz";
-compat_libwpg_0_9.patch
-   abiword-2.8.6-no-undefined.patch)
-sha1sums=('998f69d038000b3fc027d4259548f02d67c8d0df'
-  'e5374f439e3d9b63a4bbd2cd39146c67cf1e85ea'
-  '159b1cd0b9354868ab86f851b64a03dae7d254dc')
+'compat_libwpg_0_9.patch'
+   'abiword-2.8.6-no-undefined.patch'
+'abiword-2.8.6-libpng15.patch')
+md5sums=('f883b0a7f26229a9c66fd6a1a94381aa'
+ '09446a2ebba8288fc611e88f7cf17298'
+ '42e2614b6e0aad457d91f6ce20b6f225'
+ '40e370e7e88c5437140ef18037abfbd3')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -24,10 +27,23 @@
   patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch"
   # fix a gcc 4.6.x build issue, patch from Fedora
   patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch"
+  patch -Np0 -i "${srcdir}/abiword-2.8.6-libpng15.patch"
+
   libtoolize --force
   autoreconf
 
-  ./configure --prefix=/usr --enable-clipart --enable-templates 
--enable-collab-backend-xmpp --enable-collab-backend-tcp 
--enable-collab-backend-service --disable-collab-backend-sugar --enable-plugins 
--without-gnomevfs --with-gio --with-goffice --disable-static 
--with-psiconv-config=/nothere
+  ./configure --prefix=/usr \
+  --enable-clipart \
+  --enable-templates \
+  --enable-collab-backend-xmpp \
+  --enable-collab-backend-tcp \
+  --enable-collab-backend-service \
+  --disable-collab-backend-sugar \
+  --enable-plugins --without-gnomevfs \
+  --with-gio \
+  --with-goffice \
+  --disable-static \
+  --with-psiconv-config=/nothere
   make
 }
 
@@ -54,7 +70,8 @@
 
 package_abiword-plugins() {
   pkgdesc="Additional plugins for Abiword"
-  depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 
'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf')
+  depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 
'link-grammar' 
+   'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf')
 
   cd "${srcdir}/${pkgbase}-${pkgver}/plugins"
   for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; 
do

Added: abiword-2.8.6-libpng15.patch
===
--- abiword-2.8.6-libpng15.patch(rev 0)
+++ abiword-2.8.6-libpng15.patch2012-01-19 14:58:28 UTC (rev 146945)
@@ -0,0 +1,100 @@
+$NetBSD: patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp,v 1.1 2011/02/01 
10:48:15 wiz Exp $
+
+Fix build with png-1.5.
+
+--- plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig  2009-06-25 04:02:06.0 
+
 plugins/bmp/xp/ie_impGraphic_BMP.cpp
+@@ -191,7 +191,10 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap
+ 
+   /* Clean Up Memory Used */
+   
+-  FREEP(m_pPNGInfo->palette);
++  png_colorp palette;
++  int num_palette;
++  png_get_PLTE( m_pPNG, m_pPNGInfo, &palette, &num_palette );
++  FREEP(palette);
+   DELETEP(pBB);
+   png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+
+@@ -313,7 +316,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
+* the normal method of doing things with libpng).  REQUIRED unless you
+* set up your own error handlers in the png_create_read_struct() 
earlier.
+*/
+-  if (setjmp(m_pPNG->jmpbuf))
++  if (setjmp(png_jmpbuf(m_pPNG)))
+   {
+   /* Free all of the memory associated with the png_ptr and 
info_ptr */
+   png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+@@ -332,7 +335,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
+

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

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 08:58:47
  Author: giovanni
Revision: 146944

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

Added:
  wv/repos/staging-i686/
  wv/repos/staging-i686/PKGBUILD
(from rev 146943, wv/trunk/PKGBUILD)
  wv/repos/staging-i686/fix-soname.patch
(from rev 146943, wv/trunk/fix-soname.patch)
  wv/repos/staging-x86_64/
  wv/repos/staging-x86_64/PKGBUILD
(from rev 146943, wv/trunk/PKGBUILD)
  wv/repos/staging-x86_64/fix-soname.patch
(from rev 146943, wv/trunk/fix-soname.patch)

-+
 staging-i686/PKGBUILD   |   29 +
 staging-i686/fix-soname.patch   |   14 ++
 staging-x86_64/PKGBUILD |   29 +
 staging-x86_64/fix-soname.patch |   14 ++
 4 files changed, 86 insertions(+)

Copied: wv/repos/staging-i686/PKGBUILD (from rev 146943, wv/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 13:58:47 UTC (rev 146944)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan de Groot 
+# Contributor: William Rea 
+pkgname=wv
+pkgver=1.2.9
+pkgrel=1
+pkgdesc="MSWord library can load and parse Word 2000, 97, 95 and 6 file 
formats"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/wvware";
+license=('GPL')
+depends=('libgsf' 'libpng' 'sh')
+makedepends=('pkg-config')
+options=('!libtool')
+source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";)
+md5sums=('dbccf2e9f747e50c913b7e3d126b73f7')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+  --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+}

Copied: wv/repos/staging-i686/fix-soname.patch (from rev 146943, 
wv/trunk/fix-soname.patch)
===
--- staging-i686/fix-soname.patch   (rev 0)
+++ staging-i686/fix-soname.patch   2012-01-19 13:58:47 UTC (rev 146944)
@@ -0,0 +1,14 @@
+diff -ru wv-1.2.7.orig//configure wv-1.2.7//configure
+--- wv-1.2.7.orig//configure   2009-09-21 12:22:46.0 +0200
 wv-1.2.7//configure2010-06-08 12:00:27.948857203 +0200
+@@ -2082,8 +2082,8 @@
+ WV_MAJOR_VERSION=1
+ WV_MINOR_VERSION=2
+ WV_MICRO_VERSION=7
+-WV_INTERFACE_AGE=3
+-WV_BINARY_AGE=3
++WV_INTERFACE_AGE=4
++WV_BINARY_AGE=4
+ WV_VERSION=$WV_MAJOR_VERSION.$WV_MINOR_VERSION.$WV_MICRO_VERSION
+ 
+ 

Copied: wv/repos/staging-x86_64/PKGBUILD (from rev 146943, wv/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-19 13:58:47 UTC (rev 146944)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan de Groot 
+# Contributor: William Rea 
+pkgname=wv
+pkgver=1.2.9
+pkgrel=1
+pkgdesc="MSWord library can load and parse Word 2000, 97, 95 and 6 file 
formats"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/wvware";
+license=('GPL')
+depends=('libgsf' 'libpng' 'sh')
+makedepends=('pkg-config')
+options=('!libtool')
+source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";)
+md5sums=('dbccf2e9f747e50c913b7e3d126b73f7')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+  --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+}

Copied: wv/repos/staging-x86_64/fix-soname.patch (from rev 146943, 
wv/trunk/fix-soname.patch)
===
--- staging-x86_64/fix-soname.patch (rev 0)
+++ staging-x86_64/fix-soname.patch 2012-01-19 13:58:47 UTC (rev 146944)
@@ -0,0 +1,14 @@
+diff -ru wv-1.2.7.orig//configure wv-1.2.7//configure
+--- wv-1.2.7.orig//configure   2009-09-21 12:22:46.0 +0200
 wv-1.2.7//configure2010-06-08 12:00:27.948857203 +0200
+@@ -2082,8 +2082,8 @@
+ WV_MAJOR_VERSION=1
+ WV_MINOR_VERSION=2
+ WV_MICRO_VERSION=7
+-WV_INTERFACE_AGE=3
+-WV_BINARY_AGE=3
++WV_INTERFACE_AGE=4
++WV_BINARY_AGE=4
+ WV_VERSION=$WV_MAJOR_VERSION.$WV_MINOR_VERSION.$WV_MICRO_VERSION
+ 
+ 



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

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 08:58:28
  Author: giovanni
Revision: 146943

upgpkg: wv 1.2.9-1

libpng 1.5 rebuild

Modified:
  wv/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 13:36:15 UTC (rev 146942)
+++ PKGBUILD2012-01-19 13:58:28 UTC (rev 146943)
@@ -2,24 +2,28 @@
 # Maintainer: Jan de Groot 
 # Contributor: William Rea 
 pkgname=wv
-pkgver=1.2.7
+pkgver=1.2.9
 pkgrel=1
 pkgdesc="MSWord library can load and parse Word 2000, 97, 95 and 6 file 
formats"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/wvware";
-license=(GPL)
-depends=('libgsf>=1.14.18' 'libpng>=1.4.2' 'sh')
+license=('GPL')
+depends=('libgsf' 'libpng' 'sh')
 makedepends=('pkg-config')
 options=('!libtool')
-source=(http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
-fix-soname.patch)
-sha256sums=('a3a367062e894770fc3ef63bbf7e285cb025253f972fa899c16931f741e856ea'
-'0fccf12cc5db8481dfcd5cffa987545e060f8bb526c9c910fd76a18468bd7ce1')
+source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";)
+md5sums=('dbccf2e9f747e50c913b7e3d126b73f7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix-soname.patch" || return 1
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+
+  ./configure --prefix=/usr \
+  --mandir=/usr/share/man
+  make
 }
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+}



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

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 08:36:15
  Author: giovanni
Revision: 146942

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

Added:
  amule/repos/staging-i686/
  amule/repos/staging-i686/PKGBUILD
(from rev 146941, amule/trunk/PKGBUILD)
  amule/repos/staging-x86_64/
  amule/repos/staging-x86_64/PKGBUILD
(from rev 146941, amule/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   44 
 staging-x86_64/PKGBUILD |   44 
 2 files changed, 88 insertions(+)

Copied: amule/repos/staging-i686/PKGBUILD (from rev 146941, 
amule/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 13:36:15 UTC (rev 146942)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Giovanni Scafora 
+# Contributor: Henrik Ronellenfitsch 
+# Contributor: Alessio Sergi 
+# Contributor: Dario 'Dax' Vilardi 
+
+pkgname=amule
+pkgver=10708
+pkgrel=2
+pkgdesc="An eMule-like client for ed2k p2p network"
+arch=('i686' 'x86_64')
+url="http://www.amule.org";
+license=('GPL')
+depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
+source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2";)
+md5sums=('3c1c2a03b24c9ec7ba6fd675382f26a3')
+
+build() {
+  cd "${srcdir}/aMule-SVN-r${pkgver}"
+
+  ./configure --prefix=/usr \
+  --mandir=/usr/share/man \
+  --enable-cas \
+  --enable-wxcas \
+  --enable-amule-daemon \
+  --enable-amulecmd \
+  --enable-amule-gui \
+  --enable-alc \
+  --enable-alcc \
+  --enable-webserver \
+  --disable-debug \
+  --enable-optimize \
+  --enable-ccache \
+  --enable-geoip \
+  --enable-upnp
+
+  make
+}
+
+package() {
+  cd "${srcdir}/aMule-SVN-r${pkgver}"
+
+  make DESTDIR=${pkgdir}/ install
+}

Copied: amule/repos/staging-x86_64/PKGBUILD (from rev 146941, 
amule/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-19 13:36:15 UTC (rev 146942)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Giovanni Scafora 
+# Contributor: Henrik Ronellenfitsch 
+# Contributor: Alessio Sergi 
+# Contributor: Dario 'Dax' Vilardi 
+
+pkgname=amule
+pkgver=10708
+pkgrel=2
+pkgdesc="An eMule-like client for ed2k p2p network"
+arch=('i686' 'x86_64')
+url="http://www.amule.org";
+license=('GPL')
+depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
+source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2";)
+md5sums=('3c1c2a03b24c9ec7ba6fd675382f26a3')
+
+build() {
+  cd "${srcdir}/aMule-SVN-r${pkgver}"
+
+  ./configure --prefix=/usr \
+  --mandir=/usr/share/man \
+  --enable-cas \
+  --enable-wxcas \
+  --enable-amule-daemon \
+  --enable-amulecmd \
+  --enable-amule-gui \
+  --enable-alc \
+  --enable-alcc \
+  --enable-webserver \
+  --disable-debug \
+  --enable-optimize \
+  --enable-ccache \
+  --enable-geoip \
+  --enable-upnp
+
+  make
+}
+
+package() {
+  cd "${srcdir}/aMule-SVN-r${pkgver}"
+
+  make DESTDIR=${pkgdir}/ install
+}



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

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 08:35:54
  Author: giovanni
Revision: 146941

upgpkg: amule 10708-2

libpng 1.5 rebuild

Modified:
  amule/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 13:11:45 UTC (rev 146940)
+++ PKGBUILD2012-01-19 13:35:54 UTC (rev 146941)
@@ -6,7 +6,7 @@
 
 pkgname=amule
 pkgver=10708
-pkgrel=1
+pkgrel=2
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64')
 url="http://www.amule.org";



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

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 08:11:45
  Author: giovanni
Revision: 146940

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

Added:
  zvbi/repos/staging-i686/
  zvbi/repos/staging-i686/PKGBUILD
(from rev 146939, zvbi/trunk/PKGBUILD)
  zvbi/repos/staging-i686/fix-includes.patch
(from rev 146939, zvbi/trunk/fix-includes.patch)
  zvbi/repos/staging-i686/zvbi-0.2.33-libpng15.patch
(from rev 146939, zvbi/trunk/zvbi-0.2.33-libpng15.patch)
  zvbi/repos/staging-x86_64/
  zvbi/repos/staging-x86_64/PKGBUILD
(from rev 146939, zvbi/trunk/PKGBUILD)
  zvbi/repos/staging-x86_64/fix-includes.patch
(from rev 146939, zvbi/trunk/fix-includes.patch)
  zvbi/repos/staging-x86_64/zvbi-0.2.33-libpng15.patch
(from rev 146939, zvbi/trunk/zvbi-0.2.33-libpng15.patch)

---+
 staging-i686/PKGBUILD |   38 
 staging-i686/fix-includes.patch   |   36 ++
 staging-i686/zvbi-0.2.33-libpng15.patch   |   21 +++
 staging-x86_64/PKGBUILD   |   38 
 staging-x86_64/fix-includes.patch |   36 ++
 staging-x86_64/zvbi-0.2.33-libpng15.patch |   21 +++
 6 files changed, 190 insertions(+)

Copied: zvbi/repos/staging-i686/PKGBUILD (from rev 146939, zvbi/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 13:11:45 UTC (rev 146940)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: 
+# Contributor: Alexander Baldeck 
+# Contributor: dorphell 
+
+pkgname=zvbi
+pkgver=0.2.33
+pkgrel=4
+pkgdesc="VBI capture and decoding library"
+url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome";
+arch=('i686' 'x86_64')
+depends=('libpng' 'libx11')
+license=('GPL')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2";
+'fix-includes.patch'
+'zvbi-0.2.33-libpng15.patch')
+md5sums=('1741a6045c3eedfb611d645f2da69ac8'
+ '38766bc59e1571133d0399f0102da653'
+ '4434de7addc438be8c5a33274146bd11')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/fix-includes.patch"
+  patch -Np0 -i "${srcdir}/zvbi-0.2.33-libpng15.patch"
+
+  ./configure --prefix=/usr \
+  --disable-static \
+  --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+}

Copied: zvbi/repos/staging-i686/fix-includes.patch (from rev 146939, 
zvbi/trunk/fix-includes.patch)
===
--- staging-i686/fix-includes.patch (rev 0)
+++ staging-i686/fix-includes.patch 2012-01-19 13:11:45 UTC (rev 146940)
@@ -0,0 +1,36 @@
+Add proper #includes so that we do not get undef errors to S_ISCHR
+during linking.
+
+Signed-off-by: Alex Chiang 
+---
+--- zvbi-0.2.33.orig/src/io-dvb.c
 zvbi-0.2.33/src/io-dvb.c
+@@ -29,6 +29,8 @@
+ #include 
+ #include 
+ #include 
++#include 
++#include 
+ 
+ #ifndef HAVE_S64_U64
+   /* Linux 2.6.x asm/types.h defines __s64 and __u64 only
+--- zvbi-0.2.33.orig/src/io-v4l.c
 zvbi-0.2.33/src/io-v4l.c
+@@ -42,6 +42,7 @@ static const char rcsid [] =
+ #include 
+ #include  /* timeval */
+ #include /* fd_set, uid_t */
++#include  /* S_ISCHR */
+ #include /* for (_)videodev.h */
+ #include 
+ 
+--- zvbi-0.2.33.orig/contrib/ntsc-cc.c
 zvbi-0.2.33/contrib/ntsc-cc.c
+@@ -34,6 +34,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #ifdef HAVE_GETOPT_LONG
+ #  include 

Copied: zvbi/repos/staging-i686/zvbi-0.2.33-libpng15.patch (from rev 146939, 
zvbi/trunk/zvbi-0.2.33-libpng15.patch)
===
--- staging-i686/zvbi-0.2.33-libpng15.patch (rev 0)
+++ staging-i686/zvbi-0.2.33-libpng15.patch 2012-01-19 13:11:45 UTC (rev 
146940)
@@ -0,0 +1,21 @@
+Index: src/exp-gfx.c
+===
+RCS file: /cvsroot/zapping/vbi/src/exp-gfx.c,v
+retrieving revision 1.16
+diff -u -B -r1.16 exp-gfx.c
+--- src/exp-gfx.c  24 Feb 2008 14:17:47 -  1.16
 src/exp-gfx.c  15 Feb 2011 20:03:58 -
+@@ -1672,11 +1672,11 @@
+   char title[80];
+   unsigned int i;
+ 
+-  if (setjmp (png_ptr->jmpbuf))
++  if (setjmp (png_jmpbuf(png_ptr)))
+   return FALSE;
+ 
+   png_set_write_fn (png_ptr,
+-(voidp) gfx,
++(png_voidp) gfx,
+ write_data,
+ flush_data);
+ 

Copied: zvbi/repos/staging-x86_64/PKGBUILD (from rev 146939, 
zvbi/trunk/PKGBUILD)
===

[arch-commits] Commit in zvbi/trunk (PKGBUILD zvbi-0.2.33-libpng15.patch)

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 08:11:21
  Author: giovanni
Revision: 146939

upgpkg: zvbi 0.2.33-4

libpng 1.5 rebuild

Added:
  zvbi/trunk/zvbi-0.2.33-libpng15.patch
Modified:
  zvbi/trunk/PKGBUILD

+
 PKGBUILD   |   25 +++--
 zvbi-0.2.33-libpng15.patch |   21 +
 2 files changed, 40 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 12:54:40 UTC (rev 146938)
+++ PKGBUILD2012-01-19 13:11:21 UTC (rev 146939)
@@ -2,24 +2,37 @@
 # Maintainer: 
 # Contributor: Alexander Baldeck 
 # Contributor: dorphell 
+
 pkgname=zvbi
 pkgver=0.2.33
-pkgrel=3
+pkgrel=4
 pkgdesc="VBI capture and decoding library"
 url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome";
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 depends=('libpng' 'libx11')
 license=('GPL')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2
-fix-includes.patch)
+source=("http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2";
+'fix-includes.patch'
+'zvbi-0.2.33-libpng15.patch')
 md5sums=('1741a6045c3eedfb611d645f2da69ac8'
- '38766bc59e1571133d0399f0102da653')
+ '38766bc59e1571133d0399f0102da653'
+ '4434de7addc438be8c5a33274146bd11')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   patch -Np1 -i "${srcdir}/fix-includes.patch"
-  ./configure --prefix=/usr --disable-static --mandir=/usr/share/man
+  patch -Np0 -i "${srcdir}/zvbi-0.2.33-libpng15.patch"
+
+  ./configure --prefix=/usr \
+  --disable-static \
+  --mandir=/usr/share/man
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   make DESTDIR="${pkgdir}" install
 }

Added: zvbi-0.2.33-libpng15.patch
===
--- zvbi-0.2.33-libpng15.patch  (rev 0)
+++ zvbi-0.2.33-libpng15.patch  2012-01-19 13:11:21 UTC (rev 146939)
@@ -0,0 +1,21 @@
+Index: src/exp-gfx.c
+===
+RCS file: /cvsroot/zapping/vbi/src/exp-gfx.c,v
+retrieving revision 1.16
+diff -u -B -r1.16 exp-gfx.c
+--- src/exp-gfx.c  24 Feb 2008 14:17:47 -  1.16
 src/exp-gfx.c  15 Feb 2011 20:03:58 -
+@@ -1672,11 +1672,11 @@
+   char title[80];
+   unsigned int i;
+ 
+-  if (setjmp (png_ptr->jmpbuf))
++  if (setjmp (png_jmpbuf(png_ptr)))
+   return FALSE;
+ 
+   png_set_write_fn (png_ptr,
+-(voidp) gfx,
++(png_voidp) gfx,
+ write_data,
+ flush_data);
+ 



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

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 07:54:40
  Author: giovanni
Revision: 146938

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

Added:
  vice/repos/staging-i686/
  vice/repos/staging-i686/PKGBUILD
(from rev 146937, vice/trunk/PKGBUILD)
  vice/repos/staging-i686/vice-2.3-x11video.patch
(from rev 146937, vice/trunk/vice-2.3-x11video.patch)
  vice/repos/staging-x86_64/
  vice/repos/staging-x86_64/PKGBUILD
(from rev 146937, vice/trunk/PKGBUILD)
  vice/repos/staging-x86_64/vice-2.3-x11video.patch
(from rev 146937, vice/trunk/vice-2.3-x11video.patch)

+
 staging-i686/PKGBUILD  |   35 +++
 staging-i686/vice-2.3-x11video.patch   |   11 +
 staging-x86_64/PKGBUILD|   35 +++
 staging-x86_64/vice-2.3-x11video.patch |   11 +
 4 files changed, 92 insertions(+)

Copied: vice/repos/staging-i686/PKGBUILD (from rev 146937, vice/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 12:54:40 UTC (rev 146938)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Giovanni Scafora 
+# Contributor: Tom Newsom 
+
+pkgname=vice
+pkgver=2.3
+pkgrel=5
+pkgdesc="A Versatile Commodore Emulator"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.viceteam.org/";
+depends=('alsa-lib' 'gcc-libs' 'giflib' 'lame' 'libxrandr' 
+ 'libxv' 'libjpeg' 'libpng' 'libxaw' 'libxxf86vm')
+makedepends=('xorg-font-utils')
+options=('!makeflags')
+source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz";
+'vice-2.3-x11video.patch')
+md5sums=('b48d137874daad50c087a0686cbdde34'
+ '088292ce9efe785edfb2b0c7c670785e')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i ${srcdir}/vice-2.3-x11video.patch
+  ./configure --prefix=/usr \
+  --with-alsa \
+  --enable-fullscreen
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+}

Copied: vice/repos/staging-i686/vice-2.3-x11video.patch (from rev 146937, 
vice/trunk/vice-2.3-x11video.patch)
===
--- staging-i686/vice-2.3-x11video.patch(rev 0)
+++ staging-i686/vice-2.3-x11video.patch2012-01-19 12:54:40 UTC (rev 
146938)
@@ -0,0 +1,11 @@
+--- a/src/arch/unix/x11/xaw/x11video.c 2011-01-18 23:59:00.0 +0100
 b/src/arch/unix/x11/xaw/x11video.c 2011-02-27 18:40:52.0 +0100
+@@ -60,6 +60,8 @@
+ #include 
+ #include 
+ #include 
++#include 
++#include 
+ 
+ #include 
+ #include 

Copied: vice/repos/staging-x86_64/PKGBUILD (from rev 146937, 
vice/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-19 12:54:40 UTC (rev 146938)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Giovanni Scafora 
+# Contributor: Tom Newsom 
+
+pkgname=vice
+pkgver=2.3
+pkgrel=5
+pkgdesc="A Versatile Commodore Emulator"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.viceteam.org/";
+depends=('alsa-lib' 'gcc-libs' 'giflib' 'lame' 'libxrandr' 
+ 'libxv' 'libjpeg' 'libpng' 'libxaw' 'libxxf86vm')
+makedepends=('xorg-font-utils')
+options=('!makeflags')
+source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz";
+'vice-2.3-x11video.patch')
+md5sums=('b48d137874daad50c087a0686cbdde34'
+ '088292ce9efe785edfb2b0c7c670785e')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i ${srcdir}/vice-2.3-x11video.patch
+  ./configure --prefix=/usr \
+  --with-alsa \
+  --enable-fullscreen
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+}

Copied: vice/repos/staging-x86_64/vice-2.3-x11video.patch (from rev 146937, 
vice/trunk/vice-2.3-x11video.patch)
===
--- staging-x86_64/vice-2.3-x11video.patch  (rev 0)
+++ staging-x86_64/vice-2.3-x11video.patch  2012-01-19 12:54:40 UTC (rev 
146938)
@@ -0,0 +1,11 @@
+--- a/src/arch/unix/x11/xaw/x11video.c 2011-01-18 23:59:00.0 +0100
 b/src/arch/unix/x11/xaw/x11video.c 2011-02-27 18:40:52.0 +0100
+@@ -60,6 +60,8 @@
+ #include 
+ #include 
+ #include 
++#include 
++#include 
+ 
+ #include 
+ #include 



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

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 07:54:20
  Author: giovanni
Revision: 146937

upgpkg: vice 2.3-5

libpng 1.5 rebuild

Modified:
  vice/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 12:08:17 UTC (rev 146936)
+++ PKGBUILD2012-01-19 12:54:20 UTC (rev 146937)
@@ -4,7 +4,7 @@
 
 pkgname=vice
 pkgver=2.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A Versatile Commodore Emulator"
 arch=('i686' 'x86_64')
 license=('GPL')



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

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 07:08:17
  Author: giovanni
Revision: 146936

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

Added:
  lbreakout2/repos/staging-i686/
  lbreakout2/repos/staging-i686/PKGBUILD
(from rev 146935, lbreakout2/trunk/PKGBUILD)
  lbreakout2/repos/staging-i686/lbreakout2.desktop
(from rev 146935, lbreakout2/trunk/lbreakout2.desktop)
  lbreakout2/repos/staging-i686/lbreakout2.png
(from rev 146935, lbreakout2/trunk/lbreakout2.png)
  lbreakout2/repos/staging-x86_64/
  lbreakout2/repos/staging-x86_64/PKGBUILD
(from rev 146935, lbreakout2/trunk/PKGBUILD)
  lbreakout2/repos/staging-x86_64/lbreakout2.desktop
(from rev 146935, lbreakout2/trunk/lbreakout2.desktop)
  lbreakout2/repos/staging-x86_64/lbreakout2.png
(from rev 146935, lbreakout2/trunk/lbreakout2.png)

---+
 staging-i686/PKGBUILD |   44 
 staging-i686/lbreakout2.desktop   |   10 
 staging-x86_64/PKGBUILD   |   44 
 staging-x86_64/lbreakout2.desktop |   10 
 4 files changed, 108 insertions(+)

Copied: lbreakout2/repos/staging-i686/PKGBUILD (from rev 146935, 
lbreakout2/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 12:08:17 UTC (rev 146936)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Giovanni Scafora 
+# Contributor: Tom Newsom 
+
+pkgname=lbreakout2
+pkgver=2.6.3
+pkgrel=3
+pkgdesc="A breakout game with nice effects, graphics, and sounds"
+arch=('i686' 'x86_64')
+url="http://lgames.sourceforge.net";
+license=('GPL')
+depends=('sdl_mixer' 'libpng')
+backup=('var/games/lbreakout2/lbreakout2.hscr')
+source=("http://downloads.sourceforge.net/lgames/${pkgname}-${pkgver/_/-}.tar.gz";
+'lbreakout2.desktop'
+   'lbreakout2.png')
+md5sums=('43900187bc935475cd6489569cd2230a'
+ '14cd34a72a8f4e3b8f385f9023625241'
+ '94e2fa393eb2a7d4494641dec580573b')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver/_/-}
+
+  ./configure --prefix=/usr \
+  --localstatedir=/var/games/lbreakout2 
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver/_/-}
+
+  make DESTDIR=${pkgdir}/ doc_dir=/usr/share/doc install
+  
+  chmod -R 755 ${pkgdir}/usr
+  chown root:games ${pkgdir}/var/games
+  chmod 775 ${pkgdir}/var/games
+  chown root:games ${pkgdir}/var/games/lbreakout2
+  chmod 755 ${pkgdir}/var/games/lbreakout2
+  chown root:games ${pkgdir}/var/games/lbreakout2/lbreakout2.hscr
+  chmod 775 ${pkgdir}/var/games/lbreakout2/lbreakout2.hscr
+
+  install -Dm644 ${srcdir}/lbreakout2.png 
${pkgdir}/usr/share/pixmaps/lbreakout2.png
+  install -Dm644 ${srcdir}/lbreakout2.desktop 
${pkgdir}/usr/share/applications/lbreakout2.desktop
+}

Copied: lbreakout2/repos/staging-i686/lbreakout2.desktop (from rev 146935, 
lbreakout2/trunk/lbreakout2.desktop)
===
--- staging-i686/lbreakout2.desktop (rev 0)
+++ staging-i686/lbreakout2.desktop 2012-01-19 12:08:17 UTC (rev 146936)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=Linux Breakout 2
+Comment=Breakout and Arkanoid style arcade game
+Icon=/usr/share/pixmaps/lbreakout2.png
+TryExec=lbreakout2
+Exec=lbreakout2
+Terminal=false
+Categories=Application;Game;

Copied: lbreakout2/repos/staging-i686/lbreakout2.png (from rev 146935, 
lbreakout2/trunk/lbreakout2.png)
===
(Binary files differ)

Copied: lbreakout2/repos/staging-x86_64/PKGBUILD (from rev 146935, 
lbreakout2/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-19 12:08:17 UTC (rev 146936)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Giovanni Scafora 
+# Contributor: Tom Newsom 
+
+pkgname=lbreakout2
+pkgver=2.6.3
+pkgrel=3
+pkgdesc="A breakout game with nice effects, graphics, and sounds"
+arch=('i686' 'x86_64')
+url="http://lgames.sourceforge.net";
+license=('GPL')
+depends=('sdl_mixer' 'libpng')
+backup=('var/games/lbreakout2/lbreakout2.hscr')
+source=("http://downloads.sourceforge.net/lgames/${pkgname}-${pkgver/_/-}.tar.gz";
+'lbreakout2.desktop'
+   'lbreakout2.png')
+md5sums=('43900187bc935475cd6489569cd2230a'
+ '14cd34a72a8f4e3b8f385f9023625241'
+ '94e2fa393eb2a7d4494641dec580573b')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver/_/-}
+
+  ./configure --prefix=/usr \
+  --localstatedir=/var/games/lbreakout2 
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver/_/-}
+
+  make DESTDIR=${pkgdir}/ doc_dir=/usr/share/doc install
+  
+  chmod -R 755 ${pkgdir}/usr
+  chown root:games ${pkgdir}/var/games
+  chmod 775 ${pkgdir}/var/games
+  chown root:games ${

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

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 07:07:38
  Author: giovanni
Revision: 146935

upgpkg: lbreakout2 2.6.3-3

libpng 1.5 rebuild

Modified:
  lbreakout2/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 11:54:37 UTC (rev 146934)
+++ PKGBUILD2012-01-19 12:07:38 UTC (rev 146935)
@@ -4,7 +4,7 @@
 
 pkgname=lbreakout2
 pkgver=2.6.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A breakout game with nice effects, graphics, and sounds"
 arch=('i686' 'x86_64')
 url="http://lgames.sourceforge.net";



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

2012-01-19 Thread Florian Pritz
Date: Thursday, January 19, 2012 @ 06:54:37
  Author: bluewind
Revision: 146934

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

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

-+
 PKGBUILD|   75 
 git-fixes.patch | 4772 +++---
 2 files changed, 2428 insertions(+), 2419 deletions(-)

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


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

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 06:45:57
  Author: giovanni
Revision: 146933

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

Added:
  gif2png/repos/staging-i686/
  gif2png/repos/staging-i686/PKGBUILD
(from rev 146932, gif2png/trunk/PKGBUILD)
  gif2png/repos/staging-i686/gif2png-2.5.4-libpng15.patch
(from rev 146932, gif2png/trunk/gif2png-2.5.4-libpng15.patch)
  gif2png/repos/staging-x86_64/
  gif2png/repos/staging-x86_64/PKGBUILD
(from rev 146932, gif2png/trunk/PKGBUILD)
  gif2png/repos/staging-x86_64/gif2png-2.5.4-libpng15.patch
(from rev 146932, gif2png/trunk/gif2png-2.5.4-libpng15.patch)

-+
 staging-i686/PKGBUILD   |   36 +
 staging-i686/gif2png-2.5.4-libpng15.patch   |   43 ++
 staging-x86_64/PKGBUILD |   36 +
 staging-x86_64/gif2png-2.5.4-libpng15.patch |   43 ++
 4 files changed, 158 insertions(+)

Copied: gif2png/repos/staging-i686/PKGBUILD (from rev 146932, 
gif2png/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 11:45:57 UTC (rev 146933)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Giovanni Scafora 
+# Contributor: eric 
+# Contributor: Andrew Rose 
+
+pkgname=gif2png
+pkgver=2.5.4
+pkgrel=3
+pkgdesc="A GIF to PNG image format converter"
+arch=('i686' 'x86_64')
+url="http://www.catb.org/~esr/gif2png/";
+license=('ZLIB')
+depends=('libpng')
+optdepends=('python2: for using web2png')
+source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz";
+'gif2png-2.5.4-libpng15.patch')
+md5sums=('d63ea3fc6b6119589e8d4d6fead30df9'
+ 'd4d6d31e04e7448315eae56bb12d4df6')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  sed -i 's#env python#env python2#' web2png
+  patch -Np0 -i ${srcdir}/gif2png-2.5.4-libpng15.patch
+
+  ./configure --prefix=/usr \
+  --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
+}

Copied: gif2png/repos/staging-i686/gif2png-2.5.4-libpng15.patch (from rev 
146932, gif2png/trunk/gif2png-2.5.4-libpng15.patch)
===
--- staging-i686/gif2png-2.5.4-libpng15.patch   (rev 0)
+++ staging-i686/gif2png-2.5.4-libpng15.patch   2012-01-19 11:45:57 UTC (rev 
146933)
@@ -0,0 +1,43 @@
+ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/graphics/gif2png/patches/patch-aa
+
+--- gif2png.c
 gif2png.c
+@@ -10,6 +10,7 @@
+ #include 
+ #include 
+ #include/* for isatty() */
++#include 
+ 
+ #if !defined(TRUE)
+ #define FALSE 0
+@@ -120,8 +121,8 @@ int writefile(struct GIFelement *s,struc
+ int colors_used = 0;
+ byte remap[MAXCMSIZE];
+ int low_prec;
+-png_struct *png_ptr = xalloc(sizeof (png_struct));
+-png_info *info_ptr = xalloc(sizeof (png_info));
++png_struct *png_ptr;
++png_info *info_ptr;
+ int p;
+ int gray_bitdepth;
+ png_color pal_rgb[MAXCMSIZE], *pltep;
+@@ -136,6 +137,19 @@ int writefile(struct GIFelement *s,struc
+ png_text software;
+ png_text comment;
+ 
++png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
++if (png_ptr == NULL) {
++  fprintf(stderr, "gif2png: fatal error, out of memory\n");
++  fprintf(stderr, "gif2png: exiting ungracefully\n");
++  exit(1);
++}
++info_ptr = png_create_info_struct(png_ptr);
++if (info_ptr == NULL) {
++  fprintf(stderr, "gif2png: fatal error, out of memory\n");
++  fprintf(stderr, "gif2png: exiting ungracefully\n");
++  exit(1);
++}
++
+ /* these volatile declarations prevent gcc warnings ("variable might be
+  *  clobbered by `longjmp' or `vfork'") */
+ volatile int gray = TRUE;

Copied: gif2png/repos/staging-x86_64/PKGBUILD (from rev 146932, 
gif2png/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-19 11:45:57 UTC (rev 146933)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Giovanni Scafora 
+# Contributor: eric 
+# Contributor: Andrew Rose 
+
+pkgname=gif2png
+pkgver=2.5.4
+pkgrel=3
+pkgdesc="A GIF to PNG image format converter"
+arch=('i686' 'x86_64')
+url="http://www.catb.org/~esr/gif2png/";
+license=('ZLIB')
+depends=('libpng')
+optdepends=('python2: for using web2png')
+source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz";
+'gif2png-2.5.4-libpng15.patch')
+md5sums=('d63ea3fc6b6119589e8d4d6fead30df9'
+ 'd4d6d31e04e7448315eae56bb12d4df6')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  sed -i 's#env python#env python2#' web2png
+  p

[arch-commits] Commit in gif2png/trunk (PKGBUILD gif2png-2.5.4-libpng15.patch)

2012-01-19 Thread Giovanni Scafora
Date: Thursday, January 19, 2012 @ 06:45:38
  Author: giovanni
Revision: 146932

upgpkg: gif2png 2.5.4-3

libpng 1.5 rebuild

Added:
  gif2png/trunk/gif2png-2.5.4-libpng15.patch
Modified:
  gif2png/trunk/PKGBUILD

--+
 PKGBUILD |   10 ++---
 gif2png-2.5.4-libpng15.patch |   43 +
 2 files changed, 50 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 10:12:16 UTC (rev 146931)
+++ PKGBUILD2012-01-19 11:45:38 UTC (rev 146932)
@@ -5,20 +5,24 @@
 
 pkgname=gif2png
 pkgver=2.5.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A GIF to PNG image format converter"
 arch=('i686' 'x86_64')
 url="http://www.catb.org/~esr/gif2png/";
 license=('ZLIB')
 depends=('libpng')
 optdepends=('python2: for using web2png')
-source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz";)
-md5sums=('d63ea3fc6b6119589e8d4d6fead30df9')
+source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz";
+'gif2png-2.5.4-libpng15.patch')
+md5sums=('d63ea3fc6b6119589e8d4d6fead30df9'
+ 'd4d6d31e04e7448315eae56bb12d4df6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i 's#env python#env python2#' web2png
+  patch -Np0 -i ${srcdir}/gif2png-2.5.4-libpng15.patch
+
   ./configure --prefix=/usr \
   --mandir=/usr/share/man
   make

Added: gif2png-2.5.4-libpng15.patch
===
--- gif2png-2.5.4-libpng15.patch(rev 0)
+++ gif2png-2.5.4-libpng15.patch2012-01-19 11:45:38 UTC (rev 146932)
@@ -0,0 +1,43 @@
+ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/graphics/gif2png/patches/patch-aa
+
+--- gif2png.c
 gif2png.c
+@@ -10,6 +10,7 @@
+ #include 
+ #include 
+ #include/* for isatty() */
++#include 
+ 
+ #if !defined(TRUE)
+ #define FALSE 0
+@@ -120,8 +121,8 @@ int writefile(struct GIFelement *s,struc
+ int colors_used = 0;
+ byte remap[MAXCMSIZE];
+ int low_prec;
+-png_struct *png_ptr = xalloc(sizeof (png_struct));
+-png_info *info_ptr = xalloc(sizeof (png_info));
++png_struct *png_ptr;
++png_info *info_ptr;
+ int p;
+ int gray_bitdepth;
+ png_color pal_rgb[MAXCMSIZE], *pltep;
+@@ -136,6 +137,19 @@ int writefile(struct GIFelement *s,struc
+ png_text software;
+ png_text comment;
+ 
++png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
++if (png_ptr == NULL) {
++  fprintf(stderr, "gif2png: fatal error, out of memory\n");
++  fprintf(stderr, "gif2png: exiting ungracefully\n");
++  exit(1);
++}
++info_ptr = png_create_info_struct(png_ptr);
++if (info_ptr == NULL) {
++  fprintf(stderr, "gif2png: fatal error, out of memory\n");
++  fprintf(stderr, "gif2png: exiting ungracefully\n");
++  exit(1);
++}
++
+ /* these volatile declarations prevent gcc warnings ("variable might be
+  *  clobbered by `longjmp' or `vfork'") */
+ volatile int gray = TRUE;



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

2012-01-19 Thread Ionut Biru
Date: Thursday, January 19, 2012 @ 05:12:16
  Author: ibiru
Revision: 146931

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

Added:
  gnome-shell/repos/extra-i686/PKGBUILD
(from rev 146930, gnome-shell/trunk/PKGBUILD)
  gnome-shell/repos/extra-i686/gnome-shell.install
(from rev 146930, gnome-shell/trunk/gnome-shell.install)
  
gnome-shell/repos/extra-i686/revert-notificationdaemon-group-based-on-pid-and-titles.patch
(from rev 146930, 
gnome-shell/trunk/revert-notificationdaemon-group-based-on-pid-and-titles.patch)
  gnome-shell/repos/extra-x86_64/PKGBUILD
(from rev 146930, gnome-shell/trunk/PKGBUILD)
  gnome-shell/repos/extra-x86_64/gnome-shell.install
(from rev 146930, gnome-shell/trunk/gnome-shell.install)
  
gnome-shell/repos/extra-x86_64/revert-notificationdaemon-group-based-on-pid-and-titles.patch
(from rev 146930, 
gnome-shell/trunk/revert-notificationdaemon-group-based-on-pid-and-titles.patch)
Deleted:
  gnome-shell/repos/extra-i686/PKGBUILD
  gnome-shell/repos/extra-i686/gnome-shell.install
  gnome-shell/repos/extra-x86_64/PKGBUILD
  gnome-shell/repos/extra-x86_64/gnome-shell.install

+
 extra-i686/PKGBUILD|   
80 +--
 extra-i686/gnome-shell.install |   
44 -
 extra-i686/revert-notificationdaemon-group-based-on-pid-and-titles.patch   |  
224 ++
 extra-x86_64/PKGBUILD  |   
80 +--
 extra-x86_64/gnome-shell.install   |   
44 -
 extra-x86_64/revert-notificationdaemon-group-based-on-pid-and-titles.patch |  
224 ++
 6 files changed, 576 insertions(+), 120 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-19 10:10:05 UTC (rev 146930)
+++ extra-i686/PKGBUILD 2012-01-19 10:12:16 UTC (rev 146931)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru 
-# Contributor: Flamelab http://live.gnome.org/GnomeShell";
-license=('GPL2')
-depends=('mutter' 'gjs' 'libcroco' 'gnome-bluetooth' 'gnome-desktop' 
'gnome-menus' 'libpulse' 'folks' 'telepathy-logger' 'networkmanager' 'caribou' 
'nautilus' 'telepathy-mission-control' 'unzip')
-makedepends=('intltool' 'gnome-doc-utils')
-optdepends=('network-manager-applet: shell integration for networkmanager')
-options=('!libtool' '!emptydirs')
-install=gnome-shell.install
-groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('68967b9d58ad0551d7d3d28a276526a15faf1fc1d27f4624eb405663910e2eb8')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-  --libexecdir=/usr/lib/gnome-shell \
-  --localstatedir=/var --disable-static \
-  --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" 
--domain gnome-shell "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}

Copied: gnome-shell/repos/extra-i686/PKGBUILD (from rev 146930, 
gnome-shell/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-19 10:12:16 UTC (rev 146931)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Ionut Biru 
+# Contributor: Flamelab http://live.gnome.org/GnomeShell";
+license=('GPL2')
+depends=('mutter' 'gjs' 'libcroco' 'gnome-bluetooth' 'gnome-desktop' 
'gnome-menus' 'libpulse' 'folks' 'telepathy-logger' 'networkmanager' 'caribou' 
'nautilus' 'telepathy-mission-control' 'unzip')
+makedepends=('intltool' 'gnome-doc-utils')
+optdepends=('network-manager-applet: shell integration for networkmanager')
+options=('!libtool' '!emptydirs')
+install=gnome-shell.install
+groups=(gnome)
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+revert-notificationdaemon-group-based-on-pid-and-titles.patch)
+sha256sums=('68967b9d58ad0551d7d3d28a276526a15faf1fc1d27f4624eb405663910e2eb8'
+'9e0337cd25d29d7215561d6fa30612d69c89fe7c27aa563a0c0b8a5b6f6cf12a')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -Np1 -R -i 
"$srcdir/revert-notificationdaemon-group-based-on-pid-and-titles.patch"
+
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+  --libexecdir=/usr/lib/gnome-shell \
+  --localstatedir=/var --disable-static \
+  --disable-schemas-compile
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+
+  install -m755 -d "$pkgdir/usr/

[arch-commits] Commit in gnome-shell/trunk (2 files)

2012-01-19 Thread Ionut Biru
Date: Thursday, January 19, 2012 @ 05:10:05
  Author: ibiru
Revision: 146930

revert commit that breaks tray icons for apps like skype, pidgin, dropbox. 
FS#27987

Added:
  
gnome-shell/trunk/revert-notificationdaemon-group-based-on-pid-and-titles.patch
Modified:
  gnome-shell/trunk/PKGBUILD

---+
 PKGBUILD  |   10 
 revert-notificationdaemon-group-based-on-pid-and-titles.patch |  224 ++
 2 files changed, 231 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 10:08:04 UTC (rev 146929)
+++ PKGBUILD2012-01-19 10:10:05 UTC (rev 146930)
@@ -4,7 +4,7 @@
 
 pkgname=gnome-shell
 pkgver=3.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The next generation GNOME Shell"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/GnomeShell";
@@ -15,12 +15,16 @@
 options=('!libtool' '!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('68967b9d58ad0551d7d3d28a276526a15faf1fc1d27f4624eb405663910e2eb8')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+revert-notificationdaemon-group-based-on-pid-and-titles.patch)
+sha256sums=('68967b9d58ad0551d7d3d28a276526a15faf1fc1d27f4624eb405663910e2eb8'
+'9e0337cd25d29d7215561d6fa30612d69c89fe7c27aa563a0c0b8a5b6f6cf12a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  patch -Np1 -R -i 
"$srcdir/revert-notificationdaemon-group-based-on-pid-and-titles.patch"
+
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
   --libexecdir=/usr/lib/gnome-shell \
   --localstatedir=/var --disable-static \

Added: revert-notificationdaemon-group-based-on-pid-and-titles.patch
===
--- revert-notificationdaemon-group-based-on-pid-and-titles.patch   
(rev 0)
+++ revert-notificationdaemon-group-based-on-pid-and-titles.patch   
2012-01-19 10:10:05 UTC (rev 146930)
@@ -0,0 +1,224 @@
+From 7e654ab3ca6e8ac75ba5e45c2a411eb1c2904b26 Mon Sep 17 00:00:00 2001
+From: Marina Zhurakhinskaya 
+Date: Tue, 20 Dec 2011 05:51:35 +
+Subject: notificationDaemon: group sources based on a combination of pid and 
title
+
+That way different system notifications, such as the ones about battery power
+and the ones about software updates, are shown with separate message tray
+sources.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=664138
+---
+diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
+index f40205d..c691efe 100644
+--- a/js/ui/notificationDaemon.js
 b/js/ui/notificationDaemon.js
+@@ -92,7 +92,7 @@ NotificationDaemon.prototype = {
+ _init: function() {
+ DBus.session.exportObject('/org/freedesktop/Notifications', this);
+ 
+-this._sources = {};
++this._sources = [];
+ this._senderToPid = {};
+ this._notifications = {};
+ this._busProxy = new Bus();
+@@ -150,14 +150,30 @@ NotificationDaemon.prototype = {
+ }
+ },
+ 
++_lookupSource: function(title, pid, trayIcon) {
++for (let i = 0; i < this._sources.length; i++) {
++let source = this._sources[i];
++if (source.pid == pid &&
++(source.initialTitle == title || source.trayIcon || trayIcon))
++return source;
++}
++return null;
++},
++
+ // Returns the source associated with ndata.notification if it is set.
+-// Otherwise, returns the source associated with the pid if one is
+-// stored in this._sources and the notification is not transient.
+-// Otherwise, creates a new source as long as pid is provided.
++// Otherwise, returns the source associated with the title and pid if
++// such source is stored in this._sources and the notification is not
++// transient. If the existing or requested source is associated with
++// a tray icon and passed in pid matches a pid of an existing source,
++// the title match is ignored to enable representing a tray icon and
++// notifications from the same application with a single source.
++//
++// If no existing source is found, a new source is created as long as
++// pid is provided.
+ //
+ // Either a pid or ndata.notification is needed to retrieve or
+ // create a source.
+-_getSource: function(title, pid, ndata, sender) {
++_getSource: function(title, pid, ndata, sender, trayIcon) {
+ if (!pid && !(ndata && ndata.notification))
+ return null;
+ 
+@@ -174,20 +190,24 @@ NotificationDaemon.prototype = {
+ // with a transient one from the same sender, so we
+ // always create a new source object for new transient notifications
+ // and never add it to

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

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 05:08:04
  Author: eric
Revision: 146929

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

Added:
  glhack/repos/staging-i686/
  glhack/repos/staging-i686/PKGBUILD
(from rev 146928, glhack/trunk/PKGBUILD)
  glhack/repos/staging-i686/glhack-libpng15.patch
(from rev 146928, glhack/trunk/glhack-libpng15.patch)
  glhack/repos/staging-i686/glhack.install
(from rev 146928, glhack/trunk/glhack.install)
  glhack/repos/staging-x86_64/
  glhack/repos/staging-x86_64/PKGBUILD
(from rev 146928, glhack/trunk/PKGBUILD)
  glhack/repos/staging-x86_64/glhack-libpng15.patch
(from rev 146928, glhack/trunk/glhack-libpng15.patch)
  glhack/repos/staging-x86_64/glhack.install
(from rev 146928, glhack/trunk/glhack.install)

--+
 staging-i686/PKGBUILD|   54 +
 staging-i686/glhack-libpng15.patch   |   11 ++
 staging-i686/glhack.install  |   24 ++
 staging-x86_64/PKGBUILD  |   54 +
 staging-x86_64/glhack-libpng15.patch |   11 ++
 staging-x86_64/glhack.install|   24 ++
 6 files changed, 178 insertions(+)

Copied: glhack/repos/staging-i686/PKGBUILD (from rev 146928, 
glhack/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-19 10:08:04 UTC (rev 146929)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=glhack
+pkgver=1.2
+pkgrel=6
+pkgdesc="A port of Nethack, a single player dungeon exploration game in 2D"
+arch=('i686' 'x86_64')
+url="http://glhack.sourceforge.net/";
+license=('custom')
+depends=('sdl' 'libpng' 'libgl')
+makedepends=('mesa')
+options=('!makeflags')
+install=glhack.install
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
 glhack-libpng15.patch)
+sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae'
+  '4cf1a13e76cc1f1eb3708d42c74b85b7f321092d')
+
+build(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i ../glhack-libpng15.patch
+  sed -i 's|/usr/lib/games|/usr/share|' include/config.h
+  sed -i 's|/var/lib/games/glhack|/var/games/glhack|' include/unixconf.h
+  sed -i -e 's|PREFIX   = /usr|PREFIX   = $(DESTDIR)/usr|' Makefile
+  sed -i -e 's|VARDIR   = /var/lib/games/glhack|VARDIR   = 
$(DESTDIR)/var/games/glhack|' Makefile
+  sed -i -e 's|/usr/man/man6|$(DESTDIR)/usr/share/man/man6|' doc/Makefile
+  sed -i -e 's|GAMEDIR  = $(PREFIX)/lib/games/$(GAME)|GAMEDIR  = 
$(PREFIX)/share/$(GAME)|' Makefile
+
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -d "${pkgdir}"/usr/share/man/man{5,6}
+  make DESTDIR="$pkgdir" install
+  install -D -m644 dat/license 
"${pkgdir}/usr/share/licenses/${pkgname}/license"
+
+# Renaming man pages which conflicts with nethack
+  cd "${pkgdir}/usr/share/man/man6"
+  for manpage in dgn_comp dlb lev_comp nethack recover; do
+mv $manpage.6 $manpage-glhack.6
+  done
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  mv "${pkgdir}/usr/share/glhack/glhack" "${pkgdir}/usr/bin/glhack"
+  mv "${pkgdir}/usr/share/glhack/recover_glhack" 
"${pkgdir}/usr/bin/recover_glhack"
+
+  chown -R root:root "${pkgdir}/usr/share/glhack"
+
+  rm -r "${pkgdir}"/var/games/glhack
+  install -d "${pkgdir}/var/games/glhack/save"
+  chmod -R 775 "${pkgdir}/var/games"
+  chown -R root:games "${pkgdir}/var/games"
+}

Copied: glhack/repos/staging-i686/glhack-libpng15.patch (from rev 146928, 
glhack/trunk/glhack-libpng15.patch)
===
--- staging-i686/glhack-libpng15.patch  (rev 0)
+++ staging-i686/glhack-libpng15.patch  2012-01-19 10:08:04 UTC (rev 146929)
@@ -0,0 +1,11 @@
+--- win/gl/gl_image.c.old  2012-01-19 04:01:26.0 -0500
 win/gl/gl_image.c  2012-01-19 04:03:04.0 -0500
+@@ -486,7 +486,7 @@
+   /* set error handling since we are using the setjmp/longjmp method
+* (this is the normal method of doing things with libpng).
+*/
+-  if (setjmp(png_ptr->jmpbuf))
++  if (setjmp(png_jmpbuf(png_ptr)))
+   {
+ sdlgl_warning("Problem within LibPNG (unknown)\n");
+ goto failed;

Copied: glhack/repos/staging-i686/glhack.install (from rev 146928, 
glhack/trunk/glhack.install)
===
--- staging-i686/glhack.install (rev 0)
+++ staging-i686/glhack.install 2012-01-19 10:08:04 UTC (rev 146929)
@@ -0,0 +1,24 @@
+post_install() {
+  touch var/games/glhack/{record,perm,logfile}
+  chown root:games var/games/glhack/{record,perm,logfile}
+  chmod 664 var/games/glhack/{record,perm,logfile}
+}
+
+pre_upgrade() {
+  install -d -m775 var/games/glhack
+  chown root:games var/games/glhack
+  [ -e usr/share/glhack/record ] && cp usr/share/glhack/record var/games/glhack
+  [ -e usr/share/g

[arch-commits] Commit in glhack/trunk (PKGBUILD glhack-libpng15.patch)

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 05:07:45
  Author: eric
Revision: 146928

upgpkg: glhack 1.2-6

Rebuild against libpng 1.5 and libtiff 4.0

Added:
  glhack/trunk/glhack-libpng15.patch
Modified:
  glhack/trunk/PKGBUILD

---+
 PKGBUILD  |   10 +-
 glhack-libpng15.patch |   11 +++
 2 files changed, 16 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 10:01:03 UTC (rev 146927)
+++ PKGBUILD2012-01-19 10:07:45 UTC (rev 146928)
@@ -3,7 +3,7 @@
 
 pkgname=glhack
 pkgver=1.2
-pkgrel=5
+pkgrel=6
 pkgdesc="A port of Nethack, a single player dungeon exploration game in 2D"
 arch=('i686' 'x86_64')
 url="http://glhack.sourceforge.net/";
@@ -12,13 +12,13 @@
 makedepends=('mesa')
 options=('!makeflags')
 install=glhack.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('b4c68e3ab689610ca638b7660c1b05bd')
-sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
 glhack-libpng15.patch)
+sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae'
+  '4cf1a13e76cc1f1eb3708d42c74b85b7f321092d')
 
 build(){
   cd "${srcdir}/${pkgname}-${pkgver}"
-
+  patch -p0 -i ../glhack-libpng15.patch
   sed -i 's|/usr/lib/games|/usr/share|' include/config.h
   sed -i 's|/var/lib/games/glhack|/var/games/glhack|' include/unixconf.h
   sed -i -e 's|PREFIX   = /usr|PREFIX   = $(DESTDIR)/usr|' Makefile

Added: glhack-libpng15.patch
===
--- glhack-libpng15.patch   (rev 0)
+++ glhack-libpng15.patch   2012-01-19 10:07:45 UTC (rev 146928)
@@ -0,0 +1,11 @@
+--- win/gl/gl_image.c.old  2012-01-19 04:01:26.0 -0500
 win/gl/gl_image.c  2012-01-19 04:03:04.0 -0500
+@@ -486,7 +486,7 @@
+   /* set error handling since we are using the setjmp/longjmp method
+* (this is the normal method of doing things with libpng).
+*/
+-  if (setjmp(png_ptr->jmpbuf))
++  if (setjmp(png_jmpbuf(png_ptr)))
+   {
+ sdlgl_warning("Problem within LibPNG (unknown)\n");
+ goto failed;



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

2012-01-19 Thread Florian Pritz
Date: Thursday, January 19, 2012 @ 05:01:03
  Author: bluewind
Revision: 146927

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

Added:
  
perl/repos/core-x86_64/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
(from rev 146925, 
perl/repos/testing-x86_64/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch)
  perl/repos/core-x86_64/ChangeLog
(from rev 146925, perl/repos/testing-x86_64/ChangeLog)
  perl/repos/core-x86_64/PKGBUILD
(from rev 146925, perl/repos/testing-x86_64/PKGBUILD)
  perl/repos/core-x86_64/digest_eval_hole.diff
(from rev 146925, perl/repos/testing-x86_64/digest_eval_hole.diff)
  perl/repos/core-x86_64/fix-h2ph-and-tests.patch
(from rev 146925, perl/repos/testing-x86_64/fix-h2ph-and-tests.patch)
  perl/repos/core-x86_64/perl.install
(from rev 146925, perl/repos/testing-x86_64/perl.install)
  perl/repos/core-x86_64/perlbin.csh
(from rev 146925, perl/repos/testing-x86_64/perlbin.csh)
  perl/repos/core-x86_64/perlbin.sh
(from rev 146925, perl/repos/testing-x86_64/perlbin.sh)
  perl/repos/core-x86_64/provides.pl
(from rev 146925, perl/repos/testing-x86_64/provides.pl)
Deleted:
  
perl/repos/core-x86_64/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
  perl/repos/core-x86_64/ChangeLog
  perl/repos/core-x86_64/PKGBUILD
  perl/repos/core-x86_64/fix-h2ph-and-tests.patch
  perl/repos/core-x86_64/perl.install
  perl/repos/core-x86_64/perlbin.csh
  perl/repos/core-x86_64/perlbin.sh
  perl/repos/core-x86_64/provides.pl
  perl/repos/testing-x86_64/

-+
 0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch |  166 +-
 ChangeLog   |  132 +-
 PKGBUILD|  238 ++--
 digest_eval_hole.diff   |   61 +
 fix-h2ph-and-tests.patch|  208 +--
 perl.install|   20 
 perlbin.csh |   30 
 perlbin.sh  |   36 
 provides.pl |  572 
+-
 9 files changed, 764 insertions(+), 699 deletions(-)

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


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

2012-01-19 Thread Florian Pritz
Date: Thursday, January 19, 2012 @ 05:01:01
  Author: bluewind
Revision: 146926

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

Added:
  
perl/repos/core-i686/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
(from rev 146925, 
perl/repos/testing-i686/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch)
  perl/repos/core-i686/ChangeLog
(from rev 146925, perl/repos/testing-i686/ChangeLog)
  perl/repos/core-i686/PKGBUILD
(from rev 146925, perl/repos/testing-i686/PKGBUILD)
  perl/repos/core-i686/digest_eval_hole.diff
(from rev 146925, perl/repos/testing-i686/digest_eval_hole.diff)
  perl/repos/core-i686/fix-h2ph-and-tests.patch
(from rev 146925, perl/repos/testing-i686/fix-h2ph-and-tests.patch)
  perl/repos/core-i686/perl.install
(from rev 146925, perl/repos/testing-i686/perl.install)
  perl/repos/core-i686/perlbin.csh
(from rev 146925, perl/repos/testing-i686/perlbin.csh)
  perl/repos/core-i686/perlbin.sh
(from rev 146925, perl/repos/testing-i686/perlbin.sh)
  perl/repos/core-i686/provides.pl
(from rev 146925, perl/repos/testing-i686/provides.pl)
Deleted:
  
perl/repos/core-i686/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
  perl/repos/core-i686/ChangeLog
  perl/repos/core-i686/PKGBUILD
  perl/repos/core-i686/fix-h2ph-and-tests.patch
  perl/repos/core-i686/perl.install
  perl/repos/core-i686/perlbin.csh
  perl/repos/core-i686/perlbin.sh
  perl/repos/core-i686/provides.pl
  perl/repos/testing-i686/

-+
 0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch |  166 +-
 ChangeLog   |  132 +-
 PKGBUILD|  238 ++--
 digest_eval_hole.diff   |   61 +
 fix-h2ph-and-tests.patch|  208 +--
 perl.install|   20 
 perlbin.csh |   30 
 perlbin.sh  |   36 
 provides.pl |  572 
+-
 9 files changed, 764 insertions(+), 699 deletions(-)

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


[arch-commits] Commit in lirc/repos (25 files)

2012-01-19 Thread Thomas Bächler
Date: Thursday, January 19, 2012 @ 05:00:36
  Author: thomas
Revision: 146925

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

Added:
  lirc/repos/extra-x86_64/PKGBUILD
(from rev 146923, lirc/repos/testing-x86_64/PKGBUILD)
  lirc/repos/extra-x86_64/irexec.conf
(from rev 146923, lirc/repos/testing-x86_64/irexec.conf)
  lirc/repos/extra-x86_64/irexecd
(from rev 146923, lirc/repos/testing-x86_64/irexecd)
  lirc/repos/extra-x86_64/kernel-2.6.39.patch
(from rev 146923, lirc/repos/testing-x86_64/kernel-2.6.39.patch)
  lirc/repos/extra-x86_64/lirc.install
(from rev 146923, lirc/repos/testing-x86_64/lirc.install)
  lirc/repos/extra-x86_64/lirc.logrotate
(from rev 146923, lirc/repos/testing-x86_64/lirc.logrotate)
  lirc/repos/extra-x86_64/lirc_atiusb-kfifo.patch
(from rev 146923, lirc/repos/testing-x86_64/lirc_atiusb-kfifo.patch)
  lirc/repos/extra-x86_64/lirc_wpc8769l.patch
(from rev 146923, lirc/repos/testing-x86_64/lirc_wpc8769l.patch)
  lirc/repos/extra-x86_64/lircd
(from rev 146923, lirc/repos/testing-x86_64/lircd)
  lirc/repos/extra-x86_64/lircd-handle-large-config.patch
(from rev 146923, lirc/repos/testing-x86_64/lircd-handle-large-config.patch)
  lirc/repos/extra-x86_64/lircd.conf
(from rev 146923, lirc/repos/testing-x86_64/lircd.conf)
  lirc/repos/extra-x86_64/lircmd
(from rev 146923, lirc/repos/testing-x86_64/lircmd)
Deleted:
  lirc/repos/extra-x86_64/PKGBUILD
  lirc/repos/extra-x86_64/irexec.conf
  lirc/repos/extra-x86_64/irexecd
  lirc/repos/extra-x86_64/kernel-2.6.39.patch
  lirc/repos/extra-x86_64/lirc.install
  lirc/repos/extra-x86_64/lirc.logrotate
  lirc/repos/extra-x86_64/lirc_atiusb-kfifo.patch
  lirc/repos/extra-x86_64/lirc_wpc8769l.patch
  lirc/repos/extra-x86_64/lircd
  lirc/repos/extra-x86_64/lircd-handle-large-config.patch
  lirc/repos/extra-x86_64/lircd.conf
  lirc/repos/extra-x86_64/lircmd
  lirc/repos/testing-x86_64/

-+
 PKGBUILD|  208 +++---
 irexec.conf |   10 -
 irexecd |   76 ++---
 kernel-2.6.39.patch |  108 +--
 lirc.install|   32 ++---
 lirc.logrotate  |   10 -
 lirc_atiusb-kfifo.patch |   62 +--
 lirc_wpc8769l.patch |  176 
 lircd   |  104 +--
 lircd-handle-large-config.patch |   78 +++---
 lircd.conf  |   16 +-
 lircmd  |   72 ++---
 12 files changed, 476 insertions(+), 476 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-01-19 10:00:34 UTC (rev 146924)
+++ extra-x86_64/PKGBUILD   2012-01-19 10:00:36 UTC (rev 146925)
@@ -1,104 +0,0 @@
-# $Id$
-# Maintainer: Paul Mattal 
-
-pkgbase=lirc
-pkgname=('lirc' 'lirc-utils')
-pkgver=0.9.0
-pkgrel=8
-epoch=1
-_extramodules=extramodules-3.1-ARCH
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
-arch=('i686' 'x86_64')
-url="http://www.lirc.org/";
-license=('GPL')
-makedepends=('help2man' 'linux-headers>=3.1' 'linux-headers<3.2' 'alsa-lib' 
'libx11' 'libftdi' 'libirman' 'python2')
-options=('!makeflags' '!strip')
-source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
-lirc_wpc8769l.patch
-lircd-handle-large-config.patch
-lirc_atiusb-kfifo.patch
-kernel-2.6.39.patch
-   lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd)
-md5sums=('b232aef26f23fe33ea8305d276637086'
- '1cce37e18e3f6f46044abab29016d18f'
- 'b70cc9640505205446ec47b7d4779f38'
- '1f8b104a2365d9f93404b143f499059b'
- '087a7d102e1c96bf1179f38db2b0b237'
- '8d0e238dc0eda95e340fe570605da492'
- '85f7fdac55e5256967241864049bf5e9'
- '3deb02604b37811d41816e9b4385fcc3'
- '5b1f8c9cd788a39a6283f93302ce5c6e'
- 'f0c0ac930326168035f0c8e24357ae55'
- '69d099e6deedfa3c1ee2b6e82d9b8bfb')
-
-build() {
-  cd "${srcdir}/lirc-${pkgver}"
-  patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
-  patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
-  patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch"
-  patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
-
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  sed -e 's/@X_CFLAGS@//g' \
-  -e 's/@X_LIBS@//g' \
-  -e 's/@X_PRE_LIBS@//g' \
-  -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
-  libtoolize
-  autoreconf
-
-  PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
-  --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
-  --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
-  --with-transmitter
-
-  # Remove drivers already in kernel
-  sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
-  -e "s:lirc_im

[arch-commits] Commit in lirc/repos (25 files)

2012-01-19 Thread Thomas Bächler
Date: Thursday, January 19, 2012 @ 05:00:34
  Author: thomas
Revision: 146924

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

Added:
  lirc/repos/extra-i686/PKGBUILD
(from rev 146923, lirc/repos/testing-i686/PKGBUILD)
  lirc/repos/extra-i686/irexec.conf
(from rev 146923, lirc/repos/testing-i686/irexec.conf)
  lirc/repos/extra-i686/irexecd
(from rev 146923, lirc/repos/testing-i686/irexecd)
  lirc/repos/extra-i686/kernel-2.6.39.patch
(from rev 146923, lirc/repos/testing-i686/kernel-2.6.39.patch)
  lirc/repos/extra-i686/lirc.install
(from rev 146923, lirc/repos/testing-i686/lirc.install)
  lirc/repos/extra-i686/lirc.logrotate
(from rev 146923, lirc/repos/testing-i686/lirc.logrotate)
  lirc/repos/extra-i686/lirc_atiusb-kfifo.patch
(from rev 146923, lirc/repos/testing-i686/lirc_atiusb-kfifo.patch)
  lirc/repos/extra-i686/lirc_wpc8769l.patch
(from rev 146923, lirc/repos/testing-i686/lirc_wpc8769l.patch)
  lirc/repos/extra-i686/lircd
(from rev 146923, lirc/repos/testing-i686/lircd)
  lirc/repos/extra-i686/lircd-handle-large-config.patch
(from rev 146923, lirc/repos/testing-i686/lircd-handle-large-config.patch)
  lirc/repos/extra-i686/lircd.conf
(from rev 146923, lirc/repos/testing-i686/lircd.conf)
  lirc/repos/extra-i686/lircmd
(from rev 146923, lirc/repos/testing-i686/lircmd)
Deleted:
  lirc/repos/extra-i686/PKGBUILD
  lirc/repos/extra-i686/irexec.conf
  lirc/repos/extra-i686/irexecd
  lirc/repos/extra-i686/kernel-2.6.39.patch
  lirc/repos/extra-i686/lirc.install
  lirc/repos/extra-i686/lirc.logrotate
  lirc/repos/extra-i686/lirc_atiusb-kfifo.patch
  lirc/repos/extra-i686/lirc_wpc8769l.patch
  lirc/repos/extra-i686/lircd
  lirc/repos/extra-i686/lircd-handle-large-config.patch
  lirc/repos/extra-i686/lircd.conf
  lirc/repos/extra-i686/lircmd
  lirc/repos/testing-i686/

-+
 PKGBUILD|  208 +++---
 irexec.conf |   10 -
 irexecd |   76 ++---
 kernel-2.6.39.patch |  108 +--
 lirc.install|   32 ++---
 lirc.logrotate  |   10 -
 lirc_atiusb-kfifo.patch |   62 +--
 lirc_wpc8769l.patch |  176 
 lircd   |  104 +--
 lircd-handle-large-config.patch |   78 +++---
 lircd.conf  |   16 +-
 lircmd  |   72 ++---
 12 files changed, 476 insertions(+), 476 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-19 09:59:56 UTC (rev 146923)
+++ extra-i686/PKGBUILD 2012-01-19 10:00:34 UTC (rev 146924)
@@ -1,104 +0,0 @@
-# $Id$
-# Maintainer: Paul Mattal 
-
-pkgbase=lirc
-pkgname=('lirc' 'lirc-utils')
-pkgver=0.9.0
-pkgrel=8
-epoch=1
-_extramodules=extramodules-3.1-ARCH
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
-arch=('i686' 'x86_64')
-url="http://www.lirc.org/";
-license=('GPL')
-makedepends=('help2man' 'linux-headers>=3.1' 'linux-headers<3.2' 'alsa-lib' 
'libx11' 'libftdi' 'libirman' 'python2')
-options=('!makeflags' '!strip')
-source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
-lirc_wpc8769l.patch
-lircd-handle-large-config.patch
-lirc_atiusb-kfifo.patch
-kernel-2.6.39.patch
-   lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd)
-md5sums=('b232aef26f23fe33ea8305d276637086'
- '1cce37e18e3f6f46044abab29016d18f'
- 'b70cc9640505205446ec47b7d4779f38'
- '1f8b104a2365d9f93404b143f499059b'
- '087a7d102e1c96bf1179f38db2b0b237'
- '8d0e238dc0eda95e340fe570605da492'
- '85f7fdac55e5256967241864049bf5e9'
- '3deb02604b37811d41816e9b4385fcc3'
- '5b1f8c9cd788a39a6283f93302ce5c6e'
- 'f0c0ac930326168035f0c8e24357ae55'
- '69d099e6deedfa3c1ee2b6e82d9b8bfb')
-
-build() {
-  cd "${srcdir}/lirc-${pkgver}"
-  patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
-  patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
-  patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch"
-  patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
-
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  sed -e 's/@X_CFLAGS@//g' \
-  -e 's/@X_LIBS@//g' \
-  -e 's/@X_PRE_LIBS@//g' \
-  -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
-  libtoolize
-  autoreconf
-
-  PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
-  --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
-  --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
-  --with-transmitter
-
-  # Remove drivers already in kernel
-  sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
-  -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \
-  -e "s:lirc_serial::" -e "s:lirc_sir:

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

2012-01-19 Thread Florian Pritz
Date: Thursday, January 19, 2012 @ 04:59:56
  Author: bluewind
Revision: 146923

archrelease: copy trunk to testing-any

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

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

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


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

2012-01-19 Thread Florian Pritz
Date: Thursday, January 19, 2012 @ 04:59:40
  Author: bluewind
Revision: 146922

upgpkg: xkeyboard-config 2.4.1-3

remove debugging keys

References: 
https://mailman.archlinux.org/pipermail/arch-general/2012-January/024292.html

Modified:
  xkeyboard-config/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 08:17:01 UTC (rev 146921)
+++ PKGBUILD2012-01-19 09:59:40 UTC (rev 146922)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 pkgname=xkeyboard-config
 pkgver=2.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X keyboard configuration files"
 arch=(any)
 license=('custom')
@@ -20,6 +20,15 @@
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/git-fixes.patch"
+
+  # remove debugging bindings from default mappings
+  find symbols -type f -exec sed \
+  -e 's/XF86_Ungrab/NoSymbol/g' \
+  -e 's/XF86_ClearGrab/NoSymbol/g' \
+  -e 's/XF86_LogWindowTree/NoSymbol/g' \
+  -e 's/XF86_LogGrabInfo/NoSymbol/g' \
+  -i {} +
+
   ./configure --prefix=/usr \
   --with-xkb-base=/usr/share/X11/xkb \
   --with-xkb-rules-symlink=xorg \



[arch-commits] Commit in kdelibs3/repos (18 files)

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 03:17:01
  Author: eric
Revision: 146921

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

Added:
  kdelibs3/repos/staging-i686/
  kdelibs3/repos/staging-i686/PKGBUILD
(from rev 146920, kdelibs3/trunk/PKGBUILD)
  kdelibs3/repos/staging-i686/acinclude.patch
(from rev 146920, kdelibs3/trunk/acinclude.patch)
  kdelibs3/repos/staging-i686/kconf_updaterc
(from rev 146920, kdelibs3/trunk/kconf_updaterc)
  kdelibs3/repos/staging-i686/kde3.profile
(from rev 146920, kdelibs3/trunk/kde3.profile)
  kdelibs3/repos/staging-i686/kde4-compatibility.patch
(from rev 146920, kdelibs3/trunk/kde4-compatibility.patch)
  kdelibs3/repos/staging-i686/kdelibs3-missing-include.patch
(from rev 146920, kdelibs3/trunk/kdelibs3-missing-include.patch)
  kdelibs3/repos/staging-i686/kdelibs3.install
(from rev 146920, kdelibs3/trunk/kdelibs3.install)
  kdelibs3/repos/staging-i686/openssl.patch
(from rev 146920, kdelibs3/trunk/openssl.patch)
  kdelibs3/repos/staging-x86_64/
  kdelibs3/repos/staging-x86_64/PKGBUILD
(from rev 146920, kdelibs3/trunk/PKGBUILD)
  kdelibs3/repos/staging-x86_64/acinclude.patch
(from rev 146920, kdelibs3/trunk/acinclude.patch)
  kdelibs3/repos/staging-x86_64/kconf_updaterc
(from rev 146920, kdelibs3/trunk/kconf_updaterc)
  kdelibs3/repos/staging-x86_64/kde3.profile
(from rev 146920, kdelibs3/trunk/kde3.profile)
  kdelibs3/repos/staging-x86_64/kde4-compatibility.patch
(from rev 146920, kdelibs3/trunk/kde4-compatibility.patch)
  kdelibs3/repos/staging-x86_64/kdelibs3-missing-include.patch
(from rev 146920, kdelibs3/trunk/kdelibs3-missing-include.patch)
  kdelibs3/repos/staging-x86_64/kdelibs3.install
(from rev 146920, kdelibs3/trunk/kdelibs3.install)
  kdelibs3/repos/staging-x86_64/openssl.patch
(from rev 146920, kdelibs3/trunk/openssl.patch)

---+
 staging-i686/PKGBUILD |   94 ++
 staging-i686/acinclude.patch  |   66 +
 staging-i686/kconf_updaterc   |2 
 staging-i686/kde3.profile |6 
 staging-i686/kde4-compatibility.patch | 1012 
 staging-i686/kdelibs3-missing-include.patch   |   10 
 staging-i686/kdelibs3.install |   12 
 staging-i686/openssl.patch|  180 
 staging-x86_64/PKGBUILD   |   94 ++
 staging-x86_64/acinclude.patch|   66 +
 staging-x86_64/kconf_updaterc |2 
 staging-x86_64/kde3.profile   |6 
 staging-x86_64/kde4-compatibility.patch   | 1012 
 staging-x86_64/kdelibs3-missing-include.patch |   10 
 staging-x86_64/kdelibs3.install   |   12 
 staging-x86_64/openssl.patch  |  180 
 16 files changed, 2764 insertions(+)

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


[arch-commits] Commit in kdelibs3/trunk (PKGBUILD kdelibs3-missing-include.patch)

2012-01-19 Thread Eric Bélanger
Date: Thursday, January 19, 2012 @ 03:16:06
  Author: eric
Revision: 146920

upgpkg: kdelibs3 3.5.10-12

Rebuild against libpng 1.5 and libtiff 4.0, Add hspell optdepends, Clean up 
depends and makedepends, Add build fix

Added:
  kdelibs3/trunk/kdelibs3-missing-include.patch
Modified:
  kdelibs3/trunk/PKGBUILD

+
 PKGBUILD   |   32 ++--
 kdelibs3-missing-include.patch |   10 ++
 2 files changed, 28 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 07:41:51 UTC (rev 146919)
+++ PKGBUILD2012-01-19 08:16:06 UTC (rev 146920)
@@ -1,34 +1,37 @@
 # $Id$
-# Maintainer:
+# Maintainer: Eric Bélanger 
 # Contributor: Pierre Schmitz 
 # Contributor: Tobias Powalowski 
 
 pkgname=kdelibs3
 pkgver=3.5.10
-pkgrel=11
+pkgrel=12
 pkgdesc='KDE3 Core Libraries'
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
 depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
- 'bzip2' 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
-makedepends=('pkgconfig' 'cups' 'hspell' 'autoconf')
+ 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
+makedepends=('cups' 'hspell')
+optdepends=('hspell: for Hebrew spell-checking support')
 options=('libtool')
-install='kdelibs3.install'
+install=kdelibs3.install
 
source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2";
 'ftp://ftp.archlinux.org/other/kde/kde-3.5-1074156.patch.gz'
 'acinclude.patch'
 'kde3.profile'
 'kde4-compatibility.patch'
 'kconf_updaterc'
-'openssl.patch')
-md5sums=('43cd55ed15f63b5738d620ef9f9fd568'
- 'ca50d4515468cfda80946690c53073f3'
- 'a5aedcc9550809ce6672a7dddf9f5ad4'
- 'ab14ce2c40698e24e162284d50c6f466'
- 'f4e0735475b5de59d738d68a9f467b77'
- '11e49bc6aca497f55610146afe217751'
- '242f0e4750c019e62e285c0aad0c03b8')
+'openssl.patch'
+'kdelibs3-missing-include.patch')
+sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82'
+  'c8ca21e4848a627760746d0a8a64bf4f90684c3e'
+  '50c9de71b102507fb78b192ecc22a5fc3e031bc3'
+  'fbd6e773edf3e8bb8e1272629984025e041da2ca'
+  '5fbbf7a5e2032878815fa055bfb5020f478d2b25'
+  '35e56fe4c5f71685e64b13f448dcacc620166e06'
+  '50e92950498463defb9149ffcf8cbc2e8cd1063b'
+  'e5f5b8c060a2db9cedb82bf18caadfa869921779')
 
 build() {
cd "$srcdir"/kdelibs-${pkgver}
@@ -39,7 +42,8 @@
patch -p0 -i "$srcdir"/kde-3.5-1074156.patch
patch -p1 -i "$srcdir"/acinclude.patch
patch -p1 -i "$srcdir"/kde4-compatibility.patch
-patch -p1 -i "${srcdir}"/openssl.patch
+   patch -p1 -i "${srcdir}"/openssl.patch
+   patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch
 
sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' 
admin/cvs.sh
make -f admin/Makefile.common cvs

Added: kdelibs3-missing-include.patch
===
--- kdelibs3-missing-include.patch  (rev 0)
+++ kdelibs3-missing-include.patch  2012-01-19 08:16:06 UTC (rev 146920)
@@ -0,0 +1,10 @@
+--- kdeprint/cups/cupsdconf2/cups-util.c.old   2012-01-19 01:30:26.0 
-0500
 kdeprint/cups/cupsdconf2/cups-util.c   2012-01-19 01:31:33.0 
-0500
+@@ -2,6 +2,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include