[arch-commits] Commit in gdk-pixbuf2/trunk (PKGBUILD gdk-pixbuf2.install)
Date: Sunday, April 15, 2012 @ 03:55:16
Author: ibiru
Revision: 156169
update to 2.26.1
Modified:
gdk-pixbuf2/trunk/PKGBUILD
gdk-pixbuf2/trunk/gdk-pixbuf2.install
-+
PKGBUILD|4 ++--
gdk-pixbuf2.install |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-15 04:29:31 UTC (rev 156168)
+++ PKGBUILD2012-04-15 07:55:16 UTC (rev 156169)
@@ -2,7 +2,7 @@
# Maintainer: Ionut Biru ib...@archlinux.org
pkgname=gdk-pixbuf2
-pkgver=2.26.0
+pkgver=2.26.1
pkgrel=1
pkgdesc=An image loading library
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
options=('!libtool')
install=gdk-pixbuf2.install
source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('a5028d3a33710cbb6c6264bc561b6e252b37f067dff7b5b52473621e064f254d')
+sha256sums=('a60af12b58d9cc15ba4c680c6730ce5d38e8d664af1d575a379385b94b4ec7ba')
build() {
cd gdk-pixbuf-$pkgver
Modified: gdk-pixbuf2.install
===
--- gdk-pixbuf2.install 2012-04-15 04:29:31 UTC (rev 156168)
+++ gdk-pixbuf2.install 2012-04-15 07:55:16 UTC (rev 156169)
@@ -1,5 +1,5 @@
post_install() {
-/usr/bin/gdk-pixbuf-query-loaders --update-cache
+ gdk-pixbuf-query-loaders --update-cache
}
post_upgrade() {
[arch-commits] Commit in gdk-pixbuf2/repos (8 files)
Date: Sunday, April 15, 2012 @ 03:56:15
Author: ibiru
Revision: 156170
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
gdk-pixbuf2/repos/testing-i686/PKGBUILD
(from rev 156169, gdk-pixbuf2/trunk/PKGBUILD)
gdk-pixbuf2/repos/testing-i686/gdk-pixbuf2.install
(from rev 156169, gdk-pixbuf2/trunk/gdk-pixbuf2.install)
gdk-pixbuf2/repos/testing-x86_64/PKGBUILD
(from rev 156169, gdk-pixbuf2/trunk/PKGBUILD)
gdk-pixbuf2/repos/testing-x86_64/gdk-pixbuf2.install
(from rev 156169, gdk-pixbuf2/trunk/gdk-pixbuf2.install)
Deleted:
gdk-pixbuf2/repos/testing-i686/PKGBUILD
gdk-pixbuf2/repos/testing-i686/gdk-pixbuf2.install
gdk-pixbuf2/repos/testing-x86_64/PKGBUILD
gdk-pixbuf2/repos/testing-x86_64/gdk-pixbuf2.install
+
testing-i686/PKGBUILD | 68 +--
testing-i686/gdk-pixbuf2.install | 22 +--
testing-x86_64/PKGBUILD| 68 +--
testing-x86_64/gdk-pixbuf2.install | 22 +--
4 files changed, 90 insertions(+), 90 deletions(-)
Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD 2012-04-15 07:55:16 UTC (rev 156169)
+++ testing-i686/PKGBUILD 2012-04-15 07:56:15 UTC (rev 156170)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru ib...@archlinux.org
-
-pkgname=gdk-pixbuf2
-pkgver=2.26.0
-pkgrel=1
-pkgdesc=An image loading library
-arch=('i686' 'x86_64')
-url=http://www.gtk.org/;
-license=('GPL2')
-depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
-makedepends=('gtk-doc' 'gobject-introspection')
-options=('!libtool')
-install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('a5028d3a33710cbb6c6264bc561b6e252b37f067dff7b5b52473621e064f254d')
-
-build() {
- cd gdk-pixbuf-$pkgver
-
- ./configure --prefix=/usr \
---without-libjasper \
---with-x11 \
---with-included-loaders=png
- make
-}
-
-package() {
- cd gdk-pixbuf-$pkgver
-
- make DESTDIR=$pkgdir install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: gdk-pixbuf2/repos/testing-i686/PKGBUILD (from rev 156169,
gdk-pixbuf2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-04-15 07:56:15 UTC (rev 156170)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Ionut Biru ib...@archlinux.org
+
+pkgname=gdk-pixbuf2
+pkgver=2.26.1
+pkgrel=1
+pkgdesc=An image loading library
+arch=('i686' 'x86_64')
+url=http://www.gtk.org/;
+license=('GPL2')
+depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
+makedepends=('gtk-doc' 'gobject-introspection')
+options=('!libtool')
+install=gdk-pixbuf2.install
+source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz)
+sha256sums=('a60af12b58d9cc15ba4c680c6730ce5d38e8d664af1d575a379385b94b4ec7ba')
+
+build() {
+ cd gdk-pixbuf-$pkgver
+
+ ./configure --prefix=/usr \
+--without-libjasper \
+--with-x11 \
+--with-included-loaders=png
+ make
+}
+
+package() {
+ cd gdk-pixbuf-$pkgver
+
+ make DESTDIR=$pkgdir install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: testing-i686/gdk-pixbuf2.install
===
--- testing-i686/gdk-pixbuf2.install2012-04-15 07:55:16 UTC (rev 156169)
+++ testing-i686/gdk-pixbuf2.install2012-04-15 07:56:15 UTC (rev 156170)
@@ -1,11 +0,0 @@
-post_install() {
-/usr/bin/gdk-pixbuf-query-loaders --update-cache
-}
-
-post_upgrade() {
-post_install
-}
-
-pre_remove() {
-rm -f /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache
-}
Copied: gdk-pixbuf2/repos/testing-i686/gdk-pixbuf2.install (from rev 156169,
gdk-pixbuf2/trunk/gdk-pixbuf2.install)
===
--- testing-i686/gdk-pixbuf2.install(rev 0)
+++ testing-i686/gdk-pixbuf2.install2012-04-15 07:56:15 UTC (rev 156170)
@@ -0,0 +1,11 @@
+post_install() {
+ gdk-pixbuf-query-loaders --update-cache
+}
+
+post_upgrade() {
+post_install
+}
+
+pre_remove() {
+rm -f /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache
+}
Deleted: testing-x86_64/PKGBUILD
===
--- testing-x86_64/PKGBUILD 2012-04-15 07:55:16 UTC (rev 156169)
+++ testing-x86_64/PKGBUILD 2012-04-15 07:56:15 UTC (rev 156170)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru ib...@archlinux.org
-
-pkgname=gdk-pixbuf2
-pkgver=2.26.0
-pkgrel=1
-pkgdesc=An image loading library
-arch=('i686' 'x86_64')
-url=http://www.gtk.org/;
-license=('GPL2')
-depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
-makedepends=('gtk-doc' 'gobject-introspection')
-options=('!libtool')
-install=gdk-pixbuf2.install
[arch-commits] Commit in gdm/trunk (PKGBUILD)
Date: Sunday, April 15, 2012 @ 04:04:55
Author: ibiru
Revision: 156171
update to 3.4.1
Modified:
gdm/trunk/PKGBUILD
--+
PKGBUILD | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-15 07:56:15 UTC (rev 156170)
+++ PKGBUILD2012-04-15 08:04:55 UTC (rev 156171)
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot j...@archlinux.org
pkgname=gdm
-pkgver=3.4.0.1
+pkgver=3.4.1
pkgrel=1
pkgdesc=Gnome Display Manager (a reimplementation of xdm)
arch=('i686' 'x86_64')
@@ -17,12 +17,12 @@
optdepends=('gnome-shell: new login interface'
'fprintd: fingerprint authentication')
install=gdm.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
fix_external_program_directories.patch
gdm-vt-allocation-hack.patch
gdm
gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam
gdm-smartcard.pam gdm-welcome.pam)
-sha256sums=('08686e32f35f65fc5578b48db802fc5e5ca4ca3c3adbbe0d2488ddc1c6f279cd'
+sha256sums=('6292968dff5fc89877b5e1aaa3c7d1484dd3ed2d4f388e935841d053439be665'
'f68600ccf80f475deb417d58ab3306c4a1ba4622688e2901996c8549c85a9ee6'
'3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
'272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
@@ -34,7 +34,7 @@
'39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834')
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd $pkgname-$pkgver
patch -Np1 -i $srcdir/fix_external_program_directories.patch
patch -Np1 -i $srcdir/gdm-vt-allocation-hack.patch
@@ -52,14 +52,14 @@
}
package() {
- cd $srcdir/$pkgname-$pkgver
+ cd $pkgname-$pkgver
make DESTDIR=$pkgdir install
for i in gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam
gdm-smartcard.pam gdm-welcome.pam;do
install -m644 $srcdir/$i $pkgdir/etc/pam.d/${i%.pam}
done
- install -Dm755 ${srcdir}/gdm ${pkgdir}/etc/rc.d/gdm
+ install -Dm755 $srcdir/gdm $pkgdir/etc/rc.d/gdm
chmod 1770 $pkgdir/var/log/gdm
chmod 700 $pkgdir/var/lib/gdm/.config/dconf
[arch-commits] Commit in gdm/repos (44 files)
Date: Sunday, April 15, 2012 @ 04:17:07 Author: ibiru Revision: 156172 archrelease: copy trunk to testing-i686, testing-x86_64 Added: gdm/repos/testing-i686/PKGBUILD (from rev 156171, gdm/trunk/PKGBUILD) gdm/repos/testing-i686/fix_external_program_directories.patch (from rev 156171, gdm/trunk/fix_external_program_directories.patch) gdm/repos/testing-i686/gdm (from rev 156171, gdm/trunk/gdm) gdm/repos/testing-i686/gdm-autologin.pam (from rev 156171, gdm/trunk/gdm-autologin.pam) gdm/repos/testing-i686/gdm-fingerprint.pam (from rev 156171, gdm/trunk/gdm-fingerprint.pam) gdm/repos/testing-i686/gdm-password.pam (from rev 156171, gdm/trunk/gdm-password.pam) gdm/repos/testing-i686/gdm-smartcard.pam (from rev 156171, gdm/trunk/gdm-smartcard.pam) gdm/repos/testing-i686/gdm-vt-allocation-hack.patch (from rev 156171, gdm/trunk/gdm-vt-allocation-hack.patch) gdm/repos/testing-i686/gdm-welcome.pam (from rev 156171, gdm/trunk/gdm-welcome.pam) gdm/repos/testing-i686/gdm.install (from rev 156171, gdm/trunk/gdm.install) gdm/repos/testing-i686/gdm.pam (from rev 156171, gdm/trunk/gdm.pam) gdm/repos/testing-x86_64/PKGBUILD (from rev 156171, gdm/trunk/PKGBUILD) gdm/repos/testing-x86_64/fix_external_program_directories.patch (from rev 156171, gdm/trunk/fix_external_program_directories.patch) gdm/repos/testing-x86_64/gdm (from rev 156171, gdm/trunk/gdm) gdm/repos/testing-x86_64/gdm-autologin.pam (from rev 156171, gdm/trunk/gdm-autologin.pam) gdm/repos/testing-x86_64/gdm-fingerprint.pam (from rev 156171, gdm/trunk/gdm-fingerprint.pam) gdm/repos/testing-x86_64/gdm-password.pam (from rev 156171, gdm/trunk/gdm-password.pam) gdm/repos/testing-x86_64/gdm-smartcard.pam (from rev 156171, gdm/trunk/gdm-smartcard.pam) gdm/repos/testing-x86_64/gdm-vt-allocation-hack.patch (from rev 156171, gdm/trunk/gdm-vt-allocation-hack.patch) gdm/repos/testing-x86_64/gdm-welcome.pam (from rev 156171, gdm/trunk/gdm-welcome.pam) gdm/repos/testing-x86_64/gdm.install (from rev 156171, gdm/trunk/gdm.install) gdm/repos/testing-x86_64/gdm.pam (from rev 156171, gdm/trunk/gdm.pam) Deleted: gdm/repos/testing-i686/PKGBUILD gdm/repos/testing-i686/fix_external_program_directories.patch gdm/repos/testing-i686/gdm gdm/repos/testing-i686/gdm-autologin.pam gdm/repos/testing-i686/gdm-fingerprint.pam gdm/repos/testing-i686/gdm-password.pam gdm/repos/testing-i686/gdm-smartcard.pam gdm/repos/testing-i686/gdm-vt-allocation-hack.patch gdm/repos/testing-i686/gdm-welcome.pam gdm/repos/testing-i686/gdm.install gdm/repos/testing-i686/gdm.pam gdm/repos/testing-x86_64/PKGBUILD gdm/repos/testing-x86_64/fix_external_program_directories.patch gdm/repos/testing-x86_64/gdm gdm/repos/testing-x86_64/gdm-autologin.pam gdm/repos/testing-x86_64/gdm-fingerprint.pam gdm/repos/testing-x86_64/gdm-password.pam gdm/repos/testing-x86_64/gdm-smartcard.pam gdm/repos/testing-x86_64/gdm-vt-allocation-hack.patch gdm/repos/testing-x86_64/gdm-welcome.pam gdm/repos/testing-x86_64/gdm.install gdm/repos/testing-x86_64/gdm.pam ---+ testing-i686/PKGBUILD | 134 - testing-i686/fix_external_program_directories.patch | 68 ++-- testing-i686/gdm | 72 ++-- testing-i686/gdm-autologin.pam| 36 +- testing-i686/gdm-fingerprint.pam | 36 +- testing-i686/gdm-password.pam | 40 +- testing-i686/gdm-smartcard.pam| 36 +- testing-i686/gdm-vt-allocation-hack.patch | 236 testing-i686/gdm-welcome.pam | 24 - testing-i686/gdm.install | 60 ++-- testing-i686/gdm.pam | 20 - testing-x86_64/PKGBUILD | 134 - testing-x86_64/fix_external_program_directories.patch | 68 ++-- testing-x86_64/gdm| 72 ++-- testing-x86_64/gdm-autologin.pam | 36 +- testing-x86_64/gdm-fingerprint.pam| 36 +- testing-x86_64/gdm-password.pam | 40 +- testing-x86_64/gdm-smartcard.pam | 36 +- testing-x86_64/gdm-vt-allocation-hack.patch | 236 testing-x86_64/gdm-welcome.pam| 24 - testing-x86_64/gdm.install| 60 ++-- testing-x86_64/gdm.pam| 20 - 22 files changed, 762 insertions(+), 762 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 156171:156172 to see the changes.
[arch-commits] Commit in gnome-screensaver/trunk (PKGBUILD gnome-screensaver.install)
Date: Sunday, April 15, 2012 @ 04:24:20
Author: ibiru
Revision: 156173
update to 3.4.1
Modified:
gnome-screensaver/trunk/PKGBUILD
gnome-screensaver/trunk/gnome-screensaver.install
---+
PKGBUILD | 14 +++---
gnome-screensaver.install |2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-15 08:17:07 UTC (rev 156172)
+++ PKGBUILD2012-04-15 08:24:20 UTC (rev 156173)
@@ -3,7 +3,7 @@
# Contributor: Jan de Groot j...@archlinux.org
pkgname=gnome-screensaver
-pkgver=3.4.0
+pkgver=3.4.1
pkgrel=1
pkgdesc=Screensaver designed to integrate well with the GNOME desktop.
arch=('i686' 'x86_64')
@@ -15,13 +15,13 @@
groups=('gnome')
options=(!emptydirs)
install=gnome-screensaver.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
gnome-screensaver.pam)
-sha256sums=('8d73e687f41975d66ee1fa56986d901a0bbdf4094f429cdbbed4a19016a38974'
+sha256sums=('d54a253f826ff6cd48eba53724339896a6dea39029848b6a8d5972c8e162069b'
'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb')
build() {
- cd ${pkgname}-${pkgver}
+ cd $pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/gnome-screensaver \
--localstatedir=/var \
@@ -31,7 +31,7 @@
}
package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- install -Dm644 ${srcdir}/gnome-screensaver.pam
${pkgdir}/etc/pam.d/gnome-screensaver
+ cd $pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+ install -Dm644 $srcdir/gnome-screensaver.pam
$pkgdir/etc/pam.d/gnome-screensaver
}
Modified: gnome-screensaver.install
===
--- gnome-screensaver.install 2012-04-15 08:17:07 UTC (rev 156172)
+++ gnome-screensaver.install 2012-04-15 08:24:20 UTC (rev 156173)
@@ -2,6 +2,6 @@
pre_upgrade() {
if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-usr/sbin/gconfpkg --uninstall ${pkgname}
+gconfpkg --uninstall ${pkgname}
fi
}
[arch-commits] Commit in gnome-screensaver/repos (12 files)
Date: Sunday, April 15, 2012 @ 04:25:54
Author: ibiru
Revision: 156174
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
gnome-screensaver/repos/testing-i686/PKGBUILD
(from rev 156173, gnome-screensaver/trunk/PKGBUILD)
gnome-screensaver/repos/testing-i686/gnome-screensaver.install
(from rev 156173, gnome-screensaver/trunk/gnome-screensaver.install)
gnome-screensaver/repos/testing-i686/gnome-screensaver.pam
(from rev 156173, gnome-screensaver/trunk/gnome-screensaver.pam)
gnome-screensaver/repos/testing-x86_64/PKGBUILD
(from rev 156173, gnome-screensaver/trunk/PKGBUILD)
gnome-screensaver/repos/testing-x86_64/gnome-screensaver.install
(from rev 156173, gnome-screensaver/trunk/gnome-screensaver.install)
gnome-screensaver/repos/testing-x86_64/gnome-screensaver.pam
(from rev 156173, gnome-screensaver/trunk/gnome-screensaver.pam)
Deleted:
gnome-screensaver/repos/testing-i686/PKGBUILD
gnome-screensaver/repos/testing-i686/gnome-screensaver.install
gnome-screensaver/repos/testing-i686/gnome-screensaver.pam
gnome-screensaver/repos/testing-x86_64/PKGBUILD
gnome-screensaver/repos/testing-x86_64/gnome-screensaver.install
gnome-screensaver/repos/testing-x86_64/gnome-screensaver.pam
--+
testing-i686/PKGBUILD| 74 ++---
testing-i686/gnome-screensaver.install | 14 ++---
testing-i686/gnome-screensaver.pam |6 +-
testing-x86_64/PKGBUILD | 74 ++---
testing-x86_64/gnome-screensaver.install | 14 ++---
testing-x86_64/gnome-screensaver.pam |6 +-
6 files changed, 94 insertions(+), 94 deletions(-)
Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD 2012-04-15 08:24:20 UTC (rev 156173)
+++ testing-i686/PKGBUILD 2012-04-15 08:25:54 UTC (rev 156174)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
-# Contributor: Jan de Groot j...@archlinux.org
-
-pkgname=gnome-screensaver
-pkgver=3.4.0
-pkgrel=1
-pkgdesc=Screensaver designed to integrate well with the GNOME desktop.
-arch=('i686' 'x86_64')
-license=('GPL')
-url=http://live.gnome.org/GnomeScreensaver;
-backup=(etc/pam.d/gnome-screensaver)
-depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas'
'libsystemd')
-makedepends=('pkgconfig' 'intltool' 'libxss')
-groups=('gnome')
-options=(!emptydirs)
-install=gnome-screensaver.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
- gnome-screensaver.pam)
-sha256sums=('8d73e687f41975d66ee1fa56986d901a0bbdf4094f429cdbbed4a19016a38974'
-'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb')
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/gnome-screensaver \
- --localstatedir=/var \
- --with-mit-ext --with-systemd
-
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- install -Dm644 ${srcdir}/gnome-screensaver.pam
${pkgdir}/etc/pam.d/gnome-screensaver
-}
Copied: gnome-screensaver/repos/testing-i686/PKGBUILD (from rev 156173,
gnome-screensaver/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-04-15 08:25:54 UTC (rev 156174)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+# Contributor: Jan de Groot j...@archlinux.org
+
+pkgname=gnome-screensaver
+pkgver=3.4.1
+pkgrel=1
+pkgdesc=Screensaver designed to integrate well with the GNOME desktop.
+arch=('i686' 'x86_64')
+license=('GPL')
+url=http://live.gnome.org/GnomeScreensaver;
+backup=(etc/pam.d/gnome-screensaver)
+depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas'
'libsystemd')
+makedepends=('pkgconfig' 'intltool' 'libxss')
+groups=('gnome')
+options=(!emptydirs)
+install=gnome-screensaver.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+ gnome-screensaver.pam)
+sha256sums=('d54a253f826ff6cd48eba53724339896a6dea39029848b6a8d5972c8e162069b'
+'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --libexecdir=/usr/lib/gnome-screensaver \
+ --localstatedir=/var \
+ --with-mit-ext --with-systemd
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+ install -Dm644 $srcdir/gnome-screensaver.pam
$pkgdir/etc/pam.d/gnome-screensaver
+}
Deleted: testing-i686/gnome-screensaver.install
===
--- testing-i686/gnome-screensaver.install
[arch-commits] Commit in lucene/trunk (PKGBUILD)
Date: Sunday, April 15, 2012 @ 05:27:06
Author: guillaume
Revision: 156175
upgpkg: lucene 2.9.4-3
Fixed file conflit (#28765) and dependency on headless JRE (#28959)
Modified:
lucene/trunk/PKGBUILD
--+
PKGBUILD |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-15 08:25:54 UTC (rev 156174)
+++ PKGBUILD2012-04-15 09:27:06 UTC (rev 156175)
@@ -4,12 +4,12 @@
pkgname=lucene
pkgver=2.9.4 # don't update to 3.x tree - OOo is not yet ready to use it
-pkgrel=2
+pkgrel=3
arch=('any')
pkgdesc=A high-performance, full-featured text search engine library written
entirely in Java
url=http://lucene.apache.org/java/docs/index.html;
license=(APACHE)
-depends=('java-runtime')
+depends=('java-runtime-headless')
source=(http://www.mirrorservice.org/sites/ftp.apache.org/lucene/java/$pkgver/lucene-${pkgver}.tar.gz;)
md5sums=('ffc60c3a163105b22610dec15602329a')
@@ -28,7 +28,4 @@
j=${i//-${pkgver}/}
ln -sv $i $j
done
-
- # and one with different version numbering
- ln -sv servlet-api-2.4.jar servlet-api.jar
}
[arch-commits] Commit in lucene/repos/extra-any (PKGBUILD PKGBUILD)
Date: Sunday, April 15, 2012 @ 05:27:34
Author: guillaume
Revision: 156176
archrelease: copy trunk to extra-any
Added:
lucene/repos/extra-any/PKGBUILD
(from rev 156175, lucene/trunk/PKGBUILD)
Deleted:
lucene/repos/extra-any/PKGBUILD
--+
PKGBUILD | 65 +
1 file changed, 31 insertions(+), 34 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2012-04-15 09:27:06 UTC (rev 156175)
+++ PKGBUILD2012-04-15 09:27:34 UTC (rev 156176)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR andy...@archlinux.org
-# Contributor: Andy Roberts (arooaroo) d...@andy-roberts.net
-
-pkgname=lucene
-pkgver=2.9.4 # don't update to 3.x tree - OOo is not yet ready to use it
-pkgrel=2
-arch=('any')
-pkgdesc=A high-performance, full-featured text search engine library written
entirely in Java
-url=http://lucene.apache.org/java/docs/index.html;
-license=(APACHE)
-depends=('java-runtime')
-source=(http://www.mirrorservice.org/sites/ftp.apache.org/lucene/java/$pkgver/lucene-${pkgver}.tar.gz;)
-md5sums=('ffc60c3a163105b22610dec15602329a')
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- install -m755 -d ${pkgdir}/usr/share/java/
-
- # install all *.jar files
- for i in `find ${srcdir} -name '*.jar'`; do
-install $i ${pkgdir}/usr/share/java/
- done
-
- # create symlinks
- cd ${pkgdir}/usr/share/java/
- for i in `ls -1 *${pkgver}*.jar`; do
-j=${i//-${pkgver}/}
-ln -sv $i $j
- done
-
- # and one with different version numbering
- ln -sv servlet-api-2.4.jar servlet-api.jar
-}
Copied: lucene/repos/extra-any/PKGBUILD (from rev 156175, lucene/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2012-04-15 09:27:34 UTC (rev 156176)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: AndyRTR andy...@archlinux.org
+# Contributor: Andy Roberts (arooaroo) d...@andy-roberts.net
+
+pkgname=lucene
+pkgver=2.9.4 # don't update to 3.x tree - OOo is not yet ready to use it
+pkgrel=3
+arch=('any')
+pkgdesc=A high-performance, full-featured text search engine library written
entirely in Java
+url=http://lucene.apache.org/java/docs/index.html;
+license=(APACHE)
+depends=('java-runtime-headless')
+source=(http://www.mirrorservice.org/sites/ftp.apache.org/lucene/java/$pkgver/lucene-${pkgver}.tar.gz;)
+md5sums=('ffc60c3a163105b22610dec15602329a')
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ install -m755 -d ${pkgdir}/usr/share/java/
+
+ # install all *.jar files
+ for i in `find ${srcdir} -name '*.jar'`; do
+install $i ${pkgdir}/usr/share/java/
+ done
+
+ # create symlinks
+ cd ${pkgdir}/usr/share/java/
+ for i in `ls -1 *${pkgver}*.jar`; do
+j=${i//-${pkgver}/}
+ln -sv $i $j
+ done
+}
[arch-commits] Commit in xorg-server/trunk (2 files)
Date: Sunday, April 15, 2012 @ 06:02:51
Author: andyrtr
Revision: 156177
upgpkg: xorg-server 1.12.1-2
add a testing patch to fix EXA issues with cairo 1.12
Added:
xorg-server/trunk/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
Modified:
xorg-server/trunk/PKGBUILD
-+
EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff | 116
++
PKGBUILD|9
2 files changed, 124 insertions(+), 1 deletion(-)
Added: EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
===
--- EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
(rev 0)
+++ EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
2012-04-15 10:02:51 UTC (rev 156177)
@@ -0,0 +1,116 @@
+--- xorg-server-1.12.1/exa/exa_glyphs.c2012-03-30 04:57:25.0
+0200
xorg-server-1.12.1/exa_glyphs.c.new2012-04-15 11:48:51.683214230
+0200
+@@ -686,6 +686,7 @@
+ PixmapPtr pMaskPixmap = 0;
+ PicturePtr pMask = NULL;
+ ScreenPtr pScreen = pDst-pDrawable-pScreen;
++ExaScreenPriv(pScreen);
+ int width = 0, height = 0;
+ int x, y;
+ int first_xOff = list-xOff, first_yOff = list-yOff;
+@@ -697,7 +698,6 @@
+ ExaGlyphBuffer buffer;
+
+ if (maskFormat) {
+-ExaScreenPriv(pScreen);
+ GCPtr pGC;
+ xRectangle rect;
+
+@@ -719,22 +719,20 @@
+ maskFormat-depth,
+ CREATE_PIXMAP_USAGE_SCRATCH);
+ if (!pMaskPixmap)
+-return;
++ goto fallback;
+ component_alpha = NeedsComponent(maskFormat-format);
+ pMask = CreatePicture(0, pMaskPixmap-drawable,
+ maskFormat, CPComponentAlpha, component_alpha,
+ serverClient, error);
+-if (!pMask ||
+-(!component_alpha pExaScr-info-CheckComposite
+- !(*pExaScr-info-CheckComposite) (PictOpAdd, pSrc, NULL,
pMask)))
++(*pScreen-DestroyPixmap) (pMaskPixmap);
++ if (!pMask)
++ goto fallback;
++
++ if (!component_alpha pExaScr-info-CheckComposite
++ !(*pExaScr-info-CheckComposite) (PictOpAdd, pSrc, NULL, pMask))
+ {
+ PictFormatPtr argbFormat;
+
+-(*pScreen-DestroyPixmap) (pMaskPixmap);
+-
+-if (!pMask)
+-return;
+-
+ /* The driver can't seem to composite to a8, let's try argb (but
+ * without component-alpha) */
+ FreePicture((pointer) pMask, (XID) 0);
+@@ -748,15 +746,25 @@
+ maskFormat-depth,
+
CREATE_PIXMAP_USAGE_SCRATCH);
+ if (!pMaskPixmap)
+-return;
++ goto fallback;
+
+ pMask = CreatePicture(0, pMaskPixmap-drawable, maskFormat, 0, 0,
+ serverClient, error);
+-if (!pMask) {
+-(*pScreen-DestroyPixmap) (pMaskPixmap);
+-return;
+-}
++(*pScreen-DestroyPixmap) (pMaskPixmap);
++ if (!pMask)
++ goto fallback;
+ }
++
++ if (pExaScr-info-CheckComposite
++ (!(*pExaScr-info-CheckComposite) (PictOpAdd, pSrc, NULL, pMask) ||
++ (!(*pExaScr-info-CheckComposite) (op, pSrc, pMask, pDst)
++(op != PictOpOver ||
++ !(*pExaScr-info-CheckComposite) (PictOpOutReverse, pSrc,
pMask, pDst) ||
++ !(*pExaScr-info-CheckComposite) (PictOpOver, pSrc, pMask,
pDst) {
++ FreePicture ((pointer) pMask, (XID) 0);
++ goto fallback;
++ }
++
+ pGC = GetScratchGC(pMaskPixmap-drawable.depth, pScreen);
+ ValidateGC(pMaskPixmap-drawable, pGC);
+ rect.x = 0;
+@@ -769,6 +777,13 @@
+ y = -extents.y1;
+ }
+ else {
++ if (pExaScr-info-CheckComposite
++ !(*pExaScr-info-CheckComposite) (op, pSrc, NULL, pDst)
++ (op != PictOpOver ||
++ !(*pExaScr-info-CheckComposite) (PictOpOutReverse, pSrc, NULL,
pDst) ||
++ !(*pExaScr-info-CheckComposite) (PictOpOver, pSrc, NULL, pDst)))
++ goto fallback;
++
+ x = 0;
+ y = 0;
+ }
+@@ -834,6 +849,10 @@
+ xSrc + x - first_xOff,
+ ySrc + y - first_yOff, 0, 0, x, y, width, height);
+ FreePicture((pointer) pMask, (XID) 0);
+-(*pScreen-DestroyPixmap) (pMaskPixmap);
+ }
++
++return;
++
++fallback:
++ExaCheckGlyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list,
glyphs);
+ }
+--- xorg-server-1.12.1/exa/exa_render.c2012-03-30 04:57:25.0
[arch-commits] Commit in xorg-server/repos (18 files)
Date: Sunday, April 15, 2012 @ 06:04:10 Author: andyrtr Revision: 156178 archrelease: copy trunk to testing-i686, testing-x86_64 Added: xorg-server/repos/testing-i686/ xorg-server/repos/testing-i686/10-quirks.conf (from rev 156177, xorg-server/trunk/10-quirks.conf) xorg-server/repos/testing-i686/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff (from rev 156177, xorg-server/trunk/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff) xorg-server/repos/testing-i686/PKGBUILD (from rev 156177, xorg-server/trunk/PKGBUILD) xorg-server/repos/testing-i686/autoconfig-nvidia.patch (from rev 156177, xorg-server/trunk/autoconfig-nvidia.patch) xorg-server/repos/testing-i686/autoconfig-sis.patch (from rev 156177, xorg-server/trunk/autoconfig-sis.patch) xorg-server/repos/testing-i686/git-fixes.patch (from rev 156177, xorg-server/trunk/git-fixes.patch) xorg-server/repos/testing-i686/xvfb-run (from rev 156177, xorg-server/trunk/xvfb-run) xorg-server/repos/testing-i686/xvfb-run.1 (from rev 156177, xorg-server/trunk/xvfb-run.1) xorg-server/repos/testing-x86_64/ xorg-server/repos/testing-x86_64/10-quirks.conf (from rev 156177, xorg-server/trunk/10-quirks.conf) xorg-server/repos/testing-x86_64/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff (from rev 156177, xorg-server/trunk/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff) xorg-server/repos/testing-x86_64/PKGBUILD (from rev 156177, xorg-server/trunk/PKGBUILD) xorg-server/repos/testing-x86_64/autoconfig-nvidia.patch (from rev 156177, xorg-server/trunk/autoconfig-nvidia.patch) xorg-server/repos/testing-x86_64/autoconfig-sis.patch (from rev 156177, xorg-server/trunk/autoconfig-sis.patch) xorg-server/repos/testing-x86_64/git-fixes.patch (from rev 156177, xorg-server/trunk/git-fixes.patch) xorg-server/repos/testing-x86_64/xvfb-run (from rev 156177, xorg-server/trunk/xvfb-run) xorg-server/repos/testing-x86_64/xvfb-run.1 (from rev 156177, xorg-server/trunk/xvfb-run.1) + testing-i686/10-quirks.conf | 10 testing-i686/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff | 116 testing-i686/PKGBUILD | 201 +++ testing-i686/autoconfig-nvidia.patch | 28 testing-i686/autoconfig-sis.patch | 21 testing-i686/git-fixes.patch | 161 + testing-i686/xvfb-run | 180 ++ testing-i686/xvfb-run.1 | 282 ++ testing-x86_64/10-quirks.conf | 10 testing-x86_64/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff | 116 testing-x86_64/PKGBUILD | 201 +++ testing-x86_64/autoconfig-nvidia.patch | 28 testing-x86_64/autoconfig-sis.patch | 21 testing-x86_64/git-fixes.patch | 161 + testing-x86_64/xvfb-run | 180 ++ testing-x86_64/xvfb-run.1 | 282 ++ 16 files changed, 1998 insertions(+) The diff is longer than the limit of 200KB. Use svn diff -r 156177:156178 to see the changes.
[arch-commits] Commit in xf86-video-ati/trunk (6 files)
Date: Sunday, April 15, 2012 @ 06:26:36 Author: andyrtr Revision: 156179 upgpkg: xf86-video-ati 6.14.4-4 add testing patches to fix EXA issues with cairo 1.12; reqiures EXA patches Xorg-server; should sovle now FS#29453 Added: xf86-video-ati/trunk/-poor-man-s-solid-picture-support-for-r300-r600.patch xf86-video-ati/trunk/0001-poor-man-s-solid-picture-support-for-evergreen.patch xf86-video-ati/trunk/0002-poor-man-s-solid-picture-support-for-r100.patch xf86-video-ati/trunk/0003-poor-man-s-solid-picture-support-for-r200.patch Modified: xf86-video-ati/trunk/PKGBUILD Deleted: xf86-video-ati/trunk/solid_pictures_fixes.diff ---+ -poor-man-s-solid-picture-support-for-r300-r600.patch | 571 + 0001-poor-man-s-solid-picture-support-for-evergreen.patch | 290 ++ 0002-poor-man-s-solid-picture-support-for-r100.patch | 182 + 0003-poor-man-s-solid-picture-support-for-r200.patch | 179 + PKGBUILD | 25 solid_pictures_fixes.diff | 1238 6 files changed, 1240 insertions(+), 1245 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 156178:156179 to see the changes.
[arch-commits] Commit in xf86-video-ati/repos (18 files)
Date: Sunday, April 15, 2012 @ 06:27:42 Author: andyrtr Revision: 156180 archrelease: copy trunk to testing-i686, testing-x86_64 Added: xf86-video-ati/repos/testing-i686/-poor-man-s-solid-picture-support-for-r300-r600.patch (from rev 156179, xf86-video-ati/trunk/-poor-man-s-solid-picture-support-for-r300-r600.patch) xf86-video-ati/repos/testing-i686/0001-poor-man-s-solid-picture-support-for-evergreen.patch (from rev 156179, xf86-video-ati/trunk/0001-poor-man-s-solid-picture-support-for-evergreen.patch) xf86-video-ati/repos/testing-i686/0002-poor-man-s-solid-picture-support-for-r100.patch (from rev 156179, xf86-video-ati/trunk/0002-poor-man-s-solid-picture-support-for-r100.patch) xf86-video-ati/repos/testing-i686/0003-poor-man-s-solid-picture-support-for-r200.patch (from rev 156179, xf86-video-ati/trunk/0003-poor-man-s-solid-picture-support-for-r200.patch) xf86-video-ati/repos/testing-i686/PKGBUILD (from rev 156179, xf86-video-ati/trunk/PKGBUILD) xf86-video-ati/repos/testing-i686/git_fixes.diff (from rev 156179, xf86-video-ati/trunk/git_fixes.diff) xf86-video-ati/repos/testing-x86_64/-poor-man-s-solid-picture-support-for-r300-r600.patch (from rev 156179, xf86-video-ati/trunk/-poor-man-s-solid-picture-support-for-r300-r600.patch) xf86-video-ati/repos/testing-x86_64/0001-poor-man-s-solid-picture-support-for-evergreen.patch (from rev 156179, xf86-video-ati/trunk/0001-poor-man-s-solid-picture-support-for-evergreen.patch) xf86-video-ati/repos/testing-x86_64/0002-poor-man-s-solid-picture-support-for-r100.patch (from rev 156179, xf86-video-ati/trunk/0002-poor-man-s-solid-picture-support-for-r100.patch) xf86-video-ati/repos/testing-x86_64/0003-poor-man-s-solid-picture-support-for-r200.patch (from rev 156179, xf86-video-ati/trunk/0003-poor-man-s-solid-picture-support-for-r200.patch) xf86-video-ati/repos/testing-x86_64/PKGBUILD (from rev 156179, xf86-video-ati/trunk/PKGBUILD) xf86-video-ati/repos/testing-x86_64/git_fixes.diff (from rev 156179, xf86-video-ati/trunk/git_fixes.diff) Deleted: xf86-video-ati/repos/testing-i686/PKGBUILD xf86-video-ati/repos/testing-i686/git_fixes.diff xf86-video-ati/repos/testing-i686/solid_pictures_fixes.diff xf86-video-ati/repos/testing-x86_64/PKGBUILD xf86-video-ati/repos/testing-x86_64/git_fixes.diff xf86-video-ati/repos/testing-x86_64/solid_pictures_fixes.diff --+ testing-i686/-poor-man-s-solid-picture-support-for-r300-r600.patch | 571 testing-i686/0001-poor-man-s-solid-picture-support-for-evergreen.patch | 290 ++ testing-i686/0002-poor-man-s-solid-picture-support-for-r100.patch| 182 + testing-i686/0003-poor-man-s-solid-picture-support-for-r200.patch| 179 + testing-i686/PKGBUILD| 89 testing-i686/git_fixes.diff | 66 testing-i686/solid_pictures_fixes.diff | 1238 -- testing-x86_64/-poor-man-s-solid-picture-support-for-r300-r600.patch | 571 testing-x86_64/0001-poor-man-s-solid-picture-support-for-evergreen.patch | 290 ++ testing-x86_64/0002-poor-man-s-solid-picture-support-for-r100.patch | 182 + testing-x86_64/0003-poor-man-s-solid-picture-support-for-r200.patch | 179 + testing-x86_64/PKGBUILD | 89 testing-x86_64/git_fixes.diff| 66 testing-x86_64/solid_pictures_fixes.diff | 1238 -- 14 files changed, 2610 insertions(+), 2620 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 156179:156180 to see the changes.
[arch-commits] Commit in nx/repos (6 files)
Date: Sunday, April 15, 2012 @ 07:01:00
Author: andyrtr
Revision: 156181
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
nx/repos/staging-i686/
nx/repos/staging-i686/PKGBUILD
(from rev 156180, nx/trunk/PKGBUILD)
nx/repos/staging-i686/nx-x11.ld.so.conf.d
(from rev 156180, nx/trunk/nx-x11.ld.so.conf.d)
nx/repos/staging-x86_64/
nx/repos/staging-x86_64/PKGBUILD
(from rev 156180, nx/trunk/PKGBUILD)
nx/repos/staging-x86_64/nx-x11.ld.so.conf.d
(from rev 156180, nx/trunk/nx-x11.ld.so.conf.d)
+
staging-i686/PKGBUILD | 81 +++
staging-i686/nx-x11.ld.so.conf.d |1
staging-x86_64/PKGBUILD| 81 +++
staging-x86_64/nx-x11.ld.so.conf.d |1
4 files changed, 164 insertions(+)
Copied: nx/repos/staging-i686/PKGBUILD (from rev 156180, nx/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-04-15 11:01:00 UTC (rev 156181)
@@ -0,0 +1,81 @@
+# $Id$
+# Maintainer: Andreas Radke andy...@archlinux.org
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent')
+pkgver=3.5.0.12
+pkgrel=0.1
+arch=('i686' 'x86_64')
+url=http://wiki.x2go.org/;
+license=('GPL')
+options=('!makeflags')
+makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies
from subpackages
+ 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm'
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
+ )
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
+nx-x11.ld.so.conf.d)
+md5sums=('a2011e034a318016cf2260c30a567301'
+ 'f2ec60c7e2d81bef2f7292d2b33681a6')
+
+build() {
+ cd ${srcdir}/nx-libs_$pkgver
+ make CONFIGURE=./configure --prefix=/usr --libdir=/usr/lib
--libexecdir=/usr/lib --includedir=/usr/include
+ # fake install
+ mkdir $srcdir/fakeinstall
+ make DESTDIR=$srcdir/fakeinstall install
+}
+
+package_libxcomp() {
+
+ pkgdesc=NX X compression library
+ depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
+
+ cd ${srcdir}/fakeinstall
+ install -dm755 ${pkgdir}/usr/lib/
+ cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib
+}
+
+package_nxproxy() {
+
+ pkgdesc=NX proxy
+ depends=('libxcomp')
+
+ cd ${srcdir}/fakeinstall
+ install -dm755 ${pkgdir}/usr/{bin,share/man/man1}
+ cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
+ cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1
${pkgdir}/usr/share/man/man1
+}
+
+package_nx-xcompext() {
+
+ pkgdesc=Xcompext/Xcompshad library for NX
+ depends=('libxcomp' 'nx-x11')
+
+ cd ${srcdir}/fakeinstall
+ install -dm755 ${pkgdir}/usr/lib/
+ cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib
+}
+
+package_nx-x11() {
+
+ pkgdesc=NX-X11 lib for the NX framework
+ depends=('libxcomp')
+
+ cd ${srcdir}/fakeinstall
+ install -dm755 ${pkgdir}/{etc/ld.so.conf.d,/usr/lib/nx}
+ cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so*
${pkgdir}/usr/lib/nx
+
+ install -m 644 $srcdir/nx-x11.ld.so.conf.d
$pkgdir/etc/ld.so.conf.d/nx.conf
+}
+
+package_nxagent() {
+
+ pkgdesc=NX X server based on Xnest
+ depends=('nx-xcompext')
+
+ cd ${srcdir}/fakeinstall
+ install -dm755 ${pkgdir}/usr/{bin,lib/nx}
+ cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
+ cd ${pkgdir}/usr/bin
+ ln -sv /usr/lib/nx/nxagent .
+}
Copied: nx/repos/staging-i686/nx-x11.ld.so.conf.d (from rev 156180,
nx/trunk/nx-x11.ld.so.conf.d)
===
--- staging-i686/nx-x11.ld.so.conf.d(rev 0)
+++ staging-i686/nx-x11.ld.so.conf.d2012-04-15 11:01:00 UTC (rev 156181)
@@ -0,0 +1 @@
+/usr/lib/nx/
Copied: nx/repos/staging-x86_64/PKGBUILD (from rev 156180, nx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-04-15 11:01:00 UTC (rev 156181)
@@ -0,0 +1,81 @@
+# $Id$
+# Maintainer: Andreas Radke andy...@archlinux.org
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent')
+pkgver=3.5.0.12
+pkgrel=0.1
+arch=('i686' 'x86_64')
+url=http://wiki.x2go.org/;
+license=('GPL')
+options=('!makeflags')
+makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies
from subpackages
+ 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm'
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
+ )
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
+nx-x11.ld.so.conf.d)
+md5sums=('a2011e034a318016cf2260c30a567301'
+
[arch-commits] Commit in xf86-video-intel/trunk (7 files)
Date: Sunday, April 15, 2012 @ 08:17:01 Author: jgc Revision: 156182 Add uxa patches from git master to fix several display bugs or server segfaults. Added: xf86-video-intel/trunk/0001-uxa-gen3-Remove-special-casing-of-solid-pictures.patch xf86-video-intel/trunk/0002-uxa-Defer-the-call-to-EnterVT-till-after-outputs-are.patch xf86-video-intel/trunk/0003-uxa-Remove-hook-for-CompositeRectangles.patch xf86-video-intel/trunk/0004-uxa-Remove-broken-render-glyphs-to-dst.patch xf86-video-intel/trunk/0005-uxa-Fix-leak-of-glyph-mask-for-unhandled-glyph-compo.patch Modified: xf86-video-intel/trunk/PKGBUILD Deleted: xf86-video-intel/trunk/Remove_broken_render_glyphs-to-dst.diff -+ 0001-uxa-gen3-Remove-special-casing-of-solid-pictures.patch | 533 ++ 0002-uxa-Defer-the-call-to-EnterVT-till-after-outputs-are.patch | 50 0003-uxa-Remove-hook-for-CompositeRectangles.patch | 255 0004-uxa-Remove-broken-render-glyphs-to-dst.patch | 391 +++ 0005-uxa-Fix-leak-of-glyph-mask-for-unhandled-glyph-compo.patch | 40 PKGBUILD| 25 Remove_broken_render_glyphs-to-dst.diff | 387 --- 7 files changed, 1287 insertions(+), 394 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 156181:156182 to see the changes.
[arch-commits] Commit in xf86-video-intel/repos (14 files)
Date: Sunday, April 15, 2012 @ 08:22:45 Author: jgc Revision: 156183 archrelease: copy trunk to extra-i686, extra-x86_64 Added: xf86-video-intel/repos/extra-i686/0001-uxa-gen3-Remove-special-casing-of-solid-pictures.patch (from rev 156182, xf86-video-intel/trunk/0001-uxa-gen3-Remove-special-casing-of-solid-pictures.patch) xf86-video-intel/repos/extra-i686/0002-uxa-Defer-the-call-to-EnterVT-till-after-outputs-are.patch (from rev 156182, xf86-video-intel/trunk/0002-uxa-Defer-the-call-to-EnterVT-till-after-outputs-are.patch) xf86-video-intel/repos/extra-i686/0003-uxa-Remove-hook-for-CompositeRectangles.patch (from rev 156182, xf86-video-intel/trunk/0003-uxa-Remove-hook-for-CompositeRectangles.patch) xf86-video-intel/repos/extra-i686/0004-uxa-Remove-broken-render-glyphs-to-dst.patch (from rev 156182, xf86-video-intel/trunk/0004-uxa-Remove-broken-render-glyphs-to-dst.patch) xf86-video-intel/repos/extra-i686/0005-uxa-Fix-leak-of-glyph-mask-for-unhandled-glyph-compo.patch (from rev 156182, xf86-video-intel/trunk/0005-uxa-Fix-leak-of-glyph-mask-for-unhandled-glyph-compo.patch) xf86-video-intel/repos/extra-i686/PKGBUILD (from rev 156182, xf86-video-intel/trunk/PKGBUILD) xf86-video-intel/repos/extra-x86_64/0001-uxa-gen3-Remove-special-casing-of-solid-pictures.patch (from rev 156182, xf86-video-intel/trunk/0001-uxa-gen3-Remove-special-casing-of-solid-pictures.patch) xf86-video-intel/repos/extra-x86_64/0002-uxa-Defer-the-call-to-EnterVT-till-after-outputs-are.patch (from rev 156182, xf86-video-intel/trunk/0002-uxa-Defer-the-call-to-EnterVT-till-after-outputs-are.patch) xf86-video-intel/repos/extra-x86_64/0003-uxa-Remove-hook-for-CompositeRectangles.patch (from rev 156182, xf86-video-intel/trunk/0003-uxa-Remove-hook-for-CompositeRectangles.patch) xf86-video-intel/repos/extra-x86_64/0004-uxa-Remove-broken-render-glyphs-to-dst.patch (from rev 156182, xf86-video-intel/trunk/0004-uxa-Remove-broken-render-glyphs-to-dst.patch) xf86-video-intel/repos/extra-x86_64/0005-uxa-Fix-leak-of-glyph-mask-for-unhandled-glyph-compo.patch (from rev 156182, xf86-video-intel/trunk/0005-uxa-Fix-leak-of-glyph-mask-for-unhandled-glyph-compo.patch) xf86-video-intel/repos/extra-x86_64/PKGBUILD (from rev 156182, xf86-video-intel/trunk/PKGBUILD) Deleted: xf86-video-intel/repos/extra-i686/PKGBUILD xf86-video-intel/repos/extra-x86_64/PKGBUILD --+ extra-i686/0001-uxa-gen3-Remove-special-casing-of-solid-pictures.patch | 533 ++ extra-i686/0002-uxa-Defer-the-call-to-EnterVT-till-after-outputs-are.patch | 50 extra-i686/0003-uxa-Remove-hook-for-CompositeRectangles.patch| 255 extra-i686/0004-uxa-Remove-broken-render-glyphs-to-dst.patch | 391 +++ extra-i686/0005-uxa-Fix-leak-of-glyph-mask-for-unhandled-glyph-compo.patch | 40 extra-i686/PKGBUILD | 75 - extra-x86_64/0001-uxa-gen3-Remove-special-casing-of-solid-pictures.patch | 533 ++ extra-x86_64/0002-uxa-Defer-the-call-to-EnterVT-till-after-outputs-are.patch | 50 extra-x86_64/0003-uxa-Remove-hook-for-CompositeRectangles.patch | 255 extra-x86_64/0004-uxa-Remove-broken-render-glyphs-to-dst.patch | 391 +++ extra-x86_64/0005-uxa-Fix-leak-of-glyph-mask-for-unhandled-glyph-compo.patch | 40 extra-x86_64/PKGBUILD| 75 - 12 files changed, 2628 insertions(+), 60 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 156182:156183 to see the changes.
[arch-commits] Commit in nx/trunk (PKGBUILD)
Date: Sunday, April 15, 2012 @ 09:54:31
Author: andyrtr
Revision: 156184
upgpkg: nx 3.5.0.12-0.2
add nx-headers needed to build nxssh
Modified:
nx/trunk/PKGBUILD
--+
PKGBUILD | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-15 12:22:45 UTC (rev 156183)
+++ PKGBUILD2012-04-15 13:54:31 UTC (rev 156184)
@@ -2,9 +2,9 @@
# Maintainer: Andreas Radke andy...@archlinux.org
pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent')
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
pkgver=3.5.0.12
-pkgrel=0.1
+pkgrel=0.2
arch=('i686' 'x86_64')
url=http://wiki.x2go.org/;
license=('GPL')
@@ -79,3 +79,12 @@
cd ${pkgdir}/usr/bin
ln -sv /usr/lib/nx/nxagent .
}
+
+package_nx-headers() {
+
+ pkgdesc=NX headers
+
+ cd ${srcdir}/fakeinstall
+ install -dm755 ${pkgdir}/usr/include/nx
+ cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
+}
[arch-commits] Commit in nx/repos (8 files)
Date: Sunday, April 15, 2012 @ 09:55:12
Author: andyrtr
Revision: 156185
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
nx/repos/staging-i686/PKGBUILD
(from rev 156184, nx/trunk/PKGBUILD)
nx/repos/staging-i686/nx-x11.ld.so.conf.d
(from rev 156184, nx/trunk/nx-x11.ld.so.conf.d)
nx/repos/staging-x86_64/PKGBUILD
(from rev 156184, nx/trunk/PKGBUILD)
nx/repos/staging-x86_64/nx-x11.ld.so.conf.d
(from rev 156184, nx/trunk/nx-x11.ld.so.conf.d)
Deleted:
nx/repos/staging-i686/PKGBUILD
nx/repos/staging-i686/nx-x11.ld.so.conf.d
nx/repos/staging-x86_64/PKGBUILD
nx/repos/staging-x86_64/nx-x11.ld.so.conf.d
+
staging-i686/PKGBUILD | 171 ++-
staging-i686/nx-x11.ld.so.conf.d |2
staging-x86_64/PKGBUILD| 171 ++-
staging-x86_64/nx-x11.ld.so.conf.d |2
4 files changed, 182 insertions(+), 164 deletions(-)
Deleted: staging-i686/PKGBUILD
===
--- staging-i686/PKGBUILD 2012-04-15 13:54:31 UTC (rev 156184)
+++ staging-i686/PKGBUILD 2012-04-15 13:55:12 UTC (rev 156185)
@@ -1,81 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke andy...@archlinux.org
-
-pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent')
-pkgver=3.5.0.12
-pkgrel=0.1
-arch=('i686' 'x86_64')
-url=http://wiki.x2go.org/;
-license=('GPL')
-options=('!makeflags')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies
from subpackages
- 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm'
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
- )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
-nx-x11.ld.so.conf.d)
-md5sums=('a2011e034a318016cf2260c30a567301'
- 'f2ec60c7e2d81bef2f7292d2b33681a6')
-
-build() {
- cd ${srcdir}/nx-libs_$pkgver
- make CONFIGURE=./configure --prefix=/usr --libdir=/usr/lib
--libexecdir=/usr/lib --includedir=/usr/include
- # fake install
- mkdir $srcdir/fakeinstall
- make DESTDIR=$srcdir/fakeinstall install
-}
-
-package_libxcomp() {
-
- pkgdesc=NX X compression library
- depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
-
- cd ${srcdir}/fakeinstall
- install -dm755 ${pkgdir}/usr/lib/
- cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib
-}
-
-package_nxproxy() {
-
- pkgdesc=NX proxy
- depends=('libxcomp')
-
- cd ${srcdir}/fakeinstall
- install -dm755 ${pkgdir}/usr/{bin,share/man/man1}
- cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
- cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1
${pkgdir}/usr/share/man/man1
-}
-
-package_nx-xcompext() {
-
- pkgdesc=Xcompext/Xcompshad library for NX
- depends=('libxcomp' 'nx-x11')
-
- cd ${srcdir}/fakeinstall
- install -dm755 ${pkgdir}/usr/lib/
- cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib
-}
-
-package_nx-x11() {
-
- pkgdesc=NX-X11 lib for the NX framework
- depends=('libxcomp')
-
- cd ${srcdir}/fakeinstall
- install -dm755 ${pkgdir}/{etc/ld.so.conf.d,/usr/lib/nx}
- cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so*
${pkgdir}/usr/lib/nx
-
- install -m 644 $srcdir/nx-x11.ld.so.conf.d
$pkgdir/etc/ld.so.conf.d/nx.conf
-}
-
-package_nxagent() {
-
- pkgdesc=NX X server based on Xnest
- depends=('nx-xcompext')
-
- cd ${srcdir}/fakeinstall
- install -dm755 ${pkgdir}/usr/{bin,lib/nx}
- cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
- cd ${pkgdir}/usr/bin
- ln -sv /usr/lib/nx/nxagent .
-}
Copied: nx/repos/staging-i686/PKGBUILD (from rev 156184, nx/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-04-15 13:55:12 UTC (rev 156185)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Andreas Radke andy...@archlinux.org
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
+pkgver=3.5.0.12
+pkgrel=0.2
+arch=('i686' 'x86_64')
+url=http://wiki.x2go.org/;
+license=('GPL')
+options=('!makeflags')
+makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies
from subpackages
+ 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm'
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
+ )
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
+nx-x11.ld.so.conf.d)
+md5sums=('a2011e034a318016cf2260c30a567301'
+ 'f2ec60c7e2d81bef2f7292d2b33681a6')
+
+build() {
+ cd ${srcdir}/nx-libs_$pkgver
+ make CONFIGURE=./configure --prefix=/usr --libdir=/usr/lib
--libexecdir=/usr/lib --includedir=/usr/include
+ # fake install
+ mkdir $srcdir/fakeinstall
+ make
[arch-commits] Commit in tomcat6/trunk (PKGBUILD)
Date: Sunday, April 15, 2012 @ 10:11:55
Author: guillaume
Revision: 156186
upgpkg: tomcat6 6.0.35-1
Upstream release and added binary tomcat-dbcp.jar
Modified:
tomcat6/trunk/PKGBUILD
--+
PKGBUILD | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-15 13:55:12 UTC (rev 156185)
+++ PKGBUILD2012-04-15 14:11:55 UTC (rev 156186)
@@ -1,21 +1,21 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgbase=tomcat6
pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
-pkgver=6.0.33
-pkgrel=4
+pkgver=6.0.35
+pkgrel=1
arch=('any')
url='http://tomcat.apache.org/'
license=('APACHE')
makedepends=('java-environment=5' 'apache-ant=1.6' 'java-commons-daemon'
'eclipse-ecj')
source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-
http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar
+
http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
tomcat6.conf.d
tomcat6
tomcat6.install)
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
- 'a6ff671562c9ac91e8cc2812760df49d'
+#noextract=(dbcp-${pkgver}.jar)
+md5sums=('4d44a7e7610a83ebe930a781257a8b1d'
+ '171d255cd60894b29a41684ce0ff93a8'
'5a95b41d320aa455fe9cbf97a80b0953'
'8f2ccc09837577394441d29a03b0e667'
'afdb7edc5c7a7b5fa85ad110d021cad3')
@@ -63,7 +63,8 @@
package_tomcat6() {
pkgdesc=Servlet-2.5/JSP-2.1 Container
- depends=('java-runtime=5' 'java-jsvc' 'java-servlet2.5-tomcat'
'java-jsp2.1-tomcat' 'eclipse-ecj')
+ depends=('java-runtime=5' 'java-jsvc' 'eclipse-ecj'
+ java-servlet2.5-tomcat=${pkgver} java-jsp2.1-tomcat=${pkgver})
optdepends=('tomcat-native: to allow optimal performance in production
environments')
backup=(etc/tomcat6/catalina.policy
etc/tomcat6/catalina.properties
@@ -86,6 +87,7 @@
# eclipse-ecj is packaged on its own
rm lib/eclipse-ecj.jar
install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
+ ln -s /usr/share/java/eclipse-ecj.jar
${pkgdir}/usr/share/java/${pkgname}/eclipse-ecj.jar
# Provided by previous packages
rm ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
@@ -98,7 +100,7 @@
${pkgdir}/usr/share/java/${pkgname}/${j}.jar
done
- install -m644 ${srcdir}/dbcp-${pkgver}.jar \
+ install -m644 ${srcdir}/apache-tomcat-${pkgver}/lib/tomcat-dbcp.jar \
${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp-${pkgver}.jar
ln -s tomcat-dbcp-${pkgver}.jar \
${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp.jar
[arch-commits] Commit in tomcat6/repos/extra-any (8 files)
Date: Sunday, April 15, 2012 @ 10:12:20
Author: guillaume
Revision: 156187
archrelease: copy trunk to extra-any
Added:
tomcat6/repos/extra-any/PKGBUILD
(from rev 156186, tomcat6/trunk/PKGBUILD)
tomcat6/repos/extra-any/tomcat6
(from rev 156186, tomcat6/trunk/tomcat6)
tomcat6/repos/extra-any/tomcat6.conf.d
(from rev 156186, tomcat6/trunk/tomcat6.conf.d)
tomcat6/repos/extra-any/tomcat6.install
(from rev 156186, tomcat6/trunk/tomcat6.install)
Deleted:
tomcat6/repos/extra-any/PKGBUILD
tomcat6/repos/extra-any/tomcat6
tomcat6/repos/extra-any/tomcat6.conf.d
tomcat6/repos/extra-any/tomcat6.install
-+
PKGBUILD| 264 +++---
tomcat6 | 154 +++
tomcat6.conf.d | 30 +++---
tomcat6.install | 54 +--
4 files changed, 252 insertions(+), 250 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2012-04-15 14:11:55 UTC (rev 156186)
+++ PKGBUILD2012-04-15 14:12:20 UTC (rev 156187)
@@ -1,131 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat6
-pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
-pkgver=6.0.33
-pkgrel=4
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-makedepends=('java-environment=5' 'apache-ant=1.6' 'java-commons-daemon'
'eclipse-ecj')
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-
http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar
-tomcat6.conf.d
-tomcat6
-tomcat6.install)
-
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
- 'a6ff671562c9ac91e8cc2812760df49d'
- '5a95b41d320aa455fe9cbf97a80b0953'
- '8f2ccc09837577394441d29a03b0e667'
- 'afdb7edc5c7a7b5fa85ad110d021cad3')
-
-_servletver=2.5
-_jspver=2.1
-
-#FIXME ant target 'download' should not be called
-build() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src
-
- . /etc/profile.d/apache-ant.sh
- ant download deploy\
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package_java-servlet2.5-tomcat() {
- pkgdesc=Servlet ${_servletver} java library implementation by Apache Tomcat
- depends=('java-environment=5')
-
- cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib
-
- install -dm755 ${pkgdir}/usr/share/java/servlet${_servletver}-tomcat
- install -m644 servlet-api.jar \
-
${pkgdir}/usr/share/java/servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar
-# ln -s servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar \
-#${pkgdir}/usr/share/java/servlet-api.jar
-}
-
-package_java-jsp2.1-tomcat() {
- pkgdesc=JSP 2.1 java library implementation by Apache Tomcat
- depends=('java-environment=5')
-
- cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib
-
- install -dm755 ${pkgdir}/usr/share/java/jsp${_jspver}-tomcat
- for j in el-api jsp-api; do
-install -m644 ${j}.jar \
-
${pkgdir}/usr/share/java/jsp${_jspver}-tomcat/${j}-${_jspver}.jar
-#ln -s jsp${_jspver}-tomcat/${j}-${_jspver}.jar
${pkgdir}/usr/share/java/${j}.jar
- done
-}
-
-package_tomcat6() {
- pkgdesc=Servlet-2.5/JSP-2.1 Container
- depends=('java-runtime=5' 'java-jsvc' 'java-servlet2.5-tomcat'
'java-jsp2.1-tomcat' 'eclipse-ecj')
- optdepends=('tomcat-native: to allow optimal performance in production
environments')
- backup=(etc/tomcat6/catalina.policy
- etc/tomcat6/catalina.properties
- etc/tomcat6/context.xml
- etc/tomcat6/logging.properties
- etc/tomcat6/server.xml
- etc/tomcat6/tomcat-users.xml
- etc/tomcat6/web.xml
- etc/conf.d/tomcat6)
- install=tomcat6.install
-
- cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
-
- # eclipse-ecj is packaged on its own
- rm lib/eclipse-ecj.jar
- install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-
- # Provided by previous packages
- rm ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
- ln -s
/usr/share/java/servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar \
-${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
-
- for j in el-api jsp-api; do
-rm ${pkgdir}/usr/share/java/${pkgname}/${j}.jar
-ln -s /usr/share/java/jsp${_jspver}-tomcat/${j}-${_jspver}.jar \
- ${pkgdir}/usr/share/java/${pkgname}/${j}.jar
- done
-
- install -m644 ${srcdir}/dbcp-${pkgver}.jar \
-
[arch-commits] Commit in nx-common/trunk (PKGBUILD)
Date: Sunday, April 15, 2012 @ 10:20:08
Author: andyrtr
Revision: 156188
upgpkg: nx-common 3.5.0-4.1
mv files to /usr; use new nx-libs
Modified:
nx-common/trunk/PKGBUILD
--+
PKGBUILD | 46 --
1 file changed, 16 insertions(+), 30 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-15 14:12:20 UTC (rev 156187)
+++ PKGBUILD2012-04-15 14:20:08 UTC (rev 156188)
@@ -4,56 +4,42 @@
pkgname=nx-common
pkgver=3.5.0
-pkgrel=4
+pkgrel=4.1
pkgdesc=NoMachine NX common package for client and server
arch=('i686' 'x86_64')
license=('GPL')
url=http://nomachine.com/;
-depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'bash')
-makedepends=('xorg-server-devel')
-source=( #Compression libs and proxy sources
- http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz
- http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz
- http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz
- nxcompsh-gcc43.patch
- nx-3.5.0-libpng15.patch)
-options=(!libtool)
-md5sums=('ad8c0f133122c6d07732ca69c8759410'
- '84ade443b79ea079380b754aba9d392e'
+depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'libxcomp') # 'bash'
+makedepends=('xorg-server-devel' 'nx-headers')
+source=(http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz
+http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz
+nxcompsh-gcc43.patch)
+options=('!libtool')
+md5sums=('84ade443b79ea079380b754aba9d392e'
'f52fcdb38e09f8dcfb9ff0344dfbbbd6'
- 'b6c279654dac421fc3dd1a27d66ff53c'
- '2966353cabb96829eab291212ef078dc')
+ 'b6c279654dac421fc3dd1a27d66ff53c')
build() {
- # nxcomp
- cd ${srcdir}/nxcomp
- patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch
-
- ./configure --prefix=/opt/NX
- make
# nxcompsh
cd ${srcdir}/nxcompsh
patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
-
- ./configure --prefix=/opt/NX
+ ./configure --prefix=/usr/lib/nx
make
+
# nxssh
cd ${srcdir}/nxssh
- ./configure --prefix=/opt/NX
+ sed -i s:NX.h:nx/NX.h:g clientloop.c packet.c proxy.c
+ ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib
make
}
package() {
- mkdir -p ${pkgdir}/opt/NX/bin
- mkdir -p ${pkgdir}/opt/NX/lib
+ install -dm755 ${pkgdir}/usr/{bin,lib/nx}
- # nxcomp
- cd ${srcdir}/nxcomp
- cp -a libXcomp.so* ${pkgdir}/opt/NX/lib
# nxcompsh
cd ${srcdir}/nxcompsh
- cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib
+ cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx # really needed?
# nxssh
cd ${srcdir}/nxssh
- install -D -m755 nxssh ${pkgdir}/opt/NX/bin/nxssh
+ install -D -m755 nxssh ${pkgdir}/usr/bin/nxssh
}
[arch-commits] Commit in tomcat-native/trunk (PKGBUILD)
Date: Sunday, April 15, 2012 @ 10:20:10
Author: guillaume
Revision: 156189
upgpkg: tomcat-native 1.1.23-1
Upstream release
Modified:
tomcat-native/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-15 14:20:08 UTC (rev 156188)
+++ PKGBUILD2012-04-15 14:20:10 UTC (rev 156189)
@@ -2,16 +2,16 @@
# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
pkgname=tomcat-native
-pkgver=1.1.22
+pkgver=1.1.23
pkgrel=1
pkgdesc=The Apache Tomcat Native Library
arch=('i686' 'x86_64')
url=http://tomcat.apache.org/;
-license=Apache
+license=(Apache)
depends=('apr' 'openssl')
makedepends=('java-environment')
source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
-md5sums=('44d764f8d99d0454c7337ba9701558ee')
+md5sums=('f2a55b5a19adbe491edc98e0c11d9028')
build() {
cd ${srcdir}/tomcat-native-${pkgver}-src/jni/native
[arch-commits] Commit in tomcat-native/repos (4 files)
Date: Sunday, April 15, 2012 @ 10:20:46
Author: guillaume
Revision: 156190
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
tomcat-native/repos/extra-i686/PKGBUILD
(from rev 156189, tomcat-native/trunk/PKGBUILD)
tomcat-native/repos/extra-x86_64/PKGBUILD
(from rev 156189, tomcat-native/trunk/PKGBUILD)
Deleted:
tomcat-native/repos/extra-i686/PKGBUILD
tomcat-native/repos/extra-x86_64/PKGBUILD
---+
extra-i686/PKGBUILD | 64
extra-x86_64/PKGBUILD | 64
2 files changed, 64 insertions(+), 64 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-04-15 14:20:10 UTC (rev 156189)
+++ extra-i686/PKGBUILD 2012-04-15 14:20:46 UTC (rev 156190)
@@ -1,32 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
-
-pkgname=tomcat-native
-pkgver=1.1.22
-pkgrel=1
-pkgdesc=The Apache Tomcat Native Library
-arch=('i686' 'x86_64')
-url=http://tomcat.apache.org/;
-license=Apache
-depends=('apr' 'openssl')
-makedepends=('java-environment')
-source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
-md5sums=('44d764f8d99d0454c7337ba9701558ee')
-
-build() {
- cd ${srcdir}/tomcat-native-${pkgver}-src/jni/native
-
- ./configure \
---prefix=/usr \
---with-java-home=${JAVA_HOME} \
---with-apr=/usr \
---with-ssl=/usr
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}-src/jni/native
-
- make DESTDIR=${pkgdir} install
- rm -rf ${pkgdir}/usr/{bin,include}
-}
Copied: tomcat-native/repos/extra-i686/PKGBUILD (from rev 156189,
tomcat-native/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-04-15 14:20:46 UTC (rev 156190)
@@ -0,0 +1,32 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
+
+pkgname=tomcat-native
+pkgver=1.1.23
+pkgrel=1
+pkgdesc=The Apache Tomcat Native Library
+arch=('i686' 'x86_64')
+url=http://tomcat.apache.org/;
+license=(Apache)
+depends=('apr' 'openssl')
+makedepends=('java-environment')
+source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
+md5sums=('f2a55b5a19adbe491edc98e0c11d9028')
+
+build() {
+ cd ${srcdir}/tomcat-native-${pkgver}-src/jni/native
+
+ ./configure \
+--prefix=/usr \
+--with-java-home=${JAVA_HOME} \
+--with-apr=/usr \
+--with-ssl=/usr
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}-src/jni/native
+
+ make DESTDIR=${pkgdir} install
+ rm -rf ${pkgdir}/usr/{bin,include}
+}
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2012-04-15 14:20:10 UTC (rev 156189)
+++ extra-x86_64/PKGBUILD 2012-04-15 14:20:46 UTC (rev 156190)
@@ -1,32 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
-
-pkgname=tomcat-native
-pkgver=1.1.22
-pkgrel=1
-pkgdesc=The Apache Tomcat Native Library
-arch=('i686' 'x86_64')
-url=http://tomcat.apache.org/;
-license=Apache
-depends=('apr' 'openssl')
-makedepends=('java-environment')
-source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
-md5sums=('44d764f8d99d0454c7337ba9701558ee')
-
-build() {
- cd ${srcdir}/tomcat-native-${pkgver}-src/jni/native
-
- ./configure \
---prefix=/usr \
---with-java-home=${JAVA_HOME} \
---with-apr=/usr \
---with-ssl=/usr
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}-src/jni/native
-
- make DESTDIR=${pkgdir} install
- rm -rf ${pkgdir}/usr/{bin,include}
-}
Copied: tomcat-native/repos/extra-x86_64/PKGBUILD (from rev 156189,
tomcat-native/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-04-15 14:20:46 UTC (rev 156190)
@@ -0,0 +1,32 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
+
+pkgname=tomcat-native
+pkgver=1.1.23
+pkgrel=1
+pkgdesc=The Apache Tomcat Native Library
+arch=('i686' 'x86_64')
+url=http://tomcat.apache.org/;
+license=(Apache)
+depends=('apr' 'openssl')
+makedepends=('java-environment')
+source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
+md5sums=('f2a55b5a19adbe491edc98e0c11d9028')
+
+build() {
+ cd ${srcdir}/tomcat-native-${pkgver}-src/jni/native
+
+ ./configure \
+--prefix=/usr \
+--with-java-home=${JAVA_HOME} \
+--with-apr=/usr \
+--with-ssl=/usr
+ make
+}
+
[arch-commits] Commit in nx-common/repos (10 files)
Date: Sunday, April 15, 2012 @ 10:20:58
Author: andyrtr
Revision: 156191
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
nx-common/repos/staging-i686/
nx-common/repos/staging-i686/NXproto.h.64bit.diff
(from rev 156189, nx-common/trunk/NXproto.h.64bit.diff)
nx-common/repos/staging-i686/PKGBUILD
(from rev 156189, nx-common/trunk/PKGBUILD)
nx-common/repos/staging-i686/nx-3.5.0-libpng15.patch
(from rev 156189, nx-common/trunk/nx-3.5.0-libpng15.patch)
nx-common/repos/staging-i686/nxcompsh-gcc43.patch
(from rev 156189, nx-common/trunk/nxcompsh-gcc43.patch)
nx-common/repos/staging-x86_64/
nx-common/repos/staging-x86_64/NXproto.h.64bit.diff
(from rev 156190, nx-common/trunk/NXproto.h.64bit.diff)
nx-common/repos/staging-x86_64/PKGBUILD
(from rev 156190, nx-common/trunk/PKGBUILD)
nx-common/repos/staging-x86_64/nx-3.5.0-libpng15.patch
(from rev 156190, nx-common/trunk/nx-3.5.0-libpng15.patch)
nx-common/repos/staging-x86_64/nxcompsh-gcc43.patch
(from rev 156190, nx-common/trunk/nxcompsh-gcc43.patch)
+
staging-i686/NXproto.h.64bit.diff | 66 +++
staging-i686/PKGBUILD | 45 +
staging-i686/nx-3.5.0-libpng15.patch | 30 ++
staging-i686/nxcompsh-gcc43.patch | 19
staging-x86_64/NXproto.h.64bit.diff| 66 +++
staging-x86_64/PKGBUILD| 45 +
staging-x86_64/nx-3.5.0-libpng15.patch | 30 ++
staging-x86_64/nxcompsh-gcc43.patch| 19
8 files changed, 320 insertions(+)
Copied: nx-common/repos/staging-i686/NXproto.h.64bit.diff (from rev 156189,
nx-common/trunk/NXproto.h.64bit.diff)
===
--- staging-i686/NXproto.h.64bit.diff (rev 0)
+++ staging-i686/NXproto.h.64bit.diff 2012-04-15 14:20:58 UTC (rev 156191)
@@ -0,0 +1,66 @@
+--- nxcomp.old/NXproto.h 2006-06-19 19:55:56.0 +0200
nxcomp/NXproto.h 2007-02-12 18:17:41.0 +0100
+@@ -26,6 +26,30 @@
+ #include X11/Xmd.h
+ #include X11/Xproto.h
+
++/*
++ Copied from Xproto.h
++ */
++
++/* For the purpose of the structure definitions in this file,
++we must redefine the following types in terms of Xmd.h's types, which may
++include bit fields. All of these are #undef'd at the end of this file,
++restoring the definitions in X.h. */
++
++#define Window CARD32
++#define Drawable CARD32
++#define Font CARD32
++#define Pixmap CARD32
++#define Cursor CARD32
++#define Colormap CARD32
++#define GContext CARD32
++#define Atom CARD32
++#define VisualID CARD32
++#define Time CARD32
++#define KeyCode CARD8
++#define KeySym CARD32
++
++/* End copied from Xproto.h */
++
+ #define sz_xNXGetControlParametersReq 4
+ #define sz_xNXGetCleanupParametersReq 4
+ #define sz_xNXGetImageParametersReq 4
+@@ -343,9 +367,9 @@
+ CARD8dstDepth;
+ CARD32 srcLength B32;
+ CARD32 dstLength B32;
+-INT16srcX B16, srcY B16;
++CARD16srcX B16, srcY B16;
+ CARD16 srcWidth B16, srcHeight B16;
+-INT16dstX B16, dstY B16;
++CARD16dstX B16, dstY B16;
+ CARD16 dstWidth B16, dstHeight B16;
+ } xNXPutPackedImageReq;
+
+@@ -463,4 +487,20 @@
+ }
+ #endif
+
++/* Copied from Xproto.h */
++
++/* restore these definitions back to the typedefs in X.h */
++#undef Window
++#undef Drawable
++#undef Font
++#undef Pixmap
++#undef Cursor
++#undef Colormap
++#undef GContext
++#undef Atom
++#undef VisualID
++#undef Time
++#undef KeyCode
++#undef KeySym
++
+ #endif /* NXproto_H */
Copied: nx-common/repos/staging-i686/PKGBUILD (from rev 156189,
nx-common/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-04-15 14:20:58 UTC (rev 156191)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+# Contributed: eliott eli...@solarblue.net, Andre Naumann
anaum...@sparced.org
+
+pkgname=nx-common
+pkgver=3.5.0
+pkgrel=4.1
+pkgdesc=NoMachine NX common package for client and server
+arch=('i686' 'x86_64')
+license=('GPL')
+url=http://nomachine.com/;
+depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'libxcomp') # 'bash'
+makedepends=('xorg-server-devel' 'nx-headers')
+source=(http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz
+http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz
+nxcompsh-gcc43.patch)
+options=('!libtool')
+md5sums=('84ade443b79ea079380b754aba9d392e'
+ 'f52fcdb38e09f8dcfb9ff0344dfbbbd6'
+ 'b6c279654dac421fc3dd1a27d66ff53c')
+
+build() {
+ # nxcompsh
+ cd ${srcdir}/nxcompsh
+ patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
+ ./configure --prefix=/usr/lib/nx
+ make
+
+ # nxssh
+ cd
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Sunday, April 15, 2012 @ 10:26:07
Author: andrea
Revision: 156192
Fix make/dependencies; add replaces(koffice-kformula) to calligra-plugins
(FS#29463); build marble support
Modified:
calligra/trunk/PKGBUILD
--+
PKGBUILD | 80 ++---
1 file changed, 35 insertions(+), 45 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-15 14:20:58 UTC (rev 156191)
+++ PKGBUILD2012-04-15 14:26:07 UTC (rev 156192)
@@ -20,17 +20,18 @@
'calligra-sheets'
'calligra-words'
'calligra-handbook'
- 'calligra-thesaurus-doc'
'calligra-braindump'
'calligra-flow')
pkgver=2.4.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
-url='http://www.calligra-suite.org'
+url='http://www.calligra-suite.org/'
license=('FDL1.2' 'GPL2' 'LGPL')
-makedepends=('kdepimlibs' 'eigen2' 'freetds' 'kdegraphics-okular' 'libgsf'
- 'libwpd' 'libwpg' 'pstoedit' 'glew' 'gsl' 'cmake' 'automoc4'
- 'boost' 'libkdcraw' 'libpqxx' 'fftw' 'opengtl' 'lcms2')
+makedepends=('cmake' 'automoc4' 'boost ' 'eigen2'
+ 'kdepimlibs' 'libpqxx' 'freetds' 'xbase'
+ 'kdegraphics-okular' 'gsl' 'kdeedu-marble'
+ 'libwpd' 'libwpg' 'pstoedit' 'glew'
+ 'fftw' 'opengtl' 'lcms2' 'libkdcraw' 'wv2')
groups=('calligra')
source=(http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2;
'do-not-build-hancomword.patch')
@@ -46,24 +47,16 @@
cd build
cmake ../${pkgbase}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
--DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_active=OFF \
-DBUILD_mobile=OFF \
--DBUILD_mysql=OFF \
--DKDCRAW_LOCAL_FOUND=/usr/lib/libkdcraw.so \
--DWITH_Marble=OFF \
-DIHAVEPATCHEDQT=1
make
}
package_calligra-filters() {
pkgdesc=Filters for the Calligra office suite
- optdepends=('libgsf: Microsoft Word document importer'
- 'libwpd: WordPerfect document importer'
- 'libwpg: Corel WordPerfect Graphics image importer'
- 'pstoedit: Karbon EPS import filter'
- 'libkdcraw: support for raw images')
+ optdepends=('libwpg: Corel WordPerfect Graphics image importer')
conflicts=('koffice-filters')
replaces=('koffice-filters')
install=calligra-filters.install
@@ -94,9 +87,10 @@
package_calligra-plugins() {
pkgdesc=Plugins for the Calligra office suite
- depends=('calligra-libs')
+ depends=('calligra-libs' 'calligra-filters')
+ optdepends=('kdeedu-marble: map shape for Calligra')
conflicts=('koffice-plugins' 'koffice-kchart')
- replaces=('koffice-plugins' 'koffice-kchart')
+ replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula')
cd ${srcdir}/build/plugins
make DESTDIR=${pkgdir} install
@@ -104,7 +98,6 @@
package_calligra-pics() {
pkgdesc=Icons for the Calligra office suite
- depends=('calligra-libs')
conflicts=('koffice-pics')
replaces=('koffice-pics')
install=calligra.install
@@ -143,13 +136,11 @@
make DESTDIR=${pkgdir} install
}
- package common files done #
-
- package apps and their docs #
-
package_calligra-karbon() {
pkgdesc=Create scalable vector drawings
- depends=('calligra-libs' 'calligra-templates')
+ depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime')
+ optdepends=('calligra-filters: import/export filters'
+ 'calligra-tools: extra calligra tools')
conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
install=calligra-karbon.install
@@ -161,6 +152,13 @@
package_calligra-kexi() {
pkgdesc=Develop desktop database applications
depends=('calligra-libs' 'calligra-templates')
+ optdepends=('libmysqlclient: MySQL driver'
+ 'libpqxx: PostgreSQL driver'
+ 'freetds: Sybase MS SQL driver'
+ 'xbase: XBase driver'
+ 'calligra-sheets: Spreadsheet-to-Kexi-table import plugin'
+ 'kdeedu-marble: map form widget'
+ 'calligra-plugins: extra calligra plugins')
conflicts=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
replaces=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
install=calligra-kexi.install
@@ -192,8 +190,8 @@
package_calligra-stage() {
pkgdesc=Write presentation documents
- depends=('calligra-libs' 'calligra-templates')
- optdepends=('calligra-filters: import/export filters')
+ depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime')
+ optdepends=('calligra-plugins: extra calligra plugins')
conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc'
'calligra-stage-doc')
replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
install=calligra-stage.install
@@ -204,9 +202,8 @@
[arch-commits] Commit in nx/trunk (PKGBUILD)
Date: Sunday, April 15, 2012 @ 11:10:23
Author: andyrtr
Revision: 156193
upgpkg: nx 3.5.0.12-0.3
add nxauth to x11-libs
Modified:
nx/trunk/PKGBUILD
--+
PKGBUILD |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-15 14:26:07 UTC (rev 156192)
+++ PKGBUILD2012-04-15 15:10:23 UTC (rev 156193)
@@ -4,7 +4,7 @@
pkgbase=nx
pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
pkgver=3.5.0.12
-pkgrel=0.2
+pkgrel=0.3
arch=('i686' 'x86_64')
url=http://wiki.x2go.org/;
license=('GPL')
@@ -62,8 +62,9 @@
depends=('libxcomp')
cd ${srcdir}/fakeinstall
- install -dm755 ${pkgdir}/{etc/ld.so.conf.d,/usr/lib/nx}
+ install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx}
cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so*
${pkgdir}/usr/lib/nx
+ cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/bin
install -m 644 $srcdir/nx-x11.ld.so.conf.d
$pkgdir/etc/ld.so.conf.d/nx.conf
}
@@ -75,7 +76,7 @@
cd ${srcdir}/fakeinstall
install -dm755 ${pkgdir}/usr/{bin,lib/nx}
- cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
+ cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
cd ${pkgdir}/usr/bin
ln -sv /usr/lib/nx/nxagent .
}
[arch-commits] Commit in nx/repos (8 files)
Date: Sunday, April 15, 2012 @ 11:11:02
Author: andyrtr
Revision: 156194
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
nx/repos/staging-i686/PKGBUILD
(from rev 156193, nx/trunk/PKGBUILD)
nx/repos/staging-i686/nx-x11.ld.so.conf.d
(from rev 156193, nx/trunk/nx-x11.ld.so.conf.d)
nx/repos/staging-x86_64/PKGBUILD
(from rev 156193, nx/trunk/PKGBUILD)
nx/repos/staging-x86_64/nx-x11.ld.so.conf.d
(from rev 156193, nx/trunk/nx-x11.ld.so.conf.d)
Deleted:
nx/repos/staging-i686/PKGBUILD
nx/repos/staging-i686/nx-x11.ld.so.conf.d
nx/repos/staging-x86_64/PKGBUILD
nx/repos/staging-x86_64/nx-x11.ld.so.conf.d
+
staging-i686/PKGBUILD | 181 +--
staging-i686/nx-x11.ld.so.conf.d |2
staging-x86_64/PKGBUILD| 181 +--
staging-x86_64/nx-x11.ld.so.conf.d |2
4 files changed, 184 insertions(+), 182 deletions(-)
Deleted: staging-i686/PKGBUILD
===
--- staging-i686/PKGBUILD 2012-04-15 15:10:23 UTC (rev 156193)
+++ staging-i686/PKGBUILD 2012-04-15 15:11:02 UTC (rev 156194)
@@ -1,90 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke andy...@archlinux.org
-
-pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
-pkgver=3.5.0.12
-pkgrel=0.2
-arch=('i686' 'x86_64')
-url=http://wiki.x2go.org/;
-license=('GPL')
-options=('!makeflags')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies
from subpackages
- 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm'
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
- )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
-nx-x11.ld.so.conf.d)
-md5sums=('a2011e034a318016cf2260c30a567301'
- 'f2ec60c7e2d81bef2f7292d2b33681a6')
-
-build() {
- cd ${srcdir}/nx-libs_$pkgver
- make CONFIGURE=./configure --prefix=/usr --libdir=/usr/lib
--libexecdir=/usr/lib --includedir=/usr/include
- # fake install
- mkdir $srcdir/fakeinstall
- make DESTDIR=$srcdir/fakeinstall install
-}
-
-package_libxcomp() {
-
- pkgdesc=NX X compression library
- depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
-
- cd ${srcdir}/fakeinstall
- install -dm755 ${pkgdir}/usr/lib/
- cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib
-}
-
-package_nxproxy() {
-
- pkgdesc=NX proxy
- depends=('libxcomp')
-
- cd ${srcdir}/fakeinstall
- install -dm755 ${pkgdir}/usr/{bin,share/man/man1}
- cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
- cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1
${pkgdir}/usr/share/man/man1
-}
-
-package_nx-xcompext() {
-
- pkgdesc=Xcompext/Xcompshad library for NX
- depends=('libxcomp' 'nx-x11')
-
- cd ${srcdir}/fakeinstall
- install -dm755 ${pkgdir}/usr/lib/
- cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib
-}
-
-package_nx-x11() {
-
- pkgdesc=NX-X11 lib for the NX framework
- depends=('libxcomp')
-
- cd ${srcdir}/fakeinstall
- install -dm755 ${pkgdir}/{etc/ld.so.conf.d,/usr/lib/nx}
- cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so*
${pkgdir}/usr/lib/nx
-
- install -m 644 $srcdir/nx-x11.ld.so.conf.d
$pkgdir/etc/ld.so.conf.d/nx.conf
-}
-
-package_nxagent() {
-
- pkgdesc=NX X server based on Xnest
- depends=('nx-xcompext')
-
- cd ${srcdir}/fakeinstall
- install -dm755 ${pkgdir}/usr/{bin,lib/nx}
- cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
- cd ${pkgdir}/usr/bin
- ln -sv /usr/lib/nx/nxagent .
-}
-
-package_nx-headers() {
-
- pkgdesc=NX headers
-
- cd ${srcdir}/fakeinstall
- install -dm755 ${pkgdir}/usr/include/nx
- cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
-}
Copied: nx/repos/staging-i686/PKGBUILD (from rev 156193, nx/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-04-15 15:11:02 UTC (rev 156194)
@@ -0,0 +1,91 @@
+# $Id$
+# Maintainer: Andreas Radke andy...@archlinux.org
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
+pkgver=3.5.0.12
+pkgrel=0.3
+arch=('i686' 'x86_64')
+url=http://wiki.x2go.org/;
+license=('GPL')
+options=('!makeflags')
+makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies
from subpackages
+ 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm'
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
+ )
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
+nx-x11.ld.so.conf.d)
+md5sums=('a2011e034a318016cf2260c30a567301'
+ 'f2ec60c7e2d81bef2f7292d2b33681a6')
+
+build() {
[arch-commits] Commit in gnome-applets/trunk (PKGBUILD)
Date: Sunday, April 15, 2012 @ 11:53:10
Author: ibiru
Revision: 156195
update to 3.4.1
Modified:
gnome-applets/trunk/PKGBUILD
--+
PKGBUILD | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-15 15:11:02 UTC (rev 156194)
+++ PKGBUILD2012-04-15 15:53:10 UTC (rev 156195)
@@ -2,22 +2,22 @@
# Maintainer: Jan de Groot j...@archlinux.org
pkgname=gnome-applets
-pkgver=3.2.1
+pkgver=3.4.1
pkgrel=1
pkgdesc=GNOME Applets
arch=(i686 x86_64)
license=('GPL')
depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify' 'cpufrequtils')
-makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon'
'networkmanager' 'gnome-common')
+makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon'
'networkmanager')
options=(!emptydirs)
url=http://www.gnome.org;
groups=(gnome)
install=gnome-applets.install
-source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('cba1dff05bf2aad57f0df2ea746a9bf1c3483a0388a70bf501f61d95b1017dc1')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('ec5487eb81fb29851b6336de94a329f5623e73830d61022e0e20fe3d038a415e')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd $pkgname-$pkgver
PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
--sysconfdir=/etc --libexecdir=/usr/lib/gnome-applets \
--localstatedir=/var --disable-static \
@@ -27,10 +27,10 @@
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install
+ cd $pkgname-$pkgver
+ make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install
- install -m755 -d ${pkgdir}/usr/share/gconf/schemas
- gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas
--domain gnome-applets-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+ install -m755 -d $pkgdir/usr/share/gconf/schemas
+ gconf-merge-schema $pkgdir/usr/share/gconf/schemas/$pkgname.schemas
--domain gnome-applets-3.0 $pkgdir/etc/gconf/schemas/*.schemas
+ rm -f $pkgdir/etc/gconf/schemas/*.schemas
}
[arch-commits] Commit in gnome-applets/repos (6 files)
Date: Sunday, April 15, 2012 @ 11:56:32
Author: ibiru
Revision: 156196
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
gnome-applets/repos/testing-i686/
gnome-applets/repos/testing-i686/PKGBUILD
(from rev 156195, gnome-applets/trunk/PKGBUILD)
gnome-applets/repos/testing-i686/gnome-applets.install
(from rev 156195, gnome-applets/trunk/gnome-applets.install)
gnome-applets/repos/testing-x86_64/
gnome-applets/repos/testing-x86_64/PKGBUILD
(from rev 156195, gnome-applets/trunk/PKGBUILD)
gnome-applets/repos/testing-x86_64/gnome-applets.install
(from rev 156195, gnome-applets/trunk/gnome-applets.install)
--+
testing-i686/PKGBUILD| 36 +
testing-i686/gnome-applets.install | 22
testing-x86_64/PKGBUILD | 36 +
testing-x86_64/gnome-applets.install | 22
4 files changed, 116 insertions(+)
Copied: gnome-applets/repos/testing-i686/PKGBUILD (from rev 156195,
gnome-applets/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-04-15 15:56:32 UTC (rev 156196)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=gnome-applets
+pkgver=3.4.1
+pkgrel=1
+pkgdesc=GNOME Applets
+arch=(i686 x86_64)
+license=('GPL')
+depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify' 'cpufrequtils')
+makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon'
'networkmanager')
+options=(!emptydirs)
+url=http://www.gnome.org;
+groups=(gnome)
+install=gnome-applets.install
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('ec5487eb81fb29851b6336de94a329f5623e73830d61022e0e20fe3d038a415e')
+
+build() {
+ cd $pkgname-$pkgver
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+ --sysconfdir=/etc --libexecdir=/usr/lib/gnome-applets \
+ --localstatedir=/var --disable-static \
+ --disable-scrollkeeper --disable-schemas-install \
+ --without-hal
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install
+
+ install -m755 -d $pkgdir/usr/share/gconf/schemas
+ gconf-merge-schema $pkgdir/usr/share/gconf/schemas/$pkgname.schemas
--domain gnome-applets-3.0 $pkgdir/etc/gconf/schemas/*.schemas
+ rm -f $pkgdir/etc/gconf/schemas/*.schemas
+}
Copied: gnome-applets/repos/testing-i686/gnome-applets.install (from rev
156195, gnome-applets/trunk/gnome-applets.install)
===
--- testing-i686/gnome-applets.install (rev 0)
+++ testing-i686/gnome-applets.install 2012-04-15 15:56:32 UTC (rev 156196)
@@ -0,0 +1,22 @@
+pkgname=gnome-applets
+
+post_install() {
+ usr/sbin/gconfpkg --install ${pkgname}
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
Copied: gnome-applets/repos/testing-x86_64/PKGBUILD (from rev 156195,
gnome-applets/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-04-15 15:56:32 UTC (rev 156196)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=gnome-applets
+pkgver=3.4.1
+pkgrel=1
+pkgdesc=GNOME Applets
+arch=(i686 x86_64)
+license=('GPL')
+depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify' 'cpufrequtils')
+makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon'
'networkmanager')
+options=(!emptydirs)
+url=http://www.gnome.org;
+groups=(gnome)
+install=gnome-applets.install
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('ec5487eb81fb29851b6336de94a329f5623e73830d61022e0e20fe3d038a415e')
+
+build() {
+ cd $pkgname-$pkgver
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+ --sysconfdir=/etc --libexecdir=/usr/lib/gnome-applets \
+ --localstatedir=/var --disable-static \
+ --disable-scrollkeeper --disable-schemas-install \
+ --without-hal
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install
+
+ install -m755 -d $pkgdir/usr/share/gconf/schemas
+ gconf-merge-schema $pkgdir/usr/share/gconf/schemas/$pkgname.schemas
--domain gnome-applets-3.0 $pkgdir/etc/gconf/schemas/*.schemas
+ rm -f $pkgdir/etc/gconf/schemas/*.schemas
+}
Copied: gnome-applets/repos/testing-x86_64/gnome-applets.install (from rev
156195, gnome-applets/trunk/gnome-applets.install)
[arch-commits] Commit in calligra/repos (56 files)
Date: Sunday, April 15, 2012 @ 12:00:02 Author: andrea Revision: 156197 archrelease: copy trunk to testing-i686, testing-x86_64 Added: calligra/repos/testing-i686/PKGBUILD (from rev 156196, calligra/trunk/PKGBUILD) calligra/repos/testing-i686/calligra-braindump.install (from rev 156196, calligra/trunk/calligra-braindump.install) calligra/repos/testing-i686/calligra-filters.install (from rev 156196, calligra/trunk/calligra-filters.install) calligra/repos/testing-i686/calligra-flow.install (from rev 156196, calligra/trunk/calligra-flow.install) calligra/repos/testing-i686/calligra-karbon.install (from rev 156196, calligra/trunk/calligra-karbon.install) calligra/repos/testing-i686/calligra-kexi.install (from rev 156196, calligra/trunk/calligra-kexi.install) calligra/repos/testing-i686/calligra-krita.install (from rev 156196, calligra/trunk/calligra-krita.install) calligra/repos/testing-i686/calligra-plan.install (from rev 156196, calligra/trunk/calligra-plan.install) calligra/repos/testing-i686/calligra-sheets.install (from rev 156196, calligra/trunk/calligra-sheets.install) calligra/repos/testing-i686/calligra-stage.install (from rev 156196, calligra/trunk/calligra-stage.install) calligra/repos/testing-i686/calligra-tools.install (from rev 156196, calligra/trunk/calligra-tools.install) calligra/repos/testing-i686/calligra-words.install (from rev 156196, calligra/trunk/calligra-words.install) calligra/repos/testing-i686/calligra.install (from rev 156196, calligra/trunk/calligra.install) calligra/repos/testing-i686/do-not-build-hancomword.patch (from rev 156196, calligra/trunk/do-not-build-hancomword.patch) calligra/repos/testing-x86_64/PKGBUILD (from rev 156196, calligra/trunk/PKGBUILD) calligra/repos/testing-x86_64/calligra-braindump.install (from rev 156196, calligra/trunk/calligra-braindump.install) calligra/repos/testing-x86_64/calligra-filters.install (from rev 156196, calligra/trunk/calligra-filters.install) calligra/repos/testing-x86_64/calligra-flow.install (from rev 156196, calligra/trunk/calligra-flow.install) calligra/repos/testing-x86_64/calligra-karbon.install (from rev 156196, calligra/trunk/calligra-karbon.install) calligra/repos/testing-x86_64/calligra-kexi.install (from rev 156196, calligra/trunk/calligra-kexi.install) calligra/repos/testing-x86_64/calligra-krita.install (from rev 156196, calligra/trunk/calligra-krita.install) calligra/repos/testing-x86_64/calligra-plan.install (from rev 156196, calligra/trunk/calligra-plan.install) calligra/repos/testing-x86_64/calligra-sheets.install (from rev 156196, calligra/trunk/calligra-sheets.install) calligra/repos/testing-x86_64/calligra-stage.install (from rev 156196, calligra/trunk/calligra-stage.install) calligra/repos/testing-x86_64/calligra-tools.install (from rev 156196, calligra/trunk/calligra-tools.install) calligra/repos/testing-x86_64/calligra-words.install (from rev 156196, calligra/trunk/calligra-words.install) calligra/repos/testing-x86_64/calligra.install (from rev 156196, calligra/trunk/calligra.install) calligra/repos/testing-x86_64/do-not-build-hancomword.patch (from rev 156196, calligra/trunk/do-not-build-hancomword.patch) Deleted: calligra/repos/testing-i686/PKGBUILD calligra/repos/testing-i686/calligra-braindump.install calligra/repos/testing-i686/calligra-filters.install calligra/repos/testing-i686/calligra-flow.install calligra/repos/testing-i686/calligra-karbon.install calligra/repos/testing-i686/calligra-kexi.install calligra/repos/testing-i686/calligra-krita.install calligra/repos/testing-i686/calligra-plan.install calligra/repos/testing-i686/calligra-sheets.install calligra/repos/testing-i686/calligra-stage.install calligra/repos/testing-i686/calligra-tools.install calligra/repos/testing-i686/calligra-words.install calligra/repos/testing-i686/calligra.install calligra/repos/testing-i686/do-not-build-hancomword.patch calligra/repos/testing-x86_64/PKGBUILD calligra/repos/testing-x86_64/calligra-braindump.install calligra/repos/testing-x86_64/calligra-filters.install calligra/repos/testing-x86_64/calligra-flow.install calligra/repos/testing-x86_64/calligra-karbon.install calligra/repos/testing-x86_64/calligra-kexi.install calligra/repos/testing-x86_64/calligra-krita.install calligra/repos/testing-x86_64/calligra-plan.install calligra/repos/testing-x86_64/calligra-sheets.install calligra/repos/testing-x86_64/calligra-stage.install calligra/repos/testing-x86_64/calligra-tools.install calligra/repos/testing-x86_64/calligra-words.install calligra/repos/testing-x86_64/calligra.install calligra/repos/testing-x86_64/do-not-build-hancomword.patch --+ testing-i686/PKGBUILD| 548 -
[arch-commits] Commit in nxclient/trunk (PKGBUILD nxclient.install)
Date: Sunday, April 15, 2012 @ 12:22:43
Author: andyrtr
Revision: 156198
upgpkg: nxclient 3.5.0.7-1.1
mv files to /usr
Modified:
nxclient/trunk/PKGBUILD
nxclient/trunk/nxclient.install
--+
PKGBUILD | 51 +++
nxclient.install | 26 --
2 files changed, 51 insertions(+), 26 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-15 16:00:02 UTC (rev 156197)
+++ PKGBUILD2012-04-15 16:22:43 UTC (rev 156198)
@@ -4,13 +4,13 @@
pkgname=nxclient
pkgver=3.5.0.7
-pkgrel=1
+pkgrel=1.1
pkgdesc=Nomachine's closed source client for NX servers
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
url=http://nomachine.com;
-makedepends=('rpmextract')
license=('custom:nomachine')
-depends=('nx-common=3.5.0' 'libxext' 'libxft' 'xorg-xauth')
+depends=('libxext' 'libxft' 'xorg-xauth' 'libxcomp' 'nx-x11'
'nx-common=3.5.0-4.1' 'desktop-file-utils')
+makedepends=('rpmextract' 'chrpath')
optdepends=('cups: for printing support')
[ $CARCH = x86_64 ]
source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.x86_64.rpm
nomachine.key)
[ $CARCH = x86_64 ] md5sums=('0648c2e36a14d5810e26d7d640d8382f'
'cb5df74aff5160eab9cd4313019ae228')
@@ -21,41 +21,52 @@
build() {
cd ${srcdir}/
rpmextract.sh *.rpm
- sed -i -e 's,/usr/NX,/opt/NX,g' etc/profile.d/nx.sh etc/profile.d/nx.csh
- sed -i -e 's,/usr/NX/,/opt/NX/,g'
${srcdir}/usr/NX/share/applnk/network/*.desktop
+ sed -i -e 's:/usr/NX:/usr/lib/NX:g' etc/profile.d/nx.*
+ sed -i -e 's:/usr/NX:/usr/lib/NX:g'
${srcdir}/usr/NX/share/applnk/network/*.desktop
}
package() {
- mkdir -p ${pkgdir}/opt
- cd ${srcdir}/usr
+ # profile files
install -D -m 755 ${srcdir}/etc/profile.d/nx.sh
${pkgdir}/etc/profile.d/nx.sh
install -D -m 755 ${srcdir}/etc/profile.d/nx.csh
${pkgdir}/etc/profile.d/nx.csh
+ # menu entries
install -D -m 644
${srcdir}/usr/NX/share/applnk/network/nxclient-wizard.desktop
${pkgdir}/usr/share/applications/nxclient-wizard.desktop
install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient.desktop
${pkgdir}/usr/share/applications/nxclient.desktop
install -D -m 644
${srcdir}/usr/NX/share/applnk/network/nxclient-admin.desktop
${pkgdir}/usr/share/applications/nxclient-admin.desktop
rm -r ${srcdir}/usr/NX/share/applnk
- # remove libs that come in system and are provided by nx-common
+ # remove libs that come in system and are provided by libxcomp/nx-x11
rm
${srcdir}/usr/NX/lib/{libXcomp.*,libXcompsh.*,libcrypto.*,libjpeg.*,libz.*}
- ### HACK: fix libpng linking until nomachine fixes upstream! - shouldn't be
needed, why not /opt/NX/lib ?
- mkdir -p ${pkgdir}/usr/NX/lib/
- cp -a NX/lib/libpng* ${pkgdir}/usr/NX/lib/
- rm -r NX/lib
# provided by nx-common
- rm NX/bin/nxssh
- rm NX/bin/nxesd # esd support has been fully dropped
+ rm ${srcdir}/usr/NX/bin/nxssh
+ rm ${srcdir}/usr/NX/bin/nxesd # esd support has been fully dropped
# provide default key file later
- rm NX/share/keys/server.id_dsa.key
+ rm ${srcdir}/usr/NX/share/keys/server.id_dsa.key
- # move files to /opt
- cp -a NX ${pkgdir}/opt
+ # move files
+ install -dm755 ${pkgdir}/usr/{bin,lib}
+ cp -aR ${srcdir}/usr/NX ${pkgdir}/usr/lib
+ # add symlinks
+ cd ${pkgdir}/usr/bin
+ ln -sv /usr/lib/NX/bin/{nxclient,nxkill,nxprint,nxservice} .
+ # move libs into proper ld.conf.so place provided by nx-x11
+ install -dm 755 ${pkgdir}/usr/lib/nx
+ cp -aR ${pkgdir}/usr/lib/NX/lib* ${pkgdir}/usr/lib/nx
+ rm -rf ${pkgdir}/usr/lib/NX/lib*
+
# add default key file
- install -D -m 644 ${srcdir}/nomachine.key
${pkgdir}/opt/NX/share/keys/server.id_dsa.key
+ install -D -m 644 ${srcdir}/nomachine.key
${pkgdir}/usr/lib/NX/share/keys/server.id_dsa.key
# add license file
mkdir -p ${pkgdir}/usr/share/licenses/nxclient
- mv ${pkgdir}/opt/NX/share/documents/client/license-info
${pkgdir}/usr/share/licenses/nxclient/LICENSE
+ mv ${pkgdir}/usr/lib/NX/share/documents/client/license-info
${pkgdir}/usr/share/licenses/nxclient/LICENSE
+
+ # some cleanup
+ rm -rf ${pkgdir}/usr/lib/NX/share/{documents,cups}
+
+ # fix insecure rpath
+ chrpath -d $pkgdir/usr/lib/NX/bin/nxclient
}
Modified: nxclient.install
===
--- nxclient.install2012-04-15 16:00:02 UTC (rev 156197)
+++ nxclient.install2012-04-15 16:22:43 UTC (rev 156198)
@@ -1,8 +1,22 @@
-# arg 1: the new package version
post_install() {
-/bin/cat THEEND
-ATTENTION NXCLIENT:
-For correct setup please take a look at the wiki:
-http://wiki.archlinux.org/index.php/FreeNX
-THEEND
+ update-desktop-database -q
+
+ echo For correct setup please take a look at the wiki:
+ echo http://wiki.archlinux.org/index.php/FreeNX;
+
+
}
+
+post_upgrade() {
+ update-desktop-database -q
+
+ if [ `vercmp $2 3.5.0.7-1` -lt 0 ]; then
+#
[arch-commits] Commit in nxclient/repos (8 files)
Date: Sunday, April 15, 2012 @ 12:23:21
Author: andyrtr
Revision: 156199
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
nxclient/repos/staging-i686/
nxclient/repos/staging-i686/PKGBUILD
(from rev 156198, nxclient/trunk/PKGBUILD)
nxclient/repos/staging-i686/nomachine.key
(from rev 156198, nxclient/trunk/nomachine.key)
nxclient/repos/staging-i686/nxclient.install
(from rev 156198, nxclient/trunk/nxclient.install)
nxclient/repos/staging-x86_64/
nxclient/repos/staging-x86_64/PKGBUILD
(from rev 156198, nxclient/trunk/PKGBUILD)
nxclient/repos/staging-x86_64/nomachine.key
(from rev 156198, nxclient/trunk/nomachine.key)
nxclient/repos/staging-x86_64/nxclient.install
(from rev 156198, nxclient/trunk/nxclient.install)
-+
staging-i686/PKGBUILD | 72 ++
staging-i686/nomachine.key | 12 ++
staging-i686/nxclient.install | 22 +++
staging-x86_64/PKGBUILD | 72 ++
staging-x86_64/nomachine.key| 12 ++
staging-x86_64/nxclient.install | 22 +++
6 files changed, 212 insertions(+)
Copied: nxclient/repos/staging-i686/PKGBUILD (from rev 156198,
nxclient/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-04-15 16:23:21 UTC (rev 156199)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+#Contributed: eliott eli...@solarblue.net, Andre Naumann
anaum...@sparced.org
+
+pkgname=nxclient
+pkgver=3.5.0.7
+pkgrel=1.1
+pkgdesc=Nomachine's closed source client for NX servers
+arch=('i686' 'x86_64')
+url=http://nomachine.com;
+license=('custom:nomachine')
+depends=('libxext' 'libxft' 'xorg-xauth' 'libxcomp' 'nx-x11'
'nx-common=3.5.0-4.1' 'desktop-file-utils')
+makedepends=('rpmextract' 'chrpath')
+optdepends=('cups: for printing support')
+[ $CARCH = x86_64 ]
source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.x86_64.rpm
nomachine.key)
+[ $CARCH = x86_64 ] md5sums=('0648c2e36a14d5810e26d7d640d8382f'
'cb5df74aff5160eab9cd4313019ae228')
+[ $CARCH = i686 ]
source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.i386.rpm
nomachine.key)
+[ $CARCH = i686 ] md5sums=('53e5b9b4a1096324e7d3dbd8ffb192a1'
'cb5df74aff5160eab9cd4313019ae228')
+install=nxclient.install
+
+build() {
+ cd ${srcdir}/
+ rpmextract.sh *.rpm
+ sed -i -e 's:/usr/NX:/usr/lib/NX:g' etc/profile.d/nx.*
+ sed -i -e 's:/usr/NX:/usr/lib/NX:g'
${srcdir}/usr/NX/share/applnk/network/*.desktop
+}
+
+package() {
+ # profile files
+ install -D -m 755 ${srcdir}/etc/profile.d/nx.sh
${pkgdir}/etc/profile.d/nx.sh
+ install -D -m 755 ${srcdir}/etc/profile.d/nx.csh
${pkgdir}/etc/profile.d/nx.csh
+ # menu entries
+ install -D -m 644
${srcdir}/usr/NX/share/applnk/network/nxclient-wizard.desktop
${pkgdir}/usr/share/applications/nxclient-wizard.desktop
+ install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient.desktop
${pkgdir}/usr/share/applications/nxclient.desktop
+ install -D -m 644
${srcdir}/usr/NX/share/applnk/network/nxclient-admin.desktop
${pkgdir}/usr/share/applications/nxclient-admin.desktop
+ rm -r ${srcdir}/usr/NX/share/applnk
+
+ # remove libs that come in system and are provided by libxcomp/nx-x11
+ rm
${srcdir}/usr/NX/lib/{libXcomp.*,libXcompsh.*,libcrypto.*,libjpeg.*,libz.*}
+
+ # provided by nx-common
+ rm ${srcdir}/usr/NX/bin/nxssh
+ rm ${srcdir}/usr/NX/bin/nxesd # esd support has been fully dropped
+
+ # provide default key file later
+ rm ${srcdir}/usr/NX/share/keys/server.id_dsa.key
+
+ # move files
+ install -dm755 ${pkgdir}/usr/{bin,lib}
+ cp -aR ${srcdir}/usr/NX ${pkgdir}/usr/lib
+ # add symlinks
+ cd ${pkgdir}/usr/bin
+ ln -sv /usr/lib/NX/bin/{nxclient,nxkill,nxprint,nxservice} .
+
+ # move libs into proper ld.conf.so place provided by nx-x11
+ install -dm 755 ${pkgdir}/usr/lib/nx
+ cp -aR ${pkgdir}/usr/lib/NX/lib* ${pkgdir}/usr/lib/nx
+ rm -rf ${pkgdir}/usr/lib/NX/lib*
+
+ # add default key file
+ install -D -m 644 ${srcdir}/nomachine.key
${pkgdir}/usr/lib/NX/share/keys/server.id_dsa.key
+
+ # add license file
+ mkdir -p ${pkgdir}/usr/share/licenses/nxclient
+ mv ${pkgdir}/usr/lib/NX/share/documents/client/license-info
${pkgdir}/usr/share/licenses/nxclient/LICENSE
+
+ # some cleanup
+ rm -rf ${pkgdir}/usr/lib/NX/share/{documents,cups}
+
+ # fix insecure rpath
+ chrpath -d $pkgdir/usr/lib/NX/bin/nxclient
+}
Copied: nxclient/repos/staging-i686/nomachine.key (from rev 156198,
nxclient/trunk/nomachine.key)
===
--- staging-i686/nomachine.key (rev 0)
+++ staging-i686/nomachine.key 2012-04-15 16:23:21 UTC (rev 156199)
@@ -0,0 +1,12 @@
+-BEGIN DSA PRIVATE KEY-
[arch-commits] Commit in expat/trunk (CVE-2009-3560.patch CVE-2009-3720.patch)
Date: Sunday, April 15, 2012 @ 23:39:58
Author: allan
Revision: 156200
remove unneeded patches
Deleted:
expat/trunk/CVE-2009-3560.patch
expat/trunk/CVE-2009-3720.patch
-+
CVE-2009-3560.patch | 13 -
CVE-2009-3720.patch | 12
2 files changed, 25 deletions(-)
Deleted: CVE-2009-3560.patch
===
--- CVE-2009-3560.patch 2012-04-15 16:23:21 UTC (rev 156199)
+++ CVE-2009-3560.patch 2012-04-16 03:39:58 UTC (rev 156200)
@@ -1,13 +0,0 @@
-diff -urNad trunk~/lib/xmlparse.c trunk/lib/xmlparse.c
trunk~/lib/xmlparse.c 2007-05-08 04:25:35.0 +0200
-+++ trunk/lib/xmlparse.c 2009-12-29 21:57:22.141732904 +0100
-@@ -3703,6 +3703,9 @@
- return XML_ERROR_UNCLOSED_TOKEN;
- case XML_TOK_PARTIAL_CHAR:
- return XML_ERROR_PARTIAL_CHAR;
-+ case -XML_TOK_PROLOG_S:
-+tok = -tok;
-+break;
- case XML_TOK_NONE:
- #ifdef XML_DTD
- /* for internal PE NOT referenced between declarations */
Deleted: CVE-2009-3720.patch
===
--- CVE-2009-3720.patch 2012-04-15 16:23:21 UTC (rev 156199)
+++ CVE-2009-3720.patch 2012-04-16 03:39:58 UTC (rev 156200)
@@ -1,12 +0,0 @@
-diff -urNad trunk~/lib/xmltok_impl.c trunk/lib/xmltok_impl.c
trunk~/lib/xmltok_impl.c 2006-11-26 18:34:46.0 +0100
-+++ trunk/lib/xmltok_impl.c2009-10-22 21:42:41.0 +0200
-@@ -1744,7 +1744,7 @@
-const char *end,
-POSITION *pos)
- {
-- while (ptr != end) {
-+ while (ptr end) {
- switch (BYTE_TYPE(enc, ptr)) {
- #define LEAD_CASE(n) \
- case BT_LEAD ## n: \
[arch-commits] Commit in expat/repos (8 files)
Date: Sunday, April 15, 2012 @ 23:41:12
Author: allan
Revision: 156201
archrelease: copy trunk to core-i686, core-x86_64
Added:
expat/repos/core-i686/PKGBUILD
(from rev 156200, expat/trunk/PKGBUILD)
expat/repos/core-x86_64/PKGBUILD
(from rev 156200, expat/trunk/PKGBUILD)
Deleted:
expat/repos/core-i686/CVE-2009-3560.patch
expat/repos/core-i686/CVE-2009-3720.patch
expat/repos/core-i686/PKGBUILD
expat/repos/core-x86_64/CVE-2009-3560.patch
expat/repos/core-x86_64/CVE-2009-3720.patch
expat/repos/core-x86_64/PKGBUILD
-+
core-i686/CVE-2009-3560.patch | 13 ---
core-i686/CVE-2009-3720.patch | 12 ---
core-i686/PKGBUILD | 64 +++---
core-x86_64/CVE-2009-3560.patch | 13 ---
core-x86_64/CVE-2009-3720.patch | 12 ---
core-x86_64/PKGBUILD| 64 +++---
6 files changed, 64 insertions(+), 114 deletions(-)
Deleted: core-i686/CVE-2009-3560.patch
===
--- core-i686/CVE-2009-3560.patch 2012-04-16 03:39:58 UTC (rev 156200)
+++ core-i686/CVE-2009-3560.patch 2012-04-16 03:41:12 UTC (rev 156201)
@@ -1,13 +0,0 @@
-diff -urNad trunk~/lib/xmlparse.c trunk/lib/xmlparse.c
trunk~/lib/xmlparse.c 2007-05-08 04:25:35.0 +0200
-+++ trunk/lib/xmlparse.c 2009-12-29 21:57:22.141732904 +0100
-@@ -3703,6 +3703,9 @@
- return XML_ERROR_UNCLOSED_TOKEN;
- case XML_TOK_PARTIAL_CHAR:
- return XML_ERROR_PARTIAL_CHAR;
-+ case -XML_TOK_PROLOG_S:
-+tok = -tok;
-+break;
- case XML_TOK_NONE:
- #ifdef XML_DTD
- /* for internal PE NOT referenced between declarations */
Deleted: core-i686/CVE-2009-3720.patch
===
--- core-i686/CVE-2009-3720.patch 2012-04-16 03:39:58 UTC (rev 156200)
+++ core-i686/CVE-2009-3720.patch 2012-04-16 03:41:12 UTC (rev 156201)
@@ -1,12 +0,0 @@
-diff -urNad trunk~/lib/xmltok_impl.c trunk/lib/xmltok_impl.c
trunk~/lib/xmltok_impl.c 2006-11-26 18:34:46.0 +0100
-+++ trunk/lib/xmltok_impl.c2009-10-22 21:42:41.0 +0200
-@@ -1744,7 +1744,7 @@
-const char *end,
-POSITION *pos)
- {
-- while (ptr != end) {
-+ while (ptr end) {
- switch (BYTE_TYPE(enc, ptr)) {
- #define LEAD_CASE(n) \
- case BT_LEAD ## n: \
Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD 2012-04-16 03:39:58 UTC (rev 156200)
+++ core-i686/PKGBUILD 2012-04-16 03:41:12 UTC (rev 156201)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae al...@archlinux.org
-# Committer: Judd Vinet jvi...@zeroflux.org
-
-pkgname=expat
-pkgver=2.1.0
-pkgrel=1
-pkgdesc=An XML parser library
-arch=('i686' 'x86_64')
-url=http://expat.sourceforge.net/;
-license=('custom')
-depends=('glibc')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/expat/${pkgname}-${pkgver}.tar.gz)
-md5sums=('dd7dab7a5fea97d2a6a43f511449b7cd')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --mandir=/usr/share/man
- make
-}
-
-check() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make check
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}
Copied: expat/repos/core-i686/PKGBUILD (from rev 156200, expat/trunk/PKGBUILD)
===
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2012-04-16 03:41:12 UTC (rev 156201)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Committer: Judd Vinet jvi...@zeroflux.org
+
+pkgname=expat
+pkgver=2.1.0
+pkgrel=1
+pkgdesc=An XML parser library
+arch=('i686' 'x86_64')
+url=http://expat.sourceforge.net/;
+license=('custom')
+depends=('glibc')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/expat/${pkgname}-${pkgver}.tar.gz)
+md5sums=('dd7dab7a5fea97d2a6a43f511449b7cd')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+ install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}
Deleted: core-x86_64/CVE-2009-3560.patch
===
--- core-x86_64/CVE-2009-3560.patch 2012-04-16 03:39:58 UTC (rev 156200)
+++ core-x86_64/CVE-2009-3560.patch 2012-04-16 03:41:12 UTC (rev 156201)
@@ -1,13 +0,0 @@
-diff -urNad trunk~/lib/xmlparse.c trunk/lib/xmlparse.c
trunk~/lib/xmlparse.c 2007-05-08 04:25:35.0 +0200
-+++
[arch-commits] Commit in gmp/trunk (538dfce27f41.patch)
Date: Sunday, April 15, 2012 @ 23:45:36
Author: allan
Revision: 156202
remove unneeded patches
Deleted:
gmp/trunk/538dfce27f41.patch
+
538dfce27f41.patch | 38 --
1 file changed, 38 deletions(-)
Deleted: 538dfce27f41.patch
===
--- 538dfce27f41.patch 2012-04-16 03:41:12 UTC (rev 156201)
+++ 538dfce27f41.patch 2012-04-16 03:45:36 UTC (rev 156202)
@@ -1,38 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund t...@gmplib.org
-# Date 1310730221 -7200
-# Node ID 538dfce27f410b910d5e2f09269e224d16a3
-# Parent 03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366
-(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right.
-
-diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c
a/mpn/generic/dcpi1_bdiv_q.c Thu Jun 16 12:22:24 2011 +0200
-+++ b/mpn/generic/dcpi1_bdiv_q.c Fri Jul 15 13:43:41 2011 +0200
-@@ -7,7 +7,7 @@
-SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES. IN FACT, IT IS ALMOST
-GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
-
--Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
-+Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-
- This file is part of the GNU MP Library.
-
-@@ -28,7 +28,6 @@
- #include gmp-impl.h
-
-
--
- mp_size_t
- mpn_dcpi1_bdiv_q_n_itch (mp_size_t n)
- {
-@@ -130,7 +129,7 @@
- qn = nn - qn;
- while (qn dn)
- {
--mpn_sub_1 (np + dn, np + dn, qn, cy);
-+mpn_sub_1 (np + dn, np + dn, qn - dn, cy);
- cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp);
- qp += dn;
- np += dn;
-
[arch-commits] Commit in gmp/repos (10 files)
Date: Sunday, April 15, 2012 @ 23:46:32
Author: allan
Revision: 156203
archrelease: copy trunk to core-i686, core-x86_64
Added:
gmp/repos/core-i686/PKGBUILD
(from rev 156202, gmp/trunk/PKGBUILD)
gmp/repos/core-i686/gmp.install
(from rev 156202, gmp/trunk/gmp.install)
gmp/repos/core-x86_64/PKGBUILD
(from rev 156202, gmp/trunk/PKGBUILD)
gmp/repos/core-x86_64/gmp.install
(from rev 156202, gmp/trunk/gmp.install)
Deleted:
gmp/repos/core-i686/538dfce27f41.patch
gmp/repos/core-i686/PKGBUILD
gmp/repos/core-i686/gmp.install
gmp/repos/core-x86_64/538dfce27f41.patch
gmp/repos/core-x86_64/PKGBUILD
gmp/repos/core-x86_64/gmp.install
+
core-i686/538dfce27f41.patch | 38
core-i686/PKGBUILD | 74 +++
core-i686/gmp.install | 40 ++---
core-x86_64/538dfce27f41.patch | 38
core-x86_64/PKGBUILD | 74 +++
core-x86_64/gmp.install| 40 ++---
6 files changed, 114 insertions(+), 190 deletions(-)
Deleted: core-i686/538dfce27f41.patch
===
--- core-i686/538dfce27f41.patch2012-04-16 03:45:36 UTC (rev 156202)
+++ core-i686/538dfce27f41.patch2012-04-16 03:46:32 UTC (rev 156203)
@@ -1,38 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund t...@gmplib.org
-# Date 1310730221 -7200
-# Node ID 538dfce27f410b910d5e2f09269e224d16a3
-# Parent 03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366
-(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right.
-
-diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c
a/mpn/generic/dcpi1_bdiv_q.c Thu Jun 16 12:22:24 2011 +0200
-+++ b/mpn/generic/dcpi1_bdiv_q.c Fri Jul 15 13:43:41 2011 +0200
-@@ -7,7 +7,7 @@
-SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES. IN FACT, IT IS ALMOST
-GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
-
--Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
-+Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-
- This file is part of the GNU MP Library.
-
-@@ -28,7 +28,6 @@
- #include gmp-impl.h
-
-
--
- mp_size_t
- mpn_dcpi1_bdiv_q_n_itch (mp_size_t n)
- {
-@@ -130,7 +129,7 @@
- qn = nn - qn;
- while (qn dn)
- {
--mpn_sub_1 (np + dn, np + dn, qn, cy);
-+mpn_sub_1 (np + dn, np + dn, qn - dn, cy);
- cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp);
- qp += dn;
- np += dn;
-
Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD 2012-04-16 03:45:36 UTC (rev 156202)
+++ core-i686/PKGBUILD 2012-04-16 03:46:32 UTC (rev 156203)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae al...@archlinux.org
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=gmp
-pkgver=5.0.4
-pkgrel=1
-pkgdesc=A free library for arbitrary precision arithmetic
-arch=('i686' 'x86_64')
-url=http://gmplib.org/;
-depends=('gcc-libs' 'sh')
-license=('LGPL3')
-options=(!libtool)
-install=gmp.install
-source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.xz{,.sig})
-md5sums=('0881f4ff2617226c673fc534ac39d448'
- 'f9e448fff9eaeccdde6ee1f1df00c988')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- [ ${CARCH} = i686 ] export ABI=32
- ./configure --build=${CHOST} \
---prefix=/usr --infodir=/usr/share/info \
---enable-cxx
- make
-}
-
-check() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make check
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-}
Copied: gmp/repos/core-i686/PKGBUILD (from rev 156202, gmp/trunk/PKGBUILD)
===
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2012-04-16 03:46:32 UTC (rev 156203)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=gmp
+pkgver=5.0.4
+pkgrel=1
+pkgdesc=A free library for arbitrary precision arithmetic
+arch=('i686' 'x86_64')
+url=http://gmplib.org/;
+depends=('gcc-libs' 'sh')
+license=('LGPL3')
+options=(!libtool)
+install=gmp.install
+source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.xz{,.sig})
+md5sums=('0881f4ff2617226c673fc534ac39d448'
+ 'f9e448fff9eaeccdde6ee1f1df00c988')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ [ ${CARCH} = i686 ] export ABI=32
+ ./configure --build=${CHOST} \
+--prefix=/usr --infodir=/usr/share/info \
+--enable-cxx
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
Deleted: core-i686/gmp.install
===
--- core-i686/gmp.install
[arch-commits] Commit in pkg-config/trunk (autoconf-2.66.patch)
Date: Sunday, April 15, 2012 @ 23:56:31 Author: allan Revision: 156204 remove unneeded patches Deleted: pkg-config/trunk/autoconf-2.66.patch -+ autoconf-2.66.patch | 12 1 file changed, 12 deletions(-) Deleted: autoconf-2.66.patch === --- autoconf-2.66.patch 2012-04-16 03:46:32 UTC (rev 156203) +++ autoconf-2.66.patch 2012-04-16 03:56:31 UTC (rev 156204) @@ -1,12 +0,0 @@ -diff -Naur pkg-config-0.25-old//pkg.m4 pkg-config-0.25/pkg.m4 pkg-config-0.25-old//pkg.m42009-12-07 06:39:02.0 +1000 -+++ pkg-config-0.25/pkg.m4 2010-07-15 14:44:37.466942978 +1000 -@@ -135,7 +135,7 @@ - Consider adjusting the PKG_CONFIG_PATH environment variable if you - installed software in a non-standard prefix. - --_PKG_TEXT])dnl -+_PKG_TEXT])[]dnl - ]) - elif test $pkg_failed = untried; then - AC_MSG_RESULT([no])
[arch-commits] Commit in pkg-config/repos (6 files)
Date: Sunday, April 15, 2012 @ 23:57:28
Author: allan
Revision: 156205
archrelease: copy trunk to core-i686, core-x86_64
Added:
pkg-config/repos/core-i686/PKGBUILD
(from rev 156204, pkg-config/trunk/PKGBUILD)
pkg-config/repos/core-x86_64/PKGBUILD
(from rev 156204, pkg-config/trunk/PKGBUILD)
Deleted:
pkg-config/repos/core-i686/PKGBUILD
pkg-config/repos/core-i686/autoconf-2.66.patch
pkg-config/repos/core-x86_64/PKGBUILD
pkg-config/repos/core-x86_64/autoconf-2.66.patch
-+
core-i686/PKGBUILD | 74 +++---
core-i686/autoconf-2.66.patch | 12 --
core-x86_64/PKGBUILD| 74 +++---
core-x86_64/autoconf-2.66.patch | 12 --
4 files changed, 74 insertions(+), 98 deletions(-)
Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD 2012-04-16 03:56:31 UTC (rev 156204)
+++ core-i686/PKGBUILD 2012-04-16 03:57:28 UTC (rev 156205)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae al...@archlinux.org
-# Committer: Judd Vinet jvi...@zeroflux.org
-
-pkgname=pkg-config
-pkgver=0.26
-pkgrel=2
-pkgdesc=A system for managing library compile/link flags
-arch=('i686' 'x86_64')
-url=http://pkgconfig.freedesktop.org/wiki/;
-license=('GPL')
-groups=('base-devel')
-depends=('glibc' 'popt' 'glib2')
-provides=(pkgconfig=${pkgver})
-conflicts=('pkgconfig')
-replaces=('pkgconfig')
-source=(http://pkgconfig.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
-md5sums=('47525c26a9ba7ba14bf85e01509a7234')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # Use system popt
- ./configure --prefix=/usr --with-installed-popt
-
- make
-}
-
-check() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make check
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-}
Copied: pkg-config/repos/core-i686/PKGBUILD (from rev 156204,
pkg-config/trunk/PKGBUILD)
===
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2012-04-16 03:57:28 UTC (rev 156205)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Committer: Judd Vinet jvi...@zeroflux.org
+
+pkgname=pkg-config
+pkgver=0.26
+pkgrel=2
+pkgdesc=A system for managing library compile/link flags
+arch=('i686' 'x86_64')
+url=http://pkgconfig.freedesktop.org/wiki/;
+license=('GPL')
+groups=('base-devel')
+depends=('glibc' 'popt' 'glib2')
+provides=(pkgconfig=${pkgver})
+conflicts=('pkgconfig')
+replaces=('pkgconfig')
+source=(http://pkgconfig.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
+md5sums=('47525c26a9ba7ba14bf85e01509a7234')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ # Use system popt
+ ./configure --prefix=/usr --with-installed-popt
+
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
Deleted: core-i686/autoconf-2.66.patch
===
--- core-i686/autoconf-2.66.patch 2012-04-16 03:56:31 UTC (rev 156204)
+++ core-i686/autoconf-2.66.patch 2012-04-16 03:57:28 UTC (rev 156205)
@@ -1,12 +0,0 @@
-diff -Naur pkg-config-0.25-old//pkg.m4 pkg-config-0.25/pkg.m4
pkg-config-0.25-old//pkg.m42009-12-07 06:39:02.0 +1000
-+++ pkg-config-0.25/pkg.m4 2010-07-15 14:44:37.466942978 +1000
-@@ -135,7 +135,7 @@
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
-
--_PKG_TEXT])dnl
-+_PKG_TEXT])[]dnl
- ])
- elif test $pkg_failed = untried; then
- AC_MSG_RESULT([no])
Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2012-04-16 03:56:31 UTC (rev 156204)
+++ core-x86_64/PKGBUILD2012-04-16 03:57:28 UTC (rev 156205)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae al...@archlinux.org
-# Committer: Judd Vinet jvi...@zeroflux.org
-
-pkgname=pkg-config
-pkgver=0.26
-pkgrel=2
-pkgdesc=A system for managing library compile/link flags
-arch=('i686' 'x86_64')
-url=http://pkgconfig.freedesktop.org/wiki/;
-license=('GPL')
-groups=('base-devel')
-depends=('glibc' 'popt' 'glib2')
-provides=(pkgconfig=${pkgver})
-conflicts=('pkgconfig')
-replaces=('pkgconfig')
-source=(http://pkgconfig.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
-md5sums=('47525c26a9ba7ba14bf85e01509a7234')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # Use system popt
- ./configure --prefix=/usr --with-installed-popt
-
- make
-}
-
-check() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make check
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-}
Copied: pkg-config/repos/core-x86_64/PKGBUILD (from rev 156204,
pkg-config/trunk/PKGBUILD)
[arch-commits] Commit in automake/trunk (PKGBUILD)
Date: Monday, April 16, 2012 @ 00:33:05
Author: allan
Revision: 156206
upgpkg: automake 1.11.5-1
upstream update
Modified:
automake/trunk/PKGBUILD
--+
PKGBUILD | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-16 03:57:28 UTC (rev 156205)
+++ PKGBUILD2012-04-16 04:33:05 UTC (rev 156206)
@@ -3,7 +3,7 @@
# Contributor: judd jvi...@zeroflux.org
pkgname=automake
-pkgver=1.11.4
+pkgver=1.11.5
pkgrel=1
pkgdesc=A GNU tool for automatically creating Makefiles
arch=('any')
@@ -13,9 +13,9 @@
depends=('perl' 'bash')
makedepends=('autoconf')
install=automake.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('f4c545f01252089d2c3837e1d1d3e21b'
- '290d7b0dc40011b3956decc1effb0bb1')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('13f6a9522339ac0885110506cb7abad8'
+ 'c1170aad0acbe57b87d17b5eaf3f9061')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -23,8 +23,7 @@
make
}
-check()
-{
+check() {
cd ${srcdir}/${pkgname}-${pkgver}
make check
}
[arch-commits] Commit in automake/repos (5 files)
Date: Monday, April 16, 2012 @ 00:41:46
Author: allan
Revision: 156207
fix conflict
Added:
automake/repos/testing-any/
automake/repos/testing-any/PKGBUILD
(from rev 156206, automake/trunk/PKGBUILD)
automake/repos/testing-any/automake.install
(from rev 156206, automake/trunk/automake.install)
Deleted:
automake/repos/testing-any/PKGBUILD
automake/repos/testing-any/automake.install
--+
PKGBUILD | 69 ++---
automake.install | 44 -
2 files changed, 56 insertions(+), 57 deletions(-)
Deleted: testing-any/PKGBUILD
===
--- testing-any/PKGBUILD2012-04-04 09:05:52 UTC (rev 155494)
+++ testing-any/PKGBUILD2012-04-16 04:41:46 UTC (rev 156207)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae al...@archlinux.org
-# Contributor: judd jvi...@zeroflux.org
-
-pkgname=automake
-pkgver=1.11.4
-pkgrel=1
-pkgdesc=A GNU tool for automatically creating Makefiles
-arch=('any')
-license=('GPL')
-url=http://www.gnu.org/software/automake;
-groups=('base-devel')
-depends=('perl' 'bash')
-makedepends=('autoconf')
-install=automake.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('f4c545f01252089d2c3837e1d1d3e21b'
- '290d7b0dc40011b3956decc1effb0bb1')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-check()
-{
- cd ${srcdir}/${pkgname}-${pkgver}
- make check
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-}
Copied: automake/repos/testing-any/PKGBUILD (from rev 156206,
automake/trunk/PKGBUILD)
===
--- testing-any/PKGBUILD(rev 0)
+++ testing-any/PKGBUILD2012-04-16 04:41:46 UTC (rev 156207)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+pkgname=automake
+pkgver=1.11.5
+pkgrel=1
+pkgdesc=A GNU tool for automatically creating Makefiles
+arch=('any')
+license=('GPL')
+url=http://www.gnu.org/software/automake;
+groups=('base-devel')
+depends=('perl' 'bash')
+makedepends=('autoconf')
+install=automake.install
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('13f6a9522339ac0885110506cb7abad8'
+ 'c1170aad0acbe57b87d17b5eaf3f9061')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
Deleted: testing-any/automake.install
===
--- testing-any/automake.install2012-04-04 09:05:52 UTC (rev 155494)
+++ testing-any/automake.install2012-04-16 04:41:46 UTC (rev 156207)
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(automake.info automake.info-1 automake.info-2)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
-install-info $infodir/$file.gz $infodir/dir 2 /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
-install-info --delete $infodir/$file.gz $infodir/dir 2 /dev/null
- done
-}
-
-# vim:set ts=2 sw=2 et:
Copied: automake/repos/testing-any/automake.install (from rev 156206,
automake/trunk/automake.install)
===
--- testing-any/automake.install(rev 0)
+++ testing-any/automake.install2012-04-16 04:41:46 UTC (rev 156207)
@@ -0,0 +1,22 @@
+infodir=/usr/share/info
+filelist=(automake.info automake.info-1 automake.info-2)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+install-info $infodir/$file.gz $infodir/dir 2 /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+install-info --delete $infodir/$file.gz $infodir/dir 2 /dev/null
+ done
+}
+
+# vim:set ts=2 sw=2 et:
[arch-commits] Commit in automake/repos (6 files)
Date: Monday, April 16, 2012 @ 00:42:37
Author: allan
Revision: 156208
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
automake/repos/testing-i686/
automake/repos/testing-i686/PKGBUILD
(from rev 156207, automake/trunk/PKGBUILD)
automake/repos/testing-i686/automake.install
(from rev 156207, automake/trunk/automake.install)
automake/repos/testing-x86_64/
automake/repos/testing-x86_64/PKGBUILD
(from rev 156207, automake/trunk/PKGBUILD)
automake/repos/testing-x86_64/automake.install
(from rev 156207, automake/trunk/automake.install)
-+
testing-i686/PKGBUILD | 34 ++
testing-i686/automake.install | 22 ++
testing-x86_64/PKGBUILD | 34 ++
testing-x86_64/automake.install | 22 ++
4 files changed, 112 insertions(+)
Copied: automake/repos/testing-i686/PKGBUILD (from rev 156207,
automake/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-04-16 04:42:37 UTC (rev 156208)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+pkgname=automake
+pkgver=1.11.5
+pkgrel=1
+pkgdesc=A GNU tool for automatically creating Makefiles
+arch=('any')
+license=('GPL')
+url=http://www.gnu.org/software/automake;
+groups=('base-devel')
+depends=('perl' 'bash')
+makedepends=('autoconf')
+install=automake.install
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('13f6a9522339ac0885110506cb7abad8'
+ 'c1170aad0acbe57b87d17b5eaf3f9061')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
Copied: automake/repos/testing-i686/automake.install (from rev 156207,
automake/trunk/automake.install)
===
--- testing-i686/automake.install (rev 0)
+++ testing-i686/automake.install 2012-04-16 04:42:37 UTC (rev 156208)
@@ -0,0 +1,22 @@
+infodir=/usr/share/info
+filelist=(automake.info automake.info-1 automake.info-2)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+install-info $infodir/$file.gz $infodir/dir 2 /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+install-info --delete $infodir/$file.gz $infodir/dir 2 /dev/null
+ done
+}
+
+# vim:set ts=2 sw=2 et:
Copied: automake/repos/testing-x86_64/PKGBUILD (from rev 156207,
automake/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-04-16 04:42:37 UTC (rev 156208)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+pkgname=automake
+pkgver=1.11.5
+pkgrel=1
+pkgdesc=A GNU tool for automatically creating Makefiles
+arch=('any')
+license=('GPL')
+url=http://www.gnu.org/software/automake;
+groups=('base-devel')
+depends=('perl' 'bash')
+makedepends=('autoconf')
+install=automake.install
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('13f6a9522339ac0885110506cb7abad8'
+ 'c1170aad0acbe57b87d17b5eaf3f9061')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
Copied: automake/repos/testing-x86_64/automake.install (from rev 156207,
automake/trunk/automake.install)
===
--- testing-x86_64/automake.install (rev 0)
+++ testing-x86_64/automake.install 2012-04-16 04:42:37 UTC (rev 156208)
@@ -0,0 +1,22 @@
+infodir=/usr/share/info
+filelist=(automake.info automake.info-1 automake.info-2)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+install-info $infodir/$file.gz $infodir/dir 2 /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+install-info --delete $infodir/$file.gz $infodir/dir 2 /dev/null
+ done
+}
+
+# vim:set ts=2 sw=2 et:
[arch-commits] Commit in automake/repos/testing-any (4 files)
Date: Monday, April 16, 2012 @ 00:59:24
Author: allan
Revision: 156209
archrelease: copy trunk to testing-any
Added:
automake/repos/testing-any/PKGBUILD
(from rev 156208, automake/trunk/PKGBUILD)
automake/repos/testing-any/automake.install
(from rev 156208, automake/trunk/automake.install)
Deleted:
automake/repos/testing-any/PKGBUILD
automake/repos/testing-any/automake.install
--+
PKGBUILD | 68 ++---
automake.install | 44 +-
2 files changed, 56 insertions(+), 56 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2012-04-16 04:42:37 UTC (rev 156208)
+++ PKGBUILD2012-04-16 04:59:24 UTC (rev 156209)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae al...@archlinux.org
-# Contributor: judd jvi...@zeroflux.org
-
-pkgname=automake
-pkgver=1.11.5
-pkgrel=1
-pkgdesc=A GNU tool for automatically creating Makefiles
-arch=('any')
-license=('GPL')
-url=http://www.gnu.org/software/automake;
-groups=('base-devel')
-depends=('perl' 'bash')
-makedepends=('autoconf')
-install=automake.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('13f6a9522339ac0885110506cb7abad8'
- 'c1170aad0acbe57b87d17b5eaf3f9061')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-check() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make check
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-}
Copied: automake/repos/testing-any/PKGBUILD (from rev 156208,
automake/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2012-04-16 04:59:24 UTC (rev 156209)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+pkgname=automake
+pkgver=1.11.5
+pkgrel=1
+pkgdesc=A GNU tool for automatically creating Makefiles
+arch=('any')
+license=('GPL')
+url=http://www.gnu.org/software/automake;
+groups=('base-devel')
+depends=('perl' 'bash')
+makedepends=('autoconf')
+install=automake.install
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('13f6a9522339ac0885110506cb7abad8'
+ 'c1170aad0acbe57b87d17b5eaf3f9061')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
Deleted: automake.install
===
--- automake.install2012-04-16 04:42:37 UTC (rev 156208)
+++ automake.install2012-04-16 04:59:24 UTC (rev 156209)
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(automake.info automake.info-1 automake.info-2)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
-install-info $infodir/$file.gz $infodir/dir 2 /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
-install-info --delete $infodir/$file.gz $infodir/dir 2 /dev/null
- done
-}
-
-# vim:set ts=2 sw=2 et:
Copied: automake/repos/testing-any/automake.install (from rev 156208,
automake/trunk/automake.install)
===
--- automake.install(rev 0)
+++ automake.install2012-04-16 04:59:24 UTC (rev 156209)
@@ -0,0 +1,22 @@
+infodir=/usr/share/info
+filelist=(automake.info automake.info-1 automake.info-2)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+install-info $infodir/$file.gz $infodir/dir 2 /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+install-info --delete $infodir/$file.gz $infodir/dir 2 /dev/null
+ done
+}
+
+# vim:set ts=2 sw=2 et:
[arch-commits] Commit in automake/repos (testing-i686 testing-x86_64)
Date: Monday, April 16, 2012 @ 01:00:04 Author: allan Revision: 156210 clean-up my clean-up Deleted: automake/repos/testing-i686/ automake/repos/testing-x86_64/
