summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community/cgminer/PKGBUILD7
-rw-r--r--community/couchdb/PKGBUILD4
-rw-r--r--community/dee/PKGBUILD6
-rw-r--r--community/dwdiff/PKGBUILD4
-rw-r--r--community/fcitx/PKGBUILD7
-rw-r--r--community/fcitx/fcitx-gtk2.install4
-rw-r--r--community/filezilla/PKGBUILD6
-rw-r--r--community/gambas3/PKGBUILD14
-rw-r--r--community/ibus-qt/0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch75
-rw-r--r--community/ibus-qt/PKGBUILD23
-rwxr-xr-xcommunity/libfbclient/PKGBUILD16
-rw-r--r--community/lxsession/PKGBUILD30
-rw-r--r--community/lxsession/lxsession-0.4.6.1-logind-support.patch608
-rw-r--r--community/mapnik/PKGBUILD4
-rw-r--r--community/mod_wsgi2/PKGBUILD33
-rw-r--r--community/mod_wsgi2/mod_wsgi2.install14
-rw-r--r--community/openntpd/PKGBUILD4
-rw-r--r--community/openntpd/openntpd.install3
-rw-r--r--community/openttd/PKGBUILD4
-rw-r--r--community/parrot/PKGBUILD4
-rw-r--r--community/pion-net/PKGBUILD4
-rw-r--r--community/rygel/PKGBUILD12
-rw-r--r--community/uzbl/PKGBUILD7
-rw-r--r--community/yaz/PKGBUILD4
-rw-r--r--core/ldns/PKGBUILD6
-rw-r--r--core/openssh/PKGBUILD4
-rw-r--r--extra/bind/PKGBUILD13
-rwxr-xr-xextra/bind/named5
-rw-r--r--extra/bind/named.conf2
-rw-r--r--extra/bind/named.logrotate2
-rw-r--r--extra/bind/tmpfiles.d1
-rw-r--r--extra/boost/PKGBUILD8
-rw-r--r--extra/brltty/PKGBUILD6
-rw-r--r--extra/calligra/PKGBUILD10
-rw-r--r--extra/emacs/PKGBUILD8
-rw-r--r--extra/emacs/emacs.install2
-rw-r--r--extra/fontforge/PKGBUILD11
-rw-r--r--extra/fontforge/install12
-rw-r--r--extra/glade/PKGBUILD7
-rw-r--r--extra/gnutls/PKGBUILD18
-rw-r--r--extra/gptfdisk/PKGBUILD4
-rw-r--r--extra/harfbuzz/PKGBUILD11
-rw-r--r--extra/icu/PKGBUILD21
-rw-r--r--extra/icu/changeset_32780.diff67
-rw-r--r--extra/irqbalance/PKGBUILD6
-rw-r--r--extra/ktorrent/PKGBUILD13
-rw-r--r--extra/ktorrent/groupmiewmodel.diff87
-rw-r--r--extra/lapack/PKGBUILD82
-rw-r--r--extra/libcap-ng/PKGBUILD8
-rw-r--r--extra/libreoffice/PKGBUILD8
-rw-r--r--extra/php/PKGBUILD4
-rw-r--r--extra/plotutils/PKGBUILD10
-rw-r--r--extra/plotutils/plotutils-2.6-libpng-1.5.patch6
-rw-r--r--extra/qt/PKGBUILD4
-rw-r--r--extra/raptor/PKGBUILD4
-rw-r--r--extra/snd/PKGBUILD6
-rw-r--r--extra/tracker/PKGBUILD4
-rw-r--r--extra/wcslib/PKGBUILD37
-rw-r--r--extra/webkitgtk/PKGBUILD4
-rw-r--r--extra/weechat/PKGBUILD6
-rw-r--r--libre/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch29
-rw-r--r--libre/pacman/PKGBUILD9
-rw-r--r--social/uftp/PKGBUILD26
63 files changed, 1255 insertions, 213 deletions
diff --git a/community/cgminer/PKGBUILD b/community/cgminer/PKGBUILD
index 4cd780f39..62770c769 100644
--- a/community/cgminer/PKGBUILD
+++ b/community/cgminer/PKGBUILD
@@ -1,12 +1,13 @@
+# $Id: PKGBUILD 80252 2012-11-18 13:12:00Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: monson <holymonson@gmail.com>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: David Manouchehri <david@davidmanouchehri.com>
pkgname=cgminer
-pkgver=2.9.3
+pkgver=2.9.4
_build=
-pkgrel=3
+pkgrel=1
pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer."
url='http://forum.bitcoin.org/index.php?topic=28402.0'
license=('GPL3')
@@ -49,7 +50,7 @@ package() {
sed 's#/usr/local/bin#/usr/bin#g' example.conf > $pkgname.conf
install -Dm644 $pkgname.conf "$pkgdir"/etc/$pkgname.conf
}
-md5sums=('f386036c72861f7b2c130de6ed990d33'
+md5sums=('ad6cbea352948cd84bb4109665918a4d'
'fe4a243fabe24608f5c05e40f0f118f6'
'ee39698273671fee0e98d4af16014c36'
'c2bb974adf92cc234fbf0136ebcb355d')
diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD
index b6c03e3d5..959f4b6d8 100644
--- a/community/couchdb/PKGBUILD
+++ b/community/couchdb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 78310 2012-10-17 14:02:05Z spupykin $
+# $Id: PKGBUILD 80235 2012-11-18 10:29:50Z andrea $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
# Contributor: Michael Fellinger <m.fellinger@gmail.com>
pkgname=couchdb
pkgver=1.2.0
-pkgrel=5
+pkgrel=6
pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
arch=('i686' 'x86_64')
url="http://couchdb.apache.org"
diff --git a/community/dee/PKGBUILD b/community/dee/PKGBUILD
index 6400d7956..19cb7576d 100644
--- a/community/dee/PKGBUILD
+++ b/community/dee/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 78182 2012-10-17 10:23:20Z allan $
+# $Id: PKGBUILD 80236 2012-11-18 10:29:58Z andrea $
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
pkgname=dee
pkgver=1.0.14
-pkgrel=2
+pkgrel=3
pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus"
arch=('i686' 'x86_64')
url="https://launchpad.net/dee"
@@ -18,7 +18,7 @@ build() {
cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --disable-static --disable-tests \
+ --disable-static \
PYTHON=python2
make
}
diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD
index 1242ff2ba..620f4ab66 100644
--- a/community/dwdiff/PKGBUILD
+++ b/community/dwdiff/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 76393 2012-09-17 08:46:08Z spupykin $
+# $Id: PKGBUILD 80237 2012-11-18 10:30:05Z andrea $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=dwdiff
pkgver=2.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="A front-end for the diff program that operates at the word level instead of the line level"
arch=('i686' 'x86_64')
url="http://os.ghalkes.nl/dwdiff.html"
diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD
index e3be09540..77f532c14 100644
--- a/community/fcitx/PKGBUILD
+++ b/community/fcitx/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 79645 2012-11-10 00:57:49Z ebelanger $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 80275 2012-11-19 02:35:00Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: csslayer <wengxt AT gmail com>
pkgbase=fcitx
pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
pkgver=4.2.6.1
-pkgrel=1
+pkgrel=3
arch=('i686' 'x86_64')
url="http://code.google.com/p/fcitx/"
license=('GPL')
diff --git a/community/fcitx/fcitx-gtk2.install b/community/fcitx/fcitx-gtk2.install
index 7503c05eb..2bdfac388 100644
--- a/community/fcitx/fcitx-gtk2.install
+++ b/community/fcitx/fcitx-gtk2.install
@@ -1,5 +1,7 @@
post_install() {
- usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+ if res="$(usr/bin/gtk-query-immodules-2.0)"; then
+ echo "$res" > etc/gtk-2.0/gtk.immodules
+ fi
}
post_upgrade() {
diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD
index 04215a50a..7f1af6b30 100644
--- a/community/filezilla/PKGBUILD
+++ b/community/filezilla/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 79793 2012-11-12 19:21:34Z bluewind $
+# $Id: PKGBUILD 80261 2012-11-18 19:11:09Z jelle $
# Contributor: Alexander Fehr <pizzapunk gmail com>
# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=filezilla
-pkgver=3.6.0
+pkgver=3.6.0.1
pkgrel=1
pkgdesc="Fast and reliable FTP, FTPS and SFTP client"
arch=('i686' 'x86_64')
@@ -12,7 +12,6 @@ license=('GPL')
depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme' 'sqlite')
install=filezilla.install
source=("http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/${pkgver}/FileZilla_${pkgver}_src.tar.bz2")
-md5sums=('02efc41e87ff4abe1e6ec07ae5bd4d83')
build() {
cd "${pkgname}-${pkgver}"
@@ -32,3 +31,4 @@ package() {
make DESTDIR="${pkgdir}" install
}
+md5sums=('90839d05bf52e27e8f4a33adceb3ae5c')
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index 71c2eb3c3..fc6743a42 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78930 2012-10-27 23:44:36Z ebelanger $
+# $Id: PKGBUILD 80268 2012-11-18 23:01:13Z lcarlier $
# Maintainer: Laurent Carlier <lordheavym@gmail.com>
# Contributor : sebikul <sebikul@gmail.com>
@@ -14,8 +14,8 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings'
'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc'
'gambas3-gb-xml-xslt' 'gambas3-gb-web')
-pkgver=3.3.3
-pkgrel=3
+pkgver=3.3.4
+pkgrel=1
pkgdesc="A free development environment based on a Basic interpreter."
arch=('i686' 'x86_64')
url="http://gambas.sourceforge.net/"
@@ -27,12 +27,11 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils
'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit'
'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring'
'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm'
- 'gmime' 'glu' 'pangox-compat')
-# pangox-compat to remove when added in gtkglext package dependency
+ 'gmime' 'glu')
options=('!emptydirs')
source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('18902ae2bbd0d66d165503aba7e89474'
+md5sums=('105bb5010533052acee97395ec1c64fe'
'b284be39d147ec799f1116a6abc068b4'
'6d9e080b66443e7246387b1716d24e31')
@@ -634,8 +633,7 @@ package_gambas3-gb-gtk() {
}
package_gambas3-gb-gtk-opengl() {
- depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu' 'pangox-compat')
-# pangox-compat to remove when added in gtkglext package dependency
+ depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu')
pkgdesc="GTK+ toolkit OpenGL component"
## workaround for splitting
diff --git a/community/ibus-qt/0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch b/community/ibus-qt/0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch
new file mode 100644
index 000000000..eab3a51fe
--- /dev/null
+++ b/community/ibus-qt/0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch
@@ -0,0 +1,75 @@
+From fab6dc760edc39b9b4e561cfbf21b38c4fa86234 Mon Sep 17 00:00:00 2001
+From: Peter Wu <lekensteyn@gmail.com>
+Date: Tue, 4 Sep 2012 19:40:08 +0200
+Subject: [PATCH] Do not crash on missing/invalid DISPLAY envvar.
+
+- Check whether the passed DISPLAY environment variable contains ":".
+
+- Fallback to "-display" parameter passed to QApplication.
+---
+ src/CMakeLists.txt | 2 ++
+ src/qibusbus.cpp | 23 ++++++++++++++++-------
+ 2 files changed, 18 insertions(+), 7 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 2ad5588..8866ac0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -92,9 +92,11 @@ set_target_properties(
+ target_link_libraries(
+ ibus-qt
+ debug ${QT_QTCORE_LIBRARY_DEBUG}
++ debug ${QT_QTGUI_LIBRARY_DEBUG}
+ debug ${QT_QTDBUS_LIBRARY_DEBUG}
+ debug ${QT_QTXML_LIBRARY_DEBUG}
+ optimized ${QT_QTCORE_LIBRARY_RELEASE}
++ optimized ${QT_QTGUI_LIBRARY_RELEASE}
+ optimized ${QT_QTDBUS_LIBRARY_RELEASE}
+ optimized ${QT_QTXML_LIBRARY_RELEASE}
+ ${DBUS_LIBRARIES}
+diff --git a/src/qibusbus.cpp b/src/qibusbus.cpp
+index 6a45d65..ed8248a 100644
+--- a/src/qibusbus.cpp
++++ b/src/qibusbus.cpp
+@@ -12,7 +12,8 @@
+ #include "qibusbus.h"
+ #include "qibusibusproxy.h"
+ #include "qibusdbusproxy.h"
+-
++#include <X11/Xlib.h>
++#include <QX11Info>
+
+ namespace IBus {
+ /**
+@@ -121,15 +122,23 @@ QString
+ Bus::getSocketPath (void)
+ {
+ QString display = getenv ("DISPLAY");
+- QStringList strs = display.split(":");
+ QString hostname = "unix";
+ QString display_number = "0";
++ /* fallback when -display is passed to QApplication with no DISPLAY env */
++ if (display == NULL) {
++ Display * dpy = QX11Info::display();
++ if (dpy)
++ display = XDisplayString(dpy);
++ }
++ if (display != NULL && display.contains(':')) {
++ QStringList strs = display.split(":");
+
+- if (!strs[0].isEmpty())
+- hostname = strs[0];
+- strs = strs[1].split(".");
+- if (!strs[0].isEmpty())
+- display_number = strs[0];
++ if (!strs[0].isEmpty())
++ hostname = strs[0];
++ strs = strs[1].split(".");
++ if (!strs[0].isEmpty())
++ display_number = strs[0];
++ }
+
+ QString path =
+ QDir::homePath() +
+--
+1.7.12
diff --git a/community/ibus-qt/PKGBUILD b/community/ibus-qt/PKGBUILD
index 36013ae21..aed97d135 100644
--- a/community/ibus-qt/PKGBUILD
+++ b/community/ibus-qt/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 69758 2012-04-23 09:15:08Z ibiru $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# $Id: PKGBUILD 80239 2012-11-18 10:30:25Z andrea $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: garion < garion @ mailoo.org >
# Contributor: leemars
pkgname=ibus-qt
pkgver=1.3.1
-pkgrel=5
+pkgrel=6
pkgdesc='IBus qt library and IBus qt input method plugin'
arch=('i686' 'x86_64')
license=('LGPL')
url='http://ibus.googlecode.com'
-depends=('qt' 'ibus' 'icu')
+depends=('qt' 'ibus' 'icu>=50')
makedepends=('cmake' 'automoc4' 'doxygen')
-source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz")
-md5sums=('769e8872ca8a59327b2073ce2f142589')
+source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz"
+ 0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch)
build() {
- cd "${srcdir}"
+ cd "${srcdir}/${pkgname}-${pkgver}-Source"
+ patch -p1 -i ../0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch
+
mkdir build
cd build
- cmake "../${pkgname}-${pkgver}-Source" -DCMAKE_INSTALL_PREFIX=/usr
+ cmake .. -DCMAKE_INSTALL_PREFIX=/usr
make
}
package() {
- cd "${srcdir}/build"
+ cd "${srcdir}//${pkgname}-${pkgver}-Source/build"
make DESTDIR="${pkgdir}" install
}
+md5sums=('769e8872ca8a59327b2073ce2f142589'
+ 'c30f52b1a9018132e5ecd0c14616cb65')
diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD
index 981d50cef..969cb6ecb 100755
--- a/community/libfbclient/PKGBUILD
+++ b/community/libfbclient/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72429 2012-06-14 12:17:07Z lcarlier $
+# $Id: PKGBUILD 80240 2012-11-18 10:30:33Z andrea $
# Maintainer: Carlier Laurent <lordheavym@gmail.com>
# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
pkgname=libfbclient
-pkgver=2.5.1.26351
-pkgrel=3
+pkgver=2.5.2.26539
+pkgrel=1
pkgdesc="Client library for Firebird."
arch=('i686' 'x86_64')
url="http://www.firebirdsql.org/"
@@ -13,7 +13,7 @@ depends=('gcc-libs' 'icu')
options=('!makeflags')
source=(http://downloads.sourceforge.net/firebird/Firebird-$pkgver-0.tar.bz2
LICENSE)
-md5sums=('1772fba4f09c8fc84d989282405f90fd'
+md5sums=('adf2d2f9d48a53dc6c490ba1e44631fd'
'0d61798861e159c85dbdf0f30fe2f2ce')
build() {
@@ -31,13 +31,15 @@ build() {
package() {
cd $srcdir/Firebird-$pkgver-0
- mkdir -p $pkgdir/usr/{bin,share/firebird}
+ mkdir -p $pkgdir/usr/{bin,share/{firebird,licenses/$pkgname}}
+
cp -R gen/firebird/{lib,include} $pkgdir/usr
rm -f $pkgdir/usr/lib/libedit.a
+
install -m644 gen/firebird/*.msg $pkgdir/usr/share/firebird
install -m755 gen/firebird/bin/fb_config $pkgdir/usr/bin
- mkdir -p $srcdir/usr/share/licenses/$pkgname/
- install -D -m644 ${srcdir}/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+ install -m644 ${srcdir}/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+
# Add libgds support FS#30062 FS#30282
cd $pkgdir/usr/lib
ln -s libfbclient.so libgds.so.0
diff --git a/community/lxsession/PKGBUILD b/community/lxsession/PKGBUILD
index db8719774..178291ceb 100644
--- a/community/lxsession/PKGBUILD
+++ b/community/lxsession/PKGBUILD
@@ -1,29 +1,33 @@
-# $Id: PKGBUILD 53453 2011-08-03 19:42:00Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+# $Id: PKGBUILD 80231 2012-11-18 09:34:03Z bpiotrowski $
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
pkgname=lxsession
pkgver=0.4.6.1
-pkgrel=1
-pkgdesc="Session manager of the LXDE Desktop (light version)"
+pkgrel=3
+pkgdesc='Lightweight X11 session manager'
arch=('i686' 'x86_64')
-license=('GPL2')
url="http://lxde.org/"
+license=('GPL2')
groups=('lxde')
depends=('gtk2' 'dbus')
makedepends=('pkgconfig' 'intltool')
replaces=('lxde-settings-daemon' 'lxsession-lite')
conflicts=('lxsession-lite' 'lxde-settings-daemon')
-source=(http://downloads.sourceforge.net/lxde/lxsession-${pkgver}.tar.gz)
-md5sums=('e456b64c5ab3652a4dec661ec706dc6e')
+source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
+ lxsession-0.4.6.1-logind-support.patch)
+md5sums=('e456b64c5ab3652a4dec661ec706dc6e'
+ '7459321f5dc263493837768dcb03f852')
build() {
- cd "$srcdir/lxsession-$pkgver"
- ./configure --sysconfdir=/etc --prefix=/usr
- make
+ cd $srcdir/$pkgname-$pkgver
+ patch -Np2 -i $srcdir/lxsession-0.4.6.1-logind-support.patch
+ ./configure --sysconfdir=/etc --prefix=/usr
+ make
}
package() {
- cd "$srcdir/lxsession-$pkgver"
- make DESTDIR="$pkgdir" install
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
}
diff --git a/community/lxsession/lxsession-0.4.6.1-logind-support.patch b/community/lxsession/lxsession-0.4.6.1-logind-support.patch
new file mode 100644
index 000000000..44829e615
--- /dev/null
+++ b/community/lxsession/lxsession-0.4.6.1-logind-support.patch
@@ -0,0 +1,608 @@
+--- src/lxsession-0.4.6.1/lxsession-logout/dbus-interface.c 2011-07-27 21:26:36.000000000 +0200
++++ src/lxsession-0.4.6.1/lxsession-logout-logind/dbus-interface.c 2012-11-13 17:26:30.807070976 +0100
+@@ -51,13 +51,20 @@
+ char * dbus_HAL_Reboot(void);
+ char * dbus_HAL_Suspend(void);
+ char * dbus_HAL_Hibernate(void);
++gboolean dbus_logind_CanPowerOff(void);
++gboolean dbus_logind_CanReboot(void);
++gboolean dbus_logind_CanSuspend(void);
++gboolean dbus_logind_CanHibernate(void);
++char * dbus_logind_PowerOff(void);
++char * dbus_logind_Reboot(void);
++char * dbus_logind_Suspend(void);
++char * dbus_logind_Hibernate(void);
++char * dbus_LXDE_Logout(void);
+ /* End FORWARDS */
+
+ /* Connect to the system bus. Once a connection is made, it is saved for reuse. */
+-static DBusConnection * dbus_connect(void)
++static DBusConnection * dbus_connect_system(void)
+ {
+- if ((dbus_context.connection == NULL) && ( ! dbus_context.connection_tried))
+- {
+ DBusError error;
+ dbus_error_init(&error);
+ dbus_context.connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
+@@ -67,16 +74,57 @@
+ dbus_error_free(&error);
+ }
+ dbus_context.connection_tried = TRUE;
+- }
+
+ return dbus_context.connection;
+ }
+
++static DBusConnection * dbus_connect_session(void)
++{
++ DBusError error;
++ dbus_error_init(&error);
++ dbus_context.connection = dbus_bus_get(DBUS_BUS_SESSION, &error);
++ if (dbus_context.connection == NULL)
++ {
++ g_warning(G_STRLOC ": Failed to connect to the session message bus: %s", error.message);
++ dbus_error_free(&error);
++ }
++ dbus_context.connection_tried = TRUE;
++
++ return dbus_context.connection;
++}
++
++
+ /* Send a message. */
+-static DBusMessage * dbus_send_message(DBusMessage * message, char * * error_text)
++static DBusMessage * dbus_send_message_system(DBusMessage * message, char * * error_text)
+ {
+ /* Get a connection handle. */
+- DBusConnection * connection = dbus_connect();
++ DBusConnection * connection = dbus_connect_system();
++ if (connection == NULL)
++ return FALSE;
++
++ /* Send the message. */
++ DBusError error;
++ dbus_error_init(&error);
++ DBusMessage * reply = dbus_connection_send_with_reply_and_block(connection, message, DBUS_TIMEOUT, &error);
++ dbus_message_unref(message);
++ if (reply == NULL)
++ {
++ if ((error.name == NULL) || (strcmp(error.name, DBUS_ERROR_NO_REPLY) != 0))
++ {
++ if (error_text != NULL)
++ *error_text = g_strdup(error.message);
++ g_warning(G_STRLOC ": DBUS: %s", error.message);
++ }
++ dbus_error_free(&error);
++ }
++ return reply;
++}
++
++/* Send a message. */
++static DBusMessage * dbus_send_message_session(DBusMessage * message, char * * error_text)
++{
++ /* Get a connection handle. */
++ DBusConnection * connection = dbus_connect_session();
+ if (connection == NULL)
+ return FALSE;
+
+@@ -132,6 +180,36 @@
+ }
+ return result;
+ }
++
++/* Read a result for a method that returns a string encoded boolean. */
++static gboolean dbus_read_result_sboolean(DBusMessage * reply)
++{
++ gboolean result = FALSE;
++ char* string_result;
++ if (reply != NULL)
++ {
++ /* Get the string result. */
++ DBusError error;
++ dbus_error_init(&error);
++ dbus_bool_t status = dbus_message_get_args(
++ reply,
++ &error,
++ DBUS_TYPE_STRING, &string_result,
++ DBUS_TYPE_INVALID);
++ if ( ! status)
++ {
++ g_warning(G_STRLOC ": DBUS: %s", error.message);
++ dbus_error_free(&error);
++ }
++ else
++ {
++ if (!strcmp(string_result, "yes"))
++ result = TRUE;
++ }
++ dbus_message_unref(reply);
++ }
++ return result;
++}
+ #endif
+
+ /*** ConsoleKit mechanism ***/
+@@ -152,7 +230,7 @@
+ static gboolean dbus_ConsoleKit_query(const char * const query)
+ {
+ #ifdef HAVE_DBUS
+- return dbus_read_result_boolean(dbus_send_message(dbus_ConsoleKit_formulate_message(query), NULL));
++ return dbus_read_result_boolean(dbus_send_message_system(dbus_ConsoleKit_formulate_message(query), NULL));
+ #else
+ return FALSE;
+ #endif
+@@ -163,7 +241,7 @@
+ {
+ #ifdef HAVE_DBUS
+ char * error = NULL;
+- dbus_read_result_void(dbus_send_message(dbus_ConsoleKit_formulate_message(command), &error));
++ dbus_read_result_void(dbus_send_message_system(dbus_ConsoleKit_formulate_message(command), &error));
+ return error;
+ #else
+ return NULL;
+@@ -225,7 +303,7 @@
+ DBUS_TYPE_INVALID);
+
+ /* Send the message. */
+- DBusMessage * reply = dbus_send_message(message, NULL);
++ DBusMessage * reply = dbus_send_message_system(message, NULL);
+ if (reply == NULL)
+ return FALSE;
+
+@@ -252,7 +330,7 @@
+ {
+ #ifdef HAVE_DBUS
+ char * error = NULL;
+- dbus_read_result_void(dbus_send_message(dbus_UPower_formulate_command(command), &error));
++ dbus_read_result_void(dbus_send_message_system(dbus_UPower_formulate_command(command), &error));
+ return error;
+ #else
+ return NULL;
+@@ -329,7 +407,7 @@
+ DBusMessage * message = dbus_HAL_formulate_string_property_query(property);
+ if (message == NULL)
+ return FALSE;
+- DBusMessage * reply = dbus_send_message(message, NULL);
++ DBusMessage * reply = dbus_send_message_system(message, NULL);
+ if (reply == NULL)
+ return FALSE;
+ dbus_message_unref(reply);
+@@ -343,7 +421,7 @@
+ static gboolean dbus_HAL_boolean_query(const char * const property)
+ {
+ #ifdef HAVE_DBUS
+- return dbus_read_result_boolean(dbus_send_message(dbus_HAL_formulate_boolean_property_query(property), NULL));
++ return dbus_read_result_boolean(dbus_send_message_system(dbus_HAL_formulate_boolean_property_query(property), NULL));
+ #else
+ return FALSE;
+ #endif
+@@ -367,7 +445,7 @@
+
+ /* Send the message and wait for a reply. */
+ char * error = NULL;
+- dbus_read_result_void(dbus_send_message(message, &error));
++ dbus_read_result_void(dbus_send_message_system(message, &error));
+ return error;
+ #else
+ return NULL;
+@@ -421,3 +499,185 @@
+ {
+ return dbus_HAL_command("Hibernate");
+ }
++
++/*** logind mechanism ***/
++
++#ifdef HAVE_DBUS
++/* Formulate a message to the logind Manager interface to query a property. */
++static DBusMessage * dbus_logind_formulate_query(const char * const query)
++{
++ return dbus_message_new_method_call(
++ "org.freedesktop.login1",
++ "/org/freedesktop/login1",
++ "org.freedesktop.login1.Manager",
++ query);
++}
++
++/* Formulate a message to the logind Manager interface. */
++static DBusMessage * dbus_logind_formulate_message(const char * const method)
++{
++ static dbus_bool_t interactive = FALSE;
++ DBusMessage * message = dbus_message_new_method_call(
++ "org.freedesktop.login1",
++ "/org/freedesktop/login1",
++ "org.freedesktop.login1.Manager",
++ method);
++ if (message != NULL)
++ dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &interactive, DBUS_TYPE_INVALID);
++ return message;
++}
++#endif
++
++/* Send a specified query to the logind interface and process a boolean result. */
++static gboolean dbus_logind_query(const char * const query)
++{
++#ifdef HAVE_DBUS
++ return dbus_read_result_sboolean(dbus_send_message_system(dbus_logind_formulate_query(query), NULL));
++#else
++ return FALSE;
++#endif
++}
++
++/* Send a specified command to the logind interface and process a void result. */
++static char * dbus_logind_command(const char * const command)
++{
++#ifdef HAVE_DBUS
++ char * error = NULL;
++ dbus_read_result_void(dbus_send_message_system(dbus_logind_formulate_message(command), &error));
++ return error;
++#else
++ return NULL;
++#endif
++}
++
++/* Read the can-poweroff property of logind. */
++gboolean dbus_logind_CanPowerOff(void)
++{
++ return dbus_logind_query("CanPowerOff");
++}
++
++/* Read the can-reboot property of logind. */
++gboolean dbus_logind_CanReboot(void)
++{
++ return dbus_logind_query("CanReboot");
++}
++
++/* Read the can-suspend property of logind. */
++gboolean dbus_logind_CanSuspend(void)
++{
++ return dbus_logind_query("CanSuspend");
++}
++
++/* Read the can-hibernate property of logind. */
++gboolean dbus_logind_CanHibernate(void)
++{
++ return dbus_logind_query("CanHibernate");
++}
++
++/* Invoke the PowerOff method on logind. */
++char * dbus_logind_PowerOff(void)
++{
++ return dbus_logind_command("PowerOff");
++}
++
++/* Invoke the Reboot method on logind. */
++char * dbus_logind_Reboot(void)
++{
++ return dbus_logind_command("Reboot");
++}
++
++/* Invoke the Suspend method on logind. */
++char * dbus_logind_Suspend(void)
++{
++ return dbus_logind_command("Suspend");
++}
++
++/* Invoke the Hibernate method on logind. */
++char * dbus_logind_Hibernate(void)
++{
++ return dbus_logind_command("Hibernate");
++}
++
++/*** LXDE mechanism ***/
++
++#ifdef HAVE_DBUS
++/* Formulate a message to the LXDE Session Manager interface. */
++static DBusMessage * dbus_LXDE_formulate_message(const char * const query)
++{
++ return dbus_message_new_method_call(
++ "org.lxde.SessionManager",
++ "/org/lxde/SessionManager",
++ "org.lxde.SessionManager",
++ query);
++}
++#endif
++
++/* Send a specified message to the LXDE interface and process a boolean result. */
++static gboolean dbus_LXDE_query(const char * const query)
++{
++#ifdef HAVE_DBUS
++ return dbus_read_result_boolean(dbus_send_message_session(dbus_LXDE_formulate_message(query), NULL));
++#else
++ return FALSE;
++#endif
++}
++
++/* Send a specified message to the LXDE interface and process a void result. */
++static char * dbus_LXDE_command(const char * const command)
++{
++#ifdef HAVE_DBUS
++ char * error = NULL;
++ dbus_read_result_void(dbus_send_message_session(dbus_LXDE_formulate_message(command), &error));
++ return error;
++#else
++ return NULL;
++#endif
++}
++
++/* Invoke the Logout method on LXDE. */
++char * dbus_LXDE_Logout(void)
++{
++ return dbus_LXDE_command("Logout");
++}
++
++/*** Lightdm mechanism ***/
++
++#ifdef HAVE_DBUS
++/* Formulate a message to the Lightdm interface. */
++static DBusMessage * dbus_Lightdm_formulate_message(const char * const query)
++{
++ return dbus_message_new_method_call(
++ "org.freedesktop.DisplayManager",
++ g_getenv ("XDG_SEAT_PATH"),
++ "org.freedesktop.DisplayManager.Seat",
++ query);
++}
++#endif
++
++/* Send a specified message to the Lightdm interface and process a boolean result. */
++static gboolean dbus_Lightdm_query(const char * const query)
++{
++#ifdef HAVE_DBUS
++ return dbus_read_result_boolean(dbus_send_message_session(dbus_Lightdm_formulate_message(query), NULL));
++#else
++ return FALSE;
++#endif
++}
++
++/* Send a specified message to the Lightdm interface and process a void result. */
++static char * dbus_Lightdm_command(const char * const command)
++{
++#ifdef HAVE_DBUS
++ char * error = NULL;
++ dbus_read_result_void(dbus_send_message_session(dbus_Lightdm_formulate_message(command), &error));
++ return error;
++#else
++ return NULL;
++#endif
++}
++
++/* Invoke the Logout method on LXDE. */
++char * dbus_Lightdm_SwitchToGreeter(void)
++{
++ return dbus_Lightdm_command("SwitchToGreeter");
++}
+--- src/lxsession-0.4.6.1/lxsession-logout/dbus-interface.h 2011-07-27 21:26:36.000000000 +0200
++++ src/lxsession-0.4.6.1/lxsession-logout-logind/dbus-interface.h 2012-11-13 17:26:30.807070976 +0100
+@@ -44,4 +44,18 @@
+ extern char * dbus_HAL_Suspend(void);
+ extern char * dbus_HAL_Hibernate(void);
+
++/* Interface to logind for shutdown, reboot, suspend, and hibernate. */
++extern gboolean dbus_logind_CanPowerOff(void);
++extern gboolean dbus_logind_CanRestart(void);
++extern char * dbus_logind_PowerOff(void);
++extern char * dbus_logind_Restart(void);
++extern gboolean dbus_logind_CanSuspend(void);
++extern gboolean dbus_logind_CanHibernate(void);
++extern char * dbus_logind_Suspend(void);
++extern char * dbus_logind_Hibernate(void);
++
++extern char * dbus_LXDE_Logout(void);
++
++extern char * dbus_Lightdm_SwitchToGreeter();
++
+ #endif
+--- src/lxsession-0.4.6.1/lxsession-logout/lxsession-logout.c 2011-07-27 21:26:36.000000000 +0200
++++ src/lxsession-0.4.6.1/lxsession-logout-logind/lxsession-logout.c 2012-11-13 17:26:30.807070976 +0100
+@@ -69,12 +69,21 @@
+ int reboot_HAL : 1; /* Reboot is available via HAL */
+ int suspend_HAL : 1; /* Suspend is available via HAL */
+ int hibernate_HAL : 1; /* Hibernate is available via HAL */
++ int shutdown_logind : 1; /* Shutdown is available via logind */
++ int reboot_logind : 1; /* Reboot is available via logind */
++ int suspend_logind : 1; /* Suspend is available via logind */
++ int hibernate_logind : 1; /* Hibernate is available via logind */
+ int switch_user_GDM : 1; /* Switch User is available via GDM */
+- int switch_user_KDM : 1; /* Switch User is available via KDM */
++ int switch_user_LIGHTDM : 1; /* Switch User is available via GDM */
++ int switch_user_KDM : 1; /* Switch User is available via LIGHTDM */
+ int ltsp : 1; /* Shutdown and reboot is accomplished via LTSP */
++
++ int lock_screen : 1; /* Lock screen available */
++
+ } HandlerContext;
+
+ static gboolean lock_screen(void);
++static const gchar* determine_lock_screen(void);
+ static gboolean verify_running(const char * display_manager, const char * executable);
+ static void logout_clicked(GtkButton * button, HandlerContext * handler_context);
+ static void change_root_property(GtkWidget* w, const char* prop_name, const char* value);
+@@ -93,13 +102,32 @@
+ */
+ static gboolean lock_screen(void)
+ {
+- if (!g_spawn_command_line_async("lxlock", NULL))
++ const gchar* program = determine_lock_screen();
++
++ if (program)
+ {
++ g_spawn_command_line_async(program, NULL);
+ return TRUE;
+ }
+ return FALSE;
+ }
+
++static const gchar* determine_lock_screen(void)
++{
++ const gchar* program = NULL;
++
++ if (g_find_program_in_path("xdg-screensaver"))
++ {
++ program = "xdg-screensaver lock";
++ }
++ else if (g_find_program_in_path("lxlock"))
++ {
++ program = "lxlock";
++ }
++ return program;
++}
++
++
+ /* Verify that a program is running and that an executable is available. */
+ static gboolean verify_running(const char * display_manager, const char * executable)
+ {
+@@ -187,6 +215,8 @@
+ error_result = dbus_ConsoleKit_Stop();
+ else if (handler_context->shutdown_HAL)
+ error_result = dbus_HAL_Shutdown();
++ else if (handler_context->shutdown_logind)
++ error_result = dbus_logind_PowerOff();
+
+ if (error_result != NULL)
+ gtk_label_set_text(GTK_LABEL(handler_context->error_label), error_result);
+@@ -208,6 +238,8 @@
+ error_result = dbus_ConsoleKit_Restart();
+ else if (handler_context->reboot_HAL)
+ error_result = dbus_HAL_Reboot();
++ else if (handler_context->reboot_logind)
++ error_result = dbus_logind_Reboot();
+
+ if (error_result != NULL)
+ gtk_label_set_text(GTK_LABEL(handler_context->error_label), error_result);
+@@ -225,6 +257,8 @@
+ error_result = dbus_UPower_Suspend();
+ else if (handler_context->suspend_HAL)
+ error_result = dbus_HAL_Suspend();
++ else if (handler_context->suspend_logind)
++ error_result = dbus_logind_Suspend();
+
+ if (error_result != NULL)
+ gtk_label_set_text(GTK_LABEL(handler_context->error_label), error_result);
+@@ -242,6 +276,8 @@
+ error_result = dbus_UPower_Hibernate();
+ else if (handler_context->hibernate_HAL)
+ error_result = dbus_HAL_Hibernate();
++ else if (handler_context->hibernate_logind)
++ error_result = dbus_logind_Hibernate();
+
+ if (error_result != NULL)
+ gtk_label_set_text(GTK_LABEL(handler_context->error_label), error_result);
+@@ -258,6 +294,17 @@
+ g_spawn_command_line_sync("gdmflexiserver --startnew", NULL, NULL, NULL, NULL);
+ else if (handler_context->switch_user_KDM)
+ g_spawn_command_line_sync("kdmctl reserve", NULL, NULL, NULL, NULL);
++ else if (handler_context->switch_user_LIGHTDM)
++ dbus_Lightdm_SwitchToGreeter();
++ gtk_main_quit();
++}
++
++/* Handler for "clicked" signal on Lock button. */
++static void lock_screen_clicked(GtkButton * button, HandlerContext * handler_context)
++{
++ gtk_label_set_text(GTK_LABEL(handler_context->error_label), NULL);
++
++ lock_screen();
+ gtk_main_quit();
+ }
+
+@@ -435,6 +482,28 @@
+ handler_context.hibernate_HAL = TRUE;
+ }
+
++ /* Initialize capabilities of the logind mechanism. */
++ if (!handler_context.shutdown_available && dbus_logind_CanPowerOff())
++ {
++ handler_context.shutdown_available = TRUE;
++ handler_context.shutdown_logind = TRUE;
++ }
++ if (!handler_context.reboot_available && dbus_logind_CanReboot())
++ {
++ handler_context.reboot_available = TRUE;
++ handler_context.reboot_logind = TRUE;
++ }
++ if (!handler_context.suspend_available && dbus_logind_CanSuspend())
++ {
++ handler_context.suspend_available = TRUE;
++ handler_context.suspend_logind = TRUE;
++ }
++ if (!handler_context.hibernate_available && dbus_logind_CanHibernate())
++ {
++ handler_context.hibernate_available = TRUE;
++ handler_context.hibernate_logind = TRUE;
++ }
++
+ /* If we are under GDM, its "Switch User" is available. */
+ if (verify_running("gdm", "gdmflexiserver"))
+ {
+@@ -442,6 +511,34 @@
+ handler_context.switch_user_GDM = TRUE;
+ }
+
++ /* If we are under GDM3, its "Switch User" is available. */
++ if (verify_running("gdm3", "gdmflexiserver"))
++ {
++ handler_context.switch_user_available = TRUE;
++ handler_context.switch_user_GDM = TRUE;
++ }
++
++ /* lightdm also use gdmflexiserver */
++ if (verify_running("lightdm", "gdmflexiserver"))
++ {
++ handler_context.switch_user_available = TRUE;
++ handler_context.switch_user_GDM = TRUE;
++ }
++
++ /* lightdm also use gdmflexiserver */
++ if (verify_running("lightdm", "gdmflexiserver"))
++ {
++ handler_context.switch_user_available = TRUE;
++ handler_context.switch_user_GDM = TRUE;
++ }
++
++ /* lightdm can also be find by the env */
++ if (g_getenv("XDG_SEAT_PATH"))
++ {
++ handler_context.switch_user_available = TRUE;
++ handler_context.switch_user_LIGHTDM = TRUE;
++ }
++
+ /* If we are under KDM, its "Switch User" is available. */
+ if (verify_running("kdm", "kdmctl"))
+ {
+@@ -451,7 +548,18 @@
+
+ /* LTSP support */
+ if (g_getenv("LTSP_CLIENT"))
++ {
+ handler_context.ltsp = TRUE;
++ handler_context.shutdown_available = TRUE;
++ handler_context.reboot_available = TRUE;
++ }
++
++ /* Lock screen */
++ const gchar* very_lock_screen = determine_lock_screen();
++ if (very_lock_screen)
++ {
++ handler_context.lock_screen = TRUE;
++ }
+
+ /* Make the button images accessible. */
+ gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), PACKAGE_DATA_DIR "/lxsession/images");
+@@ -596,6 +704,17 @@
+ gtk_box_pack_start(GTK_BOX(controls), switch_user_button, FALSE, FALSE, 4);
+ }
+
++ /* Create the Lock Screen button. */
++ if (handler_context.lock_screen && !handler_context.ltsp)
++ {
++ GtkWidget * lock_screen_button = gtk_button_new_with_mnemonic(_("L_ock Screen"));
++ GtkWidget * image = gtk_image_new_from_icon_name("system-lock-screen", GTK_ICON_SIZE_BUTTON);
++ gtk_button_set_image(GTK_BUTTON(lock_screen_button), image);
++ gtk_button_set_alignment(GTK_BUTTON(lock_screen_button), 0.0, 0.5);
++ g_signal_connect(G_OBJECT(lock_screen_button), "clicked", G_CALLBACK(lock_screen_clicked), &handler_context);
++ gtk_box_pack_start(GTK_BOX(controls), lock_screen_button, FALSE, FALSE, 4);
++ }
++
+ /* Create the Logout button. */
+ GtkWidget * logout_button = gtk_button_new_with_mnemonic(_("_Logout"));
+ GtkWidget * image = gtk_image_new_from_icon_name("system-log-out", GTK_ICON_SIZE_BUTTON);
diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD
index c37ca0408..880d8fb3d 100644
--- a/community/mapnik/PKGBUILD
+++ b/community/mapnik/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 76741 2012-09-28 19:41:57Z spupykin $
+# $Id: PKGBUILD 80241 2012-11-18 10:30:41Z andrea $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: David Dent <thewinch@gmail.com>
# Contributor: orbisvicis <orbisvicis@gmail.com>
pkgname=mapnik
pkgver=2.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps"
arch=('i686' 'x86_64')
url="http://mapnik.org/"
diff --git a/community/mod_wsgi2/PKGBUILD b/community/mod_wsgi2/PKGBUILD
new file mode 100644
index 000000000..3d8a68fb6
--- /dev/null
+++ b/community/mod_wsgi2/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 80259 2012-11-18 18:18:17Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Ryan Coyner <rcoyner@gmail.com>
+
+pkgname=mod_wsgi2
+pkgver=3.4
+pkgrel=1
+pkgdesc='Python2 WSGI adapter module for Apache'
+arch=('x86_64' 'i686')
+url='http://www.modwsgi.org/'
+license=('APACHE')
+depends=('apache' 'python2')
+install=$pkgname.install
+source=("http://modwsgi.googlecode.com/files/mod_wsgi-$pkgver.tar.gz")
+sha256sums=('ae85c98e9e146840ab3c3e4490e6774f9bef0f99b9f679fca786b2adb5b4b6e8')
+
+build() {
+ cd "$srcdir/mod_wsgi-$pkgver"
+
+ ./configure --prefix=/usr \
+ --with-apxs=/usr/sbin/apxs \
+ --with-python=/usr/bin/python2
+ make
+}
+
+package() {
+ cd "$srcdir/mod_wsgi-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/mod_wsgi2/mod_wsgi2.install b/community/mod_wsgi2/mod_wsgi2.install
new file mode 100644
index 000000000..d26d61631
--- /dev/null
+++ b/community/mod_wsgi2/mod_wsgi2.install
@@ -0,0 +1,14 @@
+post_install() {
+/bin/cat << ENDOFMESSAGE
+==>
+==>
+==> To install mod_wsgi, add the following line in
+==> /etc/httpd/conf/httpd.conf file :
+==>
+==> LoadModule wsgi_module modules/mod_wsgi.so
+==>
+==> and restart/reload Apache.
+==>
+==>
+ENDOFMESSAGE
+}
diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD
index c9df68411..02b44cb29 100644
--- a/community/openntpd/PKGBUILD
+++ b/community/openntpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80216 2012-11-17 19:40:50Z jelle $
+# $Id: PKGBUILD 80248 2012-11-18 11:40:59Z jelle $
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Contributor: Mark Rosenstand <mark@borkware.net>
# Contributor: Giorgio Lando <patroclo7@gmail.com> (adjtimex patch)
@@ -6,7 +6,7 @@
pkgname=openntpd
pkgver=3.9p1
-pkgrel=20
+pkgrel=21
pkgdesc="Free, easy to use implementation of the Network Time Protocol."
url="http://www.openntpd.org/"
arch=('x86_64' 'i686')
diff --git a/community/openntpd/openntpd.install b/community/openntpd/openntpd.install
index 5b440ee2f..dd2bf4a4f 100644
--- a/community/openntpd/openntpd.install
+++ b/community/openntpd/openntpd.install
@@ -6,9 +6,6 @@ post_install() {
true
}
-post_upgrade() {
-}
-
post_remove() {
getent passwd ntp &>/dev/null && userdel ntp >/dev/null
getent group ntp &>/dev/null && groupdel ntp >/dev/null
diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD
index c00595c76..a71f62515 100644
--- a/community/openttd/PKGBUILD
+++ b/community/openttd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 79241 2012-11-01 16:48:44Z lcarlier $
+# $Id: PKGBUILD 80243 2012-11-18 10:31:01Z andrea $
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
pkgname=openttd
pkgver=1.2.3
-pkgrel=1
+pkgrel=2
pkgdesc='An engine for running Transport Tycoon Deluxe.'
arch=('i686' 'x86_64')
url='http://www.openttd.org'
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index 72e283e60..cc4aedeee 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 76937 2012-10-02 14:00:19Z spupykin $
+# $Id: PKGBUILD 80244 2012-11-18 10:31:10Z andrea $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: mpie <michael.kyne-phillips1@ntlworld.com>
@@ -6,7 +6,7 @@ pkgname=parrot
pkgver=4.8.0
#_rel=stable
_rel=devel
-pkgrel=1
+pkgrel=2
pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages"
arch=('x86_64' 'i686')
url="http://www.parrotcode.org/"
diff --git a/community/pion-net/PKGBUILD b/community/pion-net/PKGBUILD
index d2511597a..c34b2b733 100644
--- a/community/pion-net/PKGBUILD
+++ b/community/pion-net/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 74005 2012-07-18 01:08:15Z ibiru $
+# $Id: PKGBUILD 80245 2012-11-18 10:31:18Z andrea $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
# Contributor: David Watzke <david@watzke.cz>
pkgname=pion-net
pkgver=4.0.12
-pkgrel=3
+pkgrel=4
pkgdesc="A C++ development library for implementing lightweight HTTP interfaces"
url="http://www.pion.org/projects/pion-network-library"
arch=('i686' 'x86_64')
diff --git a/community/rygel/PKGBUILD b/community/rygel/PKGBUILD
index d9d5ec4bc..147c9f125 100644
--- a/community/rygel/PKGBUILD
+++ b/community/rygel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 77776 2012-10-14 17:40:17Z bgyorgy $
+# $Id: PKGBUILD 80273 2012-11-18 23:53:28Z bgyorgy $
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
pkgname=rygel
-pkgver=0.16.1
+pkgver=0.16.3
pkgrel=1
pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network"
arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ backup=('etc/rygel.conf')
options=('!libtool')
install=$pkgname.install
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c8ffc0492c60b1c66f13f3f72cbee622307225d7e4cb20b43e299601463cd28d')
+sha256sums=('a0325afabb6a91cbe958864183adce80ad88bcaa0fc8f8ed3f434ee0d09935bf')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -29,6 +29,12 @@ build() {
make
}
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make check
+}
+
package() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/uzbl/PKGBUILD b/community/uzbl/PKGBUILD
index 725ff0e0d..9ac9af3be 100644
--- a/community/uzbl/PKGBUILD
+++ b/community/uzbl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 71552 2012-05-28 19:39:02Z lcarlier $
+# $Id: PKGBUILD 80256 2012-11-18 14:26:45Z lcarlier $
# Maintainer : Laurent Carlier <lordheavym@gmail.com>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Dieter Plaetinck <dieter@plaetinck.be>
@@ -6,7 +6,7 @@
pkgbase=uzbl
pkgname=('uzbl-core' 'uzbl-browser' 'uzbl-tabbed')
pkgver=2012.05.14
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://www.uzbl.org"
license=('GPL3')
@@ -25,6 +25,9 @@ build() {
-e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
$(find ./ -name '*.py') bin/*
+ # NEW_BG_TAB event fix (merged upstream)
+ sed -i -e "s/tab_bg/bg_tab/" bin/uzbl-tabbed
+
make
}
diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD
index a0ac79479..a6463eede 100644
--- a/community/yaz/PKGBUILD
+++ b/community/yaz/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78691 2012-10-22 20:56:11Z jlichtblau $
+# $Id: PKGBUILD 80246 2012-11-18 10:31:25Z andrea $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Ray Rashif <schiv@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -8,7 +8,7 @@
pkgname=yaz
pkgver=4.2.43
-pkgrel=1
+pkgrel=2
pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers"
arch=('i686' 'x86_64')
url="http://www.indexdata.dk/yaz"
diff --git a/core/ldns/PKGBUILD b/core/ldns/PKGBUILD
index 4e2099f68..94a25fc7c 100644
--- a/core/ldns/PKGBUILD
+++ b/core/ldns/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169625 2012-10-24 23:47:25Z bisson $
+# $Id: PKGBUILD 171551 2012-11-19 03:55:29Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: mathieui <mathieui@mathieui.net>
# Contributor: jiribb <jiribb@gmail.com>
pkgname=ldns
-pkgver=1.6.14
+pkgver=1.6.16
pkgrel=1
pkgdesc='Fast DNS library supporting recent RFCs'
url='http://www.nlnetlabs.nl/projects/ldns/'
@@ -15,7 +15,7 @@ depends=('openssl' 'dnssec-anchors')
optdepends=('libpcap: ldns-dpa tool')
makedepends=('libpcap')
source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('2ef5fbf33b25d2f7b736c332ebccc0862dd12d02')
+sha1sums=('5b4fc6c5c3078cd061905c47178478cb1015c62a')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index 7202c9124..a02ad3953 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169626 2012-10-24 23:47:29Z bisson $
+# $Id: PKGBUILD 171552 2012-11-19 03:55:36Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=openssh
pkgver=6.1p1
-pkgrel=3
+pkgrel=4
pkgdesc='Free version of the SSH connectivity tools'
url='http://www.openssh.org/portable.html'
license=('custom:BSD')
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index 5e150fdf9..8cf9e4be6 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168392 2012-10-09 22:16:55Z bisson $
+# $Id: PKGBUILD 171500 2012-11-18 07:59:37Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
# Contributor: Mario Vazquez <mario_vazq@hotmail.com>
@@ -6,7 +6,7 @@
pkgname=bind
_pkgver=9.9.2
pkgver=${_pkgver//-/.}
-pkgrel=1
+pkgrel=2
pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
url='http://www.isc.org/software/bind/'
license=('custom:ISC')
@@ -16,6 +16,7 @@ depends=('openssl' 'krb5' 'libxml2')
source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
'root.hint::http://www.internic.net/zones/named.root'
'remove-tools.patch'
+ 'tmpfiles.d'
'named'
'named.conf'
'named.conf.d'
@@ -26,11 +27,12 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
sha1sums=('eb9fa7b497d67ce61a120cb96c302381bc385324'
'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
'14264affa71bcfe7703d0fb7c3556c4c47efaa8b'
- '46232e9db243c6c05e170a1781d7a7f413be5d03'
- '5ca7a5f2a132548a090a045a2df3acea6b35d9eb'
+ 'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
+ '47f9ac4f6f70bc9167c1cf7859a298531197ad20'
+ 'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726'
'7848edbfb9a848843f57c11c02b0289eefd42d00'
'7de92fff4b90c4821b3b133a05affd186fb93951'
- '9ffb5c3f72390a517aeae557e32349d5d278cb63'
+ '3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b'
'76a0d4cd1b913db177a5a375bebc47e5956866ec'
'53be0f1437ebe595240d8dbdd819939582b97fb9')
@@ -71,6 +73,7 @@ package() {
install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind
install -D -m755 ../named "${pkgdir}"/etc/rc.d/named
+ install -D -m644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/named.conf
install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named
install -D -m644 ../named.service "${pkgdir}"/usr/lib/systemd/system/named.service
install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named
diff --git a/extra/bind/named b/extra/bind/named
index 7907f9983..65dd0fe82 100755
--- a/extra/bind/named
+++ b/extra/bind/named
@@ -4,10 +4,7 @@
. /etc/rc.d/functions
. /etc/conf.d/named
-[[ -d /var/run/named ]] || mkdir -p /var/run/named
-chown named:named /var/run/named
-
-PIDFILE=/var/run/named/named.pid
+PIDFILE=/run/named/named.pid
PID=$(cat $PIDFILE 2>/dev/null)
readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; }
diff --git a/extra/bind/named.conf b/extra/bind/named.conf
index 38fb12cbe..4aaf19a49 100644
--- a/extra/bind/named.conf
+++ b/extra/bind/named.conf
@@ -4,7 +4,7 @@
options {
directory "/var/named";
- pid-file "/var/run/named/named.pid";
+ pid-file "/run/named/named.pid";
auth-nxdomain yes;
datasize default;
// Uncomment these to enable IPv6 connections support
diff --git a/extra/bind/named.logrotate b/extra/bind/named.logrotate
index ef1a2d032..5f9a47693 100644
--- a/extra/bind/named.logrotate
+++ b/extra/bind/named.logrotate
@@ -1,6 +1,6 @@
/var/log/named.log {
missingok
postrotate
- /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true
+ /bin/kill -HUP `cat /run/named/named.pid 2>/dev/null` 2>/dev/null || true
endscript
}
diff --git a/extra/bind/tmpfiles.d b/extra/bind/tmpfiles.d
new file mode 100644
index 000000000..1cfc82d08
--- /dev/null
+++ b/extra/bind/tmpfiles.d
@@ -0,0 +1 @@
+d /run/named 0750 named named -
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 63c76e61a..11efb802a 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163962 2012-07-23 02:59:56Z allan $
+# $Id: PKGBUILD 171511 2012-11-18 10:27:36Z andyrtr $
# Maintainer: kevin <kevin@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Kritoke <kritoke@gamebox.net>
@@ -8,7 +8,7 @@ pkgbase=boost
pkgname=('boost-libs' 'boost')
pkgver=1.50.0
_boostver=${pkgver//./_}
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="http://www.boost.org/"
makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
@@ -22,7 +22,7 @@ build() {
# set python path for bjam
cd "${srcdir}/${pkgbase}_${_boostver}/tools"
echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
- echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam
+ echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> build/v2/user-config.jam
echo "using mpi ;" >> build/v2/user-config.jam
cd "${srcdir}"/${pkgbase}_${_boostver}
@@ -76,7 +76,7 @@ build() {
package_boost() {
pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
depends=("boost-libs=${pkgver}")
- optdepends=('python: for python bindings'
+ optdepends=('python3: for python bindings'
'python2: for python2 bindings'
'boost-build: to use boost jam for building your project.')
diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD
index ea008e64b..dbd4fcc63 100644
--- a/extra/brltty/PKGBUILD
+++ b/extra/brltty/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 167366 2012-10-01 15:08:16Z tomegun $
+# $Id: PKGBUILD 171512 2012-11-18 10:27:37Z andyrtr $
# Maintainer:
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=brltty
pkgver=4.3
-pkgrel=6
+pkgrel=7
pkgdesc="Braille display driver for Linux/Unix"
arch=('i686' 'x86_64')
url="http://mielke.cc/brltty"
license=('GPL' 'LGPL')
-depends=('libxaw' 'at-spi2-core' 'gpm' 'icu' 'python2' 'tcl' 'atk' 'libxtst' 'pyrex')
+depends=('libxaw' 'at-spi2-core' 'gpm' 'icu' 'tcl' 'atk' 'pyrex')
makedepends=('bluez')
optdepends=('bluez: bluetooth support')
backup=(etc/brltty.conf etc/conf.d/brltty.conf)
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index c28947f5c..0d4aa9bc0 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169740 2012-10-27 23:41:30Z eric $
+# $Id: PKGBUILD 171513 2012-11-18 10:27:43Z andyrtr $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
@@ -18,7 +18,7 @@ pkgname=('calligra-filters'
'calligra-braindump'
'calligra-flow')
pkgver=2.5.3
-pkgrel=6
+pkgrel=7
arch=('i686' 'x86_64')
url='http://www.calligra-suite.org/'
license=('FDL1.2' 'GPL2' 'LGPL')
@@ -57,12 +57,10 @@ package_calligra-libs() {
depends=('kdepimlibs' 'lcms2')
conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces'
- 'calligra-libs' 'calligra-pics' 'calligra-servicetypes'
- 'calligra-templates')
+ 'calligra-pics' 'calligra-servicetypes' 'calligra-templates')
replaces=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces'
- 'calligra-libs' 'calligra-pics' 'calligra-servicetypes'
- 'calligra-templates')
+ 'calligra-pics' 'calligra-servicetypes' 'calligra-templates')
for d in interfaces libs pics servicetypes templates; do
cd "${srcdir}"/build/${d}
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index 6f900fb06..f22828aea 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169743 2012-10-27 23:41:39Z eric $
+# $Id: PKGBUILD 171502 2012-11-18 08:01:29Z eric $
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
pkgname=emacs
pkgver=24.2
-pkgrel=2
+pkgrel=3
pkgdesc="The extensible, customizable, self-documenting real-time display editor"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/emacs/emacs.html"
@@ -29,10 +29,8 @@ package() {
# remove conflict with ctags package
mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
- # fix all the 777 perms on directories
- find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \;
# fix user/root permissions on usr/share files
- find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \;
+ find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \;
# fix perms on /var/games
chmod 775 "$pkgdir"/var/games
chmod 775 "$pkgdir"/var/games/emacs
diff --git a/extra/emacs/emacs.install b/extra/emacs/emacs.install
index d84f1de14..fa9ffeeb1 100644
--- a/extra/emacs/emacs.install
+++ b/extra/emacs/emacs.install
@@ -2,7 +2,7 @@ ICON_PATH=usr/share/icons/hicolor
INFO_DIR=usr/share/info
INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
-ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake
+ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake
forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
speedbar tramp url vip viper widget woman)
diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD
index aaf572e5c..e88630203 100644
--- a/extra/fontforge/PKGBUILD
+++ b/extra/fontforge/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 164687 2012-08-02 16:06:30Z bisson $
+# $Id: PKGBUILD 171504 2012-11-18 08:12:30Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=fontforge
pkgver=20120731_b
-pkgrel=1
+pkgrel=2
pkgdesc='Outline and bitmap font editor'
arch=('i686' 'x86_64')
url='http://fontforge.sourceforge.net/'
license=('BSD')
-depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro')
+depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro'
+ 'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme')
options=('!libtool' '!makeflags')
source=("http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-${pkgver//_/-}.tar.bz2")
sha1sums=('b520f532b48e557c177dffa29120225066cc4e84')
@@ -18,6 +19,8 @@ sha1sums=('b520f532b48e557c177dffa29120225066cc4e84')
# git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz
# source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+install=install
+
build() {
cd "${srcdir}/${pkgname}-${pkgver//_/-}"
sed -i 's/python /python2 /g' Makefile.dynamic.in
@@ -38,4 +41,6 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver//_/-}"
make DESTDIR="${pkgdir}" install
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -Dm644 Packaging/fontforge.desktop "${pkgdir}/usr/share/applications/fontforge.desktop"
+ install -d "${pkgdir}/usr/share/icons/hicolor"; mv Packaging/icons "${pkgdir}/usr/share/icons/hicolor"
}
diff --git a/extra/fontforge/install b/extra/fontforge/install
new file mode 100644
index 000000000..5ffa24730
--- /dev/null
+++ b/extra/fontforge/install
@@ -0,0 +1,12 @@
+post_upgrade() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_install() {
+ post_upgrade
+}
+
+post_remove() {
+ post_upgrade
+}
diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD
index 5e253025e..96b0cb3a1 100644
--- a/extra/glade/PKGBUILD
+++ b/extra/glade/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 169882 2012-10-30 22:25:55Z heftig $
+# $Id: PKGBUILD 171495 2012-11-18 05:17:05Z eric $
# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=glade
pkgver=3.14.1
-pkgrel=1
+pkgrel=2
pkgdesc="User interface builder for GTK+ and GNOME."
arch=(i686 x86_64)
license=('GPL' 'LGPL')
depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme')
makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject' 'itstool' 'docbook-xsl')
-optdepends=('python2: Python widgets support')
+optdepends=('python2: Python widgets support'
+ 'devhelp: help browser')
options=('!libtool')
url="http://glade.gnome.org/"
install=glade.install
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index b85e0fac8..cd89bfa18 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 170032 2012-10-31 05:16:00Z andyrtr $
+# $Id: PKGBUILD 171534 2012-11-18 13:31:11Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=gnutls
-pkgver=3.1.3
-pkgrel=2
+pkgver=3.1.4
+pkgrel=1
pkgdesc="A library which provides a secure layer over a reliable transport layer"
arch=('i686' 'x86_64')
license=('GPL3' 'LGPL')
@@ -11,10 +12,10 @@ url="http://www.gnu.org/software/gnutls/"
install=gnutls.install
options=('!libtool' '!zipman')
depends=('gcc-libs>=4.7.1-5' 'libtasn1>=3.0' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12')
-makedepends=('valgrind' 'strace')
+makedepends=('valgrind' 'strace' 'datefudge')
source=(http://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('8a7b47456f65ffa8c01c58461fed1388'
- 'ecd7bfe70612f88afd117124e18444df')
+md5sums=('13901668735923add4470c33cb9d6298'
+ '340949854804f71987bc00bf50bf684e')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -22,13 +23,14 @@ build() {
--with-zlib \
--disable-static \
--disable-guile \
- --disable-valgrind-tests
+ --disable-valgrind-tests # --disable-libdane \
make
}
check() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make -k check # passes all || /bin/true
+ #make -k check # passes all || /bin/true
+ make -k check || /bin/true # some new tests are broken
}
package() {
diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD
index 6b0c45301..cd8657f0d 100644
--- a/extra/gptfdisk/PKGBUILD
+++ b/extra/gptfdisk/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 160220 2012-05-31 03:41:30Z foutrelis $
+# $Id: PKGBUILD 171514 2012-11-18 10:27:45Z andyrtr $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Hokum <hokum_at_mail_dot_ru>
pkgname=gptfdisk
pkgver=0.8.5
-pkgrel=1
+pkgrel=2
pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks"
arch=('i686' 'x86_64')
url="http://www.rodsbooks.com/gdisk/"
diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD
index 01e371845..04443c771 100644
--- a/extra/harfbuzz/PKGBUILD
+++ b/extra/harfbuzz/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 169943 2012-10-30 22:46:13Z heftig $
+# $Id: PKGBUILD 171515 2012-11-18 10:27:47Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=harfbuzz
pkgver=0.9.5
-pkgrel=1
+pkgrel=2
pkgdesc="OpenType text shaping engine."
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
license=('MIT')
-depends=('icu' 'glib2' 'freetype2')
+depends=('icu' 'glib2' 'freetype2' 'graphite')
makedepends=('icu' 'cairo' 'glib2' 'freetype2')
optdepends=('cairo: hb-view program')
options=(!libtool)
@@ -16,15 +16,14 @@ source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver
sha256sums=('57aa645606b7220fa202871b2acd9062243a5c212a2b55ab6493eeaaca1c6a7a')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
install -Dm644 COPYING "${pkgdir}/usr/share/licenses/harfbuzz/COPYING"
}
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index 73bc37d3d..2aededd6b 100644
--- a/extra/icu/PKGBUILD
+++ b/extra/icu/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163969 2012-07-23 03:03:14Z allan $
+# $Id: PKGBUILD 171516 2012-11-18 10:27:49Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Art Gramlich <art@gramlich-net.com>
pkgname=icu
-pkgver=49.1.2
+pkgver=50.1
pkgrel=2
pkgdesc="International Components for Unicode library"
arch=(i686 x86_64)
@@ -12,20 +12,31 @@ license=('custom:"icu"')
depends=('gcc-libs>=4.7.1-5' 'sh')
source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
- icu.8198.revert.icu5431.patch)
-md5sums=('bbc609fe5237202d7abf016141012a45'
- 'ebd5470fc969c75e52baf4af94a9ee82')
+ icu.8198.revert.icu5431.patch changeset_32780.diff)
+md5sums=('cf7bf9e56aa6c2057a8b6f464046483e'
+ 'ebd5470fc969c75e52baf4af94a9ee82'
+ '58f4b655e40dddc8e316600019b491b2')
build() {
cd ${srcdir}/icu/source
+
# fix Malayalam encoding https://bugzilla.redhat.com/show_bug.cgi?id=654200
patch -Rp3 -i ${srcdir}/icu.8198.revert.icu5431.patch
+
+ # fix building clients without c++11 http://bugs.icu-project.org/trac/changeset/32780
+ patch -Np4 -i ${srcdir}/changeset_32780.diff
+
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man
make
}
+check() {
+ cd "$srcdir/icu/source"
+ make -k check # passes all
+}
+
package() {
cd ${srcdir}/icu/source
make -j1 DESTDIR=${pkgdir} install
diff --git a/extra/icu/changeset_32780.diff b/extra/icu/changeset_32780.diff
new file mode 100644
index 000000000..a06c3d2ab
--- /dev/null
+++ b/extra/icu/changeset_32780.diff
@@ -0,0 +1,67 @@
+Index: /icu/trunk/source/test/intltest/strtest.cpp
+===================================================================
+--- /icu/trunk/source/test/intltest/strtest.cpp (revision 32779)
++++ /icu/trunk/source/test/intltest/strtest.cpp (revision 32780)
+@@ -1,5 +1,5 @@
+ /********************************************************************
+ * COPYRIGHT:
+- * Copyright (c) 1997-2011, International Business Machines Corporation and
++ * Copyright (c) 1997-2012, International Business Machines Corporation and
+ * others. All Rights Reserved.
+ ********************************************************************/
+@@ -95,5 +95,5 @@
+ StringTest::Test_U_STRING() {
+ U_STRING_INIT(ustringVar, "aZ0 -", 5);
+- if( sizeof(ustringVar)/sizeof(*ustringVar)!=6 ||
++ if( u_strlen(ustringVar)!=5 ||
+ ustringVar[0]!=0x61 ||
+ ustringVar[1]!=0x5a ||
+Index: /icu/trunk/source/common/unicode/ustring.h
+===================================================================
+--- /icu/trunk/source/common/unicode/ustring.h (revision 32779)
++++ /icu/trunk/source/common/unicode/ustring.h (revision 32780)
+@@ -940,5 +940,5 @@
+ */
+ #if defined(U_DECLARE_UTF16)
+-# define U_STRING_DECL(var, cs, length) static const UChar var[(length)+1]=U_DECLARE_UTF16(cs)
++# define U_STRING_DECL(var, cs, length) static const UChar *var=(const UChar *)U_DECLARE_UTF16(cs)
+ /**@stable ICU 2.0 */
+ # define U_STRING_INIT(var, cs, length)
+Index: /icu/trunk/source/common/unicode/platform.h
+===================================================================
+--- /icu/trunk/source/common/unicode/platform.h (revision 32779)
++++ /icu/trunk/source/common/unicode/platform.h (revision 32780)
+@@ -665,7 +665,7 @@
+ * gcc 4.4 defines the __CHAR16_TYPE__ macro to a usable type but
+ * does not support u"abc" string literals.
+- * C++11 requires support for UTF-16 literals
++ * C++11 and C11 require support for UTF-16 literals
+ */
+-# if (defined(__cplusplus) && __cplusplus >= 201103L)
++# if (defined(__cplusplus) && __cplusplus >= 201103L) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L)
+ # define U_HAVE_CHAR16_T 1
+ # else
+Index: /icu/trunk/source/common/unicode/umachine.h
+===================================================================
+--- /icu/trunk/source/common/unicode/umachine.h (revision 32779)
++++ /icu/trunk/source/common/unicode/umachine.h (revision 32780)
+@@ -257,5 +257,5 @@
+ /**
+ * \var UChar
+- * Define UChar to be char16_t, if available,
++ * Define UChar to be UCHAR_TYPE, if that is #defined (for example, to char16_t),
+ * or wchar_t if that is 16 bits wide; always assumed to be unsigned.
+ * If neither is available, then define UChar to be uint16_t.
+@@ -267,8 +267,8 @@
+ * @stable ICU 4.4
+ */
+-
+-/* Define UChar to be compatible with char16_t or wchar_t if possible. */
+-#if U_HAVE_CHAR16_T
+- typedef char16_t UChar;
++#if defined(UCHAR_TYPE)
++ typedef UCHAR_TYPE UChar;
++/* Not #elif U_HAVE_CHAR16_T -- because that is type-incompatible with pre-C++11 callers
++ typedef char16_t UChar; */
+ #elif U_SIZEOF_WCHAR_T==2
+ typedef wchar_t UChar;
diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD
index 4a4c077ba..ca20cdcb3 100644
--- a/extra/irqbalance/PKGBUILD
+++ b/extra/irqbalance/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Martin Striz <ms@poruba.net>
pkgname=irqbalance
-pkgver=1.0.4
+pkgver=1.0.5
pkgrel=1
pkgdesc="IRQ balancing daemon for SMP systems"
arch=('i686' 'x86_64')
@@ -11,11 +11,11 @@ license=('GPL')
depends=(glib2 numactl libcap-ng)
makedepends=(pkgconfig)
backup=(etc/conf.d/irqbalance)
-source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.bz2
+source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz
irqbalance.conf.d
irqbalance.rc.d
irqbalance.service)
-md5sums=('f7ca283c46331db73f27e686a643dcfb'
+md5sums=('b6403fa067c96adce448a48c9993654d'
'336c1ee99818f9ecda1687e34c69fd6b'
'fb82fc5d267d39110baf720d81282a7c'
'9e82dc471128117982a8dd0c4bd5f246')
diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD
index 731ed23de..af3dc10ea 100644
--- a/extra/ktorrent/PKGBUILD
+++ b/extra/ktorrent/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 166483 2012-09-08 08:54:47Z ronald $
+# $Id: PKGBUILD 171523 2012-11-18 10:30:03Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Travis Willard <travisw@wmpub.ca>
# Contributor: Georg Grabler <ggrabler@gmail.com>
pkgname=ktorrent
pkgver=4.3.0
-pkgrel=1
+pkgrel=2
pkgdesc="A powerful BitTorrent client for KDE"
arch=('i686' 'x86_64')
url='http://ktorrent.org/'
@@ -13,16 +13,21 @@ license=('GPL2')
depends=('libktorrent' 'kdebase-workspace' 'taglib')
makedepends=('automoc4' 'cmake' 'boost')
source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
- 'httpserver.patch')
+ 'httpserver.patch' 'groupmiewmodel.diff')
install=${pkgname}.install
sha1sums=('60400c6286f58934dde7ab471f56188b68d69f7b'
- 'cef22b24af540e1bfcf13da60e4846ade106c303')
+ 'cef22b24af540e1bfcf13da60e4846ade106c303'
+ '5b91b40e38afb15452bcb0644cd7ba57bc9db6eb' )
+
+options=(strip)
+
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
# build time patch
patch -p0 -i "${srcdir}/httpserver.patch"
+ patch -p0 -i "${srcdir}/groupmiewmodel.diff"
cd "${srcdir}"
mkdir build
diff --git a/extra/ktorrent/groupmiewmodel.diff b/extra/ktorrent/groupmiewmodel.diff
new file mode 100644
index 000000000..f16bdc57b
--- /dev/null
+++ b/extra/ktorrent/groupmiewmodel.diff
@@ -0,0 +1,87 @@
+commit 1009ba89b5d603ae7f1a95ef65a818c760c367cf
+Author: Joris Guisson <joris.guisson@gmail.com>
+Date: Mon Oct 22 20:07:21 2012 +0200
+
+ Backport to 4.3: Fix crash in GroupViewModel when dragging torrents over groups
+
+ BUG: 308733
+
+diff --git a/ktorrent/groups/groupviewmodel.cpp b/ktorrent/groups/groupviewmodel.cpp
+index f2e99d2..b4dca7e 100644
+--- ktorrent/groups/groupviewmodel.cpp
++++ ktorrent/groups/groupviewmodel.cpp
+@@ -55,6 +55,9 @@ namespace kt
+ QVariant GroupViewModel::data(const QModelIndex& index, int role) const
+ {
+ Item* item = (Item*)index.internalPointer();
++ if(!item)
++ return QVariant();
++
+ switch(role)
+ {
+ case Qt::DisplayRole:
+@@ -72,6 +75,9 @@ namespace kt
+ return false;
+
+ Item* item = (Item*)index.internalPointer();
++ if(!item)
++ return false;
++
+ Group* group = item->group;
+ QString new_name = value.toString();
+ if(new_name.isEmpty() || gman->find(new_name))
+@@ -96,13 +102,16 @@ namespace kt
+ return 1;
+
+ Item* item = (Item*)parent.internalPointer();
+- return item->children.size();
++ if(!item)
++ return 0;
++ else
++ return item->children.size();
+ }
+
+ QModelIndex GroupViewModel::parent(const QModelIndex& child) const
+ {
+ Item* item = (Item*)child.internalPointer();
+- if(!item->parent)
++ if(!item || !item->parent)
+ return QModelIndex();
+ else
+ return createIndex(item->parent->row, 0, (void*)item->parent);
+@@ -114,7 +123,7 @@ namespace kt
+ return createIndex(row, column, (void*)&root);
+
+ Item* item = (Item*)parent.internalPointer();
+- if(row < 0 || row >= item->children.count())
++ if(!item || row < 0 || row >= item->children.count())
+ return QModelIndex();
+
+ return createIndex(row, column, (void*)&item->children.at(row));
+@@ -157,7 +166,7 @@ namespace kt
+ Qt::ItemFlags GroupViewModel::flags(const QModelIndex& index) const
+ {
+ Item* item = (Item*)index.internalPointer();
+- if(item->group && !item->group->isStandardGroup())
++ if(item && item->group && !item->group->isStandardGroup())
+ return Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled;
+ else
+ return Qt::ItemIsEnabled;
+@@ -218,8 +227,11 @@ namespace kt
+
+ bool GroupViewModel::removeRows(int row, int count, const QModelIndex& parent)
+ {
++ Item* item = (Item*)parent.internalPointer();
++ if(!item)
++ return false;
++
+ beginRemoveRows(parent, row, row + count);
+- Item* item = (Item*)parent.internalPointer();
+ for(int i = 0; i < count; i++)
+ item->children.removeAt(row);
+ int row_index = 0;
+@@ -436,3 +448,4 @@ namespace kt
+
+
+ }
++
diff --git a/extra/lapack/PKGBUILD b/extra/lapack/PKGBUILD
index df8aa17cd..cdefb4720 100644
--- a/extra/lapack/PKGBUILD
+++ b/extra/lapack/PKGBUILD
@@ -1,56 +1,66 @@
-# $Id: PKGBUILD 164763 2012-08-04 18:50:35Z ronald $
+# $Id: PKGBUILD 171531 2012-11-18 12:48:44Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: damir <damir@archlinux.org>
# Contributor: Jason Taylor <jftaylor21@gmail.com>
-pkgname=lapack
-pkgver=3.4.1
+pkgbase=lapack
+pkgname=('lapack' 'blas')
+pkgver=3.4.2
pkgrel=1
url="http://www.netlib.org/lapack"
pkgdesc="Linear Algebra PACKage"
-makedepends=('gcc-fortran')
-depends=("blas=${pkgver}")
+makedepends=('gcc-fortran' 'cmake')
+depends=('gcc-libs')
arch=('i686' 'x86_64')
license=("custom")
-source=(http://www.netlib.org/${pkgname}/${pkgname}-${pkgver}.tgz
- Makefile.lapack)
-sha1sums=('910109a931524f8dcc2734ce23fe927b00ca199f'
- '2bedfe0d778b401b24d1fbf0eb1dc576d374be28')
-
+source=(http://www.netlib.org/${pkgbase}/${pkgbase}-${pkgver}.tgz
+ LICENSE.blas)
+sha1sums=('93a6e4e6639aaf00571d53a580ddc415416e868b'
+ '2491a151a37f0162b25fc4e4e9a8ac444b574a76')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- cp -f INSTALL/make.inc.gfortran make.inc
- cp -f "${srcdir}/Makefile.lapack" SRC/Makefile
-
- export FC=gfortran
-
- pushd INSTALL
- make clean
- make NOOPT="${CFLAGS/-O?/-O0} -fPIC" OPTS="${CFLAGS} -fPIC"
- popd
- # make sure no files with '_', *vxx.o *vfx.o and *2.O as defined in *ASRC
- # are in OBJS
- pushd SRC
- make clean
-
- make FFLAGS="${CFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" shared
- cp liblapack.so.${pkgver} "${srcdir}/${pkgname}-${pkgver}/"
- popd
+ cd "${srcdir}"
+
+ install -d build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DBUILD_SHARED_LIBS=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_Fortran_COMPILER=gfortran
+ make
}
-package() {
- install -m755 -d "${pkgdir}/usr/lib"
- install -m755 "${srcdir}/${pkgname}-${pkgver}/liblapack.so.${pkgver}" \
- "${pkgdir}/usr/lib/"
- ln -sf liblapack.so.${pkgver} "${pkgdir}/usr/lib/liblapack.so"
- ln -sf liblapack.so.${pkgver} "${pkgdir}/usr/lib/liblapack.so.3"
+package_lapack() {
+ depends=("blas=${pkgver}")
+ install -m755 -d ${pkgdir}/usr/{lib,bin}
+
+ for libname in liblapack libtmglib; do
+ install -m755 "${srcdir}/build/lib/${libname}.so" \
+ "${pkgdir}/usr/lib/"
+ ln -sf liblapack.so "${pkgdir}/usr/lib/${libname}.so.${pkgver}"
+ ln -sf liblapack.so "${pkgdir}/usr/lib/${libname}.so.3"
+ done
+
+ install -m755 ${srcdir}/build/bin/* ${pkgdir}/usr/bin
install -m755 -d "${pkgdir}/usr/share/licenses/lapack"
install -m644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" \
"${pkgdir}/usr/share/licenses/lapack/"
}
-sha1sums=('c115223ac1bac9ab971aae865d3e95442bc979bc'
- '4ea739a743e2de248ad150873137432261d5b630')
+package_blas() {
+ pkgdesc="Basic Linear Algebra Subprograms"
+
+ install -m755 -d "${pkgdir}/usr/lib"
+ install -m755 "${srcdir}/build/lib/libblas.so" \
+ "${pkgdir}/usr/lib/"
+ ln -sf libblas.so "${pkgdir}/usr/lib/libblas.so.${pkgver}"
+ ln -sf libblas.so "${pkgdir}/usr/lib/libblas.so.3"
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/blas"
+ install -m644 "${srcdir}/LICENSE.blas" \
+ "${pkgdir}/usr/share/licenses/blas/"
+}
diff --git a/extra/libcap-ng/PKGBUILD b/extra/libcap-ng/PKGBUILD
index 5f294fe1a..b435a92e6 100644
--- a/extra/libcap-ng/PKGBUILD
+++ b/extra/libcap-ng/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 165245 2012-08-14 15:06:17Z ibiru $
+# $Id: PKGBUILD 171546 2012-11-19 03:43:07Z dan $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
pkgname=libcap-ng
-pkgver=0.7
+pkgver=0.7.3
pkgrel=1
-pkgdesc="A library intended to make programming with POSIX capabilities much easier than the traditional libcap"
+pkgdesc="A library making programming with POSIX capabilities easier than traditional libcap"
arch=('i686' 'x86_64')
url="http://people.redhat.com/sgrubb/libcap-ng/"
license=('GPL2' 'LGPL2.1')
depends=('glibc')
options=('!libtool')
source=(http://people.redhat.com/sgrubb/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('85c14a2442a3721383a1e2284e254846')
+md5sums=('610afb774f80a8032b711281df126283')
build() {
cd $pkgname-$pkgver
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index dc7396217..b1c649979 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 170071 2012-10-31 14:01:16Z andyrtr $
+# $Id: PKGBUILD 171517 2012-11-18 10:27:55Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
pkgbase="libreoffice"
@@ -26,7 +26,7 @@ pkgname=('libreoffice-common'
'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
_LOver=3.6.3.2
pkgver=3.6.3
-pkgrel=1
+pkgrel=3
arch=('i686' 'x86_64')
license=('LGPL3')
url="http://www.libreoffice.org/"
@@ -37,7 +37,7 @@ makedepends=( # makedepends
'glu' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene'
# the runtime dependencies
"curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
- 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1"
+ 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=50.1-2"
'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2'
'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
'ttf-dejavu') # to satisfy regression tests
@@ -280,7 +280,7 @@ package_libreoffice-common() {
pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
install=libreoffice-common.install
depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
- 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'clucene' 'lcms2'
+ 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2'
'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
optdepends=('libreoffice-langpack: additional language support'
'java-runtime: adds java support'
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index ac32f29ae..cdf86575e 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169306 2012-10-19 05:27:26Z pierre $
+# $Id: PKGBUILD 171518 2012-11-18 10:28:03Z andyrtr $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgbase=php
@@ -22,7 +22,7 @@ pkgname=('php'
'php-tidy'
'php-xsl')
pkgver=5.4.8
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
diff --git a/extra/plotutils/PKGBUILD b/extra/plotutils/PKGBUILD
index 91e2c7775..2e1f42acc 100644
--- a/extra/plotutils/PKGBUILD
+++ b/extra/plotutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 148880 2012-02-05 11:53:57Z ibiru $
+# $Id: PKGBUILD 171506 2012-11-18 08:51:56Z eric $
# Maintainer: damir <damir@archlinux.org>
# Packager: Maksim Sipos (maxsipos at gmail dot com)
pkgname=plotutils
pkgver=2.6
-pkgrel=2
+pkgrel=3
arch=('x86_64' 'i686')
pkgdesc="Set of utilities and libraries for plotting."
url="http://directory.fsf.org/graphics/plotutils.html"
@@ -12,9 +12,11 @@ license=("GPL")
depends=("libpng" "gcc-libs" "libxaw>=1.0.5")
options=('!libtool')
install=plotutils.install
-source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz plotutils-2.6-libpng-1.5.patch)
+source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz{,.sig}
+ plotutils-2.6-libpng-1.5.patch)
sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838'
- '426f6ee04186af5059ab54322efaf0a6a976682b')
+ 'ab78e2d06402aaac367da7a0e5810439d5b9853f'
+ '492f0e04f8265ab50d9ba0905a0f5adf3ec06ab8')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/plotutils/plotutils-2.6-libpng-1.5.patch b/extra/plotutils/plotutils-2.6-libpng-1.5.patch
index b86d9f457..8a10d19e5 100644
--- a/extra/plotutils/plotutils-2.6-libpng-1.5.patch
+++ b/extra/plotutils/plotutils-2.6-libpng-1.5.patch
@@ -7,7 +7,7 @@ fix building with libpng-1.5
/* cleanup after libpng errors (error handler does a longjmp) */
- if (setjmp (png_ptr->jmpbuf))
-+ if (png_jmpbuf (png_ptr))
++ if (setjmp (png_jmpbuf (png_ptr)))
{
png_destroy_write_struct (&png_ptr, (png_info **)NULL);
return -1;
@@ -16,7 +16,7 @@ fix building with libpng-1.5
}
- longjmp (png_ptr->jmpbuf, 1);
-+ longjmp (png_jmpbuf (png_ptr), 1);
++ png_longjmp (png_ptr, 1);
}
static void
@@ -25,7 +25,7 @@ fix building with libpng-1.5
}
- longjmp (png_ptr->jmpbuf, 1);
-+ longjmp (png_jmpbuf (png_ptr), 1);
++ png_longjmp (png_ptr, 1);
}
static void
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index f7aa6735d..77bd108c3 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 170186 2012-11-04 10:04:35Z andrea $
+# $Id: PKGBUILD 171529 2012-11-18 11:57:31Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.3
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD
index 9f47b8bff..477ab5531 100644
--- a/extra/raptor/PKGBUILD
+++ b/extra/raptor/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162675 2012-06-27 20:59:49Z tomegun $
+# $Id: PKGBUILD 171519 2012-11-18 10:28:05Z andyrtr $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
# Contributor: eric <eric@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=raptor
pkgver=2.0.8
-pkgrel=1
+pkgrel=2
pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
arch=('i686' 'x86_64')
url="http://librdf.org/raptor"
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD
index 4a1880185..97b7c82f7 100644
--- a/extra/snd/PKGBUILD
+++ b/extra/snd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165577 2012-08-25 16:01:55Z schiv $
+# $Id: PKGBUILD 171550 2012-11-19 03:46:19Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: see .contrib
pkgname=snd
-pkgver=13.0
+pkgver=13.2
pkgrel=1
pkgdesc="An advanced sound editor"
arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ optdepends=('wavpack' 'flac' 'speex' 'mpg123'
'timidity++' 'vorbis-tools')
install=$pkgname.install
source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz")
-md5sums=('2288933fdaf012ed92c850d6dba90c54')
+md5sums=('303df8ac9e6d777e480e24b65a3bfaad')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 7ac43037c..b33312b05 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 170100 2012-11-01 18:21:54Z heftig $
+# $Id: PKGBUILD 171520 2012-11-18 10:28:08Z andyrtr $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -7,7 +7,7 @@ pkgbase=tracker
pkgname=(tracker libtracker-sparql)
pkgver=0.14.4
_tver=${pkgver%.*}
-pkgrel=1
+pkgrel=2
pkgdesc="All-in-one indexer, search tool and metadata database"
arch=('i686' 'x86_64')
license=('GPL')
diff --git a/extra/wcslib/PKGBUILD b/extra/wcslib/PKGBUILD
new file mode 100644
index 000000000..44b53b5bf
--- /dev/null
+++ b/extra/wcslib/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 171525 2012-11-18 11:23:12Z andrea $
+# Maintainer: Your Name <youremail@domain.com>
+
+pkgname=wcslib
+pkgver=4.16
+pkgrel=1
+pkgdesc="A C library that implements the 'World Coordinate System' (WCS) standard in FITS"
+arch=('i686' 'x86_64')
+url="http://www.atnf.csiro.au/people/Mark.Calabretta/WCS/"
+license=('GPL3')
+depends=('cfitsio')
+makedepends=('gcc-fortran')
+source=("ftp://ftp.atnf.csiro.au/pub/software/${pkgname}/${pkgname}.tar.bz2")
+md5sums=('30439a0bb730ef936646d646c9f07518')
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure --prefix=/usr \
+ --without-pgplot
+ make
+}
+
+#check() {
+# cd $pkgname-$pkgver
+# make -k check
+#}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir/" install
+
+ # Fix wrong permissions
+
+ chmod g=rx,-s "${pkgdir}"/usr/{bin/,/lib/{,pkgconfig},share/man/man1/}
+ chmod -s "${pkgdir}"/usr/{include/wcslib-${pkgver}/,share/doc/wcslib-${pkgver}/{,html/}}
+}
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
index cfc4d7652..2ff95de6d 100644
--- a/extra/webkitgtk/PKGBUILD
+++ b/extra/webkitgtk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165829 2012-08-31 06:08:20Z andyrtr $
+# $Id: PKGBUILD 171521 2012-11-18 10:28:10Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase=webkitgtk
pkgname=('webkitgtk2' 'webkitgtk3')
pkgver=1.10.1
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="http://webkitgtk.org/"
license=('custom')
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index 835f1f84a..5eb90d740 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170788 2012-11-11 10:32:52Z giovanni $
+# $Id: PKGBUILD 171536 2012-11-18 15:48:02Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: lucke <lucke at o2 dot pl>
pkgname=weechat
-pkgver=0.3.9.1
+pkgver=0.3.9.2
pkgrel=1
pkgdesc="Fast, light and extensible IRC client (curses UI)"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell')
optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell')
options=('!libtool')
source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('d26ddba44715da27c9df51ac87e8ce5b')
+md5sums=('636e96a62e60155f3b9769905d9912b9')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/libre/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch b/libre/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
new file mode 100644
index 000000000..ae3a57ecd
--- /dev/null
+++ b/libre/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
@@ -0,0 +1,29 @@
+From 1bf05e706b5edac92e9c913a69ca8686c6440f8b Mon Sep 17 00:00:00 2001
+From: Dan McGee <dan@archlinux.org>
+Date: Fri, 04 May 2012 16:41:40 +0000
+Subject: Ensure pre_upgrade scriptlet gets old package version
+
+This was accidentally broken in the refactor done in commit 73139ccb.
+
+Fixes FS#29371.
+
+Signed-off-by: Dan McGee <dan@archlinux.org>
+---
+diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
+index 6c2f0cb..c49d99b 100644
+--- a/lib/libalpm/add.c
++++ b/lib/libalpm/add.c
+@@ -488,8 +488,9 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
+ if(alpm_pkg_has_scriptlet(newpkg) &&
+ !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
+ const char *scriptlet_name = is_upgrade ? "pre_upgrade" : "pre_install";
+- _alpm_runscriptlet(handle, pkgfile,
+- scriptlet_name, newpkg->version, NULL, 1);
++
++ _alpm_runscriptlet(handle, pkgfile, scriptlet_name,
++ newpkg->version, oldpkg ? oldpkg->version : NULL, 1);
+ }
+
+ /* we override any pre-set reason if we have alldeps or allexplicit set */
+--
+cgit v0.9.0.2-13-g2bd3
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 4f05be586..85ae5cc5f 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,11 +1,11 @@
# vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 150148 2012-02-13 14:49:35Z dreisner $
+# $Id: PKGBUILD 171482 2012-11-18 01:57:51Z allan $
# Maintainer: Dan McGee <dan@archlinux.org>
-# Maintainer: Dave Reisner <dave@archlinux.org>
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
pkgname=pacman
pkgver=4.0.3
-pkgrel=3
+pkgrel=5
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.archlinux.org/pacman/"
@@ -21,6 +21,7 @@ options=(!libtool)
source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
0001-Add-conflict-for-replacing-owned-empty-directory.patch
0002-Check-empty-subdirectory-ownership.patch
+ 0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
pacman.conf
pacman.conf.x86_64
pacman.conf.mips64el
@@ -29,6 +30,7 @@ md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
'1a70392526c8768470da678b31905a6e'
'1a9b79788640907a2b34e8671cacc94a'
'a9ddd43891bed364e1e97d27b2887bf1'
+ '2e8cbf55a94b1954b167c5dee6b62317'
'080d9f76f56e135cc62205874636aa0f'
'ce9943fc8086d491890565e91ea1a0d8'
'eb8dba9bd0b315230fbf0e5dc0a7335b'
@@ -39,6 +41,7 @@ build() {
patch -p1 -i $srcdir/0001-Add-conflict-for-replacing-owned-empty-directory.patch
patch -p1 -i $srcdir/0002-Check-empty-subdirectory-ownership.patch
+ patch -p1 -i $srcdir/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --enable-doc
diff --git a/social/uftp/PKGBUILD b/social/uftp/PKGBUILD
new file mode 100644
index 000000000..1dea3b5ba
--- /dev/null
+++ b/social/uftp/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Markus Jochim <ich@markusjochim.de>
+# Maintainer (Parabola): fauno <fauno@parabola.nu>
+pkgname=uftp
+pkgver=3.7.1
+pkgrel=2
+pkgdesc="Multicast FTP software"
+arch=(i686 x86_64 mips64el)
+url="http://www.tcnj.edu/~bush/uftp.html"
+license=('GPL3')
+depends=('openssl')
+source=(http://www.tcnj.edu/~bush/downloads/uftp-${pkgver}.tar)
+md5sums=('0d3aa7d3e57251e8abf34027afa1e321')
+
+build() {
+ cd "$srcdir/uftp-${pkgver}/"
+
+ sed "s,/bin,/usr&,g" -i makefile
+
+ make CFLAGS="$CFLAGS"
+}
+
+package() {
+ cd "$srcdir/uftp-${pkgver}/"
+ make DESTDIR="${pkgdir}" install
+}
+