summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/akonadi/PKGBUILD4
-rw-r--r--extra/avogadro/PKGBUILD6
-rw-r--r--extra/boost/PKGBUILD8
-rw-r--r--extra/bzr/PKGBUILD13
-rw-r--r--extra/claws-mail/PKGBUILD13
-rw-r--r--extra/claws-mail/claws-notify-crash.patch18
-rw-r--r--extra/ekiga/PKGBUILD4
-rw-r--r--extra/help2man/PKGBUILD7
-rw-r--r--extra/help2man/help2man.install18
-rw-r--r--extra/hugin/PKGBUILD14
-rw-r--r--extra/hugin/hugin-gcc46.patch16
-rw-r--r--extra/kdeedu/PKGBUILD5
-rw-r--r--extra/libftdi/PKGBUILD18
-rw-r--r--extra/liborigin2/PKGBUILD4
-rw-r--r--extra/libpst/PKGBUILD4
-rw-r--r--extra/libtorrent-rasterbar/PKGBUILD4
-rw-r--r--extra/lyx/PKGBUILD11
-rw-r--r--extra/mkvtoolnix/PKGBUILD4
-rw-r--r--extra/neon/PKGBUILD29
-rw-r--r--extra/pidgin/PKGBUILD24
-rw-r--r--extra/pidgin/nm09-more.patch49
-rw-r--r--extra/pidgin/nm09-pidgin.patch38
-rw-r--r--extra/source-highlight/PKGBUILD4
-rw-r--r--extra/vigra/PKGBUILD19
-rw-r--r--extra/vigra/vigra-1.7.1.gcc460.patch33
-rw-r--r--extra/wesnoth/PKGBUILD8
26 files changed, 285 insertions, 90 deletions
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 4cef1ed2b..3e181dafa 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 122924 2011-05-07 10:20:40Z andrea $
+# $Id: PKGBUILD 124793 2011-05-24 13:10:03Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=akonadi
pkgver=1.5.3
-pkgrel=1
+pkgrel=2
pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
arch=('i686' 'x86_64')
url='http://pim.kde.org/akonadi'
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index 3e20b8186..6f1a6baf5 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 120742 2011-04-26 09:43:00Z andrea $
+# $Id: PKGBUILD 124796 2011-05-24 13:18:50Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
pkgname=avogadro
pkgver=1.0.3
-pkgrel=1
+pkgrel=2
pkgdesc="An advanced molecular editor based on Qt"
arch=('i686' 'x86_64')
url="http://avogadro.openmolecules.net/wiki/Main_Page"
license=('GPL2')
-depends=('eigen' 'openbabel' 'python2-qt' 'boost-libs' 'glew' 'python2-numpy')
+depends=('eigen' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
makedepends=('cmake' 'boost')
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
md5sums=('92c2702c1980f70fb6d87a1a58147911')
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index d4f0c9c78..d95541e63 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 114691 2011-03-15 13:50:13Z andrea $
+# $Id: PKGBUILD 124783 2011-05-24 12:31:42Z ibiru $
# Maintainer: kevin <kevin@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Kritoke <kritoke@gamebox.net>
@@ -6,9 +6,9 @@
pkgbase=boost
pkgname=('boost-libs' 'boost')
-pkgver=1.46.0
+pkgver=1.46.1
_boostver=${pkgver//./_}
-pkgrel=4
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.boost.org/"
makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
@@ -16,7 +16,7 @@ source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_bo
4994-compile-fix-for-Python32-v2.patch
boost-1.46.0-spirit.patch)
license=('custom')
-md5sums=('820393d5746553c192db7b81ba0e53fe'
+md5sums=('341e5d993b19d099bf1a548495ea91ec'
'cb59e8adbf2a45ef9264a2f4ab92b849'
'9d6e2f13fef23bf27d7bdddc104e182a')
diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD
index 849d9913b..7ae96eb77 100644
--- a/extra/bzr/PKGBUILD
+++ b/extra/bzr/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 119485 2011-04-11 18:46:01Z eric $
+# $Id: PKGBUILD 124960 2011-05-25 12:48:29Z andrea $
# Maintainer :
# Contributor: Hugo Doria <hugo@archlinux.org>
pkgname=bzr
-pkgver=2.3.1
+pkgver=2.3.3
pkgrel=1
pkgdesc="A decentralized revision control system (bazaar)"
arch=('i686' 'x86_64')
-url="http://www.bazaar-vcs.org"
+url="http://bazaar.canonical.com/en/"
license=('GPL')
depends=('python2')
optdepends=('python-paramiko: for sftp support')
-source=(http://launchpad.net/bzr/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('1a4367ce59a2880f321ecb882e195856')
-sha1sums=('49b9dfb5a01ffd87a120f8a7abf4833a482ba245')
+source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
+md5sums=('a8ca30af0431c691ce7e71a74497e31d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,7 +22,7 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- python2 setup.py install --prefix=/usr --root="${pkgdir}"
+ python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
# bash-completion
install -D -m644 contrib/bash/bzr "${pkgdir}/etc/bash_completion.d/bzr"
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
index 7e3760798..09a8564f2 100644
--- a/extra/claws-mail/PKGBUILD
+++ b/extra/claws-mail/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 121163 2011-04-29 06:26:08Z andyrtr $
+# $Id: PKGBUILD 124918 2011-05-25 08:15:13Z ibiru $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=claws-mail
pkgver=3.7.9
-pkgrel=2
+pkgrel=3
pkgdesc="A GTK+ based e-mail client."
arch=('i686' 'x86_64')
license=('GPL3')
@@ -20,12 +20,17 @@ replaces=('sylpheed-claws')
provides=('claws')
options=(!libtool)
install=claws-mail.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3')
+source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2
+ claws-notify-crash.patch)
+md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3'
+ '9a2903449f679344b5f5f51c91825b45')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+
+ patch -Np0 -i $srcdir/claws-notify-crash.patch
sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
+
./configure --prefix=/usr --disable-static \
--enable-enchant \
--enable-gnutls \
diff --git a/extra/claws-mail/claws-notify-crash.patch b/extra/claws-mail/claws-notify-crash.patch
new file mode 100644
index 000000000..e1d4eb686
--- /dev/null
+++ b/extra/claws-mail/claws-notify-crash.patch
@@ -0,0 +1,18 @@
+Index: src/main.c
+===================================================================
+RCS file: //claws/src/main.c,v
+retrieving revision 1.115.2.237
+retrieving revision 1.115.2.238
+diff -u -r1.115.2.237 -r1.115.2.238
+--- src/main.c 10 Apr 2011 17:19:04 -0000 1.115.2.237
++++ src/main.c 30 Apr 2011 19:27:15 -0000 1.115.2.238
+@@ -331,7 +331,7 @@
+ gtk_widget_show(hack);
+ }
+
+- xdisplay = gdk_display_get_default();
++ xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+ sn_display = sn_display_new(xdisplay,
+ sn_error_trap_push,
+ sn_error_trap_pop);
+
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 1b9b69283..7d4d83910 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 122127 2011-05-02 09:20:52Z heftig $
+# $Id: PKGBUILD 124817 2011-05-24 15:39:18Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Tom K <tomk@runbox.com>
pkgname=ekiga
pkgver=3.3.0
-pkgrel=3
+pkgrel=4
pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
url="http://www.ekiga.org"
license=(GPL)
diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index 171eb100d..ee5284faf 100644
--- a/extra/help2man/PKGBUILD
+++ b/extra/help2man/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 116002 2011-03-22 15:28:48Z giovanni $
+# $Id: PKGBUILD 124968 2011-05-25 13:58:20Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Paul Mattal <paul@mattal.com>
pkgname=help2man
-pkgver=1.39.2
+pkgver=1.39.4
pkgrel=1
pkgdesc="Conversion tool to create man files"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/help2man/"
license=('GPL')
depends=('perl-locale-gettext')
+install=help2man.install
source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('36659da3ba7a9a51813e1c4848900a28')
+md5sums=('6b1160697451ba87067231d172285840')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/help2man/help2man.install b/extra/help2man/help2man.install
new file mode 100644
index 000000000..ab6585b91
--- /dev/null
+++ b/extra/help2man/help2man.install
@@ -0,0 +1,18 @@
+info_dir=/usr/share/info
+info_files=(help2man.info)
+
+post_install() {
+ for f in ${info_files[@]}; do
+ install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ for f in ${info_files[@]}; do
+ install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+ done
+}
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 23aa5c7e8..736aeb71b 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 112014 2011-03-03 05:10:44Z eric $
+# $Id: PKGBUILD 124912 2011-05-25 06:37:46Z eric $
# Maintainer: Tobias Kieslich <tobias@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Dominik Ryba <domryba@post.pl>
pkgname=hugin
pkgver=2010.4.0
-pkgrel=2
+pkgrel=3
pkgdesc="A frontend to the panorama-tools"
arch=('i686' 'x86_64')
url="http://hugin.sourceforge.net/"
@@ -14,13 +14,15 @@ depends=('wxgtk' 'libpano13' 'boost-libs' 'enblend-enfuse' 'exiv2' 'openexr'
'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool')
makedepends=('zip' 'cmake' 'boost')
install=${pkgname}.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('bfd716655461987312b2f2f00c90dcc5')
-sha1sums=('47f25c0a8b97c27108e567bcd22203c87f268d07')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 hugin-gcc46.patch)
+md5sums=('bfd716655461987312b2f2f00c90dcc5'
+ '4393c7b31da60f230c85e63a6a2e43a0')
+sha1sums=('47f25c0a8b97c27108e567bcd22203c87f268d07'
+ '52798a155a037f853f41402f797e8a4cb6bb3e07')
build() {
cd "${srcdir}"
-
+ (cd ${pkgname}-${pkgver}; patch -p1 -i ../hugin-gcc46.patch)
mkdir build && cd build
cmake "${srcdir}/${pkgname}-${pkgver}" \
diff --git a/extra/hugin/hugin-gcc46.patch b/extra/hugin/hugin-gcc46.patch
new file mode 100644
index 000000000..98a70ad50
--- /dev/null
+++ b/extra/hugin/hugin-gcc46.patch
@@ -0,0 +1,16 @@
+
+diff -r 0377a1af6110 -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx
+--- a/src/foreign/vigra/vigra/multi_iterator.hxx Mon Jun 25 16:36:21 2007 +0000
++++ b/src/foreign/vigra/vigra/multi_iterator.hxx Tue Jan 25 21:14:13 2011 +0000
+@@ -41,6 +41,7 @@
+ #define VIGRA_MULTI_ITERATOR_HXX
+
+ #include <sys/types.h>
++#include <stddef.h>
+ #include "tinyvector.hxx"
+ #include "iteratortags.hxx"
+
+
+
+
+
diff --git a/extra/kdeedu/PKGBUILD b/extra/kdeedu/PKGBUILD
index a5770014e..a5a24fb20 100644
--- a/extra/kdeedu/PKGBUILD
+++ b/extra/kdeedu/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 122727 2011-05-06 08:29:55Z andrea $
+# $Id: PKGBUILD 124802 2011-05-24 13:56:35Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -26,7 +26,7 @@ pkgname=('kdeedu-blinken'
'kdeedu-rocs'
'kdeedu-step')
pkgver=4.6.3
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
@@ -46,7 +46,6 @@ build() {
cd ${srcdir}
mkdir build
cd build
- # rpath is needed for cantor to find R
cmake ../${pkgbase}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=OFF \
diff --git a/extra/libftdi/PKGBUILD b/extra/libftdi/PKGBUILD
index 8d89b2f88..b43d6ab53 100644
--- a/extra/libftdi/PKGBUILD
+++ b/extra/libftdi/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 101400 2010-11-29 04:43:52Z allan $
+# $Id: PKGBUILD 125350 2011-05-26 02:17:50Z eric $
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=libftdi
-pkgver=0.18
-pkgrel=2
+pkgver=0.19
+pkgrel=1
pkgdesc="A library to talk to FTDI chips"
-arch=("i686" "x86_64")
+arch=('i686' 'x86_64')
url="http://www.intra2net.com/en/developer/libftdi/download.php"
-license=("GPL2" "LGPL2.1")
-depends=('libusb-compat')
-makedepends=("boost")
+license=('GPL2' 'LGPL2.1')
+depends=('libusb-compat' 'gcc-libs')
+makedepends=('boost')
options=('!libtool')
source=("http://www.intra2net.com/en/developer/libftdi/download/$pkgname-$pkgver.tar.gz")
-md5sums=('916f65fa68d154621fc0cf1f405f2726')
-sha1sums=('52401db0e7cb90a5d83f82c2859a4f8d44e52579')
+md5sums=('e6e25f33b4327b1b7aa1156947da45f3')
+sha1sums=('0f08caf8e754ace69cd682489fae3f7f09920fe1')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/liborigin2/PKGBUILD b/extra/liborigin2/PKGBUILD
index 1944f0fe8..9d29118a9 100644
--- a/extra/liborigin2/PKGBUILD
+++ b/extra/liborigin2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 112096 2011-03-03 20:59:03Z eric $
+# $Id: PKGBUILD 124976 2011-05-25 14:38:34Z ibiru $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgbase=liborigin2
pkgname=('liborigin2' 'liborigin2-docs')
pkgver=20100913
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url="http://soft.proindependent.com/liborigin2/"
license=('GPL3')
diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
index ea581fe03..614c58ea4 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 112025 2011-03-03 09:42:31Z eric $
+# $Id: PKGBUILD 124979 2011-05-25 14:53:00Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=libpst
pkgname=('libpst' 'libpst-docs')
pkgver=0.6.49
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="http://www.five-ten-sg.com/libpst/"
license=('GPL')
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 44968f451..275c56431 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 120130 2011-04-20 11:35:26Z ibiru $
+# $Id: PKGBUILD 124787 2011-05-24 12:59:08Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
pkgname=libtorrent-rasterbar
pkgver=0.15.6
-pkgrel=1
+pkgrel=2
pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
url="http://www.rasterbar.com/products/libtorrent/"
arch=('i686' 'x86_64')
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index dec0a4419..ad728c47b 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 112021 2011-03-03 08:05:12Z eric $
+# $Id: PKGBUILD 124982 2011-05-25 15:39:01Z ibiru $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=lyx
-pkgver=1.6.9
-pkgrel=2
+pkgver=1.6.10
+pkgrel=1
pkgdesc="An advanced open-source document processor."
arch=('i686' 'x86_64')
url="http://www.lyx.org"
@@ -12,14 +12,15 @@ depends=('qt' 'texlive-core' 'python2' 'perl' 'imagemagick' 'aspell' 'aiksaurus'
makedepends=('boost')
license=('GPL')
source=(ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/$pkgname-$pkgver.tar.bz2 \
- lyx.desktop)
-sha1sums=('a1acacc8a26546542e32977ae222e811c98b1ca4'
+ lyx.desktop)
+sha1sums=('344e14897ea7d004bf181eac39355f1b08f0af83'
'e207a0b14d58aeb7b83f8fc47ab2e668cbc66844')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} +
sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp
+ export CXXFLAGS="$CXXFLAGS -fpermissive"
./configure --prefix=/usr \
--with-frontend=qt4 --without-included-boost
make
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index f0d957de4..6b609da9d 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124863 2011-05-24 19:57:14Z giovanni $
+# $Id: PKGBUILD 124985 2011-05-25 16:04:09Z ibiru $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: 03/08/04 <lefungus@altern.org>
pkgname=mkvtoolnix
pkgver=4.8.0
-pkgrel=1
+pkgrel=2
pkgdesc="Set of tools to create, edit and inspect Matroska files"
arch=('i686' 'x86_64')
license=('GPL')
diff --git a/extra/neon/PKGBUILD b/extra/neon/PKGBUILD
index c0fe650cf..3e908b618 100644
--- a/extra/neon/PKGBUILD
+++ b/extra/neon/PKGBUILD
@@ -1,29 +1,32 @@
-# $Id: PKGBUILD 121086 2011-04-29 00:26:05Z stephane $
+# $Id: PKGBUILD 124952 2011-05-25 12:20:04Z andrea $
+# Maintainer:
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# KEEP LIBTOOL FILES!
pkgname=neon
-pkgver=0.29.3
-pkgrel=3
+pkgver=0.29.6
+pkgrel=1
pkgdesc="HTTP and WebDAV client library with a C interface"
arch=('i686' 'x86_64')
license=('GPL' 'LGPL')
depends=('krb5' 'expat' 'ca-certificates')
url="http://www.webdav.org/neon/"
-source=("http://www.webdav.org/neon/${pkgname}-${pkgver}.tar.gz")
-md5sums=('ba1015b59c112d44d7797b62fe7bee51')
-options=('libtool')
+source=("http://www.webdav.org/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('591e0c82e6979e7e615211b386b8f6bc')
+options=('libtool') # FS#16067
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}"/${pkgname}-${pkgver}
./configure --prefix=/usr \
- --with-expat --enable-shared --disable-static \
- --with-ssl=openssl --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+ --with-expat \
+ --enable-shared \
+ --disable-static \
+ --with-ssl=openssl \
+ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
make
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index f58b92149..05883a1d8 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 123134 2011-05-08 21:15:31Z foutrelis $
+# $Id: PKGBUILD 124929 2011-05-25 09:33:46Z foutrelis $
# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,7 +7,7 @@
pkgname=('pidgin' 'libpurple' 'finch')
pkgver=2.7.11
-pkgrel=3
+pkgrel=5
arch=('i686' 'x86_64')
url="http://pidgin.im/"
license=('GPL')
@@ -16,12 +16,22 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool'
'networkmanager')
options=('!libtool')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('07c2a2535b4d7436b5ec7685fe063fec')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+ nm09-pidgin.patch
+ nm09-more.patch)
+md5sums=('07c2a2535b4d7436b5ec7685fe063fec'
+ '744a21b4dbaf949dba7cd3b75b12b4fe'
+ 'a673659d86c7a65aa710f7c8c7feda82')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ # Update for NetworkManager 0.9 connection states
+ # (http://developer.pidgin.im/ticket/13505)
+ # (http://developer.pidgin.im/ticket/13859)
+ patch -Np1 -i "$srcdir/nm09-pidgin.patch"
+ patch -Np1 -i "$srcdir/nm09-more.patch"
+
# Use Python 2
sed -i 's/env python$/\02/' */plugins/*.py \
libpurple/purple-{remote,notifications-example,url-handler}
@@ -51,7 +61,7 @@ package_pidgin(){
install=pidgin.install
cd "$srcdir/pidgin-$pkgver"
-
+
# For linking
make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
@@ -72,7 +82,7 @@ package_libpurple(){
'cyrus-sasl-plugins')
optdepends=('avahi: Bonjour protocol support'
'dbus-python: for purple-remote and purple-url-handler')
-
+
cd "$srcdir/pidgin-$pkgver"
for _dir in libpurple share/sounds share/ca-certs m4macros po; do
@@ -100,3 +110,5 @@ package_finch(){
rm "$pkgdir"/usr/share/man/man1/pidgin.1
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/pidgin/nm09-more.patch b/extra/pidgin/nm09-more.patch
new file mode 100644
index 000000000..8c708df9a
--- /dev/null
+++ b/extra/pidgin/nm09-more.patch
@@ -0,0 +1,49 @@
+diff -up pidgin-2.7.11/libpurple/network.c.nm09more pidgin-2.7.11/libpurple/network.c
+--- pidgin-2.7.11/libpurple/network.c.nm09more 2011-04-26 12:01:27.700085246 -0500
++++ pidgin-2.7.11/libpurple/network.c 2011-05-24 13:13:28.185165657 -0500
+@@ -833,8 +833,20 @@ purple_network_is_available(void)
+ purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n");
+ }
+
+- if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED)
+- return TRUE;
++ switch (nm_state)
++ {
++ case NM_STATE_UNKNOWN:
++#if NM_CHECK_VERSION(0,8,992)
++ case NM_STATE_CONNECTED_LOCAL:
++ case NM_STATE_CONNECTED_SITE:
++ case NM_STATE_CONNECTED_GLOBAL:
++#else
++ case NM_STATE_CONNECTED:
++#endif
++ return TRUE;
++ default:
++ break;
++ }
+
+ return FALSE;
+
+@@ -1170,9 +1182,14 @@ purple_network_init(void)
+ NM_DBUS_SERVICE,
+ NM_DBUS_PATH,
+ NM_DBUS_INTERFACE);
++ /* NM 0.6 signal */
+ dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID);
+ dbus_g_proxy_connect_signal(nm_proxy, "StateChange",
+ G_CALLBACK(nm_state_change_cb), NULL, NULL);
++ /* NM 0.7 and later signal */
++ dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID);
++ dbus_g_proxy_connect_signal(nm_proxy, "StateChanged",
++ G_CALLBACK(nm_state_change_cb), NULL, NULL);
+
+ dbus_proxy = dbus_g_proxy_new_for_name(nm_conn,
+ DBUS_SERVICE_DBUS,
+@@ -1207,6 +1224,7 @@ purple_network_uninit(void)
+ #ifdef HAVE_NETWORKMANAGER
+ if (nm_proxy) {
+ dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL);
++ dbus_g_proxy_disconnect_signal(nm_proxy, "StateChanged", G_CALLBACK(nm_state_change_cb), NULL);
+ g_object_unref(G_OBJECT(nm_proxy));
+ }
+ if (dbus_proxy) {
diff --git a/extra/pidgin/nm09-pidgin.patch b/extra/pidgin/nm09-pidgin.patch
new file mode 100644
index 000000000..1c2471d1f
--- /dev/null
+++ b/extra/pidgin/nm09-pidgin.patch
@@ -0,0 +1,38 @@
+diff -up pidgin-2.7.10/libpurple/network.c.foo pidgin-2.7.10/libpurple/network.c
+--- pidgin-2.7.10/libpurple/network.c.foo 2011-03-10 02:21:43.920933267 -0600
++++ pidgin-2.7.10/libpurple/network.c 2011-03-10 02:23:11.466838793 -0600
+@@ -71,6 +71,10 @@
+ #include <dbus/dbus-glib.h>
+ #include <NetworkManager.h>
+
++#if !defined(NM_CHECK_VERSION)
++#define NM_CHECK_VERSION(x,y,z) 0
++#endif
++
+ static DBusGConnection *nm_conn = NULL;
+ static DBusGProxy *nm_proxy = NULL;
+ static DBusGProxy *dbus_proxy = NULL;
+@@ -863,7 +867,13 @@ nm_update_state(NMState state)
+
+ switch(state)
+ {
++#if NM_CHECK_VERSION(0,8,992)
++ case NM_STATE_CONNECTED_LOCAL:
++ case NM_STATE_CONNECTED_SITE:
++ case NM_STATE_CONNECTED_GLOBAL:
++#else
+ case NM_STATE_CONNECTED:
++#endif
+ /* Call res_init in case DNS servers have changed */
+ res_init();
+ /* update STUN IP in case we it changed (theoretically we could
+@@ -880,6 +890,9 @@ nm_update_state(NMState state)
+ case NM_STATE_ASLEEP:
+ case NM_STATE_CONNECTING:
+ case NM_STATE_DISCONNECTED:
++#if NM_CHECK_VERSION(0,8,992)
++ case NM_STATE_DISCONNECTING:
++#endif
+ if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
+ break;
+ if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index 4846c97f0..144077a2b 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 111993 2011-03-02 22:17:55Z ibiru $
+# $Id: PKGBUILD 124988 2011-05-25 16:07:54Z ibiru $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=source-highlight
pkgver=3.1.4
-pkgrel=2
+pkgrel=3
pkgdesc="Convert source code to syntax highlighted document"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/src-highlite/"
diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD
index 88bd5696b..0f4d40330 100644
--- a/extra/vigra/PKGBUILD
+++ b/extra/vigra/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 112123 2011-03-04 03:09:16Z eric $
+# $Id: PKGBUILD 124991 2011-05-25 16:14:08Z ibiru $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=vigra
-pkgver=1.7.0
-pkgrel=6
+pkgver=1.7.1
+pkgrel=2
pkgdesc="Computer vision library"
arch=('i686' 'x86_64')
url="http://hci.iwr.uni-heidelberg.de/vigra/"
@@ -14,13 +14,14 @@ makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-num
optdepends=('python2: for python bindings'
'boost-libs: for python bindings')
options=('!libtool')
-source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz libpng-1.4.patch)
-md5sums=('a40b3b013653f75dc84ba55b2df1fae2' 'db610e48558eb323490ad21d636bac76')
-sha1sums=('31875646cbb1928d93c96fc4da4fda31772cf8f6' '5f668c861f5fe927a4f51014afab94805db60c46')
+source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz
+ vigra-1.7.1.gcc460.patch)
+md5sums=('2bde208e0fd7626770169dd4fa097282'
+ '25ef8bc26bc38ee67e5b512d2acd0166')
build() {
- cd "${srcdir}"/${pkgname}-${pkgver}-src
- patch -p1 < ../libpng-1.4.patch
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_VIGRANUMPY=1 \
-DDOCINSTALL=share/doc
@@ -28,7 +29,7 @@ build() {
}
package() {
- cd "${srcdir}"/${pkgname}-${pkgver}-src
+ cd "${srcdir}"/${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
# license
install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
diff --git a/extra/vigra/vigra-1.7.1.gcc460.patch b/extra/vigra/vigra-1.7.1.gcc460.patch
new file mode 100644
index 000000000..46f194dbc
--- /dev/null
+++ b/extra/vigra/vigra-1.7.1.gcc460.patch
@@ -0,0 +1,33 @@
+diff -baur vigra-1.7.1.old/include/vigra/random_forest.hxx vigra-1.7.1/include/vigra/random_forest.hxx
+--- vigra-1.7.1.old/include/vigra/random_forest.hxx 2010-12-03 17:40:34.000000000 +0000
++++ vigra-1.7.1/include/vigra/random_forest.hxx 2011-01-28 00:16:32.000000000 +0000
+@@ -43,6 +43,7 @@
+ #include <set>
+ #include <list>
+ #include <numeric>
++#include <stddef.h>
+ #include "mathutil.hxx"
+ #include "array_vector.hxx"
+ #include "sized_int.hxx"
+diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx vigra-1.7.1/include/vigra/sifImport.hxx
+--- vigra-1.7.1.old/include/vigra/sifImport.hxx 2010-12-03 17:40:34.000000000 +0000
++++ vigra-1.7.1/include/vigra/sifImport.hxx 2011-01-28 00:23:31.000000000 +0000
+@@ -57,6 +57,7 @@
+ #include <fstream>
+ #include <cstring>
+ #include <vector>
++#include <stddef.h>
+ #include "vigra/multi_array.hxx"
+
+ namespace vigra {
+diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx vigra-1.7.1/include/vigra/multi_iterator.hxx
+--- vigra-1.7.1.old/include/vigra/multi_iterator.hxx 2010-12-03 17:40:34.000000000 +0000
++++ vigra-1.7.1/include/vigra/multi_iterator.hxx 2011-01-28 00:23:31.000000000 +0000
+@@ -41,6 +41,7 @@
+ #define VIGRA_MULTI_ITERATOR_HXX
+
+ #include <sys/types.h>
++#include <stddef.h>
+ #include "tinyvector.hxx"
+ #include "iteratortags.hxx"
+
diff --git a/extra/wesnoth/PKGBUILD b/extra/wesnoth/PKGBUILD
index a60a35818..67a9f56de 100644
--- a/extra/wesnoth/PKGBUILD
+++ b/extra/wesnoth/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 112017 2011-03-03 06:20:54Z eric $
+# $Id: PKGBUILD 125126 2011-05-25 17:01:35Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Jacobo Arvelo <unix4all@ya.com>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=wesnoth
-pkgver=1.8.5
-pkgrel=3
+pkgver=1.8.6
+pkgrel=1
pkgdesc="A turn-based strategy game on a fantasy world"
arch=('i686' 'x86_64')
license=('GPL')
@@ -16,7 +16,7 @@ makedepends=('boost')
install=wesnoth.install
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2
wesnoth-libpng-1.4.0.patch)
-md5sums=('a800285d1406690755dd0ea22b98b6df'
+md5sums=('f1c3179869b01b61e253e74aeb241034'
'ca7412ffc4682ef55ddf82d56b0e2f08')
build() {