[arch-commits] Commit in (17 files)
Date: Monday, November 21, 2011 @ 20:22:51
Author: andrea
Revision: 143053
Remove pkgconfig from makedepends(); Add two new kdeplasma-addons packages
Modified:
kde-l10n/trunk/PKGBUILD
kde-meta/trunk/PKGBUILD
kdeadmin/trunk/PKGBUILD
kdeartwork/trunk/PKGBUILD
kdebase-workspace/trunk/PKGBUILD
kdebase/trunk/PKGBUILD
kdegames/trunk/PKGBUILD
kdegraphics-okular/trunk/PKGBUILD
kdenetwork/trunk/PKGBUILD
kdepim-runtime/trunk/PKGBUILD
kdepim/trunk/PKGBUILD
kdepimlibs/trunk/PKGBUILD
kdeplasma-addons/trunk/PKGBUILD
kdesdk/trunk/PKGBUILD
kdetoys/trunk/PKGBUILD
kdewebdev/trunk/PKGBUILD
oxygen-icons/trunk/PKGBUILD
---+
kde-l10n/trunk/PKGBUILD |2 +-
kde-meta/trunk/PKGBUILD |6 --
kdeadmin/trunk/PKGBUILD |3 +--
kdeartwork/trunk/PKGBUILD |4 ++--
kdebase-workspace/trunk/PKGBUILD |3 +--
kdebase/trunk/PKGBUILD|2 +-
kdegames/trunk/PKGBUILD |4 ++--
kdegraphics-okular/trunk/PKGBUILD |2 +-
kdenetwork/trunk/PKGBUILD |4 ++--
kdepim-runtime/trunk/PKGBUILD |2 +-
kdepim/trunk/PKGBUILD |4 ++--
kdepimlibs/trunk/PKGBUILD |2 +-
kdeplasma-addons/trunk/PKGBUILD | 20 ++--
kdesdk/trunk/PKGBUILD |4 ++--
kdetoys/trunk/PKGBUILD|2 +-
kdewebdev/trunk/PKGBUILD |3 +--
oxygen-icons/trunk/PKGBUILD |2 +-
17 files changed, 42 insertions(+), 27 deletions(-)
Modified: kde-l10n/trunk/PKGBUILD
===
--- kde-l10n/trunk/PKGBUILD 2011-11-22 01:22:09 UTC (rev 143052)
+++ kde-l10n/trunk/PKGBUILD 2011-11-22 01:22:51 UTC (rev 143053)
@@ -60,7 +60,7 @@
arch=('any')
url='http://www.kde.org'
license=('GPL')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'docbook-xsl')
+makedepends=('cmake' 'automoc4' 'kdelibs')
options=('docs')
source=("http://download.kde.org/stable/${pkgver}/src/kde-l10n/${pkgbase}-ar-${pkgver}.tar.bz2";
"http://download.kde.org/stable/${pkgver}/src/kde-l10n/${pkgbase}-bg-${pkgver}.tar.bz2";
Modified: kde-meta/trunk/PKGBUILD
===
--- kde-meta/trunk/PKGBUILD 2011-11-22 01:22:09 UTC (rev 143052)
+++ kde-meta/trunk/PKGBUILD 2011-11-22 01:22:51 UTC (rev 143053)
@@ -18,8 +18,8 @@
'kde-meta-kdetoys'
'kde-meta-kdeutils'
'kde-meta-kdewebdev')
-pkgver=4.7
-pkgrel=1.1
+pkgver=4.8
+pkgrel=1
arch=('any')
url='http://www.archlinux.org/'
license=('GPL')
@@ -232,6 +232,7 @@
'kdeplasma-addons-applets-filewatcher'
'kdeplasma-addons-applets-frame'
'kdeplasma-addons-applets-fuzzy-clock'
+ 'kdeplasma-addons-applets-icontasks'
'kdeplasma-addons-applets-incomingmsg'
'kdeplasma-addons-applets-kdeobservatory'
'kdeplasma-addons-applets-kimpanel'
@@ -283,6 +284,7 @@
'kdeplasma-addons-wallpapers-mandelbrot'
'kdeplasma-addons-wallpapers-marble'
'kdeplasma-addons-wallpapers-pattern'
+ 'kdeplasma-addons-wallpapers-potd'
'kdeplasma-addons-wallpapers-virus'
'kdeplasma-addons-wallpapers-weather')
replaces=('kdeplasma-addons')
Modified: kdeadmin/trunk/PKGBUILD
===
--- kdeadmin/trunk/PKGBUILD 2011-11-22 01:22:09 UTC (rev 143052)
+++ kdeadmin/trunk/PKGBUILD 2011-11-22 01:22:51 UTC (rev 143053)
@@ -13,8 +13,7 @@
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdeadmin')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python'
-'system-config-printer-common')
+makedepends=('cmake' 'automoc4' 'kdebindings-python'
'system-config-printer-common')
source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2";
'syslog-path.patch')
sha1sums=('3e06dff48271e78eec67bcda644476bcf0efa554'
Modified: kdeartwork/trunk/PKGBUILD
===
--- kdeartwork/trunk/PKGBUILD 2011-11-22 01:22:09 UTC (rev 143052)
+++ kdeartwork/trunk/PKGBUILD 2011-11-22 01:22:51 UTC (rev 143053)
@@ -19,8 +19,8 @@
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdeartwork')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen'
-'kdebase-workspace' 'libkexiv2')
+makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace'
+ 'libkexiv2')
source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2";)
sha1sums=('1b046764a5ca6481d6ce5648b0e180eec7cd08c0')
Modified: kdebase/trunk/PKGBUILD
===
--- kdebase/trunk/PKGBUILD
[arch-commits] Commit in (kdelibs/trunk/PKGBUILD kdemultimedia/trunk/PKGBUILD)
Date: Monday, November 21, 2011 @ 20:22:09
Author: andrea
Revision: 143052
Remove pkgconfig from makedepends(); Add two new kdeplasma-addons packages
Modified:
kdelibs/trunk/PKGBUILD
kdemultimedia/trunk/PKGBUILD
--+
kdelibs/trunk/PKGBUILD |2 +-
kdemultimedia/trunk/PKGBUILD |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Modified: kdelibs/trunk/PKGBUILD
===
--- kdelibs/trunk/PKGBUILD 2011-11-22 00:57:07 UTC (rev 143051)
+++ kdelibs/trunk/PKGBUILD 2011-11-22 01:22:09 UTC (rev 143052)
@@ -13,7 +13,7 @@
'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl'
'phonon' 'upower' 'udisks' 'libxcursor')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
+makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
replaces=('kdelibs-experimental')
install=${pkgname}.install
source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
Modified: kdemultimedia/trunk/PKGBUILD
===
--- kdemultimedia/trunk/PKGBUILD2011-11-22 00:57:07 UTC (rev 143051)
+++ kdemultimedia/trunk/PKGBUILD2011-11-22 01:22:09 UTC (rev 143052)
@@ -16,8 +16,8 @@
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdemultimedia')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp'
-'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
+makedepends=('cmake' 'automoc4' 'kdelibs' 'tunepimp' 'ffmpeg' 'mplayer'
+ 'pulseaudio' 'libmusicbrainz3')
source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2";
'mplayerthumbs.config')
sha1sums=('44b9adf781fcbebe1214fc87b006bf13ddd8b702'
[arch-commits] Commit in (2 files)
Date: Monday, November 21, 2011 @ 19:57:07
Author: andrea
Revision: 143051
typo
Modified:
kdesdk/trunk/PKGBUILD
kdeutils-printer-applet/trunk/PKGBUILD
+
kdesdk/trunk/PKGBUILD |8
kdeutils-printer-applet/trunk/PKGBUILD |2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
Modified: kdesdk/trunk/PKGBUILD
===
--- kdesdk/trunk/PKGBUILD 2011-11-22 00:34:16 UTC (rev 143050)
+++ kdesdk/trunk/PKGBUILD 2011-11-22 00:57:07 UTC (rev 143051)
@@ -94,7 +94,7 @@
make DESTDIR=$pkgdir install
# Fix python 2 path
-sed -i 's|#!/usr/bin/env python/#!/usr/bin/env python2|' \
+sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
"${pkgdir}"/usr/bin/hotshot2calltree
}
@@ -189,7 +189,7 @@
make DESTDIR=$pkgdir install
# Fix python 2 path
- sed -i 's|#!/usr/bin/env python/#!/usr/bin/env python2|' \
+ sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
"${pkgdir}"/usr/share/apps/lokalize/scripts/odf/xliffmerge.py
}
@@ -231,7 +231,7 @@
make DESTDIR=$pkgdir install
# Fix python 2 path
- sed -i 's|#!/usr/bin/env python/#!/usr/bin/env python2|' \
+ sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
"${pkgdir}"/usr/bin/{{kde-systemsettings-tree,kdelnk2desktop,zonetab2pot}.py,kde_generate_export_header}
}
@@ -253,6 +253,6 @@
make DESTDIR=$pkgdir install
# Fix python 2 path
- sed -i 's|#!/usr/bin/env python/#!/usr/bin/env python2|' \
+ sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
"${pkgdir}"/usr/share/apps/umbrello/headings/heading.py
}
Modified: kdeutils-printer-applet/trunk/PKGBUILD
===
--- kdeutils-printer-applet/trunk/PKGBUILD 2011-11-22 00:34:16 UTC (rev
143050)
+++ kdeutils-printer-applet/trunk/PKGBUILD 2011-11-22 00:57:07 UTC (rev
143051)
@@ -33,6 +33,6 @@
make DESTDIR=$pkgdir install
# Fix python 2 path
- sed -i 's|#!/usr/bin/env python/#!/usr/bin/env python2|' \
+ sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
"${pkgdir}"/usr/share/apps/printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py
}
[arch-commits] Commit in curl/repos (8 files)
Date: Monday, November 21, 2011 @ 19:34:16
Author: dreisner
Revision: 143050
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
curl/repos/testing-i686/
curl/repos/testing-i686/PKGBUILD
(from rev 143049, curl/trunk/PKGBUILD)
curl/repos/testing-i686/curlbuild.h
(from rev 143049, curl/trunk/curlbuild.h)
curl/repos/testing-i686/fix-J-with-O-regression.patch
(from rev 143049, curl/trunk/fix-J-with-O-regression.patch)
curl/repos/testing-x86_64/
curl/repos/testing-x86_64/PKGBUILD
(from rev 143049, curl/trunk/PKGBUILD)
curl/repos/testing-x86_64/curlbuild.h
(from rev 143049, curl/trunk/curlbuild.h)
curl/repos/testing-x86_64/fix-J-with-O-regression.patch
(from rev 143049, curl/trunk/fix-J-with-O-regression.patch)
--+
testing-i686/PKGBUILD| 70
testing-i686/curlbuild.h |9 +
testing-i686/fix-J-with-O-regression.patch | 142 +
testing-x86_64/PKGBUILD | 70
testing-x86_64/curlbuild.h |9 +
testing-x86_64/fix-J-with-O-regression.patch | 142 +
6 files changed, 442 insertions(+)
Copied: curl/repos/testing-i686/PKGBUILD (from rev 143049, curl/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2011-11-22 00:34:16 UTC (rev 143050)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Dave Reisner
+# Contributor: Angel Velasquez
+# Contributor: Eric Belanger
+# Contributor: Lucien Immink
+# Contributor: Daniel J Griffiths
+
+pkgname=curl
+pkgver=7.23.1
+pkgrel=2
+pkgdesc="An URL retrival utility and library"
+arch=('i686' 'x86_64')
+url="http://curl.haxx.se";
+license=('MIT')
+depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
+makedepends=('perl-libwww')
+options=('!libtool')
+source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+fix-J-with-O-regression.patch
+curlbuild.h)
+md5sums=('8e23151f569fb54afef093ac0695077d'
+ '5d8eb7e2e38be0fb00a043f714f6d49f'
+ 'aa4539ec4f4a2dad1663dc22dd3ab0a1'
+ '751bd433ede935c8fae727377625a8ae')
+
+ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d')
+case $ptrsize in
+ 8) _curlbuild=curlbuild-64.h ;;
+ 4) _curlbuild=curlbuild-32.h ;;
+ *) error "unknown pointer size for architecture: %s bytes" "$ptrsize"
+exit 1
+;;
+esac
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # upstream bugfix
+ # http://curl.haxx.se/mail/archive-2011-11/0030.html
+ patch -Np1 < "$srcdir/fix-J-with-O-regression.patch"
+
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --disable-dependency-tracking \
+ --disable-ldap \
+ --disable-ldaps \
+ --enable-ipv6 \
+ --enable-manual \
+ --enable-versioned-symbols \
+ --enable-threaded-resolver \
+ --without-libidn \
+ --with-random=/dev/urandom \
+ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ # license
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+ # devel
+ install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4"
+ mv "$pkgdir/usr/include/curl/curlbuild.h"
"$pkgdir/usr/include/curl/$_curlbuild"
+ install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
+}
Copied: curl/repos/testing-i686/curlbuild.h (from rev 143049,
curl/trunk/curlbuild.h)
===
--- testing-i686/curlbuild.h(rev 0)
+++ testing-i686/curlbuild.h2011-11-22 00:34:16 UTC (rev 143050)
@@ -0,0 +1,9 @@
+#include
+
+#if __WORDSIZE == 32
+#include "curlbuild-32.h"
+#elif __WORDSIZE == 64
+#include "curlbuild-64.h"
+#else
+#error "Unknown word size"
+#endif
Copied: curl/repos/testing-i686/fix-J-with-O-regression.patch (from rev 143049,
curl/trunk/fix-J-with-O-regression.patch)
===
--- testing-i686/fix-J-with-O-regression.patch (rev 0)
+++ testing-i686/fix-J-with-O-regression.patch 2011-11-22 00:34:16 UTC (rev
143050)
@@ -0,0 +1,142 @@
+From c532604b137cae2e2814280778f914e4cd0460d1 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg
+Date: Sun, 20 Nov 2011 23:33:46 +0100
+Subject: [PATCH] -J -O: use -O name if no Content-Disposition header comes!
+
+A regression between 7.22.0 and 7.23.0 -- downloading a file with the
+flags -O and -J results in the content being written to stdout if and
+only if there was no Content-Disposition header in the http response. If
+there is a C-D header with a filename attribute, the output is correctly
+written.
+
+Reported by: Dave Reisner
+Bug: http://curl.haxx.se/mail/archive-2011-11
[arch-commits] Commit in curl/trunk (PKGBUILD fix-J-with-O-regression.patch)
Date: Monday, November 21, 2011 @ 19:31:30
Author: dreisner
Revision: 143049
upgpkg: curl 7.23.1-2
backport upstream patch to fix curl -JO
Added:
curl/trunk/fix-J-with-O-regression.patch
Modified:
curl/trunk/PKGBUILD
---+
PKGBUILD |8 +-
fix-J-with-O-regression.patch | 142
2 files changed, 149 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-22 00:25:18 UTC (rev 143048)
+++ PKGBUILD2011-11-22 00:31:30 UTC (rev 143049)
@@ -7,7 +7,7 @@
pkgname=curl
pkgver=7.23.1
-pkgrel=1
+pkgrel=2
pkgdesc="An URL retrival utility and library"
arch=('i686' 'x86_64')
url="http://curl.haxx.se";
@@ -16,9 +16,11 @@
makedepends=('perl-libwww')
options=('!libtool')
source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+fix-J-with-O-regression.patch
curlbuild.h)
md5sums=('8e23151f569fb54afef093ac0695077d'
'5d8eb7e2e38be0fb00a043f714f6d49f'
+ 'aa4539ec4f4a2dad1663dc22dd3ab0a1'
'751bd433ede935c8fae727377625a8ae')
ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d')
@@ -33,6 +35,10 @@
build() {
cd "$srcdir/$pkgname-$pkgver"
+ # upstream bugfix
+ # http://curl.haxx.se/mail/archive-2011-11/0030.html
+ patch -Np1 < "$srcdir/fix-J-with-O-regression.patch"
+
./configure \
--prefix=/usr \
--mandir=/usr/share/man \
Added: fix-J-with-O-regression.patch
===
--- fix-J-with-O-regression.patch (rev 0)
+++ fix-J-with-O-regression.patch 2011-11-22 00:31:30 UTC (rev 143049)
@@ -0,0 +1,142 @@
+From c532604b137cae2e2814280778f914e4cd0460d1 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg
+Date: Sun, 20 Nov 2011 23:33:46 +0100
+Subject: [PATCH] -J -O: use -O name if no Content-Disposition header comes!
+
+A regression between 7.22.0 and 7.23.0 -- downloading a file with the
+flags -O and -J results in the content being written to stdout if and
+only if there was no Content-Disposition header in the http response. If
+there is a C-D header with a filename attribute, the output is correctly
+written.
+
+Reported by: Dave Reisner
+Bug: http://curl.haxx.se/mail/archive-2011-11/0030.html
+---
+ src/tool_cb_hdr.c |3 +-
+ src/tool_operate.c | 59 ++--
+ src/tool_operhlp.c | 18 +
+ tests/data/Makefile.am |2 +-
+ tests/data/test1210| 63
+ 5 files changed, 112 insertions(+), 33 deletions(-)
+ create mode 100644 tests/data/test1210
+
+diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c
+index fb24b45..dea7338 100644
+--- a/src/tool_cb_hdr.c
b/src/tool_cb_hdr.c
+@@ -66,8 +66,7 @@ size_t tool_header_cb(void *ptr, size_t size, size_t nmemb,
void *userdata)
+ }
+ #endif
+
+- if(!outs->filename && (cb > 20) &&
+-checkprefix("Content-disposition:", str)) {
++ if((cb > 20) && checkprefix("Content-disposition:", str)) {
+ const char *p = str + 20;
+
+ /* look for the 'filename=' parameter
+diff --git a/src/tool_operate.c b/src/tool_operate.c
+index 7ab815f..1e88120 100644
+--- a/src/tool_operate.c
b/src/tool_operate.c
+@@ -576,41 +576,40 @@ int operate(struct Configurable *config, int argc,
argv_item_t argv[])
+
+ if((urlnode->flags & GETOUT_USEREMOTE)
+ && config->content_disposition) {
+-/* Our header callback sets the filename */
++/* Our header callback MIGHT set the filename */
+ DEBUGASSERT(!outs.filename);
+ }
+- else {
+-if(config->resume_from_current) {
+- /* We're told to continue from where we are now. Get the size
+- of the file as it is now and open it for append instead */
+- struct_stat fileinfo;
+- /* VMS -- Danger, the filesize is only valid for stream files */
+- if(0 == stat(outfile, &fileinfo))
+-/* set offset to current file size: */
+-config->resume_from = fileinfo.st_size;
+- else
+-/* let offset be 0 */
+-config->resume_from = 0;
+-}
+
+-if(config->resume_from) {
+- /* open file for output: */
+- FILE *file = fopen(outfile, config->resume_from?"ab":"wb");
+- if(!file) {
+-helpf(config->errors, "Can't open '%s'!\n", outfile);
+-res = CURLE_WRITE_ERROR;
+-goto quit_urls;
+- }
+- outs.fopened = TRUE;
+- outs.stream = file;
+- outs.init = config->resume_from;
+-}
+-else {
+- outs.stream = NULL; /* open when needed */
++ if(config->resume_from_current) {
++
[arch-commits] Commit in syslog-ng/repos (10 files)
Date: Monday, November 21, 2011 @ 19:25:18
Author: dreisner
Revision: 143048
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
syslog-ng/repos/testing-i686/
syslog-ng/repos/testing-i686/PKGBUILD
(from rev 143047, syslog-ng/trunk/PKGBUILD)
syslog-ng/repos/testing-i686/syslog-ng.conf
(from rev 143047, syslog-ng/trunk/syslog-ng.conf)
syslog-ng/repos/testing-i686/syslog-ng.logrotate
(from rev 143047, syslog-ng/trunk/syslog-ng.logrotate)
syslog-ng/repos/testing-i686/syslog-ng.rc
(from rev 143047, syslog-ng/trunk/syslog-ng.rc)
syslog-ng/repos/testing-x86_64/
syslog-ng/repos/testing-x86_64/PKGBUILD
(from rev 143047, syslog-ng/trunk/PKGBUILD)
syslog-ng/repos/testing-x86_64/syslog-ng.conf
(from rev 143047, syslog-ng/trunk/syslog-ng.conf)
syslog-ng/repos/testing-x86_64/syslog-ng.logrotate
(from rev 143047, syslog-ng/trunk/syslog-ng.logrotate)
syslog-ng/repos/testing-x86_64/syslog-ng.rc
(from rev 143047, syslog-ng/trunk/syslog-ng.rc)
+
testing-i686/PKGBUILD | 53
testing-i686/syslog-ng.conf| 92 +++
testing-i686/syslog-ng.logrotate |7 ++
testing-i686/syslog-ng.rc | 66 +
testing-x86_64/PKGBUILD| 53
testing-x86_64/syslog-ng.conf | 92 +++
testing-x86_64/syslog-ng.logrotate |7 ++
testing-x86_64/syslog-ng.rc| 66 +
8 files changed, 436 insertions(+)
Copied: syslog-ng/repos/testing-i686/PKGBUILD (from rev 143047,
syslog-ng/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2011-11-22 00:25:18 UTC (rev 143048)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Dave Reisner
+# Maintainer: Eric Bélanger
+# Maintainer: Aaron Griffin
+
+pkgname=syslog-ng
+pkgver=3.3.2
+pkgrel=2
+pkgdesc="Next-generation syslogd with advanced networking and filtering
capabilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+groups=('base')
+url="http://www.balabit.com/network-security/syslog-ng/";
+depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk')
+makedepends=('flex' 'pkg-config')
+optdepends=('logrotate: for rotating log files')
+provides=('logger')
+options=('!libtool')
+backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \
+'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
+source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz";
+syslog-ng.conf
+syslog-ng.logrotate
+syslog-ng.rc)
+sha1sums=('a7cfc987cdd584e357e253d2794bad1159776638'
+ '98074e0facfc6ef036202662cc86d04b38a2c142'
+ '949128fe3d7f77a7aab99048061f885bc758000c'
+ 'a6ad26912b5bcbe1b47b003309945d733613b98f')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ ./configure \
+--prefix=/usr \
+--sysconfdir=/etc/syslog-ng \
+--libexecdir=/usr/lib \
+--localstatedir=/var/lib/syslog-ng \
+--with-pidfile-dir=/run \
+--disable-spoof-source \
+--enable-systemd \
+--with-systemdsystemunitdir=/lib/systemd/system
+
+ make
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+
+ install -dm755 "$pkgdir/var/lib/syslog-ng"
"$pkgdir/etc/syslog-ng/patterndb.d"
+ install -Dm644 "$srcdir/syslog-ng.conf"
"$pkgdir/etc/syslog-ng/syslog-ng.conf"
+ install -Dm644 "$srcdir/syslog-ng.logrotate"
"$pkgdir/etc/logrotate.d/syslog-ng"
+ install -Dm755 "$srcdir/syslog-ng.rc" "$pkgdir/etc/rc.d/syslog-ng"
+}
Copied: syslog-ng/repos/testing-i686/syslog-ng.conf (from rev 143047,
syslog-ng/trunk/syslog-ng.conf)
===
--- testing-i686/syslog-ng.conf (rev 0)
+++ testing-i686/syslog-ng.conf 2011-11-22 00:25:18 UTC (rev 143048)
@@ -0,0 +1,92 @@
+@version: 3.3
+#
+# /etc/syslog-ng/syslog-ng.conf
+#
+
+options {
+ stats_freq (0);
+ flush_lines (0);
+ time_reopen (10);
+ log_fifo_size (1);
+ chain_hostnames (off);
+ use_dns (no);
+ use_fqdn (no);
+ create_dirs (no);
+ keep_hostname (yes);
+ perm(0640);
+ group("log");
+};
+
+source src {
+ unix-dgram("/dev/log");
+ internal();
+ file("/proc/kmsg");
+};
+
+destination d_authlog { file("/var/log/auth.log"); };
+destination d_syslog { file("/var/log/syslog.log"); };
+destination d_cron { file("/var/log/crond.log"); };
+destination d_daemon { file("/var/log/daemon.log"); };
+destination d_kernel { file("/var/log/kernel.log"); };
+destination d_lpr { file("/var/log/lpr.log"); };
+destination d_user { file("/var/log/user.log"); };
+destination d_uucp { file("/var/log/uucp.log"); };
+destination d_mail { file("/var/log/mail.log"); };
+destination d_news { file("/var/log/news.log"); };
+destination d_ppp { file("/var/log/ppp.log"); };
[arch-commits] Commit in syslog-ng/trunk (PKGBUILD syslog-ng.logrotate)
Date: Monday, November 21, 2011 @ 19:24:53
Author: dreisner
Revision: 143047
upgpkg: syslog-ng 3.3.2-2
fix logrotate file to point at correct PIDFile
Modified:
syslog-ng/trunk/PKGBUILD
syslog-ng/trunk/syslog-ng.logrotate
-+
PKGBUILD|4 ++--
syslog-ng.logrotate |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-22 00:16:30 UTC (rev 143046)
+++ PKGBUILD2011-11-22 00:24:53 UTC (rev 143047)
@@ -5,7 +5,7 @@
pkgname=syslog-ng
pkgver=3.3.2
-pkgrel=1
+pkgrel=2
pkgdesc="Next-generation syslogd with advanced networking and filtering
capabilities"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -24,7 +24,7 @@
syslog-ng.rc)
sha1sums=('a7cfc987cdd584e357e253d2794bad1159776638'
'98074e0facfc6ef036202662cc86d04b38a2c142'
- 'ac997b25d7d8e69e66782d3771a0e12aff55ae7f'
+ '949128fe3d7f77a7aab99048061f885bc758000c'
'a6ad26912b5bcbe1b47b003309945d733613b98f')
build() {
Modified: syslog-ng.logrotate
===
--- syslog-ng.logrotate 2011-11-22 00:16:30 UTC (rev 143046)
+++ syslog-ng.logrotate 2011-11-22 00:24:53 UTC (rev 143047)
@@ -2,6 +2,6 @@
missingok
sharedscripts
postrotate
- /bin/kill -HUP `cat /var/run/syslog-ng.pid 2>/dev/null` 2>
/dev/null || true
+ /bin/kill -HUP $(cat /run/syslog-ng.pid 2>/dev/null)
2>/dev/null || true
endscript
}
[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD)
Date: Monday, November 21, 2011 @ 19:16:30
Author: andrea
Revision: 143046
Add libxres
Modified:
kdebase-workspace/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-21 22:57:37 UTC (rev 143045)
+++ PKGBUILD2011-11-22 00:16:30 UTC (rev 143046)
@@ -17,7 +17,7 @@
depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate'
'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage'
'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
- 'xorg-xrdb' 'libgles' 'libegl' 'kactivities')
+ 'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python'
'networkmanager')
optdepends=('kde-wallpapers: officials KDE wallapers')
[arch-commits] Commit in (25 files)
Date: Monday, November 21, 2011 @ 17:57:37
Author: andrea
Revision: 143045
python2 and .install fixes
Added:
kdebase/trunk/kdebase-dolphin.install
kdebase/trunk/kdebase-konqueror.install
kdegames/trunk/kdegames-kpatience.install
kdegraphics-mobipocket/trunk/kdegraphics-mobipocket.install
kdemultimedia/trunk/kdemultimedia-dragonplayer.install
kdesdk/trunk/kdesdk-cervisia.install
kdesdk/trunk/kdesdk-kcachegrind.install
kdesdk/trunk/kdesdk-kompare.install
kdesdk/trunk/kdesdk-kuiviewer.install
kdesdk/trunk/kdesdk-lokalize.install
kdesdk/trunk/kdesdk-umbrello.install
kdewebdev/trunk/kdewebdev-kimagemapeditor.install
Modified:
kdebase/trunk/PKGBUILD
kdebindings-perlqt/trunk/PKGBUILD
kdegames/trunk/PKGBUILD
kdegraphics-mobipocket/trunk/PKGBUILD
kdemultimedia/trunk/PKGBUILD
kdesdk-kate/trunk/kdesdk-kate.install
kdesdk/trunk/PKGBUILD
kdesdk/trunk/fix-python2-path.patch
kdeutils-kremotecontrol/trunk/PKGBUILD
kdeutils-kwallet/trunk/PKGBUILD
kdeutils-kwallet/trunk/kdeutils-kwallet.install
kdeutils-printer-applet/trunk/PKGBUILD
kdewebdev/trunk/PKGBUILD
-+
kdebase/trunk/PKGBUILD | 15 ++--
kdebase/trunk/kdebase-dolphin.install | 11 ++
kdebase/trunk/kdebase-konqueror.install | 12 +++
kdebindings-perlqt/trunk/PKGBUILD |1
kdegames/trunk/PKGBUILD |2
kdegames/trunk/kdegames-kpatience.install | 12 +++
kdegraphics-mobipocket/trunk/PKGBUILD |1
kdegraphics-mobipocket/trunk/kdegraphics-mobipocket.install | 11 ++
kdemultimedia/trunk/PKGBUILD|2
kdemultimedia/trunk/kdemultimedia-dragonplayer.install | 12 +++
kdesdk-kate/trunk/kdesdk-kate.install |7 +
kdesdk/trunk/PKGBUILD | 37 ++
kdesdk/trunk/fix-python2-path.patch | 34 -
kdesdk/trunk/kdesdk-cervisia.install| 12 +++
kdesdk/trunk/kdesdk-kcachegrind.install | 12 +++
kdesdk/trunk/kdesdk-kompare.install | 12 +++
kdesdk/trunk/kdesdk-kuiviewer.install | 12 +++
kdesdk/trunk/kdesdk-lokalize.install| 12 +++
kdesdk/trunk/kdesdk-umbrello.install| 12 +++
kdeutils-kremotecontrol/trunk/PKGBUILD |1
kdeutils-kwallet/trunk/PKGBUILD |1
kdeutils-kwallet/trunk/kdeutils-kwallet.install |6 -
kdeutils-printer-applet/trunk/PKGBUILD |4 +
kdewebdev/trunk/PKGBUILD|2
kdewebdev/trunk/kdewebdev-kimagemapeditor.install | 12 +++
25 files changed, 193 insertions(+), 62 deletions(-)
Modified: kdebase/trunk/PKGBUILD
===
--- kdebase/trunk/PKGBUILD 2011-11-21 22:39:45 UTC (rev 143044)
+++ kdebase/trunk/PKGBUILD 2011-11-21 22:57:37 UTC (rev 143045)
@@ -40,6 +40,7 @@
'kdegraphics-thumbnailers: thumbnailers for graphics file'
'ruby: servicemenu installation')
url="http://kde.org/applications/system/dolphin/";
+install=kdebase-dolphin.install
cd $srcdir/build/dolphin
make DESTDIR=$pkgdir install
cd $srcdir/build/doc/dolphin
@@ -94,13 +95,13 @@
depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
optdepends=('kwebkitpart: to enable webkit engine')
url="http://kde.org/applications/internet/konqueror/";
- install='kdebase.install'
-conflicts=('kdebase-nsplugins')
-replaces=('kdebase-nsplugins')
-for i in konqueror doc/konqueror nsplugins; do
-cd $srcdir/build/${i}
-make DESTDIR=$pkgdir install
-done
+ install='kdebase-konqueror.install'
+conflicts=('kdebase-nsplugins')
+replaces=('kdebase-nsplugins')
+for i in konqueror doc/konqueror nsplugins; do
+ cd $srcdir/build/${i}
+ make DESTDIR=$pkgdir install
+done
}
package_kdebase-lib() {
Added: kdebase/trunk/kdebase-dolphin.install
===
--- kdebase/trunk/kdebase-dolphin.install (rev 0)
+++ kdebase/trunk/kdebase-dolphin.install 2011-11-21 22:57:37 UTC (rev
143045)
@@ -0,0 +1,11 @@
+post_install() {
+update-desktop-database -q
+}
+
+post_upgrade() {
+post_install
+}
+
+post_remove() {
+post_install
+}
Added: kdebase/trunk/kdebase-konqueror.install
===
--- kdebase/trunk/kdebase-konqueror.install (rev 0)
+++ kdebase/tru
[arch-commits] Commit in di/repos (4 files)
Date: Monday, November 21, 2011 @ 17:39:45
Author: eric
Revision: 143044
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
di/repos/extra-i686/PKGBUILD
(from rev 143043, di/trunk/PKGBUILD)
di/repos/extra-x86_64/PKGBUILD
(from rev 143043, di/trunk/PKGBUILD)
Deleted:
di/repos/extra-i686/PKGBUILD
di/repos/extra-x86_64/PKGBUILD
---+
extra-i686/PKGBUILD | 48
extra-x86_64/PKGBUILD | 48
2 files changed, 48 insertions(+), 48 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-21 22:39:27 UTC (rev 143043)
+++ extra-i686/PKGBUILD 2011-11-21 22:39:45 UTC (rev 143044)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger
-
-pkgname=di
-pkgver=4.30
-pkgrel=1
-pkgdesc="A disk information utility, displaying everything (and more) that
your df command does"
-arch=('i686' 'x86_64')
-url="http://www.gentoo.com/di/";
-license=('ZLIB')
-depends=('glibc')
-source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('45fae9dd34df9f5f2c391237fb316c056d4854fe')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make INSTALL_DIR="${pkgdir}/usr" install
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: di/repos/extra-i686/PKGBUILD (from rev 143043, di/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-21 22:39:45 UTC (rev 143044)
@@ -0,0 +1,24 @@
+# $Id$
+# Maintainer: Eric Bélanger
+
+pkgname=di
+pkgver=4.31
+pkgrel=1
+pkgdesc="A disk information utility, displaying everything (and more) that
your df command does"
+arch=('i686' 'x86_64')
+url="http://www.gentoo.com/di/";
+license=('ZLIB')
+depends=('glibc')
+source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('2a7212e03286b68ebb4783ae8937999145165c79')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make INSTALL_DIR="${pkgdir}/usr" install
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2011-11-21 22:39:27 UTC (rev 143043)
+++ extra-x86_64/PKGBUILD 2011-11-21 22:39:45 UTC (rev 143044)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger
-
-pkgname=di
-pkgver=4.30
-pkgrel=1
-pkgdesc="A disk information utility, displaying everything (and more) that
your df command does"
-arch=('i686' 'x86_64')
-url="http://www.gentoo.com/di/";
-license=('ZLIB')
-depends=('glibc')
-source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('45fae9dd34df9f5f2c391237fb316c056d4854fe')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make INSTALL_DIR="${pkgdir}/usr" install
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: di/repos/extra-x86_64/PKGBUILD (from rev 143043, di/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-11-21 22:39:45 UTC (rev 143044)
@@ -0,0 +1,24 @@
+# $Id$
+# Maintainer: Eric Bélanger
+
+pkgname=di
+pkgver=4.31
+pkgrel=1
+pkgdesc="A disk information utility, displaying everything (and more) that
your df command does"
+arch=('i686' 'x86_64')
+url="http://www.gentoo.com/di/";
+license=('ZLIB')
+depends=('glibc')
+source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('2a7212e03286b68ebb4783ae8937999145165c79')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make INSTALL_DIR="${pkgdir}/usr" install
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
[arch-commits] Commit in di/trunk (PKGBUILD)
Date: Monday, November 21, 2011 @ 17:39:27
Author: eric
Revision: 143043
upgpkg: di 4.31-1
Upstream update
Modified:
di/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-21 22:18:24 UTC (rev 143042)
+++ PKGBUILD2011-11-21 22:39:27 UTC (rev 143043)
@@ -2,7 +2,7 @@
# Maintainer: Eric Bélanger
pkgname=di
-pkgver=4.30
+pkgver=4.31
pkgrel=1
pkgdesc="A disk information utility, displaying everything (and more) that
your df command does"
arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@
license=('ZLIB')
depends=('glibc')
source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('45fae9dd34df9f5f2c391237fb316c056d4854fe')
+sha1sums=('2a7212e03286b68ebb4783ae8937999145165c79')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
[arch-commits] Commit in kdeadmin/trunk (PKGBUILD)
Date: Monday, November 21, 2011 @ 17:18:24
Author: andrea
Revision: 143042
Fix the python shebang
Modified:
kdeadmin/trunk/PKGBUILD
--+
PKGBUILD |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-21 17:38:43 UTC (rev 143041)
+++ PKGBUILD2011-11-21 22:18:24 UTC (rev 143042)
@@ -73,6 +73,9 @@
cd $srcdir/build/system-config-printer-kde
make DESTDIR=$pkgdir install
-# Use the python2 executable
-find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env
python|#!/usr/bin/env python2|'
+# Use the python2 executable
+sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+
"${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \
+ "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py
}
[arch-commits] Commit in python/repos (6 files)
Date: Monday, November 21, 2011 @ 12:38:43
Author: stephane
Revision: 143041
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
python/repos/staging-i686/
python/repos/staging-i686/PKGBUILD
(from rev 143040, python/trunk/PKGBUILD)
python/repos/staging-i686/gdbm-magic-values.patch
(from rev 143040, python/trunk/gdbm-magic-values.patch)
python/repos/staging-x86_64/
python/repos/staging-x86_64/PKGBUILD
(from rev 143040, python/trunk/PKGBUILD)
python/repos/staging-x86_64/gdbm-magic-values.patch
(from rev 143040, python/trunk/gdbm-magic-values.patch)
+
staging-i686/PKGBUILD | 81 +++
staging-i686/gdbm-magic-values.patch | 13
staging-x86_64/PKGBUILD| 81 +++
staging-x86_64/gdbm-magic-values.patch | 13
4 files changed, 188 insertions(+)
Copied: python/repos/staging-i686/PKGBUILD (from rev 143040,
python/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2011-11-21 17:38:43 UTC (rev 143041)
@@ -0,0 +1,81 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault
+# Maintainer: Allan McRae
+# Contributor: Jason Chu
+
+pkgname=python
+pkgver=3.2.2
+pkgrel=2
+_pybasever=3.2
+pkgdesc="Next generation of the python high-level scripting language"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://www.python.org/";
+depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
+makedepends=('tk' 'sqlite3' 'valgrind')
+optdepends=('tk: for tkinter' 'sqlite3')
+provides=('python3')
+replaces=('python3')
+options=('!makeflags')
+source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz
+gdbm-magic-values.patch)
+sha1sums=('5e654dbd48476193ccdef4d604ed4f45b48c6769'
+ '43bfbe3e23360f412b95cb284ff29b2cbe338be9')
+
+build() {
+ cd "${srcdir}/Python-${pkgver}"
+
+ # FS#23997
+ sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
+
+ # gdbm has new magic that whichdb does not recognize
+ # http://bugs.python.org/issue13007
+ patch -Np1 -i ../gdbm-magic-values.patch
+
+ # Ensure that we are using the system copy of various libraries (expat, zlib
and libffi),
+ # rather than copies shipped in the tarball
+ rm -r Modules/expat
+ rm -r Modules/zlib
+ rm -r Modules/_ctypes/{darwin,libffi}*
+
+ ./configure --prefix=/usr \
+ --enable-shared \
+ --with-threads \
+ --with-computed-gotos \
+ --enable-ipv6 \
+ --with-valgrind \
+ --with-wide-unicode \
+ --with-system-expat \
+ --with-dbmliborder=gdbm:ndbm \
+ --with-system-ffi
+
+ make
+}
+
+check() {
+ cd "${srcdir}/Python-${pkgver}"
+ LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
+ "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils
test_site test_uuid
+}
+
+package() {
+ cd "${srcdir}/Python-${pkgver}"
+ make DESTDIR="${pkgdir}" install maninstall
+
+ # Why are these not done by default...
+ ln -sf python3 "${pkgdir}/usr/bin/python"
+ ln -sf python3-config"${pkgdir}/usr/bin/python-config"
+ ln -sf idle3 "${pkgdir}/usr/bin/idle"
+ ln -sf pydoc3"${pkgdir}/usr/bin/pydoc"
+ ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1"
+
+ # Fix FS#22552
+ ln -sf ../../libpython${_pybasever}mu.so \
+
"${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}mu/libpython${_pybasever}mu.so"
+
+ # Clean-up reference to build directory
+ sed -i "s|$srcdir/Python-${pkgver}:||"
"$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}mu/Makefile"
+
+ # License
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Copied: python/repos/staging-i686/gdbm-magic-values.patch (from rev 143040,
python/trunk/gdbm-magic-values.patch)
===
--- staging-i686/gdbm-magic-values.patch(rev 0)
+++ staging-i686/gdbm-magic-values.patch2011-11-21 17:38:43 UTC (rev
143041)
@@ -0,0 +1,13 @@
+diff -up Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic
Python-3.2.2/Lib/dbm/__init__.py
+--- Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic2011-09-03
12:16:40.0 -0400
Python-3.2.2/Lib/dbm/__init__.py 2011-09-30 15:47:27.488863694 -0400
+@@ -166,7 +166,7 @@ def whichdb(filename):
+ return ""
+
+ # Check for GNU dbm
+-if magic == 0x13579ace:
++if magic in (0x13579ace, 0x13579acd, 0x13579acf):
+ return "dbm.gnu"
+
+ # Later versions of Berkeley db hash file have a 12-byte pad in
+diff -up Python-3.2.2/Misc/NEWS.gdbm-1.9-magic Python-3.2.2/Misc/NEWS
Copied: python/repos/staging-x86_64/PKGBUILD (from rev 143040,
python/trun
[arch-commits] Commit in python/trunk (PKGBUILD gdbm-magic-values.patch)
Date: Monday, November 21, 2011 @ 12:38:37
Author: stephane
Revision: 143040
upgpkg: python 3.2.2-2
gdbm 1.10 rebuild
Added:
python/trunk/gdbm-magic-values.patch
Modified:
python/trunk/PKGBUILD
-+
PKGBUILD| 15 +++
gdbm-magic-values.patch | 13 +
2 files changed, 24 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-21 17:36:08 UTC (rev 143039)
+++ PKGBUILD2011-11-21 17:38:37 UTC (rev 143040)
@@ -5,7 +5,7 @@
pkgname=python
pkgver=3.2.2
-pkgrel=1
+pkgrel=2
_pybasever=3.2
pkgdesc="Next generation of the python high-level scripting language"
arch=('i686' 'x86_64')
@@ -17,8 +17,10 @@
provides=('python3')
replaces=('python3')
options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
-sha1sums=('5e654dbd48476193ccdef4d604ed4f45b48c6769')
+source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz
+gdbm-magic-values.patch)
+sha1sums=('5e654dbd48476193ccdef4d604ed4f45b48c6769'
+ '43bfbe3e23360f412b95cb284ff29b2cbe338be9')
build() {
cd "${srcdir}/Python-${pkgver}"
@@ -26,6 +28,10 @@
# FS#23997
sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
+ # gdbm has new magic that whichdb does not recognize
+ # http://bugs.python.org/issue13007
+ patch -Np1 -i ../gdbm-magic-values.patch
+
# Ensure that we are using the system copy of various libraries (expat, zlib
and libffi),
# rather than copies shipped in the tarball
rm -r Modules/expat
@@ -40,6 +46,7 @@
--with-valgrind \
--with-wide-unicode \
--with-system-expat \
+ --with-dbmliborder=gdbm:ndbm \
--with-system-ffi
make
@@ -48,7 +55,7 @@
check() {
cd "${srcdir}/Python-${pkgver}"
LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
- "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils
test_site
+ "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils
test_site test_uuid
}
package() {
Added: gdbm-magic-values.patch
===
--- gdbm-magic-values.patch (rev 0)
+++ gdbm-magic-values.patch 2011-11-21 17:38:37 UTC (rev 143040)
@@ -0,0 +1,13 @@
+diff -up Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic
Python-3.2.2/Lib/dbm/__init__.py
+--- Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic2011-09-03
12:16:40.0 -0400
Python-3.2.2/Lib/dbm/__init__.py 2011-09-30 15:47:27.488863694 -0400
+@@ -166,7 +166,7 @@ def whichdb(filename):
+ return ""
+
+ # Check for GNU dbm
+-if magic == 0x13579ace:
++if magic in (0x13579ace, 0x13579acd, 0x13579acf):
+ return "dbm.gnu"
+
+ # Later versions of Berkeley db hash file have a 12-byte pad in
+diff -up Python-3.2.2/Misc/NEWS.gdbm-1.9-magic Python-3.2.2/Misc/NEWS
[arch-commits] Commit in python2/repos (8 files)
Date: Monday, November 21, 2011 @ 12:36:08
Author: stephane
Revision: 143039
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
python2/repos/staging-i686/PKGBUILD
(from rev 143038, python2/trunk/PKGBUILD)
python2/repos/staging-i686/gdbm-magic-values.patch
(from rev 143038, python2/trunk/gdbm-magic-values.patch)
python2/repos/staging-i686/linux2.patch
(from rev 143038, python2/trunk/linux2.patch)
python2/repos/staging-x86_64/PKGBUILD
(from rev 143038, python2/trunk/PKGBUILD)
python2/repos/staging-x86_64/gdbm-magic-values.patch
(from rev 143038, python2/trunk/gdbm-magic-values.patch)
python2/repos/staging-x86_64/linux2.patch
(from rev 143038, python2/trunk/linux2.patch)
Deleted:
python2/repos/staging-i686/PKGBUILD
python2/repos/staging-x86_64/PKGBUILD
+
staging-i686/PKGBUILD | 182 ---
staging-i686/gdbm-magic-values.patch | 13 ++
staging-i686/linux2.patch | 23 +++
staging-x86_64/PKGBUILD| 182 ---
staging-x86_64/gdbm-magic-values.patch | 13 ++
staging-x86_64/linux2.patch| 23 +++
6 files changed, 264 insertions(+), 172 deletions(-)
Deleted: staging-i686/PKGBUILD
===
--- staging-i686/PKGBUILD 2011-11-21 17:35:56 UTC (rev 143038)
+++ staging-i686/PKGBUILD 2011-11-21 17:36:08 UTC (rev 143039)
@@ -1,86 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault
-# Contributer: Allan McRae
-# Contributer: Jason Chu
-
-pkgname=python2
-pkgver=2.7.2
-pkgrel=3
-_pybasever=2.7
-pkgdesc="A high-level scripting language"
-arch=('i686' 'x86_64')
-license=('PSF')
-url="http://www.python.org/";
-depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
-makedepends=('tk')
-optdepends=('tk: for IDLE')
-conflicts=('python<3')
-options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53')
-
-build() {
- cd "${srcdir}/Python-${pkgver}"
-
- # Temporary workaround for FS#22322
- # See http://bugs.python.org/issue10835 for upstream report
- sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
-
- # Enable built-in SQLite3 module to load extensions (fix FS#22122)
- sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
-
- # FS#23997
- sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
-
- # Ensure that we are using the system copy of various libraries (expat, zlib
and libffi),
- # rather than copies shipped in the tarball
- rm -r Modules/expat
- rm -r Modules/zlib
- rm -r Modules/_ctypes/{darwin,libffi}*
-
- export OPT="${CFLAGS}"
- ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
- --enable-unicode=ucs4 --with-system-expat --with-system-ffi
-
- # Make sure sys.platform is set to linux2, even on kernel 3.X
- # cf http://bugs.python.org/issue12326
- # Here we simply run make with a different MACHDEP variable. It requires no
patching.
- make MACHDEP=linux2
-}
-
-package() {
- cd "${srcdir}/Python-${pkgver}"
- make DESTDIR="${pkgdir}" altinstall maninstall
-
- ln -sf python${_pybasever}"${pkgdir}/usr/bin/python2"
- ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config"
- ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python2.1"
-
- ln -sf ../../libpython${_pybasever}.so \
-"${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so"
-
- mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/"
-
- # some useful "stuff"
- install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
- install -m755 Tools/i18n/{msgfmt,pygettext}.py \
-"${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/"
- install -m755 Tools/scripts/{README,*py} \
-"${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/"
-
- # fix conflicts with python
- mv "${pkgdir}"/usr/bin/idle{,2}
- mv "${pkgdir}"/usr/bin/pydoc{,2}
- mv "${pkgdir}"/usr/bin/2to3{,-2.7}
-
- # clean up #!s
- find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \
-xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
-
- # clean-up reference to build directory
- sed -i "s#${srcdir}/Python-${pkgver}:##" \
-"${pkgdir}/usr/lib/python${_pybasever}/config/Makefile"
-
- # license
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: python2/repos/staging-i686/PKGBUILD (from rev 143038,
python2/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2011-11-21 17:36:08 UTC (rev 143039)
@@ -0,0 +1,96 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault
+# Contributer: Allan McRae
+# Contributer: Jason Chu
+
+pkgname=python2
[arch-commits] Commit in python2/trunk (PKGBUILD gdbm-magic-values.patch linux2.patch)
Date: Monday, November 21, 2011 @ 12:35:56
Author: stephane
Revision: 143038
upgpkg: python2 2.7.2-4
revert last changes, re-enable gdbm
Added:
python2/trunk/gdbm-magic-values.patch
python2/trunk/linux2.patch
Modified:
python2/trunk/PKGBUILD
-+
PKGBUILD| 24 +---
gdbm-magic-values.patch | 13 +
linux2.patch| 23 +++
3 files changed, 53 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-21 17:31:39 UTC (rev 143037)
+++ PKGBUILD2011-11-21 17:35:56 UTC (rev 143038)
@@ -5,7 +5,7 @@
pkgname=python2
pkgver=2.7.2
-pkgrel=3
+pkgrel=4
_pybasever=2.7
pkgdesc="A high-level scripting language"
arch=('i686' 'x86_64')
@@ -16,8 +16,12 @@
optdepends=('tk: for IDLE')
conflicts=('python<3')
options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
+linux2.patch
+gdbm-magic-values.patch)
+sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53'
+ '937c06190899a491d662c7918658313e7640070e'
+ '0f4cd9508c9ace620a829a688a9285e0480b5fb5')
build() {
cd "${srcdir}/Python-${pkgver}"
@@ -32,6 +36,14 @@
# FS#23997
sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
+ # Make sure sys.platform is set to linux2, even on kernel 3.X
+ # cf http://bugs.python.org/issue12326
+ patch -Np1 -i ../linux2.patch
+
+ # gdbm has new magic that whichdb does not recognize
+ # http://bugs.python.org/issue13007
+ patch -Np1 -i ../gdbm-magic-values.patch
+
# Ensure that we are using the system copy of various libraries (expat, zlib
and libffi),
# rather than copies shipped in the tarball
rm -r Modules/expat
@@ -40,11 +52,9 @@
export OPT="${CFLAGS}"
./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
- --enable-unicode=ucs4 --with-system-expat --with-system-ffi
+ --enable-unicode=ucs4 --with-system-expat --with-system-ffi \
+ --with-dbmliborder=gdbm:ndbm
- # Make sure sys.platform is set to linux2, even on kernel 3.X
- # cf http://bugs.python.org/issue12326
- # Here we simply run make with a different MACHDEP variable. It requires no
patching.
make MACHDEP=linux2
}
Added: gdbm-magic-values.patch
===
--- gdbm-magic-values.patch (rev 0)
+++ gdbm-magic-values.patch 2011-11-21 17:35:56 UTC (rev 143038)
@@ -0,0 +1,13 @@
+diff -up Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic Python-2.7.2/Lib/whichdb.py
+--- Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic 2011-06-11 11:46:26.0
-0400
Python-2.7.2/Lib/whichdb.py2011-09-30 15:45:21.778872290 -0400
+@@ -91,7 +91,7 @@ def whichdb(filename):
+ return ""
+
+ # Check for GNU dbm
+-if magic == 0x13579ace:
++if magic in (0x13579ace, 0x13579acd, 0x13579acf):
+ return "gdbm"
+
+ # Check for old Berkeley db hash file format v2
+diff -up Python-2.7.2/Misc/NEWS.gdbm-1.9-magic Python-2.7.2/Misc/NEWS
Added: linux2.patch
===
--- linux2.patch(rev 0)
+++ linux2.patch2011-11-21 17:35:56 UTC (rev 143038)
@@ -0,0 +1,23 @@
+http://hg.python.org/cpython/rev/c816479f6aaf/
+diff --git a/configure b/configure
+--- a/configure
b/configure
+@@ -2995,6 +2995,7 @@ then
+ MACHDEP="$ac_md_system$ac_md_release"
+
+ case $MACHDEP in
++ linux*) MACHDEP="linux2";;
+ cygwin*) MACHDEP="cygwin";;
+ darwin*) MACHDEP="darwin";;
+ atheos*) MACHDEP="atheos";;
+diff --git a/configure.in b/configure.in
+--- a/configure.in
b/configure.in
+@@ -293,6 +293,7 @@ then
+ MACHDEP="$ac_md_system$ac_md_release"
+
+ case $MACHDEP in
++ linux*) MACHDEP="linux2";;
+ cygwin*) MACHDEP="cygwin";;
+ darwin*) MACHDEP="darwin";;
+ atheos*) MACHDEP="atheos";;
[arch-commits] Commit in (2 files)
Date: Monday, November 21, 2011 @ 12:31:39
Author: andrea
Revision: 143037
Add missing make/depends
Modified:
kdebase-runtime/trunk/PKGBUILD
kdeedu-cantor/trunk/PKGBUILD
+
kdebase-runtime/trunk/PKGBUILD |3 ++-
kdeedu-cantor/trunk/PKGBUILD |2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
Modified: kdebase-runtime/trunk/PKGBUILD
===
--- kdebase-runtime/trunk/PKGBUILD 2011-11-21 17:24:21 UTC (rev 143036)
+++ kdebase-runtime/trunk/PKGBUILD 2011-11-21 17:31:39 UTC (rev 143037)
@@ -11,7 +11,8 @@
license=('GPL' 'LGPL')
depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
'xorg-xauth')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib')
+makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen'
+ 'xine-lib')
optdepends=('htdig: to build the search index in khelpcenter'
'rarian: needed by khelpcenter'
'gdb: drkonq crash handler')
Modified: kdeedu-cantor/trunk/PKGBUILD
===
--- kdeedu-cantor/trunk/PKGBUILD2011-11-21 17:24:21 UTC (rev 143036)
+++ kdeedu-cantor/trunk/PKGBUILD2011-11-21 17:31:39 UTC (rev 143037)
@@ -9,7 +9,7 @@
arch=('i686' 'x86_64')
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libspectre')
+depends=('kdebase-runtime' 'libspectre' 'kdeedu-analitza')
makedepends=('cmake' 'automoc4' 'r')
optdepends=('maxima: Maxima backend'
'octave: Octave backend'
[arch-commits] Commit in kdebindings-kross/trunk (PKGBUILD)
Date: Monday, November 21, 2011 @ 12:24:21
Author: andrea
Revision: 143036
Replace openjdk6 with java-environment
Modified:
kdebindings-kross/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-21 15:50:17 UTC (rev 143035)
+++ PKGBUILD2011-11-21 17:24:21 UTC (rev 143036)
@@ -11,7 +11,7 @@
arch=('i686' 'x86_64')
license=('GPL' 'LGPL' 'FDL')
groups=('kdebindings')
-makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'openjdk6')
+makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment')
source=("http://download.kde.org/unstable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2";)
sha1sums=('52adafe42de134c6bc53855dbc464df2a1190efd')
@@ -37,7 +37,7 @@
package_kdebindings-kross-java() {
pkgdesc="Java language interpreters to enable in-process scripting with
Kross"
- depends=('kdelibs' 'openjdk6')
+ depends=('kdelibs' 'java-environment')
cd "${srcdir}"/build/java
make DESTDIR="${pkgdir}" install
[arch-commits] Commit in xf86-video-intel/repos (3 files)
Date: Monday, November 21, 2011 @ 10:50:17
Author: jgc
Revision: 143035
db-move: moved xf86-video-intel from [testing] to [extra] (x86_64)
Added:
xf86-video-intel/repos/extra-x86_64/PKGBUILD
(from rev 143033, xf86-video-intel/repos/testing-x86_64/PKGBUILD)
Deleted:
xf86-video-intel/repos/extra-x86_64/PKGBUILD
xf86-video-intel/repos/testing-x86_64/
--+
PKGBUILD | 62 ++---
1 file changed, 31 insertions(+), 31 deletions(-)
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2011-11-21 15:50:16 UTC (rev 143034)
+++ extra-x86_64/PKGBUILD 2011-11-21 15:50:17 UTC (rev 143035)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot
-
-pkgname=xf86-video-intel
-pkgver=2.16.0
-pkgrel=1
-pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/";
-license=('custom')
-depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev)
-makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto'
'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender')
-conflicts=('xorg-server<1.10.99.902' 'xf86-video-i810'
'xf86-video-intel-legacy')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('53441ea4d4335b501d32809b6b92593cbb1f79cf')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr --enable-dri
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xf86-video-intel/repos/extra-x86_64/PKGBUILD (from rev 143033,
xf86-video-intel/repos/testing-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-11-21 15:50:17 UTC (rev 143035)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot
+
+pkgname=xf86-video-intel
+pkgver=2.17.0
+pkgrel=1
+pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/";
+license=('custom')
+depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev)
+makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto'
'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender')
+conflicts=('xorg-server<1.10.99.902' 'xf86-video-i810'
'xf86-video-intel-legacy')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('04ad9fa1f4c4e0a90f48752a709bf14700c864af')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr --enable-dri
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
[arch-commits] Commit in xf86-video-intel/repos (3 files)
Date: Monday, November 21, 2011 @ 10:50:16
Author: jgc
Revision: 143034
db-move: moved xf86-video-intel from [testing] to [extra] (i686)
Added:
xf86-video-intel/repos/extra-i686/PKGBUILD
(from rev 143033, xf86-video-intel/repos/testing-i686/PKGBUILD)
Deleted:
xf86-video-intel/repos/extra-i686/PKGBUILD
xf86-video-intel/repos/testing-i686/
--+
PKGBUILD | 62 ++---
1 file changed, 31 insertions(+), 31 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-21 14:04:58 UTC (rev 143033)
+++ extra-i686/PKGBUILD 2011-11-21 15:50:16 UTC (rev 143034)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot
-
-pkgname=xf86-video-intel
-pkgver=2.16.0
-pkgrel=1
-pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/";
-license=('custom')
-depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev)
-makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto'
'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender')
-conflicts=('xorg-server<1.10.99.902' 'xf86-video-i810'
'xf86-video-intel-legacy')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('53441ea4d4335b501d32809b6b92593cbb1f79cf')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr --enable-dri
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xf86-video-intel/repos/extra-i686/PKGBUILD (from rev 143033,
xf86-video-intel/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-21 15:50:16 UTC (rev 143034)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot
+
+pkgname=xf86-video-intel
+pkgver=2.17.0
+pkgrel=1
+pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/";
+license=('custom')
+depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev)
+makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto'
'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender')
+conflicts=('xorg-server<1.10.99.902' 'xf86-video-i810'
'xf86-video-intel-legacy')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('04ad9fa1f4c4e0a90f48752a709bf14700c864af')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr --enable-dri
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
[arch-commits] Commit in (4 files)
Date: Monday, November 21, 2011 @ 09:04:58
Author: andrea
Revision: 143033
Minor KDE fixes
Modified:
kdebase-runtime/trunk/PKGBUILD
kdelibs/trunk/PKGBUILD
kdemultimedia/trunk/PKGBUILD
kdepim/trunk/PKGBUILD
+
kdebase-runtime/trunk/PKGBUILD |6 +-
kdelibs/trunk/PKGBUILD |6 +++---
kdemultimedia/trunk/PKGBUILD |3 +--
kdepim/trunk/PKGBUILD |5 +++--
4 files changed, 12 insertions(+), 8 deletions(-)
Modified: kdebase-runtime/trunk/PKGBUILD
===
--- kdebase-runtime/trunk/PKGBUILD 2011-11-21 14:01:14 UTC (rev 143032)
+++ kdebase-runtime/trunk/PKGBUILD 2011-11-21 14:04:58 UTC (rev 143033)
@@ -10,7 +10,7 @@
url='http://www.kde.org'
license=('GPL' 'LGPL')
depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
-'xorg-xauth' 'hicolor-icon-theme')
+'xorg-xauth')
makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib')
optdepends=('htdig: to build the search index in khelpcenter'
'rarian: needed by khelpcenter'
@@ -35,4 +35,8 @@
make DESTDIR="$pkgdir" install
rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
+
+# Fix Python2 path
+sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+ "${pkgdir}"/usr/bin/nepomuk-simpleresource-rcgen
}
Modified: kdelibs/trunk/PKGBUILD
===
--- kdelibs/trunk/PKGBUILD 2011-11-21 14:01:14 UTC (rev 143032)
+++ kdelibs/trunk/PKGBUILD 2011-11-21 14:04:58 UTC (rev 143033)
@@ -9,13 +9,13 @@
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
-'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
'grantlee'
+depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee'
+'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl'
'phonon' 'upower' 'udisks' 'libxcursor')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
replaces=('kdelibs-experimental')
-install='kdelibs.install'
+install=${pkgname}.install
source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
'kde-applications-menu.patch' 'archlinux-menu.patch')
sha1sums=('f2fb780794ec49687009d9367f895470aecb23ad'
Modified: kdemultimedia/trunk/PKGBUILD
===
--- kdemultimedia/trunk/PKGBUILD2011-11-21 14:01:14 UTC (rev 143032)
+++ kdemultimedia/trunk/PKGBUILD2011-11-21 14:04:58 UTC (rev 143033)
@@ -30,8 +30,7 @@
cmake ../${pkgbase}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_Xine=OFF
+ -DCMAKE_INSTALL_PREFIX=/usr
make
}
Modified: kdepim/trunk/PKGBUILD
===
--- kdepim/trunk/PKGBUILD 2011-11-21 14:01:14 UTC (rev 143032)
+++ kdepim/trunk/PKGBUILD 2011-11-21 14:04:58 UTC (rev 143033)
@@ -127,6 +127,7 @@
package_kdepim-kleopatra() {
pkgdesc='Certificate Manager and Unified Crypto GUI'
depends=('kdepim-libkdepim')
+install=kdepim-kleopatra.install
url="http://kde.org/applications/utilities/kleopatra/";
cd "${srcdir}"/build/kleopatra
make DESTDIR="${pkgdir}" install
@@ -138,7 +139,7 @@
pkgdesc='Mail Client'
depends=('kdepim-libkdepim')
url="http://kde.org/applications/internet/kmail/";
- install='kdepim.install'
+ install='kdepim-kmail.install'
conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
'kdepim-mimelib' 'kdepim-plugins')
replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
@@ -194,7 +195,7 @@
pkgdesc='Calendar and Scheduling Program'
depends=('kdepim-libkdepim')
url="http://kde.org/applications/office/korganizer";
- install='kdepim.install'
+ install='kdepim-korganizer.install'
cd "${srcdir}"/build/korganizer
make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/doc/korganizer
[arch-commits] Commit in avahi/repos (10 files)
Date: Monday, November 21, 2011 @ 09:01:14
Author: bisson
Revision: 143032
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
avahi/repos/staging-i686/
avahi/repos/staging-i686/PKGBUILD
(from rev 143031, avahi/trunk/PKGBUILD)
avahi/repos/staging-i686/gnome-nettool.png
(from rev 143031, avahi/trunk/gnome-nettool.png)
avahi/repos/staging-i686/install
(from rev 143031, avahi/trunk/install)
avahi/repos/staging-i686/rc.d.patch
(from rev 143031, avahi/trunk/rc.d.patch)
avahi/repos/staging-x86_64/
avahi/repos/staging-x86_64/PKGBUILD
(from rev 143031, avahi/trunk/PKGBUILD)
avahi/repos/staging-x86_64/gnome-nettool.png
(from rev 143031, avahi/trunk/gnome-nettool.png)
avahi/repos/staging-x86_64/install
(from rev 143031, avahi/trunk/install)
avahi/repos/staging-x86_64/rc.d.patch
(from rev 143031, avahi/trunk/rc.d.patch)
---+
staging-i686/PKGBUILD | 75
staging-i686/install | 21
staging-i686/rc.d.patch | 11 ++
staging-x86_64/PKGBUILD | 75
staging-x86_64/install| 21
staging-x86_64/rc.d.patch | 11 ++
6 files changed, 214 insertions(+)
Copied: avahi/repos/staging-i686/PKGBUILD (from rev 143031,
avahi/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2011-11-21 14:01:14 UTC (rev 143032)
@@ -0,0 +1,75 @@
+# $Id$
+# Contributor: Douglas Soares de Andrade
+# Maintainer: Gaetan Bisson
+
+pkgname=avahi
+pkgver=0.6.30
+pkgrel=6
+pkgdesc='A multicast/unicast DNS-SD framework'
+arch=('i686' 'x86_64')
+url='http://www.avahi.org/'
+license=('LGPL')
+depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
+optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+'gtk2: gtk2 bindings'
+'qt3: qt3 bindings'
+'qt: qt bindings'
+'pygtk: avahi-bookmarks, avahi-discover'
+'twisted: avahi-bookmarks'
+'mono: mono bindings'
+'dbus-python: avahi-discover'
+'nss-mdns: NSS support for mDNS')
+makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
+ 'gtk-sharp-2' 'gobject-introspection' 'gtk3')
+backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
+install=install
+conflicts=('howl' 'mdnsresponder')
+provides=('howl' 'mdnsresponder')
+replaces=('howl' 'mdnsresponder')
+options=('!libtool')
+source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz";
+'gnome-nettool.png'
+'rc.d.patch')
+sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06'
+ 'cf56387c88aed246b9f435efc182ef44de4d52f3'
+ '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
+ patch -p1 -i "../rc.d.patch"
+
+ # pygtk requires python2; make it explicit in case other python are
installed: FS#21865
+ PYTHON=python2 \
+ PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-monodoc \
+ --disable-doxygen-doc \
+ --disable-xmltoman \
+ --enable-compat-libdns_sd \
+ --enable-compat-howl \
+ --with-distro=archlinux \
+ --with-avahi-priv-access-group=network \
+ --with-autoipd-user=avahi \
+ --with-autoipd-group=avahi \
+ --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -D -m 644 ../gnome-nettool.png
"${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
+
+ cd "${pkgdir}"
+ sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
+ # howl and mdnsresponder compatability
+ (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s
avahi-compat-howl howl)
+ (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc)
+}
Copied: avahi/repos/staging-i686/gnome-nettool.png (from rev 143031,
avahi/trunk/gnome-nettool.png)
===
(Binary files differ)
Copied: avahi/repos/staging-i686/install (from rev 143031, avahi/trunk/install)
===
--- staging-i686/install(rev 0)
+++ staging-i686/install2011-11-21 14:01:14 UTC (rev 143032)
@@ -0,0 +1,21 @@
+post_install() {
+ getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
+ get
[arch-commits] Commit in avahi/trunk (PKGBUILD)
Date: Monday, November 21, 2011 @ 09:00:27
Author: bisson
Revision: 143031
rebuild for gdbm-1.10-1
Modified:
avahi/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-21 11:17:17 UTC (rev 143030)
+++ PKGBUILD2011-11-21 14:00:27 UTC (rev 143031)
@@ -4,7 +4,7 @@
pkgname=avahi
pkgver=0.6.30
-pkgrel=5
+pkgrel=6
pkgdesc='A multicast/unicast DNS-SD framework'
arch=('i686' 'x86_64')
url='http://www.avahi.org/'
[arch-commits] Commit in python-gdata/repos/extra-any (PKGBUILD PKGBUILD)
Date: Monday, November 21, 2011 @ 06:17:17
Author: angvp
Revision: 143030
archrelease: copy trunk to extra-any
Added:
python-gdata/repos/extra-any/PKGBUILD
(from rev 143029, python-gdata/trunk/PKGBUILD)
Deleted:
python-gdata/repos/extra-any/PKGBUILD
--+
PKGBUILD | 46 +++---
1 file changed, 23 insertions(+), 23 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2011-11-21 11:17:01 UTC (rev 143029)
+++ PKGBUILD2011-11-21 11:17:17 UTC (rev 143030)
@@ -1,23 +0,0 @@
-#$Id$
-# Maintainer: Angel Velasquez
-# Contributor: Jan de Groot
-# Contributor: Alessio 'mOLOk' Bolognino
-# Contributor: Christophe Gueret
-pkgname=python-gdata
-pkgver=2.0.14
-pkgrel=1
-arch=(any)
-pkgdesc="Python client library for Google data APIs"
-url="http://code.google.com/p/gdata-python-client/";
-license=('APACHE')
-depends=('python2')
-provides=('gdata_py')
-replaces=('gdata_py')
-conflicts=('gdata_py')
-source=(http://gdata-python-client.googlecode.com/files/gdata-${pkgver}.tar.gz)
-md5sums=('29cf394b4f75aa4fae8c1b59079f2a02')
-
-build() {
- cd "${srcdir}/gdata-${pkgver}"
- python2 setup.py install --prefix=/usr --root "${pkgdir}"
-}
Copied: python-gdata/repos/extra-any/PKGBUILD (from rev 143029,
python-gdata/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-11-21 11:17:17 UTC (rev 143030)
@@ -0,0 +1,23 @@
+#$Id$
+# Maintainer: Angel Velasquez
+# Contributor: Jan de Groot
+# Contributor: Alessio 'mOLOk' Bolognino
+# Contributor: Christophe Gueret
+pkgname=python-gdata
+pkgver=2.0.15
+pkgrel=1
+arch=(any)
+pkgdesc="Python client library for Google data APIs"
+url="http://code.google.com/p/gdata-python-client/";
+license=('APACHE')
+depends=('python2')
+provides=('gdata_py')
+replaces=('gdata_py')
+conflicts=('gdata_py')
+source=(http://gdata-python-client.googlecode.com/files/gdata-${pkgver}.tar.gz)
+md5sums=('a0cb04be31c836cf654c3b17d3e3f8ae')
+
+build() {
+ cd "${srcdir}/gdata-${pkgver}"
+ python2 setup.py install --prefix=/usr --root "${pkgdir}"
+}
[arch-commits] Commit in python-gdata/trunk (PKGBUILD)
Date: Monday, November 21, 2011 @ 06:17:01
Author: angvp
Revision: 143029
upgpkg: python-gdata 2.0.15-1
Version bump 2.0.14 -> 2.0.15
Modified:
python-gdata/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-21 05:59:12 UTC (rev 143028)
+++ PKGBUILD2011-11-21 11:17:01 UTC (rev 143029)
@@ -4,7 +4,7 @@
# Contributor: Alessio 'mOLOk' Bolognino
# Contributor: Christophe Gueret
pkgname=python-gdata
-pkgver=2.0.14
+pkgver=2.0.15
pkgrel=1
arch=(any)
pkgdesc="Python client library for Google data APIs"
@@ -15,7 +15,7 @@
replaces=('gdata_py')
conflicts=('gdata_py')
source=(http://gdata-python-client.googlecode.com/files/gdata-${pkgver}.tar.gz)
-md5sums=('29cf394b4f75aa4fae8c1b59079f2a02')
+md5sums=('a0cb04be31c836cf654c3b17d3e3f8ae')
build() {
cd "${srcdir}/gdata-${pkgver}"
