[arch-commits] Commit in wireless_tools/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 06:12:39
Author: bisson
Revision: 147203
cleanup, implement FS#22306
Modified:
wireless_tools/trunk/PKGBUILD
--+
PKGBUILD | 28 +++-
1 file changed, 15 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 06:36:37 UTC (rev 147202)
+++ PKGBUILD2012-01-24 11:12:39 UTC (rev 147203)
@@ -1,27 +1,29 @@
# $Id$
-# Maintainer: Giovanni Scafora giova...@archlinux.org
-# Contributer: Jason Chu j...@xentac.net
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Giovanni Scafora giova...@archlinux.org
+# Contributor: Jason Chu j...@xentac.net
pkgname=wireless_tools
pkgver=29
-pkgrel=5
-pkgdesc=Wireless Tools
+pkgrel=6
+pkgdesc='Wireless Tools'
+url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
arch=('i686' 'x86_64')
-url=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html;
license=('GPL')
-depends=('glibc')
-source=(http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${pkgver}.tar.gz;)
-md5sums=('e06c222e186f7cc013fd272d023710cb')
+source=(http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz;)
+sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710')
build() {
- cd ${srcdir}/wireless_tools.${pkgver}
- make
+ cd ${srcdir}/${pkgname}.${pkgver}
+ make CFLAGS=${CFLAGS} -Wall -Wextra -I. LDFLAGS=${LDFLAGS}
}
package() {
- cd ${srcdir}/wireless_tools.${pkgver}
- make INSTALL_DIR=${pkgdir}/usr/sbin \
+ cd ${srcdir}/${pkgname}.${pkgver}
+ make \
+ INSTALL_DIR=${pkgdir}/usr/sbin \
INSTALL_LIB=${pkgdir}/usr/lib \
INSTALL_INC=${pkgdir}/usr/include \
- INSTALL_MAN=${pkgdir}/usr/share/man install
+ INSTALL_MAN=${pkgdir}/usr/share/man \
+ install
}
[arch-commits] Commit in wireless_tools/repos (4 files)
Date: Tuesday, January 24, 2012 @ 06:13:02
Author: bisson
Revision: 147204
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
wireless_tools/repos/testing-i686/
wireless_tools/repos/testing-i686/PKGBUILD
(from rev 147203, wireless_tools/trunk/PKGBUILD)
wireless_tools/repos/testing-x86_64/
wireless_tools/repos/testing-x86_64/PKGBUILD
(from rev 147203, wireless_tools/trunk/PKGBUILD)
-+
testing-i686/PKGBUILD | 29 +
testing-x86_64/PKGBUILD | 29 +
2 files changed, 58 insertions(+)
Copied: wireless_tools/repos/testing-i686/PKGBUILD (from rev 147203,
wireless_tools/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-01-24 11:13:02 UTC (rev 147204)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Giovanni Scafora giova...@archlinux.org
+# Contributor: Jason Chu j...@xentac.net
+
+pkgname=wireless_tools
+pkgver=29
+pkgrel=6
+pkgdesc='Wireless Tools'
+url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
+arch=('i686' 'x86_64')
+license=('GPL')
+source=(http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz;)
+sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710')
+
+build() {
+ cd ${srcdir}/${pkgname}.${pkgver}
+ make CFLAGS=${CFLAGS} -Wall -Wextra -I. LDFLAGS=${LDFLAGS}
+}
+
+package() {
+ cd ${srcdir}/${pkgname}.${pkgver}
+ make \
+ INSTALL_DIR=${pkgdir}/usr/sbin \
+ INSTALL_LIB=${pkgdir}/usr/lib \
+ INSTALL_INC=${pkgdir}/usr/include \
+ INSTALL_MAN=${pkgdir}/usr/share/man \
+ install
+}
Copied: wireless_tools/repos/testing-x86_64/PKGBUILD (from rev 147203,
wireless_tools/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-01-24 11:13:02 UTC (rev 147204)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Giovanni Scafora giova...@archlinux.org
+# Contributor: Jason Chu j...@xentac.net
+
+pkgname=wireless_tools
+pkgver=29
+pkgrel=6
+pkgdesc='Wireless Tools'
+url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
+arch=('i686' 'x86_64')
+license=('GPL')
+source=(http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz;)
+sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710')
+
+build() {
+ cd ${srcdir}/${pkgname}.${pkgver}
+ make CFLAGS=${CFLAGS} -Wall -Wextra -I. LDFLAGS=${LDFLAGS}
+}
+
+package() {
+ cd ${srcdir}/${pkgname}.${pkgver}
+ make \
+ INSTALL_DIR=${pkgdir}/usr/sbin \
+ INSTALL_LIB=${pkgdir}/usr/lib \
+ INSTALL_INC=${pkgdir}/usr/include \
+ INSTALL_MAN=${pkgdir}/usr/share/man \
+ install
+}
[arch-commits] Commit in curl/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 12:51:31
Author: dreisner
Revision: 147205
upgpkg: curl 7.24.0-1
Modified:
curl/trunk/PKGBUILD
--+
PKGBUILD | 18 +++---
1 file changed, 7 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 11:13:02 UTC (rev 147204)
+++ PKGBUILD2012-01-24 17:51:31 UTC (rev 147205)
@@ -6,20 +6,19 @@
# Contributor: Daniel J Griffiths ghost1...@archlinux.us
pkgname=curl
-pkgver=7.23.1
-pkgrel=2
+pkgver=7.24.0
+pkgrel=1
pkgdesc=An URL retrival utility and library
arch=('i686' 'x86_64')
url=http://curl.haxx.se;
license=('MIT')
depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
-makedepends=('perl-libwww')
options=('!libtool')
source=(http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz{,.asc}
fix-J-with-O-regression.patch
curlbuild.h)
-md5sums=('8e23151f569fb54afef093ac0695077d'
- '5d8eb7e2e38be0fb00a043f714f6d49f'
+md5sums=('b93420f80a2baaa61a0f45214eddc2ba'
+ '710242df6bc318d16eea611e7d1b1410'
'aa4539ec4f4a2dad1663dc22dd3ab0a1'
'751bd433ede935c8fae727377625a8ae')
@@ -33,12 +32,8 @@
esac
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd $pkgname-$pkgver
- # upstream bugfix
- # http://curl.haxx.se/mail/archive-2011-11/0030.html
- patch -Np1 $srcdir/fix-J-with-O-regression.patch
-
./configure \
--prefix=/usr \
--mandir=/usr/share/man \
@@ -52,11 +47,12 @@
--without-libidn \
--with-random=/dev/urandom \
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+
make
}
package() {
- cd $srcdir/$pkgname-$pkgver
+ cd $pkgname-$pkgver
make DESTDIR=$pkgdir install
[arch-commits] Commit in curl/repos (8 files)
Date: Tuesday, January 24, 2012 @ 12:51:49
Author: dreisner
Revision: 147206
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
curl/repos/testing-i686/
curl/repos/testing-i686/PKGBUILD
(from rev 147205, curl/trunk/PKGBUILD)
curl/repos/testing-i686/curlbuild.h
(from rev 147205, curl/trunk/curlbuild.h)
curl/repos/testing-i686/fix-J-with-O-regression.patch
(from rev 147205, curl/trunk/fix-J-with-O-regression.patch)
curl/repos/testing-x86_64/
curl/repos/testing-x86_64/PKGBUILD
(from rev 147205, curl/trunk/PKGBUILD)
curl/repos/testing-x86_64/curlbuild.h
(from rev 147205, curl/trunk/curlbuild.h)
curl/repos/testing-x86_64/fix-J-with-O-regression.patch
(from rev 147205, curl/trunk/fix-J-with-O-regression.patch)
--+
testing-i686/PKGBUILD| 66 +++
testing-i686/curlbuild.h |9 +
testing-i686/fix-J-with-O-regression.patch | 142 +
testing-x86_64/PKGBUILD | 66 +++
testing-x86_64/curlbuild.h |9 +
testing-x86_64/fix-J-with-O-regression.patch | 142 +
6 files changed, 434 insertions(+)
Copied: curl/repos/testing-i686/PKGBUILD (from rev 147205, curl/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-01-24 17:51:49 UTC (rev 147206)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+# Contributor: Angel Velasquez an...@archlinux.org
+# Contributor: Eric Belanger e...@archlinux.org
+# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=curl
+pkgver=7.24.0
+pkgrel=1
+pkgdesc=An URL retrival utility and library
+arch=('i686' 'x86_64')
+url=http://curl.haxx.se;
+license=('MIT')
+depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
+options=('!libtool')
+source=(http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz{,.asc}
+fix-J-with-O-regression.patch
+curlbuild.h)
+md5sums=('b93420f80a2baaa61a0f45214eddc2ba'
+ '710242df6bc318d16eea611e7d1b1410'
+ 'aa4539ec4f4a2dad1663dc22dd3ab0a1'
+ '751bd433ede935c8fae727377625a8ae')
+
+ptrsize=$(cpp '__SIZEOF_POINTER__' | sed '/^#/d')
+case $ptrsize in
+ 8) _curlbuild=curlbuild-64.h ;;
+ 4) _curlbuild=curlbuild-32.h ;;
+ *) error unknown pointer size for architecture: %s bytes $ptrsize
+exit 1
+;;
+esac
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --disable-dependency-tracking \
+ --disable-ldap \
+ --disable-ldaps \
+ --enable-ipv6 \
+ --enable-manual \
+ --enable-versioned-symbols \
+ --enable-threaded-resolver \
+ --without-libidn \
+ --with-random=/dev/urandom \
+ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR=$pkgdir install
+
+ # license
+ install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+
+ # devel
+ install -Dm644 docs/libcurl/libcurl.m4 $pkgdir/usr/share/aclocal/libcurl.m4
+ mv $pkgdir/usr/include/curl/curlbuild.h
$pkgdir/usr/include/curl/$_curlbuild
+ install -m644 $srcdir/curlbuild.h $pkgdir/usr/include/curl/curlbuild.h
+}
Copied: curl/repos/testing-i686/curlbuild.h (from rev 147205,
curl/trunk/curlbuild.h)
===
--- testing-i686/curlbuild.h(rev 0)
+++ testing-i686/curlbuild.h2012-01-24 17:51:49 UTC (rev 147206)
@@ -0,0 +1,9 @@
+#include bits/wordsize.h
+
+#if __WORDSIZE == 32
+#include curlbuild-32.h
+#elif __WORDSIZE == 64
+#include curlbuild-64.h
+#else
+#error Unknown word size
+#endif
Copied: curl/repos/testing-i686/fix-J-with-O-regression.patch (from rev 147205,
curl/trunk/fix-J-with-O-regression.patch)
===
--- testing-i686/fix-J-with-O-regression.patch (rev 0)
+++ testing-i686/fix-J-with-O-regression.patch 2012-01-24 17:51:49 UTC (rev
147206)
@@ -0,0 +1,142 @@
+From c532604b137cae2e2814280778f914e4cd0460d1 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg dan...@haxx.se
+Date: Sun, 20 Nov 2011 23:33:46 +0100
+Subject: [PATCH] -J -O: use -O name if no Content-Disposition header comes!
+
+A regression between 7.22.0 and 7.23.0 -- downloading a file with the
+flags -O and -J results in the content being written to stdout if and
+only if there was no Content-Disposition header in the http response. If
+there is a C-D header with a filename attribute, the output is correctly
+written.
+
+Reported by: Dave Reisner
+Bug: http://curl.haxx.se/mail/archive-2011-11/0030.html
+---
+ src/tool_cb_hdr.c |3 +-
+ src/tool_operate.c |
[arch-commits] Commit in qwtplot3d/trunk (PKGBUILD qwtplot3d-qt-4.8.0.patch)
Date: Tuesday, January 24, 2012 @ 13:37:09
Author: ronald
Revision: 147207
upgpkg: qwtplot3d 0.2.7-4
qt 4.8.0 fix
Added:
qwtplot3d/trunk/qwtplot3d-qt-4.8.0.patch
Modified:
qwtplot3d/trunk/PKGBUILD
--+
PKGBUILD | 12
qwtplot3d-qt-4.8.0.patch | 34 ++
2 files changed, 42 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 17:51:49 UTC (rev 147206)
+++ PKGBUILD2012-01-24 18:37:09 UTC (rev 147207)
@@ -1,21 +1,25 @@
# $Id$
-# Maintainer: damir da...@archlinux.org
+# Maintainer: Ronald van Haren ron...@archlinux.org
+# Contributor: damir da...@archlinux.org
pkgname=qwtplot3d
pkgver=0.2.7
-pkgrel=3
+pkgrel=4
pkgdesc=Qt/OpenGL-based C++ programming library containing 3d-widgets
arch=(i686 x86_64)
license=('custom:zlib')
url=http://qwtplot3d.sourceforge.net/;
depends=('qt' 'qwt' 'mesa')
source=(http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz;
-qwtplot3d-gcc44.patch)
-sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea'
'52fa169b651a98550f8a8391ddf52e0eaeb2c215')
+qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch)
+sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea'
+ '52fa169b651a98550f8a8391ddf52e0eaeb2c215'
+ '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005')
build() {
cd ${srcdir}/${pkgname}
patch -p1 ../qwtplot3d-gcc44.patch
+patch -p1 ../qwtplot3d-qt-4.8.0.patch
# build qwt:
qmake qwtplot3d.pro
Added: qwtplot3d-qt-4.8.0.patch
===
--- qwtplot3d-qt-4.8.0.patch(rev 0)
+++ qwtplot3d-qt-4.8.0.patch2012-01-24 18:37:09 UTC (rev 147207)
@@ -0,0 +1,34 @@
+diff -urbN qwtplot3d/include/qwt3d_io_gl2ps.h
qwtplot3d.patched/include/qwt3d_io_gl2ps.h
+--- qwtplot3d/include/qwt3d_io_gl2ps.h 2005-07-10 16:54:52.0 +0300
qwtplot3d.patched/include/qwt3d_io_gl2ps.h 2012-01-21 22:15:20.0
+0200
+@@ -2,12 +2,7 @@
+ #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code
+
+ #include time.h
+-
+-#if QT_VERSION 0x04
+-#include qgl.h
+-#else
+-#include QtOpenGL/qgl.h
+-#endif
++#include QtOpenGL
+
+ #include qwt3d_types.h
+ #include qwt3d_io.h
+diff -urbN qwtplot3d/include/qwt3d_openglhelper.h
qwtplot3d.patched/include/qwt3d_openglhelper.h
+--- qwtplot3d/include/qwt3d_openglhelper.h 2005-07-19 17:40:28.0
+0300
qwtplot3d.patched/include/qwt3d_openglhelper.h 2012-01-21
22:29:56.0 +0200
+@@ -2,11 +2,8 @@
+ #define __openglhelper_2003_06_06_15_49__
+
+ #include qglobal.h
+-#if QT_VERSION 0x04
+-#include qgl.h
+-#else
+-#include QtOpenGL/qgl.h
+-#endif
++#include QtOpenGL
++#include GL/glu.h
+
+ namespace Qwt3D
+ {
[arch-commits] Commit in qwtplot3d/repos (10 files)
Date: Tuesday, January 24, 2012 @ 13:38:05
Author: ronald
Revision: 147208
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
qwtplot3d/repos/extra-i686/PKGBUILD
(from rev 147207, qwtplot3d/trunk/PKGBUILD)
qwtplot3d/repos/extra-i686/qwtplot3d-gcc44.patch
(from rev 147207, qwtplot3d/trunk/qwtplot3d-gcc44.patch)
qwtplot3d/repos/extra-i686/qwtplot3d-qt-4.8.0.patch
(from rev 147207, qwtplot3d/trunk/qwtplot3d-qt-4.8.0.patch)
qwtplot3d/repos/extra-x86_64/PKGBUILD
(from rev 147207, qwtplot3d/trunk/PKGBUILD)
qwtplot3d/repos/extra-x86_64/qwtplot3d-gcc44.patch
(from rev 147207, qwtplot3d/trunk/qwtplot3d-gcc44.patch)
qwtplot3d/repos/extra-x86_64/qwtplot3d-qt-4.8.0.patch
(from rev 147207, qwtplot3d/trunk/qwtplot3d-qt-4.8.0.patch)
Deleted:
qwtplot3d/repos/extra-i686/PKGBUILD
qwtplot3d/repos/extra-i686/qwtplot3d-gcc44.patch
qwtplot3d/repos/extra-x86_64/PKGBUILD
qwtplot3d/repos/extra-x86_64/qwtplot3d-gcc44.patch
---+
extra-i686/PKGBUILD | 88
extra-i686/qwtplot3d-gcc44.patch | 24
extra-i686/qwtplot3d-qt-4.8.0.patch | 34
extra-x86_64/PKGBUILD | 88
extra-x86_64/qwtplot3d-gcc44.patch| 24
extra-x86_64/qwtplot3d-qt-4.8.0.patch | 34
6 files changed, 184 insertions(+), 108 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-24 18:37:09 UTC (rev 147207)
+++ extra-i686/PKGBUILD 2012-01-24 18:38:05 UTC (rev 147208)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: damir da...@archlinux.org
-
-pkgname=qwtplot3d
-pkgver=0.2.7
-pkgrel=3
-pkgdesc=Qt/OpenGL-based C++ programming library containing 3d-widgets
-arch=(i686 x86_64)
-license=('custom:zlib')
-url=http://qwtplot3d.sourceforge.net/;
-depends=('qt' 'qwt' 'mesa')
-source=(http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz;
-qwtplot3d-gcc44.patch)
-sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea'
'52fa169b651a98550f8a8391ddf52e0eaeb2c215')
-
-build() {
-cd ${srcdir}/${pkgname}
-patch -p1 ../qwtplot3d-gcc44.patch
-
-# build qwt:
-qmake qwtplot3d.pro
-make
-}
-
-package() {
-cd ${srcdir}/${pkgname}
-
-# install qwtplot3d: (by hand, because the Makefile do not provide a
install:)
-install -d ${pkgdir}/usr/{include/qwtplot3d,lib}
-
-for n in include/* ; do
- cp -d $n ${pkgdir}/usr/include/qwtplot3d
-done
-
-for n in lib/libqwtplot3d.so* ; do
- cp -d $n ${pkgdir}/usr/lib
-done
-
-# install custom license
-install -Dm644 ${srcdir}/${pkgname}/COPYING
${pkgdir}/usr/share/licenses/qwtplot3d/LICENSE
-}
-
Copied: qwtplot3d/repos/extra-i686/PKGBUILD (from rev 147207,
qwtplot3d/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-24 18:38:05 UTC (rev 147208)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Ronald van Haren ron...@archlinux.org
+# Contributor: damir da...@archlinux.org
+
+pkgname=qwtplot3d
+pkgver=0.2.7
+pkgrel=4
+pkgdesc=Qt/OpenGL-based C++ programming library containing 3d-widgets
+arch=(i686 x86_64)
+license=('custom:zlib')
+url=http://qwtplot3d.sourceforge.net/;
+depends=('qt' 'qwt' 'mesa')
+source=(http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz;
+qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch)
+sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea'
+ '52fa169b651a98550f8a8391ddf52e0eaeb2c215'
+ '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005')
+
+build() {
+cd ${srcdir}/${pkgname}
+patch -p1 ../qwtplot3d-gcc44.patch
+patch -p1 ../qwtplot3d-qt-4.8.0.patch
+
+# build qwt:
+qmake qwtplot3d.pro
+make
+}
+
+package() {
+cd ${srcdir}/${pkgname}
+
+# install qwtplot3d: (by hand, because the Makefile do not provide a
install:)
+install -d ${pkgdir}/usr/{include/qwtplot3d,lib}
+
+for n in include/* ; do
+ cp -d $n ${pkgdir}/usr/include/qwtplot3d
+done
+
+for n in lib/libqwtplot3d.so* ; do
+ cp -d $n ${pkgdir}/usr/lib
+done
+
+# install custom license
+install -Dm644 ${srcdir}/${pkgname}/COPYING
${pkgdir}/usr/share/licenses/qwtplot3d/LICENSE
+}
+
Deleted: extra-i686/qwtplot3d-gcc44.patch
===
--- extra-i686/qwtplot3d-gcc44.patch2012-01-24 18:37:09 UTC (rev 147207)
+++ extra-i686/qwtplot3d-gcc44.patch2012-01-24 18:38:05 UTC (rev 147208)
@@ -1,12 +0,0 @@
-diff -ur qwtplot3d-orig/include/qwt3d_function.h
qwtplot3d/include/qwt3d_function.h
qwtplot3d-orig/include/qwt3d_function.h2009-07-25 18:18:58.0
-0400
-+++ qwtplot3d/include/qwt3d_function.h 2009-07-25 18:19:19.0 -0400
-@@ -2,6 +2,7 @@
- #define
[arch-commits] Commit in chromium/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 13:49:59
Author: foutrelis
Revision: 147209
upgpkg: chromium 16.0.912.77-1
New upstream release.
Modified:
chromium/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 18:38:05 UTC (rev 147208)
+++ PKGBUILD2012-01-24 18:49:59 UTC (rev 147209)
@@ -9,8 +9,8 @@
# build time.
pkgname=chromium
-pkgver=16.0.912.75
-pkgrel=2
+pkgver=16.0.912.77
+pkgrel=1
pkgdesc=The open-source project behind Google Chrome, an attempt at creating
a safer, faster, and more stable browser
arch=('i686' 'x86_64')
url=http://www.chromium.org/;
@@ -33,7 +33,7 @@
gcc-4.6.patch
fix-downloads-on-ntfs.patch
nacl-cflags-remove-fstack-protector.patch)
-sha256sums=('88c931479ae2f92c7fb31e14c044e9732a5f765dd872b27d449efd6c99c83e95'
+sha256sums=('fc84e9a96d00a95c44beb6539b9ffe7224dc3ca51afef6486e0e7ad705445a32'
'964fe3a5ec56f2505649aba00f900abe4205674b7fdaa16772647d347173bb01'
'09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
'c53bfc4db9dde684fbaed6a4bbecb207e3e7a0a2703233426fe076a6d3c557f3'
[arch-commits] Commit in chromium/repos (28 files)
Date: Tuesday, January 24, 2012 @ 13:50:47 Author: foutrelis Revision: 147210 archrelease: copy trunk to extra-i686, extra-x86_64 Added: chromium/repos/extra-i686/PKGBUILD (from rev 147209, chromium/trunk/PKGBUILD) chromium/repos/extra-i686/chromium.desktop (from rev 147209, chromium/trunk/chromium.desktop) chromium/repos/extra-i686/chromium.install (from rev 147209, chromium/trunk/chromium.install) chromium/repos/extra-i686/chromium.sh (from rev 147209, chromium/trunk/chromium.sh) chromium/repos/extra-i686/fix-downloads-on-ntfs.patch (from rev 147209, chromium/trunk/fix-downloads-on-ntfs.patch) chromium/repos/extra-i686/gcc-4.6.patch (from rev 147209, chromium/trunk/gcc-4.6.patch) chromium/repos/extra-i686/nacl-cflags-remove-fstack-protector.patch (from rev 147209, chromium/trunk/nacl-cflags-remove-fstack-protector.patch) chromium/repos/extra-x86_64/PKGBUILD (from rev 147209, chromium/trunk/PKGBUILD) chromium/repos/extra-x86_64/chromium.desktop (from rev 147209, chromium/trunk/chromium.desktop) chromium/repos/extra-x86_64/chromium.install (from rev 147209, chromium/trunk/chromium.install) chromium/repos/extra-x86_64/chromium.sh (from rev 147209, chromium/trunk/chromium.sh) chromium/repos/extra-x86_64/fix-downloads-on-ntfs.patch (from rev 147209, chromium/trunk/fix-downloads-on-ntfs.patch) chromium/repos/extra-x86_64/gcc-4.6.patch (from rev 147209, chromium/trunk/gcc-4.6.patch) chromium/repos/extra-x86_64/nacl-cflags-remove-fstack-protector.patch (from rev 147209, chromium/trunk/nacl-cflags-remove-fstack-protector.patch) Deleted: chromium/repos/extra-i686/PKGBUILD chromium/repos/extra-i686/chromium.desktop chromium/repos/extra-i686/chromium.install chromium/repos/extra-i686/chromium.sh chromium/repos/extra-i686/fix-downloads-on-ntfs.patch chromium/repos/extra-i686/gcc-4.6.patch chromium/repos/extra-i686/nacl-cflags-remove-fstack-protector.patch chromium/repos/extra-x86_64/PKGBUILD chromium/repos/extra-x86_64/chromium.desktop chromium/repos/extra-x86_64/chromium.install chromium/repos/extra-x86_64/chromium.sh chromium/repos/extra-x86_64/fix-downloads-on-ntfs.patch chromium/repos/extra-x86_64/gcc-4.6.patch chromium/repos/extra-x86_64/nacl-cflags-remove-fstack-protector.patch + extra-i686/PKGBUILD| 293 +++ extra-i686/chromium.desktop| 226 +-- extra-i686/chromium.install| 24 - extra-i686/chromium.sh |8 extra-i686/fix-downloads-on-ntfs.patch | 52 +- extra-i686/gcc-4.6.patch | 198 +- extra-i686/nacl-cflags-remove-fstack-protector.patch | 22 - extra-x86_64/PKGBUILD | 293 +++ extra-x86_64/chromium.desktop | 226 +-- extra-x86_64/chromium.install | 24 - extra-x86_64/chromium.sh |8 extra-x86_64/fix-downloads-on-ntfs.patch | 52 +- extra-x86_64/gcc-4.6.patch | 198 +- extra-x86_64/nacl-cflags-remove-fstack-protector.patch | 22 - 14 files changed, 824 insertions(+), 822 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 147209:147210 to see the changes.
[arch-commits] Commit in gnome-python/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 14:16:53
Author: eric
Revision: 147211
upgpkg: gnome-python 2.28.1-8
Rebuild against libpng 1.5 and libtiff 4.0
Modified:
gnome-python/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 18:50:47 UTC (rev 147210)
+++ PKGBUILD2012-01-24 19:16:53 UTC (rev 147211)
@@ -5,7 +5,7 @@
pkgbase=gnome-python
pkgname=('gnome-python' 'python2-bonobo' 'python2-gconf' 'python2-libgnome'
'python2-gnomecanvas' 'python2-gnomevfs')
pkgver=2.28.1
-pkgrel=7
+pkgrel=8
arch=(i686 x86_64)
license=('LGPL')
makedepends=('pygtk' 'pyorbit' 'libgnomeui')
[arch-commits] Commit in gnome-python/repos (4 files)
Date: Tuesday, January 24, 2012 @ 14:17:06
Author: eric
Revision: 147212
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
gnome-python/repos/staging-i686/
gnome-python/repos/staging-i686/PKGBUILD
(from rev 147211, gnome-python/trunk/PKGBUILD)
gnome-python/repos/staging-x86_64/
gnome-python/repos/staging-x86_64/PKGBUILD
(from rev 147211, gnome-python/trunk/PKGBUILD)
-+
staging-i686/PKGBUILD | 69 ++
staging-x86_64/PKGBUILD | 69 ++
2 files changed, 138 insertions(+)
Copied: gnome-python/repos/staging-i686/PKGBUILD (from rev 147211,
gnome-python/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-24 19:17:06 UTC (rev 147212)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Sarah Hay sa...@archlinux.org
+
+pkgbase=gnome-python
+pkgname=('gnome-python' 'python2-bonobo' 'python2-gconf' 'python2-libgnome'
'python2-gnomecanvas' 'python2-gnomevfs')
+pkgver=2.28.1
+pkgrel=8
+arch=(i686 x86_64)
+license=('LGPL')
+makedepends=('pygtk' 'pyorbit' 'libgnomeui')
+options=('!libtool')
+url=http://www.pygtk.org/;
+source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python/2.28/gnome-python-${pkgver}.tar.bz2)
+sha256sums=('759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8')
+
+build() {
+cd ${srcdir}/gnome-python-${pkgver}
+PYTHON=python2 ./configure --prefix=/usr
+make
+}
+
+package_gnome-python() {
+pkgdesc=PyGNOME Python extension module
+depends=('python2-bonobo' 'python2-gconf' 'python2-libgnome'
'python2-gnomecanvas' 'python2-gnomevfs')
+
+cd ${srcdir}/gnome-python-${pkgver}
+make install-pkgconfigDATA DESTDIR=${pkgdir}
+}
+
+package_python2-bonobo(){
+pkgdesc=Python bindings for interacting with Bonobo
+depends=('pygtk' 'libbonoboui' 'pyorbit' 'python2-gnomecanvas')
+
+cd ${srcdir}/gnome-python-${pkgver}
+make -C bonobo install DESTDIR=${pkgdir}
+}
+
+package_python2-gconf(){
+pkgdesc=Python bindings for interacting with GConf
+depends=('pygtk' 'gconf')
+
+cd ${srcdir}/gnome-python-${pkgver}
+make -C gconf install DESTDIR=${pkgdir}
+}
+
+package_python2-libgnome() {
+pkgdesc=Python bindings for libgnome
+depends=('pygtk' 'libgnomeui' 'python2-gnomevfs' 'python2-gnomecanvas'
'python2-bonobo')
+
+cd ${srcdir}/gnome-python-${pkgver}
+make -C gnome install DESTDIR=${pkgdir}
+}
+
+package_python2-gnomecanvas() {
+pkgdesc=Python bindings for the GNOME Canvas
+depends=('pygtk' 'libgnomecanvas')
+
+cd ${srcdir}/gnome-python-${pkgver}
+make -C gnomecanvas install DESTDIR=${pkgdir}
+}
+
+package_python2-gnomevfs() {
+pkgdesc=Python bindings for interacting with gnome-vfs
+depends=('python2' 'libbonobo' 'gnome-vfs')
+
+cd ${srcdir}/gnome-python-${pkgver}
+make -C gnomevfs install DESTDIR=${pkgdir}
+}
Copied: gnome-python/repos/staging-x86_64/PKGBUILD (from rev 147211,
gnome-python/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-24 19:17:06 UTC (rev 147212)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Sarah Hay sa...@archlinux.org
+
+pkgbase=gnome-python
+pkgname=('gnome-python' 'python2-bonobo' 'python2-gconf' 'python2-libgnome'
'python2-gnomecanvas' 'python2-gnomevfs')
+pkgver=2.28.1
+pkgrel=8
+arch=(i686 x86_64)
+license=('LGPL')
+makedepends=('pygtk' 'pyorbit' 'libgnomeui')
+options=('!libtool')
+url=http://www.pygtk.org/;
+source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python/2.28/gnome-python-${pkgver}.tar.bz2)
+sha256sums=('759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8')
+
+build() {
+cd ${srcdir}/gnome-python-${pkgver}
+PYTHON=python2 ./configure --prefix=/usr
+make
+}
+
+package_gnome-python() {
+pkgdesc=PyGNOME Python extension module
+depends=('python2-bonobo' 'python2-gconf' 'python2-libgnome'
'python2-gnomecanvas' 'python2-gnomevfs')
+
+cd ${srcdir}/gnome-python-${pkgver}
+make install-pkgconfigDATA DESTDIR=${pkgdir}
+}
+
+package_python2-bonobo(){
+pkgdesc=Python bindings for interacting with Bonobo
+depends=('pygtk' 'libbonoboui' 'pyorbit' 'python2-gnomecanvas')
+
+cd ${srcdir}/gnome-python-${pkgver}
+make -C bonobo install DESTDIR=${pkgdir}
+}
+
+package_python2-gconf(){
+pkgdesc=Python bindings for interacting with GConf
+depends=('pygtk' 'gconf')
+
+cd ${srcdir}/gnome-python-${pkgver}
+make -C gconf install DESTDIR=${pkgdir}
+}
+
+package_python2-libgnome() {
+pkgdesc=Python bindings for libgnome
+depends=('pygtk' 'libgnomeui' 'python2-gnomevfs' 'python2-gnomecanvas'
[arch-commits] Commit in pygtksourceview2/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 14:17:41
Author: eric
Revision: 147213
upgpkg: pygtksourceview2 2.10.1-4
Rebuild against libpng 1.5 and libtiff 4.0
Modified:
pygtksourceview2/trunk/PKGBUILD
--+
PKGBUILD |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 19:17:06 UTC (rev 147212)
+++ PKGBUILD2012-01-24 19:17:41 UTC (rev 147213)
@@ -3,12 +3,12 @@
pkgname=pygtksourceview2
pkgver=2.10.1
-pkgrel=3
+pkgrel=4
pkgdesc=Python bindings for gtksourceview2
arch=(i686 x86_64)
license=('GPL')
depends=('gtksourceview2=2.10.0' 'pygtk=2.17.0')
-makedepends=('intltool' 'pkgconfig')
+makedepends=('intltool' 'pkg-config')
options=('!libtool')
url=http://www.gnome.org;
source=(http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${pkgver}.tar.bz2)
@@ -19,5 +19,9 @@
PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static --disable-docs
make
+}
+
+package() {
+ cd ${srcdir}/pygtksourceview-${pkgver}
make DESTDIR=${pkgdir} install
}
[arch-commits] Commit in pygtksourceview2/repos (4 files)
Date: Tuesday, January 24, 2012 @ 14:17:55
Author: eric
Revision: 147214
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
pygtksourceview2/repos/staging-i686/
pygtksourceview2/repos/staging-i686/PKGBUILD
(from rev 147213, pygtksourceview2/trunk/PKGBUILD)
pygtksourceview2/repos/staging-x86_64/
pygtksourceview2/repos/staging-x86_64/PKGBUILD
(from rev 147213, pygtksourceview2/trunk/PKGBUILD)
-+
staging-i686/PKGBUILD | 27 +++
staging-x86_64/PKGBUILD | 27 +++
2 files changed, 54 insertions(+)
Copied: pygtksourceview2/repos/staging-i686/PKGBUILD (from rev 147213,
pygtksourceview2/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-24 19:17:55 UTC (rev 147214)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=pygtksourceview2
+pkgver=2.10.1
+pkgrel=4
+pkgdesc=Python bindings for gtksourceview2
+arch=(i686 x86_64)
+license=('GPL')
+depends=('gtksourceview2=2.10.0' 'pygtk=2.17.0')
+makedepends=('intltool' 'pkg-config')
+options=('!libtool')
+url=http://www.gnome.org;
+source=(http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${pkgver}.tar.bz2)
+sha256sums=('b4b47c5aeb67a26141cb03663091dfdf5c15c8a8aae4d69c46a6a943ca4c5974')
+
+build() {
+ cd ${srcdir}/pygtksourceview-${pkgver}
+ PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static --disable-docs
+ make
+}
+
+package() {
+ cd ${srcdir}/pygtksourceview-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
Copied: pygtksourceview2/repos/staging-x86_64/PKGBUILD (from rev 147213,
pygtksourceview2/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-24 19:17:55 UTC (rev 147214)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=pygtksourceview2
+pkgver=2.10.1
+pkgrel=4
+pkgdesc=Python bindings for gtksourceview2
+arch=(i686 x86_64)
+license=('GPL')
+depends=('gtksourceview2=2.10.0' 'pygtk=2.17.0')
+makedepends=('intltool' 'pkg-config')
+options=('!libtool')
+url=http://www.gnome.org;
+source=(http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${pkgver}.tar.bz2)
+sha256sums=('b4b47c5aeb67a26141cb03663091dfdf5c15c8a8aae4d69c46a6a943ca4c5974')
+
+build() {
+ cd ${srcdir}/pygtksourceview-${pkgver}
+ PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static --disable-docs
+ make
+}
+
+package() {
+ cd ${srcdir}/pygtksourceview-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
[arch-commits] Commit in libgtkhtml/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 14:34:17
Author: eric
Revision: 147215
upgpkg: libgtkhtml 2.11.1-4
Rebuild against libpng 1.5 and libtiff 4.0
Modified:
libgtkhtml/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 19:17:55 UTC (rev 147214)
+++ PKGBUILD2012-01-24 19:34:17 UTC (rev 147215)
@@ -3,7 +3,7 @@
pkgname=libgtkhtml
pkgver=2.11.1
-pkgrel=3
+pkgrel=4
pkgdesc=An HTML library for GTK
arch=(i686 x86_64)
license=('LGPL')
[arch-commits] Commit in libgtkhtml/repos (4 files)
Date: Tuesday, January 24, 2012 @ 14:34:31
Author: eric
Revision: 147216
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
libgtkhtml/repos/staging-i686/
libgtkhtml/repos/staging-i686/PKGBUILD
(from rev 147215, libgtkhtml/trunk/PKGBUILD)
libgtkhtml/repos/staging-x86_64/
libgtkhtml/repos/staging-x86_64/PKGBUILD
(from rev 147215, libgtkhtml/trunk/PKGBUILD)
-+
staging-i686/PKGBUILD | 27 +++
staging-x86_64/PKGBUILD | 27 +++
2 files changed, 54 insertions(+)
Copied: libgtkhtml/repos/staging-i686/PKGBUILD (from rev 147215,
libgtkhtml/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-24 19:34:31 UTC (rev 147216)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=libgtkhtml
+pkgver=2.11.1
+pkgrel=4
+pkgdesc=An HTML library for GTK
+arch=(i686 x86_64)
+license=('LGPL')
+depends=('gtk2=2.22.1' 'libxml2=2.7.8')
+makedepends=('perlxml')
+options=('!libtool')
+url=http://www.gnome.org;
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.11/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('a1d1a197dcff8c4571659deef5495e24')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
Copied: libgtkhtml/repos/staging-x86_64/PKGBUILD (from rev 147215,
libgtkhtml/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-24 19:34:31 UTC (rev 147216)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=libgtkhtml
+pkgver=2.11.1
+pkgrel=4
+pkgdesc=An HTML library for GTK
+arch=(i686 x86_64)
+license=('LGPL')
+depends=('gtk2=2.22.1' 'libxml2=2.7.8')
+makedepends=('perlxml')
+options=('!libtool')
+url=http://www.gnome.org;
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.11/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('a1d1a197dcff8c4571659deef5495e24')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
[arch-commits] Commit in libgnomeui/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 14:35:27
Author: eric
Revision: 147217
upgpkg: libgnomeui 2.24.4-2
Rebuild against libpng 1.5 and libtiff 4.0
Modified:
libgnomeui/trunk/PKGBUILD
--+
PKGBUILD |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 19:34:31 UTC (rev 147216)
+++ PKGBUILD2012-01-24 19:35:27 UTC (rev 147217)
@@ -3,12 +3,12 @@
pkgname=libgnomeui
pkgver=2.24.4
-pkgrel=1
+pkgrel=2
pkgdesc=User Interface library for GNOME
arch=('i686' 'x86_64')
license=('LGPL')
depends=('libbonoboui=2.24.3' 'libgnome-keyring=2.31.92' 'libsm')
-makedepends=('intltool' 'pkgconfig')
+makedepends=('intltool' 'pkg-config')
options=('!libtool')
url=http://www.gnome.org;
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
@@ -20,5 +20,9 @@
--localstatedir=/var --disable-static \
--libexecdir=/usr/lib/libgnomeui
make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
}
[arch-commits] Commit in libgnomeui/repos (4 files)
Date: Tuesday, January 24, 2012 @ 14:35:41
Author: eric
Revision: 147218
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
libgnomeui/repos/staging-i686/
libgnomeui/repos/staging-i686/PKGBUILD
(from rev 147217, libgnomeui/trunk/PKGBUILD)
libgnomeui/repos/staging-x86_64/
libgnomeui/repos/staging-x86_64/PKGBUILD
(from rev 147217, libgnomeui/trunk/PKGBUILD)
-+
staging-i686/PKGBUILD | 28
staging-x86_64/PKGBUILD | 28
2 files changed, 56 insertions(+)
Copied: libgnomeui/repos/staging-i686/PKGBUILD (from rev 147217,
libgnomeui/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-24 19:35:41 UTC (rev 147218)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=libgnomeui
+pkgver=2.24.4
+pkgrel=2
+pkgdesc=User Interface library for GNOME
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('libbonoboui=2.24.3' 'libgnome-keyring=2.31.92' 'libsm')
+makedepends=('intltool' 'pkg-config')
+options=('!libtool')
+url=http://www.gnome.org;
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('a64dcb5af190ec0bfe2ba647ab09a90e4187336fa417d301abfb736be41283b2')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --libexecdir=/usr/lib/libgnomeui
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
Copied: libgnomeui/repos/staging-x86_64/PKGBUILD (from rev 147217,
libgnomeui/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-24 19:35:41 UTC (rev 147218)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=libgnomeui
+pkgver=2.24.4
+pkgrel=2
+pkgdesc=User Interface library for GNOME
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('libbonoboui=2.24.3' 'libgnome-keyring=2.31.92' 'libsm')
+makedepends=('intltool' 'pkg-config')
+options=('!libtool')
+url=http://www.gnome.org;
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('a64dcb5af190ec0bfe2ba647ab09a90e4187336fa417d301abfb736be41283b2')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --libexecdir=/usr/lib/libgnomeui
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
[arch-commits] Commit in hylafax/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 14:49:05
Author: eric
Revision: 147219
Put $srcdir and $pkgdir in quotes
Modified:
hylafax/trunk/PKGBUILD
--+
PKGBUILD | 32
1 file changed, 16 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 19:35:41 UTC (rev 147218)
+++ PKGBUILD2012-01-24 19:49:05 UTC (rev 147219)
@@ -18,6 +18,11 @@
hylafax.cron.daily
config.local
configure-6.0.5.patch)
+md5sums=('eb9ac942354ad708e20e4583cec6615f'
+ '6602288a405324d8c8e3c5eac2bf19fd'
+ '52beffe7dc296b4f9ce9fd0387f7804e'
+ '0d2ce24d918226a852539aebf57d3f4a'
+ '51d9f639bb76e5e39cdc8e2ac07e208d')
# build as root for successful build!
build() {
@@ -28,9 +33,9 @@
useradd -u 10 -g uucp -d '/' -s /bin/false uucp /dev/null
useradd -u 69 -g daemon -d '/' -s /bin/false fax /dev/null
fi
- mkdir -p $pkgdir/usr/{bin,lib/fax,sbin,share/ghostscript/fonts}
- mkdir -p $pkgdir/var/{spool/hylafax,lock}
- cd $srcdir/${pkgname}-${pkgver}
+ mkdir -p $pkgdir/usr/{bin,lib/fax,sbin,share/ghostscript/fonts}
+ mkdir -p $pkgdir/var/{spool/hylafax,lock}
+ cd $srcdir/${pkgname}-${pkgver}
cp ../config.local .
# fix compiling
@@ -40,10 +45,10 @@
}
package () {
- cd $srcdir/${pkgname}-${pkgver}
- make ROOT=$pkgdir install
- install -D -m 755 $srcdir/hylafax $pkgdir/etc/rc.d/hylafax
- install -D -m 744 $srcdir/hylafax.cron.daily $pkgdir/etc/cron.daily/hylafax
+ cd $srcdir/${pkgname}-${pkgver}
+ make ROOT=$pkgdir install
+ install -D -m 755 $srcdir/hylafax $pkgdir/etc/rc.d/hylafax
+ install -D -m 744 $srcdir/hylafax.cron.daily
$pkgdir/etc/cron.daily/hylafax
# remove group if created
if [ $uucp_created -eq 1 ]; then
userdel uucp /dev/null
@@ -51,15 +56,10 @@
userdel fax /dev/null
fi
# add missing awk file for notify-4.1 script
- install -D -m 755 $srcdir/${pkgname}-${pkgver}/util/notify.awk \
- $pkgdir/var/spool/hylafax/bin/notify.awk
+ install -D -m 755 $srcdir/${pkgname}-${pkgver}/util/notify.awk \
+ $pkgdir/var/spool/hylafax/bin/notify.awk
# fix permission on /var/lock
- chmod 1777 $pkgdir/var/lock
+ chmod 1777 $pkgdir/var/lock
- install -D -m644 COPYRIGHT
$startdir/pkg/usr/share/licenses/$pkgname/COPYRIGHT
+ install -D -m644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT
}
-md5sums=('eb9ac942354ad708e20e4583cec6615f'
- '6602288a405324d8c8e3c5eac2bf19fd'
- '52beffe7dc296b4f9ce9fd0387f7804e'
- '0d2ce24d918226a852539aebf57d3f4a'
- '51d9f639bb76e5e39cdc8e2ac07e208d')
[arch-commits] Commit in chromium/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 14:53:17
Author: foutrelis
Revision: 147220
upgpkg: chromium 16.0.912.77-2
libpng 1.5 rebuild.
Modified:
chromium/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 19:49:05 UTC (rev 147219)
+++ PKGBUILD2012-01-24 19:53:17 UTC (rev 147220)
@@ -10,7 +10,7 @@
pkgname=chromium
pkgver=16.0.912.77
-pkgrel=1
+pkgrel=2
pkgdesc=The open-source project behind Google Chrome, an attempt at creating
a safer, faster, and more stable browser
arch=('i686' 'x86_64')
url=http://www.chromium.org/;
[arch-commits] Commit in chromium/repos (28 files)
Date: Tuesday, January 24, 2012 @ 14:54:04 Author: foutrelis Revision: 147221 archrelease: copy trunk to staging-i686, staging-x86_64 Added: chromium/repos/staging-i686/PKGBUILD (from rev 147220, chromium/trunk/PKGBUILD) chromium/repos/staging-i686/chromium.desktop (from rev 147220, chromium/trunk/chromium.desktop) chromium/repos/staging-i686/chromium.install (from rev 147220, chromium/trunk/chromium.install) chromium/repos/staging-i686/chromium.sh (from rev 147220, chromium/trunk/chromium.sh) chromium/repos/staging-i686/fix-downloads-on-ntfs.patch (from rev 147220, chromium/trunk/fix-downloads-on-ntfs.patch) chromium/repos/staging-i686/gcc-4.6.patch (from rev 147220, chromium/trunk/gcc-4.6.patch) chromium/repos/staging-i686/nacl-cflags-remove-fstack-protector.patch (from rev 147220, chromium/trunk/nacl-cflags-remove-fstack-protector.patch) chromium/repos/staging-x86_64/PKGBUILD (from rev 147220, chromium/trunk/PKGBUILD) chromium/repos/staging-x86_64/chromium.desktop (from rev 147220, chromium/trunk/chromium.desktop) chromium/repos/staging-x86_64/chromium.install (from rev 147220, chromium/trunk/chromium.install) chromium/repos/staging-x86_64/chromium.sh (from rev 147220, chromium/trunk/chromium.sh) chromium/repos/staging-x86_64/fix-downloads-on-ntfs.patch (from rev 147220, chromium/trunk/fix-downloads-on-ntfs.patch) chromium/repos/staging-x86_64/gcc-4.6.patch (from rev 147220, chromium/trunk/gcc-4.6.patch) chromium/repos/staging-x86_64/nacl-cflags-remove-fstack-protector.patch (from rev 147220, chromium/trunk/nacl-cflags-remove-fstack-protector.patch) Deleted: chromium/repos/staging-i686/PKGBUILD chromium/repos/staging-i686/chromium.desktop chromium/repos/staging-i686/chromium.install chromium/repos/staging-i686/chromium.sh chromium/repos/staging-i686/fix-downloads-on-ntfs.patch chromium/repos/staging-i686/gcc-4.6.patch chromium/repos/staging-i686/nacl-cflags-remove-fstack-protector.patch chromium/repos/staging-x86_64/PKGBUILD chromium/repos/staging-x86_64/chromium.desktop chromium/repos/staging-x86_64/chromium.install chromium/repos/staging-x86_64/chromium.sh chromium/repos/staging-x86_64/fix-downloads-on-ntfs.patch chromium/repos/staging-x86_64/gcc-4.6.patch chromium/repos/staging-x86_64/nacl-cflags-remove-fstack-protector.patch --+ staging-i686/PKGBUILD| 294 ++--- staging-i686/chromium.desktop| 226 - staging-i686/chromium.install| 24 - staging-i686/chromium.sh |8 staging-i686/fix-downloads-on-ntfs.patch | 52 +- staging-i686/gcc-4.6.patch | 198 staging-i686/nacl-cflags-remove-fstack-protector.patch | 22 staging-x86_64/PKGBUILD | 294 ++--- staging-x86_64/chromium.desktop | 226 - staging-x86_64/chromium.install | 24 - staging-x86_64/chromium.sh |8 staging-x86_64/fix-downloads-on-ntfs.patch | 52 +- staging-x86_64/gcc-4.6.patch | 198 staging-x86_64/nacl-cflags-remove-fstack-protector.patch | 22 14 files changed, 824 insertions(+), 824 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 147220:147221 to see the changes.
[arch-commits] Commit in capi4hylafax/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 14:59:04
Author: eric
Revision: 147222
Put $srcdir and $pkgdir in quotes
Modified:
capi4hylafax/trunk/PKGBUILD
--+
PKGBUILD | 49 +++--
1 file changed, 27 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 19:54:04 UTC (rev 147221)
+++ PKGBUILD2012-01-24 19:59:04 UTC (rev 147222)
@@ -11,39 +11,44 @@
depends=('glibc' 'capi4k-utils' 'hylafax' 'gcc-libs' 'libtiff')
source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz
config.faxCAPI capi4hylafax.rc)
+md5sums=('d37dc652ac80d1525ef8693be55ee67f'
+ '653b60695d21c128f020a86274ca9192'
+ '1fe40c58289fa3ba625ce6fe2fdb3d07')
install=capi4hylafax.install
backup=(var/spool/hylafax/etc/config.faxCAPI)
+
build() {
- cd $srcdir/$pkgname-01.03.00
+ cd $srcdir/$pkgname-01.03.00
# fix config file
- sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g'
src/defaults.h.in || return 1
- ./configure || return 1
- make || return 1
- install -m755 -D src/faxsend/c2faxsend $pkgdir/usr/bin/c2faxsend
- install -m755 -D src/faxrecv/c2faxrecv $pkgdir/usr/bin/c2faxrecv
- install -m755 -D setupconffile $pkgdir/usr/bin/c2faxaddmodem
- install -m644 -D $srcdir/config.faxCAPI
$pkgdir/var/spool/hylafax/etc/config.faxCAPI
- install -m755 -D $srcdir/capi4hylafax.rc $pkgdir/etc/rc.d/capi4hylafax
+ sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g'
src/defaults.h.in
+ ./configure
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-01.03.00
+ install -m755 -D src/faxsend/c2faxsend $pkgdir/usr/bin/c2faxsend
+ install -m755 -D src/faxrecv/c2faxrecv $pkgdir/usr/bin/c2faxrecv
+ install -m755 -D setupconffile $pkgdir/usr/bin/c2faxaddmodem
+ install -m644 -D $srcdir/config.faxCAPI
$pkgdir/var/spool/hylafax/etc/config.faxCAPI
+ install -m755 -D $srcdir/capi4hylafax.rc $pkgdir/etc/rc.d/capi4hylafax
# adding FIFO
- mkfifo $pkgdir/var/spool/hylafax/FIFO.faxCAPI
- chown 10 $pkgdir/var/spool/hylafax/FIFO.faxCAPI
- chgrp 14 $pkgdir/var/spool/hylafax/FIFO.faxCAPI
- chmod 0600 $pkgdir/var/spool/hylafax/FIFO.faxCAPI
+ mkfifo $pkgdir/var/spool/hylafax/FIFO.faxCAPI
+ chown 10 $pkgdir/var/spool/hylafax/FIFO.faxCAPI
+ chgrp 14 $pkgdir/var/spool/hylafax/FIFO.faxCAPI
+ chmod 0600 $pkgdir/var/spool/hylafax/FIFO.faxCAPI
# fix /var/spool/hylafax permission
- chown 10 $pkgdir/var/spool/hylafax
- chgrp 14 $pkgdir/var/spool/hylafax
+ chown 10 $pkgdir/var/spool/hylafax
+ chgrp 14 $pkgdir/var/spool/hylafax
# adding udev rule
- mkdir -p $pkgdir/lib/udev/rules.d
-cat EOF $pkgdir/lib/udev/rules.d/53-capi4hylafax.rules
+ mkdir -p $pkgdir/lib/udev/rules.d
+cat EOF $pkgdir/lib/udev/rules.d/53-capi4hylafax.rules
# CAPI devices
SUBSYSTEM==capi, KERNEL==capi, NAME=capi20, SYMLINK+=isdn/capi20,
GROUP=uucp
SUBSYSTEM==tty KERNEL==capi[0-9]*, NAME=capi/%n, GROUP=uucp
EOF
# fix c2faxadd
- sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g'
$pkgdir/usr/bin/c2faxaddmodem || return 1
- echo main_config_dialog $pkgdir/usr/bin/c2faxaddmodem
+ sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g'
$pkgdir/usr/bin/c2faxaddmodem
+ echo main_config_dialog $pkgdir/usr/bin/c2faxaddmodem
}
-md5sums=('d37dc652ac80d1525ef8693be55ee67f'
- '653b60695d21c128f020a86274ca9192'
- '1fe40c58289fa3ba625ce6fe2fdb3d07')
[arch-commits] Commit in sdl_image/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 15:21:00
Author: heftig
Revision: 147223
libpng/libtiff rebuild
Modified:
sdl_image/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 19:59:04 UTC (rev 147222)
+++ PKGBUILD2012-01-24 20:21:00 UTC (rev 147223)
@@ -5,7 +5,7 @@
pkgname=sdl_image
pkgver=1.2.12
-pkgrel=1
+pkgrel=2
pkgdesc=A simple library to load images of various formats as SDL surfaces
arch=('i686' 'x86_64')
license=('custom')
[arch-commits] Commit in sdl_image/repos (4 files)
Date: Tuesday, January 24, 2012 @ 15:21:56
Author: heftig
Revision: 147224
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
sdl_image/repos/staging-i686/
sdl_image/repos/staging-i686/PKGBUILD
(from rev 147223, sdl_image/trunk/PKGBUILD)
sdl_image/repos/staging-x86_64/
sdl_image/repos/staging-x86_64/PKGBUILD
(from rev 147223, sdl_image/trunk/PKGBUILD)
-+
staging-i686/PKGBUILD | 29 +
staging-x86_64/PKGBUILD | 29 +
2 files changed, 58 insertions(+)
Copied: sdl_image/repos/staging-i686/PKGBUILD (from rev 147223,
sdl_image/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-24 20:21:56 UTC (rev 147224)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+# Contributor: Allan McRae al...@archlinux.org
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+
+pkgname=sdl_image
+pkgver=1.2.12
+pkgrel=2
+pkgdesc=A simple library to load images of various formats as SDL surfaces
+arch=('i686' 'x86_64')
+license=('custom')
+depends=('sdl=1.2.13' 'libpng' 'libjpeg=7' 'libtiff' 'zlib')
+options=('!libtool')
+url=http://www.libsdl.org/projects/SDL_image/;
+source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-$pkgver.tar.gz)
+md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb')
+
+build() {
+ cd $srcdir/SDL_image-$pkgver
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+package() {
+ cd $srcdir/SDL_image-$pkgver
+ make DESTDIR=$pkgdir install
+
+ install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
Copied: sdl_image/repos/staging-x86_64/PKGBUILD (from rev 147223,
sdl_image/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-24 20:21:56 UTC (rev 147224)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+# Contributor: Allan McRae al...@archlinux.org
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+
+pkgname=sdl_image
+pkgver=1.2.12
+pkgrel=2
+pkgdesc=A simple library to load images of various formats as SDL surfaces
+arch=('i686' 'x86_64')
+license=('custom')
+depends=('sdl=1.2.13' 'libpng' 'libjpeg=7' 'libtiff' 'zlib')
+options=('!libtool')
+url=http://www.libsdl.org/projects/SDL_image/;
+source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-$pkgver.tar.gz)
+md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb')
+
+build() {
+ cd $srcdir/SDL_image-$pkgver
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+package() {
+ cd $srcdir/SDL_image-$pkgver
+ make DESTDIR=$pkgdir install
+
+ install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
[arch-commits] Commit in akonadi/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 15:26:47
Author: andrea
Revision: 147225
upgpkg: akonadi 1.7.0-1
Upstream release
Modified:
akonadi/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 20:21:56 UTC (rev 147224)
+++ PKGBUILD2012-01-24 20:26:47 UTC (rev 147225)
@@ -3,8 +3,8 @@
# Contributor: Pierre Schmitz pie...@archlinux.de
pkgname=akonadi
-pkgver=1.6.2
-pkgrel=2
+pkgver=1.7.0
+pkgrel=1
pkgdesc=PIM layer, which provides an asynchronous API to access all kind of
PIM data
arch=('i686' 'x86_64')
url='http://pim.kde.org/akonadi'
@@ -13,7 +13,7 @@
makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
install=${pkgname}.install
source=(http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('07e2aa2e6953ac518f9306911747e264')
+md5sums=('804309dca70ede35b4a654ab764e9079')
build() {
cd ${srcdir}
[arch-commits] Commit in tracker/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 15:32:22
Author: heftig
Revision: 147226
libpng/libtiff
Modified:
tracker/trunk/PKGBUILD
--+
PKGBUILD |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 20:26:47 UTC (rev 147225)
+++ PKGBUILD2012-01-24 20:32:22 UTC (rev 147226)
@@ -7,7 +7,7 @@
pkgname=(tracker libtracker-sparql)
pkgver=0.12.9
_tver=${pkgver%.*}
-pkgrel=1
+pkgrel=2
pkgdesc=All-in-one indexer, search tool and metadata database
arch=('i686' 'x86_64')
license=('GPL')
@@ -33,6 +33,8 @@
--enable-libflac \
--enable-libvorbis
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/if test
$export_dynamic = yes test -n $export_dynamic_flag_spec; then/
func_append compile_command -Wl,-O1,--as-needed\n func_append
finalize_command -Wl,-O1,--as-needed\n\0/' libtool
+
make
}
[arch-commits] Commit in akonadi/repos (8 files)
Date: Tuesday, January 24, 2012 @ 15:32:45
Author: andrea
Revision: 147227
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
akonadi/repos/extra-i686/PKGBUILD
(from rev 147225, akonadi/trunk/PKGBUILD)
akonadi/repos/extra-i686/akonadi.install
(from rev 147225, akonadi/trunk/akonadi.install)
akonadi/repos/extra-x86_64/PKGBUILD
(from rev 147225, akonadi/trunk/PKGBUILD)
akonadi/repos/extra-x86_64/akonadi.install
(from rev 147225, akonadi/trunk/akonadi.install)
Deleted:
akonadi/repos/extra-i686/PKGBUILD
akonadi/repos/extra-i686/akonadi.install
akonadi/repos/extra-x86_64/PKGBUILD
akonadi/repos/extra-x86_64/akonadi.install
--+
extra-i686/PKGBUILD | 64 -
extra-i686/akonadi.install | 22 +++---
extra-x86_64/PKGBUILD| 64 -
extra-x86_64/akonadi.install | 22 +++---
4 files changed, 86 insertions(+), 86 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-24 20:32:22 UTC (rev 147226)
+++ extra-i686/PKGBUILD 2012-01-24 20:32:45 UTC (rev 147227)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
-# Contributor: Pierre Schmitz pie...@archlinux.de
-
-pkgname=akonadi
-pkgver=1.6.2
-pkgrel=2
-pkgdesc=PIM layer, which provides an asynchronous API to access all kind of
PIM data
-arch=('i686' 'x86_64')
-url='http://pim.kde.org/akonadi'
-license=('LGPL')
-depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
-install=${pkgname}.install
-source=(http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('07e2aa2e6953ac518f9306911747e264')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
--DCMAKE_BUILD_TYPE=Release \
--DCMAKE_INSTALL_PREFIX=/usr \
--DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
- make
-}
-
-package() {
- cd ${srcdir}/build
- make DESTDIR=${pkgdir} install
-}
Copied: akonadi/repos/extra-i686/PKGBUILD (from rev 147225,
akonadi/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-24 20:32:45 UTC (rev 147227)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Pierre Schmitz pie...@archlinux.de
+
+pkgname=akonadi
+pkgver=1.7.0
+pkgrel=1
+pkgdesc=PIM layer, which provides an asynchronous API to access all kind of
PIM data
+arch=('i686' 'x86_64')
+url='http://pim.kde.org/akonadi'
+license=('LGPL')
+depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
+install=${pkgname}.install
+source=(http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2;)
+md5sums=('804309dca70ede35b4a654ab764e9079')
+
+build() {
+ cd ${srcdir}
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
+ make
+}
+
+package() {
+ cd ${srcdir}/build
+ make DESTDIR=${pkgdir} install
+}
Deleted: extra-i686/akonadi.install
===
--- extra-i686/akonadi.install 2012-01-24 20:32:22 UTC (rev 147226)
+++ extra-i686/akonadi.install 2012-01-24 20:32:45 UTC (rev 147227)
@@ -1,11 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: akonadi/repos/extra-i686/akonadi.install (from rev 147225,
akonadi/trunk/akonadi.install)
===
--- extra-i686/akonadi.install (rev 0)
+++ extra-i686/akonadi.install 2012-01-24 20:32:45 UTC (rev 147227)
@@ -0,0 +1,11 @@
+post_install() {
+ update-mime-database usr/share/mime /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2012-01-24 20:32:22 UTC (rev 147226)
+++ extra-x86_64/PKGBUILD 2012-01-24 20:32:45 UTC (rev 147227)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
-# Contributor: Pierre Schmitz pie...@archlinux.de
-
-pkgname=akonadi
-pkgver=1.6.2
-pkgrel=2
-pkgdesc=PIM layer, which provides an asynchronous API to access all kind of
PIM data
-arch=('i686' 'x86_64')
-url='http://pim.kde.org/akonadi'
-license=('LGPL')
-depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
-install=${pkgname}.install
[arch-commits] Commit in tracker/repos (6 files)
Date: Tuesday, January 24, 2012 @ 15:33:45
Author: heftig
Revision: 147228
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
tracker/repos/staging-i686/
tracker/repos/staging-i686/PKGBUILD
(from rev 147227, tracker/trunk/PKGBUILD)
tracker/repos/staging-i686/tracker.install
(from rev 147227, tracker/trunk/tracker.install)
tracker/repos/staging-x86_64/
tracker/repos/staging-x86_64/PKGBUILD
(from rev 147227, tracker/trunk/PKGBUILD)
tracker/repos/staging-x86_64/tracker.install
(from rev 147227, tracker/trunk/tracker.install)
+
staging-i686/PKGBUILD | 84 +++
staging-i686/tracker.install | 13 ++
staging-x86_64/PKGBUILD| 84 +++
staging-x86_64/tracker.install | 13 ++
4 files changed, 194 insertions(+)
Copied: tracker/repos/staging-i686/PKGBUILD (from rev 147227,
tracker/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-24 20:33:45 UTC (rev 147228)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Jan heftig Steffens jan.steff...@gmail.com
+# Contributor: Sergej Pupykin pupykin.s+a...@gmail.com
+# Contributor: Alexander Fehr pizzapunk gmail com
+
+pkgbase=tracker
+pkgname=(tracker libtracker-sparql)
+pkgver=0.12.9
+_tver=${pkgver%.*}
+pkgrel=2
+pkgdesc=All-in-one indexer, search tool and metadata database
+arch=('i686' 'x86_64')
+license=('GPL')
+makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
+ 'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3'
+ 'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection'
+ 'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser'
+ 'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala')
+url=http://www.gnome.org;
+options=('!libtool' '!emptydirs')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
+sha256sums=('ccd61c8f79905f7e09af3a4a863772256601dcd3213b0f9a3f76add04e553b5c')
+
+build() {
+ cd $srcdir/$pkgbase-$pkgver
+
+ ./configure \
+--prefix=/usr \
+--sysconfdir=/etc \
+--localstatedir=/var \
+--libexecdir=/usr/lib/tracker \
+--disable-unit-tests \
+--enable-libflac \
+--enable-libvorbis
+
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/if test
$export_dynamic = yes test -n $export_dynamic_flag_spec; then/
func_append compile_command -Wl,-O1,--as-needed\n func_append
finalize_command -Wl,-O1,--as-needed\n\0/' libtool
+
+ make
+}
+
+package_tracker() {
+ depends=(libtracker-sparql=$pkgver-$pkgrel 'libgee' 'libgnome-keyring'
+ 'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca'
+ 'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
+ optdepends=('giflib: extractor for GIF data'
+ 'gstreamer0.10-base: video extractor'
+ 'totem-plparser: playlist support'
+ 'nautilus: nautilus-extension'
+ 'libvorbis: Vorbis metadata extractor'
+ 'flac: FLAC metadata extractor'
+ 'taglib: writeback for audio files'
+ 'gnome-panel: tracker-search-bar')
+ groups=('gnome-extra')
+ install=tracker.install
+
+ cd $srcdir/$pkgbase-$pkgver
+ make DESTDIR=$pkgdir install
+
+### Split libtracker-sparql
+
+ mkdir -p $srcdir/sparql/usr/{include,lib}/tracker-$_tver
+ mkdir -p $srcdir/sparql/usr/lib/{girepository-1.0,pkgconfig}
+ mkdir -p $srcdir/sparql/usr/share/{gir-1.0,vala/vapi}
+
+ mv $pkgdir/usr/lib/libtracker-sparql-* $srcdir/sparql/usr/lib
+
+ mv $pkgdir/usr/lib/tracker-$_tver/*.so* \
+$srcdir/sparql/usr/lib/tracker-$_tver
+
+ mv $pkgdir/usr/share/vala/vapi/tracker-sparql-* \
+$srcdir/sparql/usr/share/vala/vapi
+
+ mv {$pkgdir,$srcdir/sparql}/usr/include/tracker-$_tver/libtracker-sparql
+ mv
{$pkgdir,$srcdir/sparql}/usr/lib/girepository-1.0/Tracker-$_tver.typelib
+ mv {$pkgdir,$srcdir/sparql}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc
+ mv {$pkgdir,$srcdir/sparql}/usr/share/gir-1.0/Tracker-$_tver.gir
+}
+
+package_libtracker-sparql() {
+ pkgdesc=$pkgdesc (SPARQL library)
+ depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux')
+
+ mv $srcdir/sparql/* $pkgdir
+}
Copied: tracker/repos/staging-i686/tracker.install (from rev 147227,
tracker/trunk/tracker.install)
===
--- staging-i686/tracker.install(rev 0)
+++ staging-i686/tracker.install2012-01-24 20:33:45 UTC (rev 147228)
@@ -0,0 +1,13 @@
+post_install() {
+ usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
[arch-commits] Commit in gnome-desktop2/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 15:45:11
Author: heftig
Revision: 147229
libpng
Modified:
gnome-desktop2/trunk/PKGBUILD
--+
PKGBUILD |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 20:33:45 UTC (rev 147228)
+++ PKGBUILD2012-01-24 20:45:11 UTC (rev 147229)
@@ -5,7 +5,7 @@
_pkgname=gnome-desktop
pkgname=${_pkgname}2
pkgver=2.32.1
-pkgrel=1
+pkgrel=2
pkgdesc=Library with common API for various GNOME modules (legacy version)
arch=(i686 x86_64)
license=(GPL LGPL)
@@ -23,6 +23,9 @@
--with-gnome-distributor=Archlinux \
--disable-scrollkeeper \
--disable-gnome-about --disable-desktop-docs
+
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/if test
$export_dynamic = yes test -n $export_dynamic_flag_spec; then/
func_append compile_command -Wl,-O1,--as-needed\n func_append
finalize_command -Wl,-O1,--as-needed\n\0/' libtool
+
make
}
[arch-commits] Commit in gnome-desktop2/repos (4 files)
Date: Tuesday, January 24, 2012 @ 15:46:21
Author: heftig
Revision: 147230
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
gnome-desktop2/repos/staging-i686/
gnome-desktop2/repos/staging-i686/PKGBUILD
(from rev 147229, gnome-desktop2/trunk/PKGBUILD)
gnome-desktop2/repos/staging-x86_64/
gnome-desktop2/repos/staging-x86_64/PKGBUILD
(from rev 147229, gnome-desktop2/trunk/PKGBUILD)
-+
staging-i686/PKGBUILD | 35 +++
staging-x86_64/PKGBUILD | 35 +++
2 files changed, 70 insertions(+)
Copied: gnome-desktop2/repos/staging-i686/PKGBUILD (from rev 147229,
gnome-desktop2/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-24 20:46:21 UTC (rev 147230)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan heftig Steffens jan.steff...@gmail.com
+# Contributor: Jan de Groot j...@archlinux.org
+
+_pkgname=gnome-desktop
+pkgname=${_pkgname}2
+pkgver=2.32.1
+pkgrel=2
+pkgdesc=Library with common API for various GNOME modules (legacy version)
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(gconf gtk2 startup-notification)
+makedepends=(gnome-doc-utils intltool)
+url=http://www.gnome.org;
+options=(!libtool !emptydirs)
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2)
+sha256sums=('55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d')
+
+build() {
+ cd $srcdir/$_pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --with-gnome-distributor=Archlinux \
+ --disable-scrollkeeper \
+ --disable-gnome-about --disable-desktop-docs
+
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/if test
$export_dynamic = yes test -n $export_dynamic_flag_spec; then/
func_append compile_command -Wl,-O1,--as-needed\n func_append
finalize_command -Wl,-O1,--as-needed\n\0/' libtool
+
+ make
+}
+
+package() {
+ cd $srcdir/$_pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+}
Copied: gnome-desktop2/repos/staging-x86_64/PKGBUILD (from rev 147229,
gnome-desktop2/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-24 20:46:21 UTC (rev 147230)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan heftig Steffens jan.steff...@gmail.com
+# Contributor: Jan de Groot j...@archlinux.org
+
+_pkgname=gnome-desktop
+pkgname=${_pkgname}2
+pkgver=2.32.1
+pkgrel=2
+pkgdesc=Library with common API for various GNOME modules (legacy version)
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(gconf gtk2 startup-notification)
+makedepends=(gnome-doc-utils intltool)
+url=http://www.gnome.org;
+options=(!libtool !emptydirs)
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2)
+sha256sums=('55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d')
+
+build() {
+ cd $srcdir/$_pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --with-gnome-distributor=Archlinux \
+ --disable-scrollkeeper \
+ --disable-gnome-about --disable-desktop-docs
+
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/if test
$export_dynamic = yes test -n $export_dynamic_flag_spec; then/
func_append compile_command -Wl,-O1,--as-needed\n func_append
finalize_command -Wl,-O1,--as-needed\n\0/' libtool
+
+ make
+}
+
+package() {
+ cd $srcdir/$_pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+}
[arch-commits] Commit in wesnoth/trunk (PKGBUILD wesnoth-libpng-1.4.0.patch)
Date: Tuesday, January 24, 2012 @ 17:46:40
Author: eric
Revision: 147231
upgpkg: wesnoth 1.8.6-4
Rebuild against libpng 1.5 and libtiff 4.0, Add python2 depends
Modified:
wesnoth/trunk/PKGBUILD
wesnoth/trunk/wesnoth-libpng-1.4.0.patch
+
PKGBUILD |7 ---
wesnoth-libpng-1.4.0.patch | 10 ++
2 files changed, 14 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 20:46:21 UTC (rev 147230)
+++ PKGBUILD2012-01-24 22:46:40 UTC (rev 147231)
@@ -6,12 +6,12 @@
pkgname=wesnoth
pkgver=1.8.6
-pkgrel=3
+pkgrel=4
pkgdesc=A turn-based strategy game on a fantasy world
arch=('i686' 'x86_64')
license=('GPL')
url=http://www.wesnoth.org/;
-depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs'
'pango' 'lua' wesnoth-data=${pkgver} 'dbus-core')
+depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs'
'pango' 'lua' wesnoth-data=${pkgver} 'dbus-core' 'python2')
makedepends=('boost')
install=wesnoth.install
options=(!emptydirs)
@@ -20,7 +20,7 @@
wesnoth-1.8.6-boost-foreach.patch
wesnoth.tmpfiles.conf)
md5sums=('f1c3179869b01b61e253e74aeb241034'
- 'ca7412ffc4682ef55ddf82d56b0e2f08'
+ '3b0d2edcb45e8ecc8c790f92bdcb0087'
'dc414ab7e1334941548e9db6db9c2460'
'b8122f5054e3895c9c054e87460869dc')
@@ -31,6 +31,7 @@
./autogen.sh
./configure --prefix=/usr --localstatedir=/var --enable-tools \
--enable-editor --enable-server --with-fifodir=/run/wesnothd
+ make
}
package() {
Modified: wesnoth-libpng-1.4.0.patch
===
--- wesnoth-libpng-1.4.0.patch 2012-01-24 20:46:21 UTC (rev 147230)
+++ wesnoth-libpng-1.4.0.patch 2012-01-24 22:46:40 UTC (rev 147231)
@@ -12,3 +12,13 @@
if(!png_ptr)
throw exploder_failure(Unable to initialize the png write
structure);
+--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp.libpng 2011-11-06
14:44:26.618711420 -0600
wesnoth-1.8/src/tools/exploder_utils.cpp 2011-11-06 14:57:12.150006511
-0600
+@@ -15,6 +15,7 @@
+ #include exploder_utils.hpp
+ #include game_config.hpp
+ #include serialization/string_utils.hpp
++#include zlib.h
+ #include png.h
+
+ exploder_point::exploder_point(const std::string s)
[arch-commits] Commit in wesnoth/repos (12 files)
Date: Tuesday, January 24, 2012 @ 17:47:27
Author: eric
Revision: 147232
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
wesnoth/repos/staging-i686/
wesnoth/repos/staging-i686/PKGBUILD
(from rev 147231, wesnoth/trunk/PKGBUILD)
wesnoth/repos/staging-i686/wesnoth-1.8.6-boost-foreach.patch
(from rev 147231, wesnoth/trunk/wesnoth-1.8.6-boost-foreach.patch)
wesnoth/repos/staging-i686/wesnoth-libpng-1.4.0.patch
(from rev 147231, wesnoth/trunk/wesnoth-libpng-1.4.0.patch)
wesnoth/repos/staging-i686/wesnoth.install
(from rev 147231, wesnoth/trunk/wesnoth.install)
wesnoth/repos/staging-i686/wesnoth.tmpfiles.conf
(from rev 147231, wesnoth/trunk/wesnoth.tmpfiles.conf)
wesnoth/repos/staging-x86_64/
wesnoth/repos/staging-x86_64/PKGBUILD
(from rev 147231, wesnoth/trunk/PKGBUILD)
wesnoth/repos/staging-x86_64/wesnoth-1.8.6-boost-foreach.patch
(from rev 147231, wesnoth/trunk/wesnoth-1.8.6-boost-foreach.patch)
wesnoth/repos/staging-x86_64/wesnoth-libpng-1.4.0.patch
(from rev 147231, wesnoth/trunk/wesnoth-libpng-1.4.0.patch)
wesnoth/repos/staging-x86_64/wesnoth.install
(from rev 147231, wesnoth/trunk/wesnoth.install)
wesnoth/repos/staging-x86_64/wesnoth.tmpfiles.conf
(from rev 147231, wesnoth/trunk/wesnoth.tmpfiles.conf)
--+
staging-i686/PKGBUILD| 47 ++
staging-i686/wesnoth-1.8.6-boost-foreach.patch | 70 +
staging-i686/wesnoth-libpng-1.4.0.patch | 24 +++
staging-i686/wesnoth.install |9 ++
staging-i686/wesnoth.tmpfiles.conf |1
staging-x86_64/PKGBUILD | 47 ++
staging-x86_64/wesnoth-1.8.6-boost-foreach.patch | 70 +
staging-x86_64/wesnoth-libpng-1.4.0.patch| 24 +++
staging-x86_64/wesnoth.install |9 ++
staging-x86_64/wesnoth.tmpfiles.conf |1
10 files changed, 302 insertions(+)
Copied: wesnoth/repos/staging-i686/PKGBUILD (from rev 147231,
wesnoth/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-24 22:47:27 UTC (rev 147232)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Jacobo Arvelo unix4...@ya.com
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+
+pkgname=wesnoth
+pkgver=1.8.6
+pkgrel=4
+pkgdesc=A turn-based strategy game on a fantasy world
+arch=('i686' 'x86_64')
+license=('GPL')
+url=http://www.wesnoth.org/;
+depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs'
'pango' 'lua' wesnoth-data=${pkgver} 'dbus-core' 'python2')
+makedepends=('boost')
+install=wesnoth.install
+options=(!emptydirs)
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
+wesnoth-libpng-1.4.0.patch
+wesnoth-1.8.6-boost-foreach.patch
+wesnoth.tmpfiles.conf)
+md5sums=('f1c3179869b01b61e253e74aeb241034'
+ '3b0d2edcb45e8ecc8c790f92bdcb0087'
+ 'dc414ab7e1334941548e9db6db9c2460'
+ 'b8122f5054e3895c9c054e87460869dc')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ patch -Np1 -i $srcdir/wesnoth-libpng-1.4.0.patch
+ patch -Np1 -i $srcdir/wesnoth-1.8.6-boost-foreach.patch
+ ./autogen.sh
+ ./configure --prefix=/usr --localstatedir=/var --enable-tools \
+ --enable-editor --enable-server --with-fifodir=/run/wesnothd
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install-exec
+ install -dm755 $pkgdir/usr/lib/tmpfiles.d/
+ install -m644 $srcdir/wesnoth.tmpfiles.conf
$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf
+
+ sed -i s|#!/usr/bin/env python|#!/usr/bin/env python2|
$pkgdir/usr/bin/wesnoth_addon_manager
+ sed -i s|#!/usr/bin/env python|#!/usr/bin/env python2|
$pkgdir/usr/bin/wmlindent
+ sed -i s|#!/usr/bin/env python|#!/usr/bin/env python2|
$pkgdir/usr/bin/wmlscope
+ sed -i s|#!/usr/bin/env python|#!/usr/bin/env python2|
$pkgdir/usr/bin/wmllint
+}
Copied: wesnoth/repos/staging-i686/wesnoth-1.8.6-boost-foreach.patch (from rev
147231, wesnoth/trunk/wesnoth-1.8.6-boost-foreach.patch)
===
--- staging-i686/wesnoth-1.8.6-boost-foreach.patch
(rev 0)
+++ staging-i686/wesnoth-1.8.6-boost-foreach.patch 2012-01-24 22:47:27 UTC
(rev 147232)
@@ -0,0 +1,70 @@
+--- wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp~ 2011-07-21
23:05:56.594879049 +0200
wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp 2011-07-21
23:28:07.540358742 +0200
+@@ -238,6 +238,17 @@ void ttree_view_node::clear()
+
+ struct ttree_view_node_implementation
+ {
++ templateclass W, class It
++ static W* find_at_aux(It
[arch-commits] Commit in texlive-bin/trunk (PKGBUILD texlive.install)
Date: Tuesday, January 24, 2012 @ 17:48:49
Author: eric
Revision: 147233
upgpkg: texlive-bin 2011.3-2
Rebuild against libpng 1.5 and libtiff 4.0, Add info pages fix in .install file
Modified:
texlive-bin/trunk/PKGBUILD
texlive-bin/trunk/texlive.install
-+
PKGBUILD| 123 +++---
texlive.install | 19
2 files changed, 81 insertions(+), 61 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 22:47:27 UTC (rev 147232)
+++ PKGBUILD2012-01-24 22:48:49 UTC (rev 147233)
@@ -1,3 +1,4 @@
+# $Id$
# Maintainer: Rémy Oudompheng r...@archlinux.org
# Contributor: francois francois.archlinux.org
@@ -4,7 +5,7 @@
pkgname=texlive-bin
pkgver=2011.3
_luatex_ver=0.70.1
-pkgrel=1
+pkgrel=2
pkgdesc=TeX Live binaries
license=('GPL')
arch=('i686' 'x86_64')
@@ -51,7 +52,7 @@
export CXXFLAGS=${CXXFLAGS} -fPIC
fi
- cd $srcdir
+ cd $srcdir
# Building LuaTeX
# cd luatex-beta-${_luatex_ver}
cd luatex
@@ -145,63 +146,63 @@
}
package() {
- cd $srcdir
+ cd $srcdir
#
### install texmf tree
echo ---
echo -- installing the texmf tree
echo ---
- install -m755 -d $pkgdir/usr/share
- cp -r texmf $pkgdir/usr/share/
- install -d -m755 $pkgdir/etc/texmf/web2c
- install -d -m755 $pkgdir/etc/texmf/chktex
- install -d -m755 $pkgdir/etc/texmf/dvips/config
- install -d -m755 $pkgdir/etc/texmf/dvipdfm/config
- install -d -m755 $pkgdir/etc/texmf/dvipdfmx
- install -d -m755 $pkgdir/etc/texmf/tex/generic/config
- install -d -m755 $pkgdir/etc/texmf/ttf2pk
- install -d -m755 $pkgdir/etc/texmf/xdvi
- install -d -m755 $pkgdir/etc/fonts/conf.avail
- install -m644 $srcdir/09-texlive-fonts.conf $pkgdir/etc/fonts/conf.avail/
+ install -m755 -d $pkgdir/usr/share
+ cp -r texmf $pkgdir/usr/share/
+ install -d -m755 $pkgdir/etc/texmf/web2c
+ install -d -m755 $pkgdir/etc/texmf/chktex
+ install -d -m755 $pkgdir/etc/texmf/dvips/config
+ install -d -m755 $pkgdir/etc/texmf/dvipdfm/config
+ install -d -m755 $pkgdir/etc/texmf/dvipdfmx
+ install -d -m755 $pkgdir/etc/texmf/tex/generic/config
+ install -d -m755 $pkgdir/etc/texmf/ttf2pk
+ install -d -m755 $pkgdir/etc/texmf/xdvi
+ install -d -m755 $pkgdir/etc/fonts/conf.avail
+ install -m644 $srcdir/09-texlive-fonts.conf
$pkgdir/etc/fonts/conf.avail/
# move man files to /usr/share/man
for i in 1 5; do
- install -d -m755 $pkgdir/usr/share/man/man$i
- mv $pkgdir/usr/share/texmf/doc/man/man$i/*.$i $pkgdir/usr/share/man/man$i/
+ install -d -m755 $pkgdir/usr/share/man/man$i
+ mv $pkgdir/usr/share/texmf/doc/man/man$i/*.$i
$pkgdir/usr/share/man/man$i/
done
# move info files to /usr/share/info
- install -d -m755 $pkgdir/usr/share/info
- mv $pkgdir/usr/share/texmf/doc/info/*.info $pkgdir/usr/share/info/
- rm -rf $pkgdir/usr/share/texmf/doc/{man,info}
+ install -d -m755 $pkgdir/usr/share/info
+ mv $pkgdir/usr/share/texmf/doc/info/*.info $pkgdir/usr/share/info/
+ rm -rf $pkgdir/usr/share/texmf/doc/{man,info}
# copy config files to $TEXMFCONFIG tree
- cp -a $pkgdir/usr/share/texmf/chktex/chktexrc \
- $pkgdir/etc/texmf/chktex/
- cp -a $pkgdir/usr/share/texmf/web2c/mktex.cnf \
- $pkgdir/etc/texmf/web2c/
- cp -a $pkgdir/usr/share/texmf/web2c/updmap.cfg \
- $pkgdir/etc/texmf/web2c/
- cp -a $pkgdir/usr/share/texmf/web2c/fmtutil.cnf \
- $pkgdir/etc/texmf/web2c/
- cp -a $pkgdir/usr/share/texmf/dvips/config/config.ps \
- $pkgdir/etc/texmf/dvips/config/
- cp -a $pkgdir/usr/share/texmf/dvipdfm/config/config \
- $pkgdir/etc/texmf/dvipdfm/config/
- cp -a $pkgdir/usr/share/texmf/dvipdfmx/dvipdfmx.cfg \
- $pkgdir/etc/texmf/dvipdfmx/
- cp -a $pkgdir/usr/share/texmf/tex/generic/config/pdftexconfig.tex \
- $pkgdir/etc/texmf/tex/generic/config/
- cp -a $pkgdir/usr/share/texmf/tex/generic/config/language.dat \
- $pkgdir/etc/texmf/tex/generic/config/
- cp -a $pkgdir/usr/share/texmf/tex/generic/config/language.def \
- $pkgdir/etc/texmf/tex/generic/config/
- cp -a $pkgdir/usr/share/texmf/ttf2pk/ttf2pk.cfg \
- $pkgdir/etc/texmf/ttf2pk/
- cp -a $pkgdir/usr/share/texmf/xdvi/XDvi \
- $pkgdir/etc/texmf/xdvi/
+ cp -a $pkgdir/usr/share/texmf/chktex/chktexrc \
+ $pkgdir/etc/texmf/chktex/
+ cp -a $pkgdir/usr/share/texmf/web2c/mktex.cnf \
+ $pkgdir/etc/texmf/web2c/
+ cp -a $pkgdir/usr/share/texmf/web2c/updmap.cfg \
+ $pkgdir/etc/texmf/web2c/
+ cp -a $pkgdir/usr/share/texmf/web2c/fmtutil.cnf \
+ $pkgdir/etc/texmf/web2c/
+ cp -a $pkgdir/usr/share/texmf/dvips/config/config.ps \
+ $pkgdir/etc/texmf/dvips/config/
+ cp
[arch-commits] Commit in texlive-bin/repos (12 files)
Date: Tuesday, January 24, 2012 @ 17:49:19 Author: eric Revision: 147234 archrelease: copy trunk to staging-i686, staging-x86_64 Added: texlive-bin/repos/staging-i686/ texlive-bin/repos/staging-i686/09-texlive-fonts.conf (from rev 147233, texlive-bin/trunk/09-texlive-fonts.conf) texlive-bin/repos/staging-i686/PKGBUILD (from rev 147233, texlive-bin/trunk/PKGBUILD) texlive-bin/repos/staging-i686/fix-fontforge-encoding.patch (from rev 147233, texlive-bin/trunk/fix-fontforge-encoding.patch) texlive-bin/repos/staging-i686/texlive.install (from rev 147233, texlive-bin/trunk/texlive.install) texlive-bin/repos/staging-i686/texmf.cnf (from rev 147233, texlive-bin/trunk/texmf.cnf) texlive-bin/repos/staging-x86_64/ texlive-bin/repos/staging-x86_64/09-texlive-fonts.conf (from rev 147233, texlive-bin/trunk/09-texlive-fonts.conf) texlive-bin/repos/staging-x86_64/PKGBUILD (from rev 147233, texlive-bin/trunk/PKGBUILD) texlive-bin/repos/staging-x86_64/fix-fontforge-encoding.patch (from rev 147233, texlive-bin/trunk/fix-fontforge-encoding.patch) texlive-bin/repos/staging-x86_64/texlive.install (from rev 147233, texlive-bin/trunk/texlive.install) texlive-bin/repos/staging-x86_64/texmf.cnf (from rev 147233, texlive-bin/trunk/texmf.cnf) -+ staging-i686/09-texlive-fonts.conf |9 staging-i686/PKGBUILD | 345 staging-i686/fix-fontforge-encoding.patch | 12 staging-i686/texlive.install| 37 + staging-i686/texmf.cnf | 724 ++ staging-x86_64/09-texlive-fonts.conf|9 staging-x86_64/PKGBUILD | 345 staging-x86_64/fix-fontforge-encoding.patch | 12 staging-x86_64/texlive.install | 37 + staging-x86_64/texmf.cnf| 724 ++ 10 files changed, 2254 insertions(+) The diff is longer than the limit of 200KB. Use svn diff -r 147233:147234 to see the changes.
[arch-commits] Commit in udev/trunk (2 files)
Date: Tuesday, January 24, 2012 @ 18:31:15
Author: tomegun
Revision: 147235
upgpkg: udev 179-1
fixes https://bugs.archlinux.org/task/28049
udev 179
Bugfix for $name resolution, which broke at least some keymap handling.
Modified:
udev/trunk/PKGBUILD
Deleted:
udev/trunk/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
+
0001-udevd-kill-hanging-event-processes-after-30-seconds.patch | 162
--
PKGBUILD |5
2 files changed, 2 insertions(+), 165 deletions(-)
Deleted: 0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
===
--- 0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
2012-01-24 22:49:19 UTC (rev 147234)
+++ 0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
2012-01-24 23:31:15 UTC (rev 147235)
@@ -1,162 +0,0 @@
-From e64fae5573e566ce4fd9b23c68ac8f3096603314 Mon Sep 17 00:00:00 2001
-From: Kay Sievers kay.siev...@vrfy.org
-Date: Wed, 18 Jan 2012 05:06:18 +0100
-Subject: [PATCH] udevd: kill hanging event processes after 30 seconds
-
-Some broken kernel drivers load firmware synchronously in the module init
-path and block modprobe until the firmware request is fulfilled.
-
-The modprobe-generated firmware request is a direct child device of the
-device which caused modprobe to run. Child device event are blocked until
-the parent device is handled. This dead-locks until the kernel firmware
-loading timeout of 60 seconds is reached.
-
-The hanging modprobe event should now time-out and allow the firmware
-event to run before the 60 second kernel timeout.
- src/udev-event.c |2 +-
- src/udevd.c | 62 +++--
- 2 files changed, 51 insertions(+), 13 deletions(-)
-
-diff --git a/src/udev-event.c b/src/udev-event.c
-index 9bdc518..f0b9548 100644
a/src/udev-event.c
-+++ b/src/udev-event.c
-@@ -49,7 +49,7 @@ struct udev_event *udev_event_new(struct udev_device *dev)
- udev_list_init(udev, event-run_list, false);
- event-fd_signal = -1;
- event-birth_usec = now_usec();
--event-timeout_usec = 60 * 1000 * 1000;
-+event-timeout_usec = 30 * 1000 * 1000;
- dbg(event-udev, allocated event %p\n, event);
- return event;
- }
-diff --git a/src/udevd.c b/src/udevd.c
-index 11ab19a..77a1e79 100644
a/src/udevd.c
-+++ b/src/udevd.c
-@@ -133,6 +133,7 @@ struct worker {
- struct udev_monitor *monitor;
- enum worker_state state;
- struct event *event;
-+unsigned long long event_start_usec;
- };
-
- /* passed from worker to main process */
-@@ -372,6 +373,7 @@ out:
- close(fd_inotify);
- close(worker_watch[WRITE_END]);
- udev_rules_unref(rules);
-+udev_builtin_exit(udev);
- udev_monitor_unref(worker_monitor);
- udev_unref(udev);
- udev_log_close();
-@@ -389,6 +391,7 @@ out:
- worker-monitor = worker_monitor;
- worker-pid = pid;
- worker-state = WORKER_RUNNING;
-+worker-event_start_usec = now_usec();
- worker-event = event;
- event-state = EVENT_RUNNING;
- udev_list_node_append(worker-node, worker_list);
-@@ -419,6 +422,7 @@ static void event_run(struct event *event)
- worker_ref(worker);
- worker-event = event;
- worker-state = WORKER_RUNNING;
-+worker-event_start_usec = now_usec();
- event-state = EVENT_RUNNING;
- return;
- }
-@@ -610,9 +614,11 @@ static void worker_returned(int fd_worker)
- continue;
-
- /* worker returned */
--worker-event-exitcode = msg.exitcode;
--event_queue_delete(worker-event, true);
--worker-event = NULL;
-+if (worker-event) {
-+worker-event-exitcode = msg.exitcode;
-+event_queue_delete(worker-event, true);
-+worker-event = NULL;
-+}
- if (worker-state != WORKER_KILLED)
- worker-state = WORKER_IDLE;
- worker_unref(worker);
-@@ -796,7 +802,7 @@ static void handle_signal(struct udev *udev, int signo)
- }
-
- if (!WIFEXITED(status) || WEXITSTATUS(status)
!= 0) {
--if (worker-event != NULL) {
-+if (worker-event) {
-
[arch-commits] Commit in udev/repos (6 files)
Date: Tuesday, January 24, 2012 @ 18:31:40
Author: tomegun
Revision: 147236
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
udev/repos/testing-i686/
udev/repos/testing-i686/PKGBUILD
(from rev 147235, udev/trunk/PKGBUILD)
udev/repos/testing-i686/udev.install
(from rev 147235, udev/trunk/udev.install)
udev/repos/testing-x86_64/
udev/repos/testing-x86_64/PKGBUILD
(from rev 147235, udev/trunk/PKGBUILD)
udev/repos/testing-x86_64/udev.install
(from rev 147235, udev/trunk/udev.install)
-+
testing-i686/PKGBUILD | 102 ++
testing-i686/udev.install | 65 ++
testing-x86_64/PKGBUILD | 102 ++
testing-x86_64/udev.install | 65 ++
4 files changed, 334 insertions(+)
Copied: udev/repos/testing-i686/PKGBUILD (from rev 147235, udev/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-01-24 23:31:40 UTC (rev 147236)
@@ -0,0 +1,102 @@
+# $Id$
+# Maintainer: Tom Gundersen t...@jklm.no
+# Contributor: Aaron Griffin aa...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Thomas Bächler tho...@archlinux.org
+
+pkgbase=udev
+pkgname=('udev' 'udev-compat')
+pkgver=179
+pkgrel=1
+arch=(i686 x86_64)
+url=http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary;
+license=('GPL')
+groups=('base')
+options=(!makeflags !libtool)
+makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod')
+source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.xz)
+
+build() {
+ cd $srcdir/$pkgbase-$pkgver
+
+ ./configure --prefix=/usr \
+ --with-rootprefix= \
+ --sysconfdir=/etc \
+ --bindir=/sbin \
+ --libdir=/usr/lib \
+ --with-rootlibdir=/lib \
+ --libexecdir=/lib \
+ --with-systemdsystemunitdir=/lib/systemd/system \
+ --enable-udev_acl
+
+ make
+}
+
+package_udev() {
+ pkgdesc=The userspace dev tools (udev)
+ depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils'
'pciutils')
+ install=udev.install
+ backup=(etc/udev/udev.conf)
+
+ cd $srcdir/$pkgbase-$pkgver
+ make DESTDIR=${pkgdir} install
+
+ # create framebuffer blacklist
+ install -d -m755 ${pkgdir}/lib/modprobe.d/
+ for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko.gz'
-exec basename {} .ko.gz \;); do
+ echo blacklist $mod
+ done | sort -u $pkgdir/lib/modprobe.d/framebuffer_blacklist.conf
+
+ # /dev/loop0 is created for convenience, to autoload the module if necessary
+ # this is no longer needed when util-linux-2.21 is released as
/dev/loop-control
+ # will be used instead. In that case move this to udev-compat
+ install -d -m755 ${pkgdir}/lib/udev/devices/
+ mknod ${pkgdir}/lib/udev/devices/loop0 b 7 0
+ chgrp disk ${pkgdir}/lib/udev/devices/loop0
+
+ # udevd moved, symlink to make life easy for restarting udevd manually
+ ln -s /lib/udev/udevd ${pkgdir}/sbin/udevd
+
+ # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
+ for i in $pkgdir/lib/udev/rules.d/*.rules; do
+sed -i -e 's#GROUP=dialout#GROUP=uucp#g;
+ s#GROUP=tape#GROUP=storage#g;
+ s#GROUP=cdrom#GROUP=optical#g' $i
+ done
+}
+
+package_udev-compat() {
+ pkgdesc=The userspace dev tools (udev) - additional rules for older kernels
+ depends=('udev')
+ groups=('')
+ install -d -m755 ${pkgdir}/lib/udev/rules.d
+ install -D -m644
${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules
${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules
+
+ # create static nodes to be compatible with on-demand module
+ # loading in the most recent kernel
+ #
+ # the list of nodes is generated from /lib/modules/`most recent
kernel`/modprobe.devname
+ # excluding any devices not included in the LTS kernel and any entries in the
+ # modprobe.devname file of the LTS kernel (if it exists).
+
+ install -d -m755 ${pkgdir}/lib/udev/devices
+ cd ${pkgdir}/lib/udev/devices
+
+ install -d -m755 net
+ mknod net/tun c 10 200
+ mknod ppp c 108 0
+# mknod loop-control c 10 237 -- does not exist in old kernels
+ mknod uinput c 10 223
+ install -d -m755 mapper
+ mknod mapper/control c 10 236
+ install -d -m755 snd
+ mknod snd/timer c 116 33
+ mknod snd/seq c 116 1
+ mknod btrfs-control c 10 234
+ mknod autofs c 10 235
+ mknod fuse c 10 229
+ install -d -m755 cpu
+ mknod cpu/microcode c 10 184
+
+}
+md5sums=('7d2880f66ea39146aae928f19ff3ca09')
Copied: udev/repos/testing-i686/udev.install (from rev 147235,
udev/trunk/udev.install)
===
--- testing-i686/udev.install (rev 0)
+++
[arch-commits] Commit in openldap/trunk (PKGBUILD mutex-end-of-struct-sigsegv.patch)
Date: Tuesday, January 24, 2012 @ 18:42:32
Author: dan
Revision: 147237
Prep for rebuild without libfetch
Also fix upstream issues #7118 and #7133 with a patch while we are at it here,
which cause segfaults left and right in the test suite when it runs due to the
SIGHUP sent to slapd.
Added:
openldap/trunk/mutex-end-of-struct-sigsegv.patch
Modified:
openldap/trunk/PKGBUILD
---+
PKGBUILD | 18 +--
mutex-end-of-struct-sigsegv.patch | 85
2 files changed, 97 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 23:31:40 UTC (rev 147236)
+++ PKGBUILD2012-01-24 23:42:32 UTC (rev 147237)
@@ -4,21 +4,26 @@
pkgbase=openldap
pkgname=('libldap' 'openldap')
pkgver=2.4.28
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url=http://www.openldap.org/;
license=('custom')
-makedepends=('libfetch' 'libltdl' 'libsasl' 'e2fsprogs' 'util-linux')
+makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux')
source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
-slapd slapd.default ntlm.patch)
+slapd slapd.default
+ntlm.patch
+mutex-end-of-struct-sigsegv.patch)
sha1sums=('d888beae1723002a5a2ff5509d3040df40885774'
'bd1ea19256d3d467f1f803e0f4046ef50f17628f'
'd89b8a533045123f1ab46c9c430cf132d58a20a4'
- 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef')
+ 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef'
+ '7ca90dbe53c4207a2dee976359b8c6663e582d00')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
patch -Np1 -i ${srcdir}/ntlm.patch
+ patch -Np1 -i ${srcdir}/mutex-end-of-struct-sigsegv.patch
+
sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|'
libraries/{liblber,libldap,libldap_r}/Makefile.in
sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP run LDAP_DIRSEP
ldapi|#define LDAPI_SOCK LDAP_DIRSEP run LDAP_DIRSEP openldap LDAP_DIRSEP
ldapi|' include/ldap_defaults.h
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf
@@ -30,7 +35,8 @@
--enable-ipv6 --enable-syslog --enable-local \
--enable-bdb --enable-hdb \
--enable-crypt --enable-dynamic \
---with-threads --disable-wrappers \
+--with-threads --disable-wrappers \
+--without-fetch \
--enable-spasswd --with-cyrus-sasl \
--enable-overlays=mod --enable-modules=yes
make
@@ -43,7 +49,7 @@
package_libldap() {
pkgdesc=Lightweight Directory Access Protocol (LDAP) client libraries
- depends=('libsasl' 'libfetch' 'e2fsprogs')
+ depends=('libsasl' 'e2fsprogs')
backup=('etc/openldap/ldap.conf')
options=('!libtool')
Added: mutex-end-of-struct-sigsegv.patch
===
--- mutex-end-of-struct-sigsegv.patch (rev 0)
+++ mutex-end-of-struct-sigsegv.patch 2012-01-24 23:42:32 UTC (rev 147237)
@@ -0,0 +1,85 @@
+From 270ef33acf18dc13bfd07f8a8e66b446f80e7d27 Mon Sep 17 00:00:00 2001
+From: Howard Chu h...@openldap.org
+Date: Tue, 24 Jan 2012 13:32:52 -0800
+Subject: [PATCH 1/1] ITS#7118, #7133 tentative fix
+
+Move mutexes to end of structs, so libldap can ignore them
+---
+ libraries/libldap/ldap-int.h | 40
+ 1 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
+index f8e6126..6b33bcd 100644
+--- a/libraries/libldap/ldap-int.h
b/libraries/libldap/ldap-int.h
+@@ -185,13 +185,6 @@ struct ldapoptions {
+ #define LDAP_TRASHED_SESSION 0xFF
+ int ldo_debug;
+
+-#ifdef LDAP_R_COMPILE
+- ldap_pvt_thread_mutex_t ldo_mutex;
+-#define LDAP_LDO_MUTEX_NULLARG, LDAP_PVT_MUTEX_NULL
+-#else
+-#define LDAP_LDO_MUTEX_NULLARG
+-#endif
+-
+ #ifdef LDAP_CONNECTIONLESS
+ #define LDAP_IS_UDP(ld) ((ld)-ld_options.ldo_is_udp)
+ void* ldo_peer; /* struct sockaddr* */
+@@ -281,6 +274,13 @@ struct ldapoptions {
+ ldaplist *ldo_conn_cbs;
+
+ LDAP_BOOLEANS ldo_booleans; /* boolean options */
++
++#ifdef LDAP_R_COMPILE
++ ldap_pvt_thread_mutex_t ldo_mutex;
++#define LDAP_LDO_MUTEX_NULLARG, LDAP_PVT_MUTEX_NULL
++#else
++#define LDAP_LDO_MUTEX_NULLARG
++#endif
+ };
+
+
+@@ -422,19 +422,6 @@ struct ldap_common {
+ #define ld_requests ldc-ldc_requests
+ #define ld_responsesldc-ldc_responses
+
+-#ifdef LDAP_R_COMPILE
+- ldap_pvt_thread_mutex_t ldc_msgid_mutex;
+- ldap_pvt_thread_mutex_t ldc_conn_mutex;
+- ldap_pvt_thread_mutex_t ldc_req_mutex;
+- ldap_pvt_thread_mutex_t ldc_res_mutex;
+- ldap_pvt_thread_mutex_t ldc_abandon_mutex;
+-#define ld_msgid_mutex ldc-ldc_msgid_mutex
+-#define ld_conn_mutex ldc-ldc_conn_mutex
+-#define ld_req_mutex
[arch-commits] Commit in openldap/trunk (PKGBUILD mutex-end-of-struct-sigsegv.patch)
Date: Tuesday, January 24, 2012 @ 19:02:29
Author: dan
Revision: 147238
Revised fix for upstream SIGSEGV issues
Modified:
openldap/trunk/PKGBUILD
openldap/trunk/mutex-end-of-struct-sigsegv.patch
---+
PKGBUILD |2
mutex-end-of-struct-sigsegv.patch | 312 ++--
2 files changed, 261 insertions(+), 53 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 23:42:32 UTC (rev 147237)
+++ PKGBUILD2012-01-25 00:02:29 UTC (rev 147238)
@@ -17,7 +17,7 @@
'bd1ea19256d3d467f1f803e0f4046ef50f17628f'
'd89b8a533045123f1ab46c9c430cf132d58a20a4'
'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef'
- '7ca90dbe53c4207a2dee976359b8c6663e582d00')
+ '694269dad78c7a806649c2d7f57bb7e503df3af1')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
Modified: mutex-end-of-struct-sigsegv.patch
===
--- mutex-end-of-struct-sigsegv.patch 2012-01-24 23:42:32 UTC (rev 147237)
+++ mutex-end-of-struct-sigsegv.patch 2012-01-25 00:02:29 UTC (rev 147238)
@@ -1,18 +1,31 @@
-From 270ef33acf18dc13bfd07f8a8e66b446f80e7d27 Mon Sep 17 00:00:00 2001
-From: Howard Chu h...@openldap.org
-Date: Tue, 24 Jan 2012 13:32:52 -0800
-Subject: [PATCH 1/1] ITS#7118, #7133 tentative fix
+ libraries/libldap/init.c |8 ++-
+ libraries/libldap/ldap-int.h | 198 ++
+ 2 files changed, 110 insertions(+), 96 deletions(-)
-Move mutexes to end of structs, so libldap can ignore them
- libraries/libldap/ldap-int.h | 40
- 1 files changed, 20 insertions(+), 20 deletions(-)
-
+diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
+index 39292d2..9d37e64 100644
+--- a/libraries/libldap/init.c
b/libraries/libldap/init.c
+@@ -36,7 +36,13 @@
+ #include lutil.h
+
+ struct ldapoptions ldap_int_global_options =
+- { LDAP_UNINITIALIZED, LDAP_DEBUG_NONE LDAP_LDO_MUTEX_NULLARG };
++ { LDAP_UNINITIALIZED, LDAP_DEBUG_NONE
++ LDAP_LDO_NULLARG
++ LDAP_LDO_CONNECTIONLESS_NULLARG
++ LDAP_LDO_TLS_NULLARG
++ LDAP_LDO_SASL_NULLARG
++ LDAP_LDO_GSSAPI_NULLARG
++ LDAP_LDO_MUTEX_NULLARG };
+
+ #define ATTR_NONE 0
+ #define ATTR_BOOL 1
diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
-index f8e6126..6b33bcd 100644
+index f8e6126..ac6c9e5 100644
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
-@@ -185,13 +185,6 @@ struct ldapoptions {
+@@ -185,29 +185,59 @@ struct ldapoptions {
#define LDAP_TRASHED_SESSION 0xFF
int ldo_debug;
@@ -22,15 +35,136 @@
-#else
-#define LDAP_LDO_MUTEX_NULLARG
-#endif
--
++ ber_int_t ldo_version;
++ ber_int_t ldo_deref;
++ ber_int_t ldo_timelimit;
++ ber_int_t ldo_sizelimit;
++
++ /* per API call timeout */
++ struct timeval ldo_tm_api;
++ struct timeval ldo_tm_net;
++
++ LDAPURLDesc *ldo_defludp;
++ int ldo_defport;
++ char* ldo_defbase;
++ char* ldo_defbinddn; /* bind dn */
++
++ /*
++ * Per connection tcp-keepalive settings (Linux only,
++ * ignored where unsupported)
++ */
++ ber_int_t ldo_keepalive_idle;
++ ber_int_t ldo_keepalive_probes;
++ ber_int_t ldo_keepalive_interval;
++
++ int ldo_refhoplimit;/* limit on referral nesting */
++
++ /* LDAPv3 server and client controls */
++ LDAPControl **ldo_sctrls;
++ LDAPControl **ldo_cctrls;
++
++ /* LDAP rebind callback function */
++ LDAP_REBIND_PROC *ldo_rebind_proc;
++ void *ldo_rebind_params;
++ LDAP_NEXTREF_PROC *ldo_nextref_proc;
++ void *ldo_nextref_params;
++ LDAP_URLLIST_PROC *ldo_urllist_proc;
++ void *ldo_urllist_params;
++
++ /* LDAP connection callback stack */
++ ldaplist *ldo_conn_cbs;
++
++ LDAP_BOOLEANS ldo_booleans; /* boolean options */
++
++#define LDAP_LDO_NULLARG ,0,0,0,0 ,{0},{0} ,0,0,0,0, 0,0,0,0, 0,0,
0,0,0,0,0,0, 0, 0
+
#ifdef LDAP_CONNECTIONLESS
#define LDAP_IS_UDP(ld) ((ld)-ld_options.ldo_is_udp)
void* ldo_peer; /* struct sockaddr* */
-@@ -281,6 +274,13 @@ struct ldapoptions {
- ldaplist *ldo_conn_cbs;
+ char* ldo_cldapdn;
+ int ldo_is_udp;
++#define LDAP_LDO_CONNECTIONLESS_NULLARG ,0,0,0
++#else
++#define LDAP_LDO_CONNECTIONLESS_NULLARG
+ #endif
- LDAP_BOOLEANS ldo_booleans; /* boolean options */
-+
+- /* per API call timeout */
+- struct timeval ldo_tm_api;
+- struct timeval ldo_tm_net;
+-
+-
[arch-commits] Commit in systemd/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 20:22:02
Author: dreisner
Revision: 147239
upgpkg: systemd 39-1
Modified:
systemd/trunk/PKGBUILD
--+
PKGBUILD | 18 +-
1 file changed, 5 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-25 00:02:29 UTC (rev 147238)
+++ PKGBUILD2012-01-25 01:22:02 UTC (rev 147239)
@@ -2,8 +2,8 @@
# Maintainer: Dave Reisner dreis...@archlinux.org
pkgname=systemd
-pkgver=38
-pkgrel=3
+pkgver=39
+pkgrel=1
pkgdesc=Session and Startup manager
arch=('i686' 'x86_64')
url=http://www.freedesktop.org/wiki/Software/systemd;
@@ -16,7 +16,6 @@
'initscripts-systemd: native boot and initialization scripts'
'python2-cairo: systemd-analyze'
'systemd-arch-units: collection of native unit files for Arch
daemon/init scripts')
-groups=('systemd')
options=('!libtool')
backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
etc/dbus-1/system.d/org.freedesktop.hostname1.conf
@@ -28,13 +27,9 @@
etc/systemd/systemd-logind.conf)
install=systemd.install
source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz;
-os-release
-'0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch'
-'0001-units-make-sure-syslog-socket-goes-away-early-during.patch')
-md5sums=('68c66dce5a28c0efd7c210af5d11efed'
- '752636def0db3c03f121f8b4f44a63cd'
- '07437e70be65ef14fd4f13c5ec5bd1fe'
- 'c567ce597f68c07b9bc5b7e835f80f7d')
+os-release)
+md5sums=('7179b34f6f6553d2a36551ac1dec5f0d'
+ '752636def0db3c03f121f8b4f44a63cd')
build() {
cd $pkgname-$pkgver
@@ -44,9 +39,6 @@
sed -i -e '/^Environ.*LANG/s/^/#/' \
-e '/^ExecStart/s/agetty/ -8/' units/getty@.service.m4
- patch -Np1
$srcdir/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
- patch -Np1
$srcdir/0001-units-make-sure-syslog-socket-goes-away-early-during.patch
-
./configure --sysconfdir=/etc \
--libexecdir=/usr/lib \
--libdir=/usr/lib \
[arch-commits] Commit in systemd/repos (20 files)
Date: Tuesday, January 24, 2012 @ 20:22:21
Author: dreisner
Revision: 147240
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
systemd/repos/testing-i686/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
(from rev 147239,
systemd/trunk/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch)
systemd/repos/testing-i686/0001-units-make-sure-syslog-socket-goes-away-early-during.patch
(from rev 147239,
systemd/trunk/0001-units-make-sure-syslog-socket-goes-away-early-during.patch)
systemd/repos/testing-i686/PKGBUILD
(from rev 147239, systemd/trunk/PKGBUILD)
systemd/repos/testing-i686/os-release
(from rev 147239, systemd/trunk/os-release)
systemd/repos/testing-i686/systemd.install
(from rev 147239, systemd/trunk/systemd.install)
systemd/repos/testing-x86_64/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
(from rev 147239,
systemd/trunk/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch)
systemd/repos/testing-x86_64/0001-units-make-sure-syslog-socket-goes-away-early-during.patch
(from rev 147239,
systemd/trunk/0001-units-make-sure-syslog-socket-goes-away-early-during.patch)
systemd/repos/testing-x86_64/PKGBUILD
(from rev 147239, systemd/trunk/PKGBUILD)
systemd/repos/testing-x86_64/os-release
(from rev 147239, systemd/trunk/os-release)
systemd/repos/testing-x86_64/systemd.install
(from rev 147239, systemd/trunk/systemd.install)
Deleted:
systemd/repos/testing-i686/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
systemd/repos/testing-i686/0001-units-make-sure-syslog-socket-goes-away-early-during.patch
systemd/repos/testing-i686/PKGBUILD
systemd/repos/testing-i686/os-release
systemd/repos/testing-i686/systemd.install
systemd/repos/testing-x86_64/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
systemd/repos/testing-x86_64/0001-units-make-sure-syslog-socket-goes-away-early-during.patch
systemd/repos/testing-x86_64/PKGBUILD
systemd/repos/testing-x86_64/os-release
systemd/repos/testing-x86_64/systemd.install
+
testing-i686/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
| 174 +-
testing-i686/0001-units-make-sure-syslog-socket-goes-away-early-during.patch
| 52 +-
testing-i686/PKGBUILD
| 166 -
testing-i686/os-release
| 10
testing-i686/systemd.install
| 106 +++---
testing-x86_64/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
| 174 +-
testing-x86_64/0001-units-make-sure-syslog-socket-goes-away-early-during.patch
| 52 +-
testing-x86_64/PKGBUILD
| 166 -
testing-x86_64/os-release
| 10
testing-x86_64/systemd.install
| 106 +++---
10 files changed, 500 insertions(+), 516 deletions(-)
Deleted:
testing-i686/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
===
---
testing-i686/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
2012-01-25 01:22:02 UTC (rev 147239)
+++
testing-i686/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
2012-01-25 01:22:21 UTC (rev 147240)
@@ -1,87 +0,0 @@
-From fdcad0c25579a60061b1fda956686e878a80faef Mon Sep 17 00:00:00 2001
-From: Lennart Poettering lenn...@poettering.net
-Date: Wed, 11 Jan 2012 22:07:35 +0100
-Subject: [PATCH] tmpfiles: fix parsing of /proc/net/unix on 32Bit machines
-
-Tracked down by Michael Meeks
- src/tmpfiles.c | 30 --
- 1 files changed, 20 insertions(+), 10 deletions(-)
-
-diff --git a/src/tmpfiles.c b/src/tmpfiles.c
-index 19a7c08..44e5c9d 100644
a/src/tmpfiles.c
-+++ b/src/tmpfiles.c
-@@ -117,41 +117,50 @@ static void load_unix_sockets(void) {
- /* We maintain a cache of the sockets we found in
- * /proc/net/unix to speed things up a little. */
-
--if (!(unix_sockets = set_new(string_hash_func, string_compare_func)))
-+unix_sockets = set_new(string_hash_func, string_compare_func);
-+if (!unix_sockets)
- return;
-
--if (!(f = fopen(/proc/net/unix, re)))
-+f = fopen(/proc/net/unix, re);
-+if (!f)
- return;
-
--if (!(fgets(line, sizeof(line), f)))
-+/* Skip header */
-+if (!fgets(line, sizeof(line), f))
- goto fail;
-
- for (;;) {
- char *p, *s;
- int k;
-
--if (!(fgets(line, sizeof(line), f)))
-+if (!fgets(line,
[arch-commits] Commit in time/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 20:42:41
Author: stephane
Revision: 147241
upgpkg: time 1.7-6
signed rebuild
Modified:
time/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-25 01:22:21 UTC (rev 147240)
+++ PKGBUILD2012-01-25 01:42:41 UTC (rev 147241)
@@ -5,7 +5,7 @@
pkgname=time
pkgver=1.7
-pkgrel=5
+pkgrel=6
pkgdesc=Utility for monitoring a program's use of system resources
arch=('i686' 'x86_64')
url=http://www.gnu.org/directory/time.html;
[arch-commits] Commit in time/repos (16 files)
Date: Tuesday, January 24, 2012 @ 20:42:55
Author: stephane
Revision: 147242
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
time/repos/extra-i686/PKGBUILD
(from rev 147241, time/trunk/PKGBUILD)
time/repos/extra-i686/time-1.7-Recompute-CPU-usage-at-microsecond-level.patch
(from rev 147241,
time/trunk/time-1.7-Recompute-CPU-usage-at-microsecond-level.patch)
time/repos/extra-i686/time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch
(from rev 147241,
time/trunk/time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch)
time/repos/extra-i686/time.install
(from rev 147241, time/trunk/time.install)
time/repos/extra-x86_64/PKGBUILD
(from rev 147241, time/trunk/PKGBUILD)
time/repos/extra-x86_64/time-1.7-Recompute-CPU-usage-at-microsecond-level.patch
(from rev 147241,
time/trunk/time-1.7-Recompute-CPU-usage-at-microsecond-level.patch)
time/repos/extra-x86_64/time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch
(from rev 147241,
time/trunk/time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch)
time/repos/extra-x86_64/time.install
(from rev 147241, time/trunk/time.install)
Deleted:
time/repos/extra-i686/PKGBUILD
time/repos/extra-i686/time-1.7-Recompute-CPU-usage-at-microsecond-level.patch
time/repos/extra-i686/time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch
time/repos/extra-i686/time.install
time/repos/extra-x86_64/PKGBUILD
time/repos/extra-x86_64/time-1.7-Recompute-CPU-usage-at-microsecond-level.patch
time/repos/extra-x86_64/time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch
time/repos/extra-x86_64/time.install
--+
extra-i686/PKGBUILD | 80
++---
extra-i686/time-1.7-Recompute-CPU-usage-at-microsecond-level.patch | 144
+-
extra-i686/time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch | 64
++--
extra-i686/time.install | 40 +-
extra-x86_64/PKGBUILD| 80
++---
extra-x86_64/time-1.7-Recompute-CPU-usage-at-microsecond-level.patch | 144
+-
extra-x86_64/time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch | 64
++--
extra-x86_64/time.install| 40 +-
8 files changed, 328 insertions(+), 328 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-25 01:42:41 UTC (rev 147241)
+++ extra-i686/PKGBUILD 2012-01-25 01:42:55 UTC (rev 147242)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault steph...@archlinux.us
-# Contributor: Daniel J Griffiths ghost1...@archlinux.us
-# Contributor: damir da...@archlinux.org
-
-pkgname=time
-pkgver=1.7
-pkgrel=5
-pkgdesc=Utility for monitoring a program's use of system resources
-arch=('i686' 'x86_64')
-url=http://www.gnu.org/directory/time.html;
-license=('GPL')
-depends=('glibc')
-install=time.install
-source=(http://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
-time-1.7-Recompute-CPU-usage-at-microsecond-level.patch
-time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch)
-sha1sums=('dde0c28c7426960736933f3e763320680356cc6a'
- 'fff80e05dd41f0a59bb1f49d1c6e581d5e8e92e5'
- 'b2a909e1d92f7af1bc99a4524ad84d467ed79a06')
-
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # cf https://bugzilla.redhat.com/show_bug.cgi?id=527276
- patch -Np1 -i ../time-1.7-Recompute-CPU-usage-at-microsecond-level.patch
-
- # cf https://bugzilla.redhat.com/show_bug.cgi?id=702826
- patch -Np1 -i ../time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch
-
- ./configure --prefix=/usr --infodir=/usr/share/info
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- make exec_prefix=${pkgdir}/usr infodir=${pkgdir}/usr/share/info
install
-}
Copied: time/repos/extra-i686/PKGBUILD (from rev 147241, time/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-25 01:42:55 UTC (rev 147242)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault steph...@archlinux.us
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: damir da...@archlinux.org
+
+pkgname=time
+pkgver=1.7
+pkgrel=6
+pkgdesc=Utility for monitoring a program's use of system resources
+arch=('i686' 'x86_64')
+url=http://www.gnu.org/directory/time.html;
+license=('GPL')
+depends=('glibc')
+install=time.install
+source=(http://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
+time-1.7-Recompute-CPU-usage-at-microsecond-level.patch
+time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch)
+sha1sums=('dde0c28c7426960736933f3e763320680356cc6a'
+ 'fff80e05dd41f0a59bb1f49d1c6e581d5e8e92e5'
+ 'b2a909e1d92f7af1bc99a4524ad84d467ed79a06')
+
+
[arch-commits] Commit in python-egenix-mx-base/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 21:06:50
Author: stephane
Revision: 147243
upgpkg: python-egenix-mx-base 3.2.2-1
upstream update
Modified:
python-egenix-mx-base/trunk/PKGBUILD
--+
PKGBUILD |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-25 01:42:55 UTC (rev 147242)
+++ PKGBUILD2012-01-25 02:06:50 UTC (rev 147243)
@@ -4,18 +4,17 @@
pkgname=python-egenix-mx-base
_origname=egenix-mx-base
-pkgver=3.2.1
+pkgver=3.2.2
pkgrel=1
pkgdesc=A collection of Python tools
arch=('i686' 'x86_64')
license=('custom')
url=http://www.egenix.com/products/python/mxBase/;
depends=('python2')
-makedepends=('python2-distribute')
replaces=('egenix-mx-base')
provides=('egenix-mx-base')
source=(http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz;)
-sha1sums=('a82f7f155ea92f26f40a6a3bf9160bfac7c52a00')
+sha1sums=('9faaf608a29b80d9a8daf16b8b3578e896b6395b')
build() {
cd ${srcdir}/${_origname}-${pkgver}
[arch-commits] Commit in python-egenix-mx-base/repos (4 files)
Date: Tuesday, January 24, 2012 @ 21:07:03
Author: stephane
Revision: 147244
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
python-egenix-mx-base/repos/extra-i686/PKGBUILD
(from rev 147243, python-egenix-mx-base/trunk/PKGBUILD)
python-egenix-mx-base/repos/extra-x86_64/PKGBUILD
(from rev 147243, python-egenix-mx-base/trunk/PKGBUILD)
Deleted:
python-egenix-mx-base/repos/extra-i686/PKGBUILD
python-egenix-mx-base/repos/extra-x86_64/PKGBUILD
---+
extra-i686/PKGBUILD | 65 +++-
extra-x86_64/PKGBUILD | 65 +++-
2 files changed, 64 insertions(+), 66 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-25 02:06:50 UTC (rev 147243)
+++ extra-i686/PKGBUILD 2012-01-25 02:07:03 UTC (rev 147244)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault steph...@archlinux.org
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-
-pkgname=python-egenix-mx-base
-_origname=egenix-mx-base
-pkgver=3.2.1
-pkgrel=1
-pkgdesc=A collection of Python tools
-arch=('i686' 'x86_64')
-license=('custom')
-url=http://www.egenix.com/products/python/mxBase/;
-depends=('python2')
-makedepends=('python2-distribute')
-replaces=('egenix-mx-base')
-provides=('egenix-mx-base')
-source=(http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz;)
-sha1sums=('a82f7f155ea92f26f40a6a3bf9160bfac7c52a00')
-
-build() {
- cd ${srcdir}/${_origname}-${pkgver}
-
- find . -name \*.py -exec sed -i -e s|#!/usr/bin/env python|#!/usr/bin/env
python2| \
- -e s|#!/usr/local/.*python.*|#!/usr/bin/env
python2| {} \;
-
- python2 setup.py build
-}
-
-package() {
- cd ${srcdir}/${_origname}-${pkgver}
- python2 setup.py install --root=${pkgdir} --skip-build --optimize=1
- install -D -m644 COPYRIGHT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
Copied: python-egenix-mx-base/repos/extra-i686/PKGBUILD (from rev 147243,
python-egenix-mx-base/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-25 02:07:03 UTC (rev 147244)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault steph...@archlinux.org
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+
+pkgname=python-egenix-mx-base
+_origname=egenix-mx-base
+pkgver=3.2.2
+pkgrel=1
+pkgdesc=A collection of Python tools
+arch=('i686' 'x86_64')
+license=('custom')
+url=http://www.egenix.com/products/python/mxBase/;
+depends=('python2')
+replaces=('egenix-mx-base')
+provides=('egenix-mx-base')
+source=(http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz;)
+sha1sums=('9faaf608a29b80d9a8daf16b8b3578e896b6395b')
+
+build() {
+ cd ${srcdir}/${_origname}-${pkgver}
+
+ find . -name \*.py -exec sed -i -e s|#!/usr/bin/env python|#!/usr/bin/env
python2| \
+ -e s|#!/usr/local/.*python.*|#!/usr/bin/env
python2| {} \;
+
+ python2 setup.py build
+}
+
+package() {
+ cd ${srcdir}/${_origname}-${pkgver}
+ python2 setup.py install --root=${pkgdir} --skip-build --optimize=1
+ install -D -m644 COPYRIGHT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2012-01-25 02:06:50 UTC (rev 147243)
+++ extra-x86_64/PKGBUILD 2012-01-25 02:07:03 UTC (rev 147244)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault steph...@archlinux.org
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-
-pkgname=python-egenix-mx-base
-_origname=egenix-mx-base
-pkgver=3.2.1
-pkgrel=1
-pkgdesc=A collection of Python tools
-arch=('i686' 'x86_64')
-license=('custom')
-url=http://www.egenix.com/products/python/mxBase/;
-depends=('python2')
-makedepends=('python2-distribute')
-replaces=('egenix-mx-base')
-provides=('egenix-mx-base')
-source=(http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz;)
-sha1sums=('a82f7f155ea92f26f40a6a3bf9160bfac7c52a00')
-
-build() {
- cd ${srcdir}/${_origname}-${pkgver}
-
- find . -name \*.py -exec sed -i -e s|#!/usr/bin/env python|#!/usr/bin/env
python2| \
- -e s|#!/usr/local/.*python.*|#!/usr/bin/env
python2| {} \;
-
- python2 setup.py build
-}
-
-package() {
- cd ${srcdir}/${_origname}-${pkgver}
- python2 setup.py install --root=${pkgdir} --skip-build --optimize=1
- install -D -m644 COPYRIGHT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
Copied: python-egenix-mx-base/repos/extra-x86_64/PKGBUILD (from rev 147243,
python-egenix-mx-base/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-01-25 02:07:03 UTC (rev
[arch-commits] Commit in sane/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 21:31:05
Author: eric
Revision: 147245
upgpkg: sane 1.0.22-5
Rebuild against libpng 1.5 and libtiff 4.0
Modified:
sane/trunk/PKGBUILD
--+
PKGBUILD | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-25 02:07:03 UTC (rev 147244)
+++ PKGBUILD2012-01-25 02:31:05 UTC (rev 147245)
@@ -6,12 +6,12 @@
pkgname=sane
pkgver=1.0.22
-pkgrel=4
+pkgrel=5
pkgdesc=Scanner Access Now Easy
url=http://www.sane-project.org/;
arch=('i686' 'x86_64')
license=('GPL')
-depends=('libtiff=3.9.2-2' 'libgphoto2=2.4.7-2' 'libjpeg=8' 'libieee1284'
'libusb-compat' 'v4l-utils' 'avahi' 'bash')
+depends=('libtiff=4.0.0' 'libgphoto2=2.4.7-2' 'libjpeg=8' 'libieee1284'
'libusb-compat' 'v4l-utils' 'avahi' 'bash')
makedepends=('texlive-latexextra')
install=$pkgname.install
backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf}
etc/xinetd.d/sane)
@@ -19,6 +19,10 @@
'sane.xinetd'
'libv4l-0.8.3.patch'
'xerox_mfp_fix_usb_devices.patch')
+md5sums=('fadf56a60f4776bfb24491f66b617cf5'
+ 'da946cc36fb83612162cf9505986d4b2'
+ 'e645a8921cff9f18ffbdabb2ed885060'
+ 'cfef73e7db7c28308914d3db6767d852')
options=(!libtool)
build() {
@@ -46,12 +50,8 @@
install -D -m0644 tools/udev/libsane.rules \
${pkgdir}/lib/udev/rules.d/53-sane.rules
# fix udev rules
- sed -i 's|NAME=%k, ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules
+ sed -i 's|NAME=%k, ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules
# install xinetd file
install -D -m644 ${srcdir}/sane.xinetd ${pkgdir}/etc/xinetd.d/sane
}
-md5sums=('fadf56a60f4776bfb24491f66b617cf5'
- 'da946cc36fb83612162cf9505986d4b2'
- 'e645a8921cff9f18ffbdabb2ed885060'
- 'cfef73e7db7c28308914d3db6767d852')
[arch-commits] Commit in sane/repos (12 files)
Date: Tuesday, January 24, 2012 @ 21:31:45
Author: eric
Revision: 147246
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
sane/repos/staging-i686/
sane/repos/staging-i686/PKGBUILD
(from rev 147245, sane/trunk/PKGBUILD)
sane/repos/staging-i686/libv4l-0.8.3.patch
(from rev 147245, sane/trunk/libv4l-0.8.3.patch)
sane/repos/staging-i686/sane.install
(from rev 147245, sane/trunk/sane.install)
sane/repos/staging-i686/sane.xinetd
(from rev 147245, sane/trunk/sane.xinetd)
sane/repos/staging-i686/xerox_mfp_fix_usb_devices.patch
(from rev 147245, sane/trunk/xerox_mfp_fix_usb_devices.patch)
sane/repos/staging-x86_64/
sane/repos/staging-x86_64/PKGBUILD
(from rev 147245, sane/trunk/PKGBUILD)
sane/repos/staging-x86_64/libv4l-0.8.3.patch
(from rev 147245, sane/trunk/libv4l-0.8.3.patch)
sane/repos/staging-x86_64/sane.install
(from rev 147245, sane/trunk/sane.install)
sane/repos/staging-x86_64/sane.xinetd
(from rev 147245, sane/trunk/sane.xinetd)
sane/repos/staging-x86_64/xerox_mfp_fix_usb_devices.patch
(from rev 147245, sane/trunk/xerox_mfp_fix_usb_devices.patch)
+
staging-i686/PKGBUILD | 57 +++
staging-i686/libv4l-0.8.3.patch| 64 +
staging-i686/sane.install |7 ++
staging-i686/sane.xinetd | 11 +++
staging-i686/xerox_mfp_fix_usb_devices.patch | 67 +++
staging-x86_64/PKGBUILD| 57 +++
staging-x86_64/libv4l-0.8.3.patch | 64 +
staging-x86_64/sane.install|7 ++
staging-x86_64/sane.xinetd | 11 +++
staging-x86_64/xerox_mfp_fix_usb_devices.patch | 67 +++
10 files changed, 412 insertions(+)
Copied: sane/repos/staging-i686/PKGBUILD (from rev 147245, sane/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-25 02:31:45 UTC (rev 147246)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+# Contributor: Sarah Hay sarah...@mb.sympatico.ca
+# Contributor: Simo L. neot...@yahoo.com
+# Contributor: eric e...@archlinux.org
+
+pkgname=sane
+pkgver=1.0.22
+pkgrel=5
+pkgdesc=Scanner Access Now Easy
+url=http://www.sane-project.org/;
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libtiff=4.0.0' 'libgphoto2=2.4.7-2' 'libjpeg=8' 'libieee1284'
'libusb-compat' 'v4l-utils' 'avahi' 'bash')
+makedepends=('texlive-latexextra')
+install=$pkgname.install
+backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf}
etc/xinetd.d/sane)
+source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz
+'sane.xinetd'
+'libv4l-0.8.3.patch'
+'xerox_mfp_fix_usb_devices.patch')
+md5sums=('fadf56a60f4776bfb24491f66b617cf5'
+ 'da946cc36fb83612162cf9505986d4b2'
+ 'e645a8921cff9f18ffbdabb2ed885060'
+ 'cfef73e7db7c28308914d3db6767d852')
+options=(!libtool)
+
+build() {
+ cd ${srcdir}/${pkgname}-backends-${pkgver}
+
+ patch -p1 -i ${srcdir}/libv4l-0.8.3.patch
+ # fix https://bugs.archlinux.org/task/26114
+ patch -Np1 -i ${srcdir}/xerox_mfp_fix_usb_devices.patch
+
+ ./configure --prefix=/usr \
+--sysconfdir=/etc \
+--localstatedir=/var \
+--with-docdir=/usr/share/doc/sane \
+--enable-avahi \
+--disable-locking
+ make
+}
+
+package () {
+ cd ${srcdir}/${pkgname}-backends-${pkgver}
+ make DESTDIR=${pkgdir} install
+ # fix hp officejets
+ echo #hpaio ${pkgdir}/etc/sane.d/dll.conf
+ # install udev files
+ install -D -m0644 tools/udev/libsane.rules \
+${pkgdir}/lib/udev/rules.d/53-sane.rules
+ # fix udev rules
+ sed -i 's|NAME=%k, ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules
+
+ # install xinetd file
+ install -D -m644 ${srcdir}/sane.xinetd ${pkgdir}/etc/xinetd.d/sane
+}
[arch-commits] Commit in evince/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 21:33:21
Author: eric
Revision: 147247
upgpkg: evince 3.2.1-3
Rebuild against libpng 1.5 and libtiff 4.0
Modified:
evince/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-25 02:31:45 UTC (rev 147246)
+++ PKGBUILD2012-01-25 02:33:21 UTC (rev 147247)
@@ -3,7 +3,7 @@
pkgname=evince
pkgver=3.2.1
-pkgrel=2
+pkgrel=3
pkgdesc=Simply a document viewer
url=http://projects.gnome.org/evince/;
arch=('i686' 'x86_64')
[arch-commits] Commit in evince/repos (6 files)
Date: Tuesday, January 24, 2012 @ 21:33:36
Author: eric
Revision: 147248
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
evince/repos/staging-i686/
evince/repos/staging-i686/PKGBUILD
(from rev 147247, evince/trunk/PKGBUILD)
evince/repos/staging-i686/evince.install
(from rev 147247, evince/trunk/evince.install)
evince/repos/staging-x86_64/
evince/repos/staging-x86_64/PKGBUILD
(from rev 147247, evince/trunk/PKGBUILD)
evince/repos/staging-x86_64/evince.install
(from rev 147247, evince/trunk/evince.install)
---+
staging-i686/PKGBUILD | 36
staging-i686/evince.install | 19 +++
staging-x86_64/PKGBUILD | 36
staging-x86_64/evince.install | 19 +++
4 files changed, 110 insertions(+)
Copied: evince/repos/staging-i686/PKGBUILD (from rev 147247,
evince/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-25 02:33:36 UTC (rev 147248)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=evince
+pkgver=3.2.1
+pkgrel=3
+pkgdesc=Simply a document viewer
+url=http://projects.gnome.org/evince/;
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre'
'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf'
'gsettings-desktop-schemas')
+makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool'
'gobject-introspection')
+optdepends=('texlive-bin: DVI support')
+groups=('gnome-extra')
+install=evince.install
+options=('!libtool' '!emptydirs')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var--libexecdir=/usr/lib/evince \
+ --disable-static--enable-nautilus \
+ --enable-pdf--enable-tiff \
+ --enable-djvu --enable-dvi \
+ --enable-t1lib --enable-comics \
+ --disable-scrollkeeper --disable-schemas-compile \
+ --enable-introspection
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
Copied: evince/repos/staging-i686/evince.install (from rev 147247,
evince/trunk/evince.install)
===
--- staging-i686/evince.install (rev 0)
+++ staging-i686/evince.install 2012-01-25 02:33:36 UTC (rev 147248)
@@ -0,0 +1,19 @@
+post_install() {
+ usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+ if (( $(vercmp $2 2.90.0) 0 )); then
+usr/sbin/gconfpkg --uninstall evince
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: evince/repos/staging-x86_64/PKGBUILD (from rev 147247,
evince/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-25 02:33:36 UTC (rev 147248)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=evince
+pkgver=3.2.1
+pkgrel=3
+pkgdesc=Simply a document viewer
+url=http://projects.gnome.org/evince/;
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre'
'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf'
'gsettings-desktop-schemas')
+makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool'
'gobject-introspection')
+optdepends=('texlive-bin: DVI support')
+groups=('gnome-extra')
+install=evince.install
+options=('!libtool' '!emptydirs')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var--libexecdir=/usr/lib/evince \
+ --disable-static--enable-nautilus \
+ --enable-pdf--enable-tiff \
+ --enable-djvu --enable-dvi \
+ --enable-t1lib --enable-comics \
+ --disable-scrollkeeper --disable-schemas-compile \
+ --enable-introspection
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
Copied: evince/repos/staging-x86_64/evince.install (from rev 147247,
evince/trunk/evince.install)
[arch-commits] Commit in libarchive/trunk (3 files)
Date: Tuesday, January 24, 2012 @ 22:21:19
Author: dreisner
Revision: 147249
upgpkg: libarchive 3.0.3-3
- backport patches to fix FS#28066
- remove make check hack, tests all pass
Added:
libarchive/trunk/interpret-non-posix-zips.patch
libarchive/trunk/test-with-zip-mtime.patch
Modified:
libarchive/trunk/PKGBUILD
+
PKGBUILD | 24 -
interpret-non-posix-zips.patch | 165 +++
test-with-zip-mtime.patch | 23 +
3 files changed, 206 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-25 02:33:36 UTC (rev 147248)
+++ PKGBUILD2012-01-25 03:21:19 UTC (rev 147249)
@@ -1,16 +1,23 @@
# $Id$
# Maintainer: Dan McGee d...@archlinux.org
+
pkgname=libarchive
pkgver=3.0.3
-pkgrel=2
+pkgrel=3
pkgdesc=library that can create and read several streaming archive formats
arch=('i686' 'x86_64')
url=http://libarchive.googlecode.com/;
license=('BSD')
depends=('zlib' 'bzip2' 'xz=5.0.0' 'acl' 'openssl=1.0.0' 'expat')
-source=(http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz;)
-md5sums=('ca4090f0099432a9ac5a8b6618dc3892')
-sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7')
+source=(http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz;
+'interpret-non-posix-zips.patch'
+'test-with-zip-mtime.patch')
+md5sums=('ca4090f0099432a9ac5a8b6618dc3892'
+ 'f02b88eb10877c7a7d527ed89c662e44'
+ '8366def6d7d70d424fa28a986c78c015')
+sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7'
+'9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc'
+'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f')
# keep an upgrade path for older installations
PKGEXT='.pkg.tar.gz'
@@ -18,6 +25,12 @@
build() {
cd $srcdir/$pkgname-$pkgver
+ # http://code.google.com/p/libarchive/issues/detail?id=225
+ patch -Np0 $srcdir/interpret-non-posix-zips.patch
+
+ # http://code.google.com/p/libarchive/issues/detail?id=231
+ patch -Np0 $srcdir/test-with-zip-mtime.patch
+
./configure --prefix=/usr --without-xml2
make
}
@@ -25,8 +38,7 @@
check() {
cd $srcdir/$pkgname-$pkgver
- # currently fails on i686 in a minor test involving atime updates (#60)
- make check || :
+ make check
}
package() {
Added: interpret-non-posix-zips.patch
===
--- interpret-non-posix-zips.patch (rev 0)
+++ interpret-non-posix-zips.patch 2012-01-25 03:21:19 UTC (rev 147249)
@@ -0,0 +1,165 @@
+Index: libarchive/archive_read_support_format_zip.c
+===
+--- libarchive/archive_read_support_format_zip.c (revision 4189)
libarchive/archive_read_support_format_zip.c (revision 4190)
+@@ -217,14 +217,13 @@
+ }
+
+ /*
+- * TODO: This is a performance sink because it forces
+- * the read core to drop buffered data from the start
+- * of file, which will then have to be re-read again
+- * if this bidder loses.
++ * TODO: This is a performance sink because it forces the read core to
++ * drop buffered data from the start of file, which will then have to
++ * be re-read again if this bidder loses.
+ *
+- * Consider passing in the winning bid value to subsequent
+- * bidders so that this bidder in particular can avoid
+- * seeking if it knows it's going to lose anyway.
++ * We workaround this a little by passing in the best bid so far so
++ * that later bidders can do nothing if they know they'll never
++ * outbid. But we can certainly do better...
+ */
+ static int
+ archive_read_format_zip_seekable_bid(struct archive_read *a, int best_bid)
+@@ -311,19 +310,29 @@
+ external_attributes = archive_le32dec(p + 38);
+ zip_entry-local_header_offset = archive_le32dec(p + 42);
+
++ /* If we can't guess the mode, leave it zero here;
++ when we read the local file header we might get
++ more information. */
++ zip_entry-mode = 0;
+ if (zip_entry-system == 3) {
+ zip_entry-mode = external_attributes 16;
+- } else {
+- zip_entry-mode = AE_IFREG | 0777;
+ }
+
+- /* Do we need to parse filename here? */
+- /* Or can we wait until we read the local header? */
++ /* We don't read the filename until we get to the
++ local file header. Reading it here would speed up
++ table-of-contents operations (removing the need to
++ find and read local file header to get the
++ filename) at the cost of requiring a lot of extra
++ space. */
++ /* We don't
[arch-commits] Commit in libarchive/repos (8 files)
Date: Tuesday, January 24, 2012 @ 22:21:31
Author: dreisner
Revision: 147250
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
libarchive/repos/testing-i686/
libarchive/repos/testing-i686/PKGBUILD
(from rev 147249, libarchive/trunk/PKGBUILD)
libarchive/repos/testing-i686/interpret-non-posix-zips.patch
(from rev 147249, libarchive/trunk/interpret-non-posix-zips.patch)
libarchive/repos/testing-i686/test-with-zip-mtime.patch
(from rev 147249, libarchive/trunk/test-with-zip-mtime.patch)
libarchive/repos/testing-x86_64/
libarchive/repos/testing-x86_64/PKGBUILD
(from rev 147249, libarchive/trunk/PKGBUILD)
libarchive/repos/testing-x86_64/interpret-non-posix-zips.patch
(from rev 147249, libarchive/trunk/interpret-non-posix-zips.patch)
libarchive/repos/testing-x86_64/test-with-zip-mtime.patch
(from rev 147249, libarchive/trunk/test-with-zip-mtime.patch)
---+
testing-i686/PKGBUILD | 49 +++
testing-i686/interpret-non-posix-zips.patch | 165
testing-i686/test-with-zip-mtime.patch| 23 +++
testing-x86_64/PKGBUILD | 49 +++
testing-x86_64/interpret-non-posix-zips.patch | 165
testing-x86_64/test-with-zip-mtime.patch | 23 +++
6 files changed, 474 insertions(+)
Copied: libarchive/repos/testing-i686/PKGBUILD (from rev 147249,
libarchive/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-01-25 03:21:31 UTC (rev 147250)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+
+pkgname=libarchive
+pkgver=3.0.3
+pkgrel=3
+pkgdesc=library that can create and read several streaming archive formats
+arch=('i686' 'x86_64')
+url=http://libarchive.googlecode.com/;
+license=('BSD')
+depends=('zlib' 'bzip2' 'xz=5.0.0' 'acl' 'openssl=1.0.0' 'expat')
+source=(http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz;
+'interpret-non-posix-zips.patch'
+'test-with-zip-mtime.patch')
+md5sums=('ca4090f0099432a9ac5a8b6618dc3892'
+ 'f02b88eb10877c7a7d527ed89c662e44'
+ '8366def6d7d70d424fa28a986c78c015')
+sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7'
+'9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc'
+'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f')
+
+# keep an upgrade path for older installations
+PKGEXT='.pkg.tar.gz'
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # http://code.google.com/p/libarchive/issues/detail?id=225
+ patch -Np0 $srcdir/interpret-non-posix-zips.patch
+
+ # http://code.google.com/p/libarchive/issues/detail?id=231
+ patch -Np0 $srcdir/test-with-zip-mtime.patch
+
+ ./configure --prefix=/usr --without-xml2
+ make
+}
+
+check() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make check
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+
+ install -D -m644 COPYING $pkgdir/usr/share/licenses/libarchive/COPYING
+}
Copied: libarchive/repos/testing-i686/interpret-non-posix-zips.patch (from rev
147249, libarchive/trunk/interpret-non-posix-zips.patch)
===
--- testing-i686/interpret-non-posix-zips.patch (rev 0)
+++ testing-i686/interpret-non-posix-zips.patch 2012-01-25 03:21:31 UTC (rev
147250)
@@ -0,0 +1,165 @@
+Index: libarchive/archive_read_support_format_zip.c
+===
+--- libarchive/archive_read_support_format_zip.c (revision 4189)
libarchive/archive_read_support_format_zip.c (revision 4190)
+@@ -217,14 +217,13 @@
+ }
+
+ /*
+- * TODO: This is a performance sink because it forces
+- * the read core to drop buffered data from the start
+- * of file, which will then have to be re-read again
+- * if this bidder loses.
++ * TODO: This is a performance sink because it forces the read core to
++ * drop buffered data from the start of file, which will then have to
++ * be re-read again if this bidder loses.
+ *
+- * Consider passing in the winning bid value to subsequent
+- * bidders so that this bidder in particular can avoid
+- * seeking if it knows it's going to lose anyway.
++ * We workaround this a little by passing in the best bid so far so
++ * that later bidders can do nothing if they know they'll never
++ * outbid. But we can certainly do better...
+ */
+ static int
+ archive_read_format_zip_seekable_bid(struct archive_read *a, int best_bid)
+@@ -311,19 +310,29 @@
+ external_attributes = archive_le32dec(p + 38);
+ zip_entry-local_header_offset = archive_le32dec(p + 42);
+
++ /* If we can't guess the mode, leave it zero here;
++ when we read the local file
[arch-commits] Commit in xsane/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 22:21:46
Author: eric
Revision: 147251
upgpkg: xsane 0.998-2
Rebuild against libpng 1.5 and libtiff 4.0
Modified:
xsane/trunk/PKGBUILD
--+
PKGBUILD | 26 ++
1 file changed, 14 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-25 03:21:31 UTC (rev 147250)
+++ PKGBUILD2012-01-25 03:21:46 UTC (rev 147251)
@@ -5,42 +5,46 @@
pkgbase=xsane
pkgname=('xsane' 'xsane-gimp')
pkgver=0.998
-pkgrel=1
+pkgrel=2
arch=(i686 x86_64)
url=http://www.xsane.org;
license=('GPL2')
makedepends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg' 'gimp')
source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz
xsane-0.995-xdg-open.patch)
+md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa'
+ '15541ff0ddc10acfa2059cf99d5478eb')
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd $srcdir/$pkgbase-$pkgver
# fix use xdg-open instead of netscape to launch help browser - taken
from Fedora
- patch -Np1 -i ${srcdir}/xsane-0.995-xdg-open.patch || return 1
-
+ patch -Np1 -i ${srcdir}/xsane-0.995-xdg-open.patch
+ sed -i -e 's:png_ptr-jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c
+
./configure --prefix=/usr --mandir=/usr/share/man --enable-gimp
- /usr/bin/make || return 1
+ make
mv src/xsane src/xsane-gimp
# build again with gimp enabled
make clean
./configure --prefix=/usr --mandir=/usr/share/man --disable-gimp
+ make
}
package_xsane() {
pkgdesc=A GTK-based X11 frontend for SANE and plugin for Gimp.
install=$pkgname.install
depends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg')
- optdepends=('xsane-gimp; for gimp plugin support')
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install || return 1
+ optdepends=('xsane-gimp: for gimp plugin support')
+ cd $srcdir/$pkgbase-$pkgver
+ make DESTDIR=$pkgdir install
}
package_xsane-gimp() {
pkgdesc=XSane Gimp plugin
depends=('xsane' 'gimp')
- cd $srcdir/$pkgname-$pkgver
- install -D -m755 src/xsane-gimp ${pkgdir}/usr/bin/xsane-gimp || return 1
+ cd $srcdir/$pkgbase-$pkgver
+ install -D -m755 src/xsane-gimp ${pkgdir}/usr/bin/xsane-gimp
## For making Gimp Plugin available
/bin/mkdir -p $pkgdir/usr/lib/gimp/2.0/plug-ins
@@ -62,5 +66,3 @@
#115 fi
#116 fi
}
-md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa'
- '15541ff0ddc10acfa2059cf99d5478eb')
[arch-commits] Commit in xsane/repos (8 files)
Date: Tuesday, January 24, 2012 @ 22:22:07
Author: eric
Revision: 147252
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
xsane/repos/staging-i686/
xsane/repos/staging-i686/PKGBUILD
(from rev 147251, xsane/trunk/PKGBUILD)
xsane/repos/staging-i686/xsane-0.995-xdg-open.patch
(from rev 147251, xsane/trunk/xsane-0.995-xdg-open.patch)
xsane/repos/staging-i686/xsane.install
(from rev 147251, xsane/trunk/xsane.install)
xsane/repos/staging-x86_64/
xsane/repos/staging-x86_64/PKGBUILD
(from rev 147251, xsane/trunk/PKGBUILD)
xsane/repos/staging-x86_64/xsane-0.995-xdg-open.patch
(from rev 147251, xsane/trunk/xsane-0.995-xdg-open.patch)
xsane/repos/staging-x86_64/xsane.install
(from rev 147251, xsane/trunk/xsane.install)
---+
staging-i686/PKGBUILD | 68
staging-i686/xsane-0.995-xdg-open.patch | 12
staging-i686/xsane.install| 16 ++
staging-x86_64/PKGBUILD | 68
staging-x86_64/xsane-0.995-xdg-open.patch | 12
staging-x86_64/xsane.install | 16 ++
6 files changed, 192 insertions(+)
Copied: xsane/repos/staging-i686/PKGBUILD (from rev 147251,
xsane/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-25 03:22:07 UTC (rev 147252)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+# Contributor: Sarah Hay sarah...@mb.sympatico.ca
+
+pkgbase=xsane
+pkgname=('xsane' 'xsane-gimp')
+pkgver=0.998
+pkgrel=2
+arch=(i686 x86_64)
+url=http://www.xsane.org;
+license=('GPL2')
+makedepends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg' 'gimp')
+source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz
+ xsane-0.995-xdg-open.patch)
+md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa'
+ '15541ff0ddc10acfa2059cf99d5478eb')
+
+build() {
+ cd $srcdir/$pkgbase-$pkgver
+ # fix use xdg-open instead of netscape to launch help browser - taken
from Fedora
+ patch -Np1 -i ${srcdir}/xsane-0.995-xdg-open.patch
+ sed -i -e 's:png_ptr-jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c
+
+ ./configure --prefix=/usr --mandir=/usr/share/man --enable-gimp
+ make
+ mv src/xsane src/xsane-gimp
+
+ # build again with gimp enabled
+ make clean
+ ./configure --prefix=/usr --mandir=/usr/share/man --disable-gimp
+ make
+}
+
+package_xsane() {
+ pkgdesc=A GTK-based X11 frontend for SANE and plugin for Gimp.
+ install=$pkgname.install
+ depends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg')
+ optdepends=('xsane-gimp: for gimp plugin support')
+ cd $srcdir/$pkgbase-$pkgver
+ make DESTDIR=$pkgdir install
+}
+
+package_xsane-gimp() {
+ pkgdesc=XSane Gimp plugin
+ depends=('xsane' 'gimp')
+ cd $srcdir/$pkgbase-$pkgver
+ install -D -m755 src/xsane-gimp ${pkgdir}/usr/bin/xsane-gimp
+
+ ## For making Gimp Plugin available
+ /bin/mkdir -p $pkgdir/usr/lib/gimp/2.0/plug-ins
+ cd $pkgdir/usr/lib/gimp/2.0/plug-ins/
+ /bin/ln -s ../../../../bin/xsane-gimp xsane
+
+#
http://cvs.fedoraproject.org/viewvc/rpms/xsane/devel/xsane.spec?revision=1.80view=markup
+# when makepkg will allow splitted pkg install file support we might change
add a xsane-gimp.install file with the commands that are used by fedora,
+# gentoo has something similar
+#%post gimp
+#107 if [ -x %{_sbindir}/gimp-plugin-mgr ]; then
+#108 %{_sbindir}/gimp-plugin-mgr --install xsane
+#109 fi
+#110
+#111 %preun gimp
+#112 if [ $1 = 0 ]; then
+#113 if [ -x %{_sbindir}/gimp-plugin-mgr ]; then
+#114 %{_sbindir}/gimp-plugin-mgr --uninstall xsane
+#115 fi
+#116 fi
+}
Copied: xsane/repos/staging-i686/xsane-0.995-xdg-open.patch (from rev 147251,
xsane/trunk/xsane-0.995-xdg-open.patch)
===
--- staging-i686/xsane-0.995-xdg-open.patch (rev 0)
+++ staging-i686/xsane-0.995-xdg-open.patch 2012-01-25 03:22:07 UTC (rev
147252)
@@ -0,0 +1,12 @@
+diff -up xsane-0.995/src/xsane.h.xdg-open xsane-0.995/src/xsane.h
+--- xsane-0.995/src/xsane.h.xdg-open 2007-08-13 09:20:32.0 +0200
xsane-0.995/src/xsane.h2007-11-23 11:50:49.0 +0100
+@@ -251,7 +251,7 @@
+ # elif defined(HAVE_OS2_H)
+ # define DEFAULT_BROWSER netscape
+ # else
+-# define DEFAULT_BROWSER netscape
++# define DEFAULT_BROWSER xdg-open
+ # endif
+ #endif
+
Copied: xsane/repos/staging-i686/xsane.install (from rev 147251,
xsane/trunk/xsane.install)
===
--- staging-i686/xsane.install (rev 0)
+++ staging-i686/xsane.install 2012-01-25 03:22:07 UTC (rev 147252)
@@ -0,0 +1,16 @@
+# arg 1: the new package version
+# arg 2: the old package version
+
+post_install() {
+ echo NOTE:
+ echo If you experience
[arch-commits] Commit in lablgtk2/trunk (PKGBUILD)
Date: Tuesday, January 24, 2012 @ 23:37:08
Author: eric
Revision: 147253
upgpkg: lablgtk2 2.14.2-5
Rebuild against libpng 1.5 and libtiff 4.0
Modified:
lablgtk2/trunk/PKGBUILD
--+
PKGBUILD |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-25 03:22:07 UTC (rev 147252)
+++ PKGBUILD2012-01-25 04:37:08 UTC (rev 147253)
@@ -3,7 +3,7 @@
pkgname=lablgtk2
pkgver=2.14.2
-pkgrel=4
+pkgrel=5
pkgdesc= An Objective Caml interface to gtk2
arch=(i686 x86_64)
license=('LGPL')
@@ -11,6 +11,7 @@
depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui'
'gtksourceview2')
makedepends=('ocaml')
optdepends=('ocaml: for using the tools')
+DLAGENTS=('https::/usr/bin/curl -fLC - --insecure --retry 3 --retry-delay 3 -o
%o %u')
source=(https://forge.ocamlcore.org/frs/download.php/561/lablgtk-${pkgver}.tar.gz)
options=(!makeflags)
md5sums=('bad77680a72dab8b915cae99d1ec9b1f')
@@ -20,6 +21,10 @@
./configure --prefix=/usr
make world
make opt
+}
+
+package() {
+ cd ${srcdir}/lablgtk-${pkgver}
make DESTDIR=${pkgdir} install
install -m644 META ${pkgdir}/usr/lib/ocaml/lablgtk2/
}
[arch-commits] Commit in lablgtk2/repos (4 files)
Date: Tuesday, January 24, 2012 @ 23:37:32
Author: eric
Revision: 147254
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
lablgtk2/repos/staging-i686/
lablgtk2/repos/staging-i686/PKGBUILD
(from rev 147253, lablgtk2/trunk/PKGBUILD)
lablgtk2/repos/staging-x86_64/
lablgtk2/repos/staging-x86_64/PKGBUILD
(from rev 147253, lablgtk2/trunk/PKGBUILD)
-+
staging-i686/PKGBUILD | 30 ++
staging-x86_64/PKGBUILD | 30 ++
2 files changed, 60 insertions(+)
Copied: lablgtk2/repos/staging-i686/PKGBUILD (from rev 147253,
lablgtk2/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-25 04:37:32 UTC (rev 147254)
@@ -0,0 +1,30 @@
+# $Id$
+#Maintainer: Tobias Powalowski tp...@archlinux.org
+
+pkgname=lablgtk2
+pkgver=2.14.2
+pkgrel=5
+pkgdesc= An Objective Caml interface to gtk2
+arch=(i686 x86_64)
+license=('LGPL')
+url=http://lablgtk.forge.ocamlcore.org/;
+depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui'
'gtksourceview2')
+makedepends=('ocaml')
+optdepends=('ocaml: for using the tools')
+DLAGENTS=('https::/usr/bin/curl -fLC - --insecure --retry 3 --retry-delay 3 -o
%o %u')
+source=(https://forge.ocamlcore.org/frs/download.php/561/lablgtk-${pkgver}.tar.gz)
+options=(!makeflags)
+md5sums=('bad77680a72dab8b915cae99d1ec9b1f')
+
+build() {
+ cd ${srcdir}/lablgtk-${pkgver}
+ ./configure --prefix=/usr
+ make world
+ make opt
+}
+
+package() {
+ cd ${srcdir}/lablgtk-${pkgver}
+ make DESTDIR=${pkgdir} install
+ install -m644 META ${pkgdir}/usr/lib/ocaml/lablgtk2/
+}
Copied: lablgtk2/repos/staging-x86_64/PKGBUILD (from rev 147253,
lablgtk2/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-25 04:37:32 UTC (rev 147254)
@@ -0,0 +1,30 @@
+# $Id$
+#Maintainer: Tobias Powalowski tp...@archlinux.org
+
+pkgname=lablgtk2
+pkgver=2.14.2
+pkgrel=5
+pkgdesc= An Objective Caml interface to gtk2
+arch=(i686 x86_64)
+license=('LGPL')
+url=http://lablgtk.forge.ocamlcore.org/;
+depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui'
'gtksourceview2')
+makedepends=('ocaml')
+optdepends=('ocaml: for using the tools')
+DLAGENTS=('https::/usr/bin/curl -fLC - --insecure --retry 3 --retry-delay 3 -o
%o %u')
+source=(https://forge.ocamlcore.org/frs/download.php/561/lablgtk-${pkgver}.tar.gz)
+options=(!makeflags)
+md5sums=('bad77680a72dab8b915cae99d1ec9b1f')
+
+build() {
+ cd ${srcdir}/lablgtk-${pkgver}
+ ./configure --prefix=/usr
+ make world
+ make opt
+}
+
+package() {
+ cd ${srcdir}/lablgtk-${pkgver}
+ make DESTDIR=${pkgdir} install
+ install -m644 META ${pkgdir}/usr/lib/ocaml/lablgtk2/
+}
[arch-commits] Commit in unison/trunk (PKGBUILD)
Date: Wednesday, January 25, 2012 @ 00:10:04
Author: eric
Revision: 147255
upgpkg: unison 2.40.63-3
Rebuild against libpng 1.5 and libtiff 4.0, Add gtk2 optdepends
Modified:
unison/trunk/PKGBUILD
--+
PKGBUILD | 27 ---
1 file changed, 16 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-25 04:37:32 UTC (rev 147254)
+++ PKGBUILD2012-01-25 05:10:04 UTC (rev 147255)
@@ -3,44 +3,49 @@
pkgname=unison
pkgver=2.40.63
-pkgrel=2
+pkgrel=3
pkgdesc=Unison is a file-synchronization tool
arch=(i686 x86_64)
license=('GPL2')
url=http://www.cis.upenn.edu/~bcpierce/unison;
depends=('glibc')
makedepends=('ocaml' 'lablgtk2' 'imagemagick')
+optdepends=('gtk2: for gtk2 support')
source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz
$pkgname.desktop)
+md5sums=('3281207850cf6f0a17fe73f371893bd3'
+ '2daecba7705455a8e4b769e48b059872')
options=(!makeflags)
build() {
- cd $startdir/src/$pkgname-$pkgver
+ cd $srcdir/$pkgname-$pkgver
CFLAGS=
make clean
make mkProjectInfo
make UISTYLE=text DEBUGGING=false THREADS=true
- mkdir -p $startdir/pkg/usr/bin
- install -Dm755 unison $startdir/pkg/usr/bin/unison
+ mv unison unison-text
# clean the builddir and rebuild with gtk support
# broken at the moment!
# make clean
# make mkProjectInfo
# make UISTYLE=gtk DEBUGGING=false THREADS=true
- # install -Dm755 unison $startdir/pkg/usr/bin/unison-gtk
+ # install -Dm755 unison $pkgdir/usr/bin/unison-gtk
# clean the builddir and rebuild with gtk2 support
make clean
make mkProjectInfo
make UISTYLE=gtk2 DEBUGGING=false THREADS=true
- install -Dm755 unison $startdir/pkg/usr/bin/unison-gtk2
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ install -Dm755 unison-text $pkgdir/usr/bin/unison
+ install -Dm755 unison $pkgdir/usr/bin/unison-gtk2
# install a .desktop file; create a compliant icon from ico file and install
the png
- install -Dm644 ../$pkgname.desktop
$startdir/pkg/usr/share/applications/$pkgname.desktop
+ install -Dm644 ../$pkgname.desktop
$pkgdir/usr/share/applications/$pkgname.desktop
convert win32rc/U.ico unison.png
- install -Dm644 ${pkgname}-1.png $startdir/pkg/usr/share/pixmaps/$pkgname.png
+ install -Dm644 ${pkgname}-1.png $pkgdir/usr/share/pixmaps/$pkgname.png
# make symlink for .desktop file
- cd $startdir/pkg//usr/bin
+ cd $pkgdir/usr/bin
ln -s unison-gtk2 unison-x11
}
-md5sums=('3281207850cf6f0a17fe73f371893bd3'
- '2daecba7705455a8e4b769e48b059872')
[arch-commits] Commit in unison/repos (10 files)
Date: Wednesday, January 25, 2012 @ 00:10:29
Author: eric
Revision: 147256
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
unison/repos/staging-i686/
unison/repos/staging-i686/PKGBUILD
(from rev 147255, unison/trunk/PKGBUILD)
unison/repos/staging-i686/unison-ssh-ocaml.patch
(from rev 147255, unison/trunk/unison-ssh-ocaml.patch)
unison/repos/staging-i686/unison.desktop
(from rev 147255, unison/trunk/unison.desktop)
unison/repos/staging-i686/unison.install
(from rev 147255, unison/trunk/unison.install)
unison/repos/staging-x86_64/
unison/repos/staging-x86_64/PKGBUILD
(from rev 147255, unison/trunk/PKGBUILD)
unison/repos/staging-x86_64/unison-ssh-ocaml.patch
(from rev 147255, unison/trunk/unison-ssh-ocaml.patch)
unison/repos/staging-x86_64/unison.desktop
(from rev 147255, unison/trunk/unison.desktop)
unison/repos/staging-x86_64/unison.install
(from rev 147255, unison/trunk/unison.install)
---+
staging-i686/PKGBUILD | 51
staging-i686/unison-ssh-ocaml.patch | 25 +++
staging-i686/unison.desktop | 13
staging-i686/unison.install | 28 +
staging-x86_64/PKGBUILD | 51
staging-x86_64/unison-ssh-ocaml.patch | 25 +++
staging-x86_64/unison.desktop | 13
staging-x86_64/unison.install | 28 +
8 files changed, 234 insertions(+)
Copied: unison/repos/staging-i686/PKGBUILD (from rev 147255,
unison/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-25 05:10:29 UTC (rev 147256)
@@ -0,0 +1,51 @@
+# $Id$
+#Maintainer: Tobias Powalowski tp...@archlinux.org
+
+pkgname=unison
+pkgver=2.40.63
+pkgrel=3
+pkgdesc=Unison is a file-synchronization tool
+arch=(i686 x86_64)
+license=('GPL2')
+url=http://www.cis.upenn.edu/~bcpierce/unison;
+depends=('glibc')
+makedepends=('ocaml' 'lablgtk2' 'imagemagick')
+optdepends=('gtk2: for gtk2 support')
+source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz
+$pkgname.desktop)
+md5sums=('3281207850cf6f0a17fe73f371893bd3'
+ '2daecba7705455a8e4b769e48b059872')
+options=(!makeflags)
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ CFLAGS=
+ make clean
+ make mkProjectInfo
+ make UISTYLE=text DEBUGGING=false THREADS=true
+ mv unison unison-text
+
+ # clean the builddir and rebuild with gtk support
+ # broken at the moment!
+ # make clean
+ # make mkProjectInfo
+ # make UISTYLE=gtk DEBUGGING=false THREADS=true
+ # install -Dm755 unison $pkgdir/usr/bin/unison-gtk
+ # clean the builddir and rebuild with gtk2 support
+ make clean
+ make mkProjectInfo
+ make UISTYLE=gtk2 DEBUGGING=false THREADS=true
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ install -Dm755 unison-text $pkgdir/usr/bin/unison
+ install -Dm755 unison $pkgdir/usr/bin/unison-gtk2
+ # install a .desktop file; create a compliant icon from ico file and install
the png
+ install -Dm644 ../$pkgname.desktop
$pkgdir/usr/share/applications/$pkgname.desktop
+ convert win32rc/U.ico unison.png
+ install -Dm644 ${pkgname}-1.png $pkgdir/usr/share/pixmaps/$pkgname.png
+ # make symlink for .desktop file
+ cd $pkgdir/usr/bin
+ ln -s unison-gtk2 unison-x11
+}
Copied: unison/repos/staging-i686/unison-ssh-ocaml.patch (from rev 147255,
unison/trunk/unison-ssh-ocaml.patch)
===
--- staging-i686/unison-ssh-ocaml.patch (rev 0)
+++ staging-i686/unison-ssh-ocaml.patch 2012-01-25 05:10:29 UTC (rev 147256)
@@ -0,0 +1,25 @@
+Index: src/terminal.ml
+===
+--- src/terminal.ml(révision 463)
src/terminal.ml(copie de travail)
+@@ -191,7 +191,6 @@
+ exit 127
+ end
+ | childPid -
+- Unix.close slaveFd;
+ (Some masterFd, childPid)
+ end
+
+Index: src/update.mli
+===
+--- src/update.mli (révision 463)
src/update.mli (copie de travail)
+@@ -1,7 +1,7 @@
+ (* Unison file synchronizer: src/update.mli *)
+ (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
+
+-module NameMap : Map.S with type key = Name.t
++module NameMap : MyMap.S with type key = Name.t
+
+ type archive =
+ ArchiveDir of Props.t * archive NameMap.t
Copied: unison/repos/staging-i686/unison.desktop (from rev 147255,
unison/trunk/unison.desktop)
===
--- staging-i686/unison.desktop (rev 0)
+++ staging-i686/unison.desktop 2012-01-25 05:10:29 UTC (rev 147256)
[arch-commits] Commit in gdb/trunk (PKGBUILD)
Date: Wednesday, January 25, 2012 @ 01:02:08
Author: allan
Revision: 147257
upgpkg: gdb 7.4-1
upstream update
Modified:
gdb/trunk/PKGBUILD
--+
PKGBUILD |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-25 05:10:29 UTC (rev 147256)
+++ PKGBUILD2012-01-25 06:02:08 UTC (rev 147257)
@@ -3,7 +3,7 @@
# Contributor: Jan de Groot j...@archlinux.org
pkgname=gdb
-pkgver=7.3.1
+pkgver=7.4
pkgrel=1
pkgdesc=The GNU Debugger
arch=('i686' 'x86_64')
@@ -14,8 +14,9 @@
backup=('etc/gdb/gdbinit')
options=('!libtool')
install=gdb.install
-source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b89a5fac359c618dda97b88645ceab47')
+source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig})
+md5sums=('95a9a8305fed4d30a30a6dc28ff9d060'
+ 'd5ac067e8dca336cf4586e4e2269d3b2')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
[arch-commits] Commit in gdb/repos (8 files)
Date: Wednesday, January 25, 2012 @ 01:03:18
Author: allan
Revision: 147258
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gdb/repos/extra-i686/PKGBUILD
(from rev 147257, gdb/trunk/PKGBUILD)
gdb/repos/extra-i686/gdb.install
(from rev 147257, gdb/trunk/gdb.install)
gdb/repos/extra-x86_64/PKGBUILD
(from rev 147257, gdb/trunk/PKGBUILD)
gdb/repos/extra-x86_64/gdb.install
(from rev 147257, gdb/trunk/gdb.install)
Deleted:
gdb/repos/extra-i686/PKGBUILD
gdb/repos/extra-i686/gdb.install
gdb/repos/extra-x86_64/PKGBUILD
gdb/repos/extra-x86_64/gdb.install
--+
extra-i686/PKGBUILD | 85 ++---
extra-i686/gdb.install | 36 +--
extra-x86_64/PKGBUILD| 85 ++---
extra-x86_64/gdb.install | 36 +--
4 files changed, 122 insertions(+), 120 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-25 06:02:08 UTC (rev 147257)
+++ extra-i686/PKGBUILD 2012-01-25 06:03:18 UTC (rev 147258)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae al...@archlinux.org
-# Contributor: Jan de Groot j...@archlinux.org
-
-pkgname=gdb
-pkgver=7.3.1
-pkgrel=1
-pkgdesc=The GNU Debugger
-arch=('i686' 'x86_64')
-url=http://www.gnu.org/software/gdb/;
-license=('GPL3')
-depends=('ncurses' 'expat' 'python2')
-makedepends=('texinfo')
-backup=('etc/gdb/gdbinit')
-options=('!libtool')
-install=gdb.install
-source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b89a5fac359c618dda97b88645ceab47')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- ./configure --prefix=/usr --disable-nls \
---with-system-readline \
---with-python=/usr/bin/python2 \
---with-system-gdbinit=/etc/gdb/gdbinit
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- # install custom system gdbinit
- install -dm755 $pkgdir/etc/gdb
- touch $pkgdir/etc/gdb/gdbinit
-
- # resolve conflicts with binutils
- rm ${pkgdir}/usr/include/{ansidecl,bfd,bfdlink,dis-asm,symcat}.h
- rm ${pkgdir}/usr/lib/{libbfd,libiberty,libopcodes}.a
- rm ${pkgdir}/usr/share/info/{bfd,configure,standards}.info
-}
Copied: gdb/repos/extra-i686/PKGBUILD (from rev 147257, gdb/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-25 06:03:18 UTC (rev 147258)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Contributor: Jan de Groot j...@archlinux.org
+
+pkgname=gdb
+pkgver=7.4
+pkgrel=1
+pkgdesc=The GNU Debugger
+arch=('i686' 'x86_64')
+url=http://www.gnu.org/software/gdb/;
+license=('GPL3')
+depends=('ncurses' 'expat' 'python2')
+makedepends=('texinfo')
+backup=('etc/gdb/gdbinit')
+options=('!libtool')
+install=gdb.install
+source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig})
+md5sums=('95a9a8305fed4d30a30a6dc28ff9d060'
+ 'd5ac067e8dca336cf4586e4e2269d3b2')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr --disable-nls \
+--with-system-readline \
+--with-python=/usr/bin/python2 \
+--with-system-gdbinit=/etc/gdb/gdbinit
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ # install custom system gdbinit
+ install -dm755 $pkgdir/etc/gdb
+ touch $pkgdir/etc/gdb/gdbinit
+
+ # resolve conflicts with binutils
+ rm ${pkgdir}/usr/include/{ansidecl,bfd,bfdlink,dis-asm,symcat}.h
+ rm ${pkgdir}/usr/lib/{libbfd,libiberty,libopcodes}.a
+ rm ${pkgdir}/usr/share/info/{bfd,configure,standards}.info
+}
Deleted: extra-i686/gdb.install
===
--- extra-i686/gdb.install 2012-01-25 06:02:08 UTC (rev 147257)
+++ extra-i686/gdb.install 2012-01-25 06:03:18 UTC (rev 147258)
@@ -1,18 +0,0 @@
-infodir=usr/share/info
-filelist=(annotate.info gdb.info gdb.info-1 gdb.info-2 gdb.info-3 gdb.info-4
gdbint.info gdbint.info-1 gdbint.info-2 stabs.info)
-
-post_install() {
- for file in ${filelist[@]}; do
-install-info $infodir/$file.gz $infodir/dir 2 /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- for file in ${filelist[@]}; do
-install-info --delete $infodir/$file.gz $infodir/dir 2 /dev/null
- done
-}
Copied: gdb/repos/extra-i686/gdb.install (from rev 147257,
gdb/trunk/gdb.install)
===
--- extra-i686/gdb.install (rev 0)
+++ extra-i686/gdb.install 2012-01-25 06:03:18 UTC (rev 147258)
@@ -0,0 +1,18 @@
+infodir=usr/share/info
+filelist=(annotate.info gdb.info gdb.info-1 gdb.info-2 gdb.info-3 gdb.info-4
gdbint.info gdbint.info-1 gdbint.info-2 stabs.info)
+
+post_install() {
+ for file in
