summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community-staging/spring/PKGBUILD55
-rw-r--r--community/adesklets/PKGBUILD31
-rw-r--r--community/adesklets/posix_signal.patch81
-rw-r--r--community/alsa-tools/PKGBUILD40
-rw-r--r--community/arptables/PKGBUILD38
-rw-r--r--community/arptables/arptables.rc58
-rw-r--r--community/cabextract/PKGBUILD4
-rw-r--r--community/converseen/PKGBUILD4
-rw-r--r--community/convertlit/PKGBUILD31
-rw-r--r--community/cpupower/PKGBUILD43
-rw-r--r--community/cpupower/conf14
-rw-r--r--community/cpupower/rc31
-rw-r--r--community/efax-gtk/PKGBUILD4
-rw-r--r--community/ext4magic/PKGBUILD26
-rw-r--r--community/flashrom/PKGBUILD6
-rw-r--r--community/gsoap/PKGBUILD6
-rw-r--r--community/gstreamermm/PKGBUILD16
-rw-r--r--community/gstreamermm/gstreamermm.changelog9
-rw-r--r--community/httperf/PKGBUILD28
-rw-r--r--community/ipset/PKGBUILD10
-rw-r--r--community/libdbi/PKGBUILD6
-rw-r--r--community/libdbi/libdbi.install8
-rw-r--r--community/libtommath/PKGBUILD32
-rw-r--r--community/libtommath/libtommath-0.42.0-makefile.patch44
-rw-r--r--community/lsscsi/PKGBUILD27
-rw-r--r--community/pcsclite/PKGBUILD8
-rw-r--r--community/perf/PKGBUILD4
-rw-r--r--community/picocom/PKGBUILD26
-rw-r--r--community/redis/PKGBUILD6
-rw-r--r--community/rxvt/PKGBUILD34
-rw-r--r--community/sshpass/PKGBUILD28
-rw-r--r--community/sysstat/PKGBUILD10
-rw-r--r--community/vifm/PKGBUILD6
-rw-r--r--community/vifm/vifm.changelog3
-rw-r--r--core/libevent/PKGBUILD8
-rw-r--r--core/syslog-ng/PKGBUILD8
-rw-r--r--extra/asio/PKGBUILD4
-rw-r--r--extra/aspell-it/PKGBUILD10
-rw-r--r--extra/barcode/PKGBUILD4
-rw-r--r--extra/cairo-perl/PKGBUILD21
-rw-r--r--extra/ccache/PKGBUILD4
-rw-r--r--extra/chkrootkit/PKGBUILD4
-rw-r--r--extra/chmlib/PKGBUILD6
-rw-r--r--extra/cinepaint/PKGBUILD6
-rw-r--r--extra/cln/PKGBUILD4
-rw-r--r--extra/crypto++/PKGBUILD24
-rw-r--r--extra/ctags/PKGBUILD13
-rw-r--r--extra/diffstat/PKGBUILD4
-rw-r--r--extra/djvulibre/PKGBUILD15
-rw-r--r--extra/djvulibre/git-fixes.patch1607
-rw-r--r--extra/dmidecode/PKGBUILD15
-rw-r--r--extra/dvdauthor/PKGBUILD8
-rw-r--r--extra/dvdrip/PKGBUILD9
-rw-r--r--extra/dvgrab/PKGBUILD6
-rw-r--r--extra/ebook-tools/PKGBUILD10
-rw-r--r--extra/enca/PKGBUILD17
-rw-r--r--extra/fping/PKGBUILD23
-rw-r--r--extra/fping/fping-2.4b2_p161-min-time.patch47
-rw-r--r--extra/fping/fping_2.4b2-to-ipv6-16.1.diff838
-rw-r--r--extra/fyre/PKGBUILD6
-rw-r--r--extra/gamin/PKGBUILD13
-rw-r--r--extra/gamin/fix-deprecated-const.patch56
-rw-r--r--extra/garcon/PKGBUILD37
-rw-r--r--extra/gconf-perl/PKGBUILD20
-rw-r--r--extra/gconf-perl/disable-orbit.patch30
-rw-r--r--extra/gif2png/PKGBUILD12
-rw-r--r--extra/gksu/PKGBUILD18
-rw-r--r--extra/glib-perl/PKGBUILD17
-rw-r--r--extra/gpart/PKGBUILD40
-rw-r--r--extra/gpart/gpart-0.1h-l64seek.patch71
-rw-r--r--extra/gpart/gpart-0.1h-openmode.patch11
-rw-r--r--extra/gpart/gpart-0.1h-reiserfs-3.6.patch443
-rw-r--r--extra/gtk-qt-engine/PKGBUILD17
-rw-r--r--extra/gtk2-perl/PKGBUILD28
-rw-r--r--extra/gtkglextmm/PKGBUILD4
-rw-r--r--extra/gtkimageview/PKGBUILD17
-rw-r--r--extra/hd2u/PKGBUILD6
-rw-r--r--extra/help2man/PKGBUILD4
-rw-r--r--extra/hexedit/PKGBUILD9
-rw-r--r--extra/hspell/PKGBUILD4
-rw-r--r--extra/java-commons-daemon/PKGBUILD5
-rw-r--r--extra/k9copy/PKGBUILD6
-rw-r--r--extra/libgksu/PKGBUILD14
-rw-r--r--extra/pango-perl/PKGBUILD23
-rw-r--r--extra/perl-dbd-mysql/PKGBUILD6
-rw-r--r--extra/telepathy-glib/PKGBUILD14
-rw-r--r--libre/lsb-release-libre/PKGBUILD4
-rw-r--r--libre/lsb-release-libre/lsb-release.install10
-rw-r--r--testing/shadow/PKGBUILD7
-rw-r--r--testing/shadow/chpasswd2
90 files changed, 4148 insertions, 298 deletions
diff --git a/community-staging/spring/PKGBUILD b/community-staging/spring/PKGBUILD
new file mode 100644
index 000000000..7fffb6dbf
--- /dev/null
+++ b/community-staging/spring/PKGBUILD
@@ -0,0 +1,55 @@
+# $Id: PKGBUILD 59573 2011-11-28 10:26:10Z svenstaro $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Arkham <arkham at archlinux dot us>
+# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=spring
+pkgver=0.84.0
+_pkgver=84.0
+pkgrel=1
+pkgdesc='A free 3D real-time-strategy (RTS) game engine'
+arch=('i686' 'x86_64')
+url="http://springrts.com/"
+license=('GPL')
+depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis')
+makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2')
+optdepends=('python2: python-based bots'
+ 'java-runtime: java-based bots')
+source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma)
+md5sums=('2aae395c055adceec5326fb3faec92ba')
+
+build() {
+ bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma
+
+ cd spring_${_pkgver}
+
+ sed -i "s/FE_DFL_ENV/FE_DFL_ENV_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp rts/lib/streflop/SMath.cpp
+ sed -i "s/FE_INVALID/FE_INVALID_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp
+ sed -i "s/FE_DENORMAL/FE_DENORMAL_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp
+ sed -i "s/FE_DIVBYZERO/FE_DIVBYZERO_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp
+ sed -i "s/FE_OVERFLOW/FE_OVERFLOW_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp
+ sed -i "s/FE_UNDERFLOW/FE_UNDERFLOW_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp
+ sed -i "s/FE_INEXACT/FE_INEXACT_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp
+ sed -i "s/FE_ALL_EXCEPT/FE_ALL_EXCEPT_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp
+ sed -i "s/FE_DOWNWARD/FE_DOWNWARD_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp
+ sed -i "s/FE_TONEAREST/FE_TONEAREST_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp
+ sed -i "s/FE_TOWARDZERO/FE_TOWARDZERO_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp
+ sed -i "s/FE_UPWARD/FE_UPWARD_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp
+ sed -i "s/feclearexcept/feclearexcept_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp
+
+ cmake . \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DDATADIR=share/spring
+ make
+}
+
+package() {
+ cd spring_${_pkgver}
+
+ make DESTDIR=$pkgdir install
+
+ install -d $pkgdir/etc/spring
+ echo '$HOME/.spring' > $pkgdir/etc/spring/datadir
+}
+
+# vim sw=2:ts=2 et:
diff --git a/community/adesklets/PKGBUILD b/community/adesklets/PKGBUILD
index d7f97a0c7..607ac3847 100644
--- a/community/adesklets/PKGBUILD
+++ b/community/adesklets/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 26100 2010-09-13 15:56:15Z schuay $
+# $Id: PKGBUILD 59648 2011-11-29 01:35:36Z ebelanger $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Fubar
pkgname=adesklets
pkgver=0.6.1
-pkgrel=11
+pkgrel=12
pkgdesc="An imlib2-based system to have interactive 'desklets'."
arch=('i686' 'x86_64')
url="http://adesklets.sourceforge.net/"
@@ -13,19 +13,21 @@ depends=('imlib2' 'fontconfig' 'python2' 'perl' 'ttf-bitstream-vera' 'libx11')
install=$pkgname.install
options=('!emptydirs')
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
- fontconfig-2.4.patch)
-
+ fontconfig-2.4.patch posix_signal.patch)
md5sums=('cd390c9398449c5566033e2e4792bccb'
- '0374aec97670c90713fcabc2710e2160')
+ '0374aec97670c90713fcabc2710e2160'
+ 'd9ac15cc92f833f2446218e487e6c607')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -p1 -i "${srcdir}/posix_signal.patch"
#patch for fontconfig => 2.4
- patch -Np0 -i ${srcdir}/fontconfig-2.4.patch
+ patch -Np0 -i "${srcdir}/fontconfig-2.4.patch"
autoreconf
- ./configure --prefix=/usr
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr
#makefile Fix
sed -i 's/\/bin\/sh//' doc/Makefile
@@ -37,16 +39,15 @@ build() {
make
}
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} INSTALLDIRS=vendor install
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
- rm ${pkgdir}/usr/share/info/dir
+ make DESTDIR="${pkgdir}" INSTALLDIRS=vendor install
#remove the font stuff
- rm -f ${pkgdir}/usr/share/adesklets/{FONT_LICENSE,Vera.ttf}
+ rm -f "${pkgdir}"/usr/share/adesklets/{FONT_LICENSE,Vera.ttf}
- find ${pkgdir} -name '.packlist' -exec rm '{}' \;
- find ${pkgdir} -name 'perllocal.pod' -exec rm '{}' \;
+ find "${pkgdir}" -name '.packlist' -exec rm '{}' \;
+ find "${pkgdir}" -name 'perllocal.pod' -exec rm '{}' \;
}
diff --git a/community/adesklets/posix_signal.patch b/community/adesklets/posix_signal.patch
new file mode 100644
index 000000000..90b3e8a12
--- /dev/null
+++ b/community/adesklets/posix_signal.patch
@@ -0,0 +1,81 @@
+From 92e686badce5c549699a30e82458a42dbcd99183 Mon Sep 17 00:00:00 2001
+From: Sylvain <syfou@users.sourceforge.net>
+Date: Wed, 2 May 2007 13:23:18 -0400
+Subject: [PATCH] Definitive fix for the signal module importation problem
+ ...from posix_signal on some amd64 systems. Many thanks to Jason
+ Pontious for his support and patience.
+
+---
+ scripting/python/posix_signal.c | 34 ++++++++++++++++++----------------
+ 1 files changed, 18 insertions(+), 16 deletions(-)
+
+diff --git a/scripting/python/posix_signal.c b/scripting/python/posix_signal.c
+index 620248f..7c5ac25 100644
+--- a/scripting/python/posix_signal.c
++++ b/scripting/python/posix_signal.c
+@@ -1,16 +1,17 @@
+ /*--- posix_signal.c -----------------------------------------------------------
+-This is nothing but a forward port from older python code by Lance Ellinghaus,
+-Guido van Rossum & al., reformatted and put back together by Sylvain Fourmanoit <syfou@users.sourceforge.net>
+-for recent (2.2.0 final and newer) python implementations.
+-
+-The ability to temporarily delay signals delivery is a very usefull feature -
+-not all C functions are reentrant (in fact, only a few need to be 'safe'
+-according to the POSIX 1003.1-2003 list), so being able to create critical
+-code sections is a must. Although I am convinced Python's developpers
+-had good reasons, I do not know myself why 'sigprocmask' and associated
+-functions support was dropped from the signal module on systems which
+-implemented them... Since I needed them in my blissful ignorance,
+-here they are, alive and kicking. :-)
++This is nothing but a forward port from older python code by Lance
++Ellinghaus, Guido van Rossum & al., reformatted and put back together
++by Sylvain Fourmanoit <syfou@users.sourceforge.net> for recent (2.2.0
++final and newer) python implementations.
++
++The ability to temporarily delay signals delivery is a very usefull
++feature - not all C functions are reentrant (in fact, only a few need
++to be 'safe' according to the POSIX 1003.1-2003 list), so being able
++to create critical code sections is a must. Although I am convinced
++Python's developpers had good reasons, I do not know myself why
++'sigprocmask' and associated functions support was dropped from the
++signal module on systems which implemented them... Since I needed them
++in my blissful ignorance, here they are, alive and kicking. :-)
+
+ ------------------------------------------------------------------------------*/
+ #include <Python.h>
+@@ -214,8 +215,9 @@ PyMODINIT_FUNC
+ initposix_signal(void)
+ {
+ const char * KEYS [] = { "__doc__", "__name__" , NULL};
+- int i, pos=0;
++ int i;
+ char * key_str, * doc_str , * new_str;
++ Py_ssize_t pos = 0;
+ PyObject * m, * mDoc, *d,
+ * pName, * pModule, * pDict,
+ * key, * value, *x;
+@@ -236,7 +238,6 @@ initposix_signal(void)
+ /* The chunk of code below roughly perfoms python equivalent of:
+ 'from signal import *' inside what would be a pure python posix_signal
+ module ... */
+- pName=PyString_FromString("signal");
+ if ((pModule=PyImport_Import((pName=PyString_FromString("signal"))))) {
+ pDict=PyModule_GetDict(pModule);
+ while (PyDict_Next(pDict, &pos, &key, &value))
+@@ -246,10 +247,11 @@ initposix_signal(void)
+ for(i=0;KEYS[i];++i)
+ if (strncmp(key_str,KEYS[i],strlen(KEYS[i]))==0)
+ break;
+- if (!KEYS[i])
++ if (!KEYS[i]) {
+ /* This needs python 2.2 and up */
++ Py_INCREF(value);
+ PyModule_AddObject(m,key_str,value);
+- else {
++ } else {
+ if (i==0) {
+ /* Append signal module documentation */
+ if ((mDoc=PyDict_GetItemString(d,KEYS[0]))) {
+--
+1.6.5.GIT
+
diff --git a/community/alsa-tools/PKGBUILD b/community/alsa-tools/PKGBUILD
new file mode 100644
index 000000000..1e097048e
--- /dev/null
+++ b/community/alsa-tools/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 59642 2011-11-28 23:44:29Z seblu $
+#Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+#Contributor: Jochen Immend�rfer <jochen dot immendoerfer at gmail dot com>
+
+pkgname=alsa-tools
+pkgver=1.0.24.1
+pkgrel=1
+pkgdesc='ALSA tools package'
+arch=('i686' 'x86_64')
+url='http://alsa-project.org/'
+license=('GPL2')
+depends=('fltk' 'alsa-lib' 'gtk2')
+options=('!libtool')
+source=("ftp://ftp.alsa-project.org/pub/tools/$pkgname-$pkgver.tar.bz2")
+md5sums=('08fe93a12006093e590d7ecc02b119dd')
+
+build() {
+ for f in $(find "$srcdir/$pkgname-$pkgver" -type f -name configure ); do
+ [[ -x $f ]] || continue
+ cd "${f%/*}"
+ [[ qlo10k1 = ${PWD##*/} ]] && continue
+ [[ hwmixvolume = ${PWD##*/} ]] && continue
+ msg2 "Building ${PWD##*/}"
+ ./configure --prefix=/usr --x-libraries=/usr/lib
+ make
+ done
+}
+
+package() {
+ for f in $(find "$srcdir/$pkgname-$pkgver" -type f -name configure ); do
+ [[ -x $f ]] || continue
+ cd "${f%/*}"
+ [[ qlo10k1 = ${PWD##*/} ]] && continue
+ [[ hwmixvolume = ${PWD##*/} ]] && continue
+ msg2 "Installing ${PWD##*/}"
+ make "DESTDIR=$pkgdir" install
+ done
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/arptables/PKGBUILD b/community/arptables/PKGBUILD
new file mode 100644
index 000000000..172baf2bd
--- /dev/null
+++ b/community/arptables/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 59644 2011-11-29 01:04:59Z seblu $
+# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net
+# Contributor: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Michal Soltys <soltys@ziu.info>
+
+pkgname=arptables
+pkgver=0.0.3_4
+pkgrel=1
+pkgdesc='ARP filtering utility'
+arch=('i686' 'x86_64')
+url='http://ebtables.sourceforge.net/'
+license=('GPL')
+source=("http://downloads.sourceforge.net/ebtables/$pkgname-v${pkgver//_/-}.tar.gz" 'arptables.rc')
+md5sums=('1d4ab05761f063b0751645d8f2b8f8e5'
+ 'f8c0ecad9151a16347c133e043232d4a')
+
+build() {
+ cd $pkgname-v${pkgver//_/-}
+ make
+}
+
+package() {
+ # install rc script
+ install -D -m 0755 arptables.rc "$pkgdir/etc/rc.d/arptables"
+
+ # setup arptables
+ cd $pkgname-v${pkgver//_/-}
+ make install \
+ DESTDIR="$pkgdir" \
+ PREFIX=/usr \
+ LIBDIR=/usr/lib/arptables \
+ BINDIR=/usr/sbin \
+ MANDIR=/usr/share/man \
+ INITDIR=/etc/rc.d \
+ SYSCONFIGDIR=/etc/arptables
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/arptables/arptables.rc b/community/arptables/arptables.rc
new file mode 100644
index 000000000..dae90ac2a
--- /dev/null
+++ b/community/arptables/arptables.rc
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+[[ -x /usr/sbin/arptables ]] || exit 1
+[[ -x /usr/sbin/arptables-save ]] || exit 1
+[[ -x /usr/sbin/arptables-restore ]] || exit 1
+
+do_start() {
+ stat_busy "Restore arptables rules"
+ if [[ -r /etc/arptables/arptables ]]; then
+ /usr/sbin/arptables-restore </etc/arptables/arptables
+ (( $? == 0 )) && stat_done && add_daemon arptables && return
+ fi
+ stat_fail
+}
+
+do_stop() {
+ stat_busy "Flushing arptables rules"
+ /usr/sbin/arptables-restore </dev/null
+ if (( $? == 0 )); then
+ stat_done
+ rm_daemon arptables
+ else
+ stat_fail
+ fi
+}
+
+do_save() {
+ stat_busy "Saving arptables rules"
+ /usr/sbin/arptables-save >/etc/arptables/arptables
+ (( $? == 0 )) && stat_done || stat_fail
+}
+
+case "$1" in
+ start)
+ do_start
+ ;;
+ stop)
+ do_stop
+ ;;
+ restart)
+ do_stop
+ do_start
+ ;;
+ save)
+ do_save
+ ;;
+ status)
+ /usr/sbin/arptables-save
+ ;;
+ *)
+ echo "Usage $0 {start|stop|restart|save|status}" >&2
+ exit 1
+esac
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/cabextract/PKGBUILD b/community/cabextract/PKGBUILD
index 70ec10920..07dca6cef 100644
--- a/community/cabextract/PKGBUILD
+++ b/community/cabextract/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 50767 2011-06-30 19:23:26Z giovanni $
+# $Id: PKGBUILD 59583 2011-11-28 16:44:30Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
pkgname=cabextract
pkgver=1.4
-pkgrel=1
+pkgrel=2
pkgdesc="A program to extract Microsoft cabinet (.CAB) files"
arch=('i686' 'x86_64')
license=('GPL')
diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD
index 3715eb04c..9cb8758be 100644
--- a/community/converseen/PKGBUILD
+++ b/community/converseen/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 57374 2011-10-26 14:37:55Z giovanni $
+# $Id: PKGBUILD 59585 2011-11-28 16:53:50Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: archtux <antonio.arias99999 at gmail.com>
pkgname=converseen
pkgver=0.4.6
-pkgrel=3
+pkgrel=4
pkgdesc="The batch image converter and resizer"
arch=('i686' 'x86_64')
url="http://converseen.sourceforge.net/"
diff --git a/community/convertlit/PKGBUILD b/community/convertlit/PKGBUILD
new file mode 100644
index 000000000..3cfb61356
--- /dev/null
+++ b/community/convertlit/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 59640 2011-11-28 23:08:09Z giovanni $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: gDD (usrgdd | gmail)
+# Contributor: cantabile
+
+pkgname=convertlit
+pkgver=1.8
+pkgrel=5
+pkgdesc="An extractor/converter for .LIT eBooks"
+arch=('i686' 'x86_64')
+url="http://www.convertlit.com/"
+license=('GPL')
+depends=('glibc')
+makedepends=('libtommath')
+source=("http://www.convertlit.com/clit18src.zip")
+md5sums=('d691d4729485fe5d73e3f0937d8fb42e')
+
+build() {
+ cd ${srcdir}/lib
+ make
+
+ cd ../clit18
+ sed -i 's|../libtommath-0.30/|/usr/lib/|' Makefile
+ make
+}
+
+package() {
+ cd ${srcdir}/clit18
+
+ install -Dm755 clit "$pkgdir/usr/bin/clit"
+}
diff --git a/community/cpupower/PKGBUILD b/community/cpupower/PKGBUILD
new file mode 100644
index 000000000..f336126b8
--- /dev/null
+++ b/community/cpupower/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 59600 2011-11-28 20:02:34Z seblu $
+# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+
+pkgname=cpupower
+pkgver=3.1.3
+pkgrel=1
+pkgdesc="Linux kernel power tool"
+license=('GPL2')
+arch=('i686' 'x86_64')
+url='http://www.kernel.org'
+backup=('etc/conf.d/cpupower')
+options=(!strip !buildflags)
+depends=('pciutils')
+conflicts=('cpufrequtils')
+provides=("cpufrequtils=$pkgver")
+source=(
+ "http://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$pkgver.tar.xz"
+ 'rc'
+ 'conf'
+)
+md5sums=('d15080e5be9c05e6981320232ca68e3f'
+ 'd8b119eff7dc1a2d655eb71a47fa6215'
+ '218fd36a7957d3170ed8bd1a0be1f62f')
+
+build() {
+ cd linux-$pkgver/tools/power/cpupower
+ make
+}
+
+package() {
+ cd linux-$pkgver/tools/power/cpupower
+ make \
+ DESTDIR="$pkgdir" \
+ INSTALL='/bin/install -c' \
+ mandir='/usr/share/man' \
+ docdir='/usr/share/doc/cpupower' \
+ install install-man
+ # install rc.d script
+ install -D -m 755 "$srcdir/rc" "$pkgdir/etc/rc.d/cpupower"
+ install -D -m 644 "$srcdir/conf" "$pkgdir/etc/conf.d/cpupower"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/cpupower/conf b/community/cpupower/conf
new file mode 100644
index 000000000..0f56836b1
--- /dev/null
+++ b/community/cpupower/conf
@@ -0,0 +1,14 @@
+# valid governors:
+# ondemand, performance, powersave,
+# conservative, userspace
+#governor="ondemand"
+
+# limit frequency range (optional)
+# valid suffixes: Hz, kHz (default), MHz, GHz, THz
+#min_freq="2.25GHz"
+#max_freq="3GHz"
+
+# use freq to set up the exact cpu frequency using it with userspace governor
+#freq=
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/cpupower/rc b/community/cpupower/rc
new file mode 100644
index 000000000..812637b61
--- /dev/null
+++ b/community/cpupower/rc
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+[[ -f /etc/conf.d/cpupower ]] && . /etc/conf.d/cpupower
+
+case "$1" in
+ start|restart)
+ stat_busy "Setting cpupower rules"
+
+ declare params=''
+ if [[ "$governor" ]]; then
+ params="-g $governor "
+ params+="${min_freq:+-d $min_freq} "
+ params+="${max_freq:+-u $max_freq} "
+ params+="${freq:+-f $freq} "
+ cpupower frequency-set $params >/dev/null || { stat_fail; exit 1; }
+ stat_done
+ else
+ stat_append ': Invalid configuration'
+ stat_fail
+ fi
+ ;;
+ *)
+ echo "usage: $0 {start|restart}"
+esac
+
+true
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/efax-gtk/PKGBUILD b/community/efax-gtk/PKGBUILD
index 611b45f8b..6376c66e4 100644
--- a/community/efax-gtk/PKGBUILD
+++ b/community/efax-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 57276 2011-10-25 09:32:03Z giovanni $
+# $Id: PKGBUILD 59587 2011-11-28 18:05:39Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
pkgname=efax-gtk
pkgver=3.2.8
-pkgrel=1
+pkgrel=2
pkgdesc="A GUI front end for the 'efax' fax program"
arch=('i686' 'x86_64')
url="http://efax-gtk.sourceforge.net/"
diff --git a/community/ext4magic/PKGBUILD b/community/ext4magic/PKGBUILD
new file mode 100644
index 000000000..424fe129f
--- /dev/null
+++ b/community/ext4magic/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 59609 2007-01-01 00:07:53Z seblu $
+# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+
+pkgname=ext4magic
+pkgver=0.2.3
+pkgrel=2
+pkgdesc='Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems'
+arch=('i686' 'x86_64')
+url='http://developer.berlios.de/projects/ext4magic/'
+license=('GPL2')
+depends=('util-linux' 'e2fsprogs')
+source=("http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('b23ecf9dccc8b597fbbe2d149d0c08ac')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/flashrom/PKGBUILD b/community/flashrom/PKGBUILD
index 442622f79..4a3495d02 100644
--- a/community/flashrom/PKGBUILD
+++ b/community/flashrom/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 52890 2011-07-29 17:53:33Z giovanni $
+# $Id: PKGBUILD 59589 2011-11-28 18:14:47Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Cilyan Olowen <gaknar@gmail.com>
# Contributor: fill <mailbox@fillo.ru>
@@ -6,9 +6,9 @@
pkgname=flashrom
pkgver=0.9.4
-pkgrel=1
+pkgrel=2
pkgdesc="Utility for reading, writing, erasing and verifying flash ROM chips"
-url="http://www.coreboot.org/Flashrom"
+url="http://www.coreboot.org/Flashrom/"
arch=('i686' 'x86_64')
license=('GPL')
depends=('libftdi')
diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD
index 8ee95b20e..c86e71fd6 100644
--- a/community/gsoap/PKGBUILD
+++ b/community/gsoap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 58578 2011-11-15 16:25:21Z spupykin $
+# $Id: PKGBUILD 59577 2011-11-28 11:48:45Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Tor Krill <tor@krill.nu>
# Contributor: Lee.MaRS <leemars@gmail.com>
pkgname=gsoap
-pkgver=2.8.4
+pkgver=2.8.5
pkgrel=1
pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++"
url="http://www.cs.fsu.edu/~engelen/soap.html"
@@ -14,7 +14,7 @@ depends=('openssl' 'zlib' 'gcc-libs')
makedepends=('autoconf' 'automake')
source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip
LICENSE)
-md5sums=('cb37c5cc3ef15b6b82863f45544d9473'
+md5sums=('541dcff86d1c6171cb8540cf51a4cfa8'
'27aaa3f5166db94d44044c11a7b2c37b')
build() {
diff --git a/community/gstreamermm/PKGBUILD b/community/gstreamermm/PKGBUILD
index 3b08b1f56..f546bc455 100644
--- a/community/gstreamermm/PKGBUILD
+++ b/community/gstreamermm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 10834 2010-02-02 19:30:09Z jlichtblau $
+# $Id: PKGBUILD 59618 2007-01-01 00:29:08Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
pkgname=gstreamermm
-pkgver=0.10.6
+pkgver=0.10.10
pkgrel=1
pkgdesc="C++ interface for GStreamer"
arch=('i686' 'x86_64')
@@ -10,14 +10,20 @@ url="http://gstreamer.freedesktop.org/bindings/cplusplus.html"
license=('LGPL')
depends=('glibmm' 'gstreamer0.10-base>=0.10.25' 'libsigc++2.0' 'libxml++')
makedepends=('doxygen' 'pkgconfig')
-options=('!libtool')
+options=('!libtool')
+changelog=$pkgname.changelog
source=(http://ftp.gnome.org/pub/GNOME/sources/gstreamermm/0.10/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d9414047afd7a44ed9c9b7075936a61d')
+sha256sums=('f8c31a7d3035d0dada60d27bdd01da04265439364f4469a981ee50d65218d638')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr
- make || return 1
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
make DESTDIR=${pkgdir} install
}
diff --git a/community/gstreamermm/gstreamermm.changelog b/community/gstreamermm/gstreamermm.changelog
new file mode 100644
index 000000000..245350ee3
--- /dev/null
+++ b/community/gstreamermm/gstreamermm.changelog
@@ -0,0 +1,9 @@
+2010-02-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * gstreamermm 0.10.10-1
+
+2010-02-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * Update to major release 0.10.6
+
+2009-11-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * Package moved to [community] as a dependency of subtitleeditor
+ * version 0.10.5
diff --git a/community/httperf/PKGBUILD b/community/httperf/PKGBUILD
new file mode 100644
index 000000000..c9b072988
--- /dev/null
+++ b/community/httperf/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 59593 2011-11-28 19:31:35Z seblu $
+# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# Contributor: Essien Ita Essien <me@essienitaessien.com>
+# Contributor: Peter Baldwin <bald_pete@hotmail.com>
+
+pkgname=httperf
+pkgver=0.9.0
+pkgrel=5
+pkgdesc='A tool for measuring web server performance.'
+arch=('i686' 'x86_64')
+license=('GPL2')
+url='http://code.google.com/p/httperf'
+depends=('openssl')
+source=("http://httperf.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+md5sums=('2968c36b9ecf3d98fc1f2c1c9c0d9341')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD
index edabb23c9..09eb63959 100644
--- a/community/ipset/PKGBUILD
+++ b/community/ipset/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 59544 2011-11-28 00:43:00Z seblu $
+# $Id: PKGBUILD 59646 2011-11-29 01:17:13Z seblu $
# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
pkgname=ipset
-pkgver=6.9.1
-pkgrel=2
+pkgver=6.10
+pkgrel=1
pkgdesc='Administration tool for IP sets'
arch=('i686' 'x86_64')
url='http://ipset.netfilter.org'
@@ -11,12 +11,12 @@ license=('GPL2')
depends=('libmnl')
makedepends=('linux-headers')
source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2")
-md5sums=('71f4b826e025be5918a52e9843673167')
+md5sums=('2dc677ab126269d09db5cd908c045591')
build() {
cd $pkgname-$pkgver
./autogen.sh
- ./configure --prefix=/usr --with-kbuild=/lib/modules/$(pacman -Qi linux-headers|sed -rn 's,Version[[:space:]]*:[[:space:]]*(.*),\1,p')-ARCH/build
+ ./configure --prefix=/usr
make
}
diff --git a/community/libdbi/PKGBUILD b/community/libdbi/PKGBUILD
index b05487261..317215e4e 100644
--- a/community/libdbi/PKGBUILD
+++ b/community/libdbi/PKGBUILD
@@ -1,9 +1,10 @@
+# $Id: PKGBUILD 59571 2011-11-28 08:58:19Z ttopper $
# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
# Contributor: Carl Flippin <carlf@photocarl.org>
pkgname=libdbi
pkgver=0.8.4
-pkgrel=1
+pkgrel=2
pkgdesc="A database independant abstraction layer for C"
url="http://libdbi.sourceforge.net"
license=('LGPL')
@@ -17,7 +18,7 @@ md5sums=('c5f15407ef7b07ba854cd8c9b15b88ff')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr
- make
+ make CFLAGS="-fno-fast-math"
}
package() {
@@ -25,3 +26,4 @@ package() {
make DESTDIR=${pkgdir} install
}
+# vim:set ts=2 sw=2 et:
diff --git a/community/libdbi/libdbi.install b/community/libdbi/libdbi.install
index 158201554..1dcdad1a1 100644
--- a/community/libdbi/libdbi.install
+++ b/community/libdbi/libdbi.install
@@ -1,19 +1,13 @@
-# arg 1: the new package version
post_install() {
ldconfig
}
-# arg 1: the new package version
-# arg 2: the old package version
post_upgrade() {
ldconfig
}
-# arg 1: the old package version
post_remove() {
ldconfig
}
-op=$1
-shift
-$op $*
+# vim:set ts=2 sw=2 et:
diff --git a/community/libtommath/PKGBUILD b/community/libtommath/PKGBUILD
new file mode 100644
index 000000000..33c60ba42
--- /dev/null
+++ b/community/libtommath/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 59626 2011-11-28 21:56:45Z giovanni $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: suasageandeggs <s_stoakley@hotmail.co.uk>
+# Contributor: Michael Fellinger <manveru@www.weez-int.com>
+
+pkgname=libtommath
+pkgver=0.42.0
+pkgrel=2
+pkgdesc="Highly optimized and portable routines for integer based number theoretic applications"
+url="http://www.libtom.org/"
+license=('custom')
+arch=('i686' 'x86_64')
+source=("http://libtom.org/files/ltm-${pkgver}.tar.bz2"
+ 'libtommath-0.42.0-makefile.patch')
+md5sums=('7380da904b020301be7045cb3a89039b'
+ 'd50c26fdc5aa87e6acfd4adc20557ff4')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ patch -Np1 -i ${srcdir}/libtommath-0.42.0-makefile.patch
+
+ make -f makefile.shared IGNORE_SPEED=1
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make DESTDIR=$pkgdir INSTALL_GROUP=root install
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ chmod 644 ${pkgdir}/usr/lib/libtommath.a
+}
diff --git a/community/libtommath/libtommath-0.42.0-makefile.patch b/community/libtommath/libtommath-0.42.0-makefile.patch
new file mode 100644
index 000000000..d98456e5b
--- /dev/null
+++ b/community/libtommath/libtommath-0.42.0-makefile.patch
@@ -0,0 +1,44 @@
+--- a/makefile.shared
++++ b/makefile.shared
+@@ -3,7 +3,7 @@
+ #Tom St Denis
+ VERSION=0:41
+
+-CC = libtool --mode=compile --tag=CC gcc
++LTCOMPILE = libtool --mode=compile --tag=CC $(CC)
+
+ CFLAGS += -I./ -Wall -W -Wshadow -Wsign-compare
+
+@@ -82,21 +82,24 @@
+
+ objs: $(OBJECTS)
+
++.c.o:
++ $(LTCOMPILE) $(CFLAGS) $(LDFLAGS) -o $@ -c $<
++
+ $(LIBNAME): $(OBJECTS)
+- libtool --mode=link gcc *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
++ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
+
+ install: $(LIBNAME)
+- install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)
++ install -d $(DESTDIR)$(LIBPATH)
+ libtool --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME)
+- install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)
+- install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
++ install -d $(DESTDIR)$(INCPATH)
++ install -m 644 $(HEADERS) $(DESTDIR)$(INCPATH)
+
+ test: $(LIBNAME) demo/demo.o
+- gcc $(CFLAGS) -c demo/demo.c -o demo/demo.o
+- libtool --mode=link gcc -o test demo/demo.o $(LIBNAME_S)
++ $(CC) $(CFLAGS) -c demo/demo.c -o demo/demo.o
++ libtool --mode=link $(CC) $(LDFLAGS) -o test demo/demo.o $(LIBNAME_S)
+
+ mtest: test
+- cd mtest ; gcc $(CFLAGS) mtest.c -o mtest
++ cd mtest ; $(CC) $(CFLAGS) $(LDFLAGS) mtest.c -o mtest
+
+ timing: $(LIBNAME)
+- gcc $(CFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest
++ libtool --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest
diff --git a/community/lsscsi/PKGBUILD b/community/lsscsi/PKGBUILD
new file mode 100644
index 000000000..7f592af0b
--- /dev/null
+++ b/community/lsscsi/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 59629 2011-11-28 22:05:11Z seblu $
+# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# Contributor : XAVeRY - los dot danielos at gmail dot com
+
+pkgname=lsscsi
+pkgver=0.25
+pkgrel=1
+pkgdesc='A tool that lists devices connected via SCSI and its transports'
+arch=('i686' 'x86_64')
+url="http://sg.danny.cz/scsi/lsscsi.html"
+license=('GPL')
+depends=('sysfsutils')
+source=("http://sg.danny.cz/scsi/${pkgname}-${pkgver}.tgz")
+md5sums=('c4e36b106624aff78527c54cf08ecbfe')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD
index 908181c19..52a20c7ac 100644
--- a/community/pcsclite/PKGBUILD
+++ b/community/pcsclite/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 59244 2011-11-21 19:29:18Z giovanni $
+# $Id: PKGBUILD 59581 2011-11-28 13:33:16Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
pkgname=pcsclite
-pkgver=1.8.0
+pkgver=1.8.1
pkgrel=1
pkgdesc="PC/SC Architecture smartcard middleware library"
arch=('i686' 'x86_64')
@@ -12,9 +12,9 @@ license=('BSD')
depends=('udev')
makedepends=('pkgconfig')
options=('!libtool' '!docs')
-source=("https://alioth.debian.org/frs/download.php/3684/pcsc-lite-${pkgver}.tar.bz2"
+source=("https://alioth.debian.org/frs/download.php/3687/pcsc-lite-${pkgver}.tar.bz2"
'pcscd')
-md5sums=('8af937240126a4afdcf235e98a6d861a'
+md5sums=('fd035e4f610eba6fa545159e60d0d780'
'c97b6bce695222efb0f003d8e8369010')
build() {
diff --git a/community/perf/PKGBUILD b/community/perf/PKGBUILD
index 0fca9ed9a..67c6b6a5c 100644
--- a/community/perf/PKGBUILD
+++ b/community/perf/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
pkgname=perf
-pkgver=3.1.2
+pkgver=3.1.3
pkgrel=1
pkgdesc="Linux kernel $pkgver performance tool"
license=('GPL2')
@@ -12,7 +12,7 @@ options=(!strip)
depends=('python2' 'libnewt' 'elfutils')
makedepends=('asciidoc' 'xmlto')
source=("http://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$pkgver.tar.xz")
-md5sums=('24027361d3ea6ea2cdd7bbdd2effe43f')
+md5sums=('d15080e5be9c05e6981320232ca68e3f')
build() {
cd linux-$pkgver/tools/perf
diff --git a/community/picocom/PKGBUILD b/community/picocom/PKGBUILD
new file mode 100644
index 000000000..7b98ad531
--- /dev/null
+++ b/community/picocom/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 59616 2007-01-01 00:26:04Z seblu $
+# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# Contributor: Jens Adam (byte/jra) <j_adam@web.de>
+
+pkgname=picocom
+pkgver=1.6
+pkgrel=2
+pkgdesc='Minimal dumb-terminal emulation program, very much like minicom'
+url='http://code.google.com/p/picocom/'
+license=('GPL2')
+arch=('i686' 'x86_64')
+source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('f042e15fa76ab3349c74a70062aa210b527e6bdc')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ make -e
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ install -D -m 755 picocom "${pkgdir}"/usr/bin/picocom
+ install -D -m 644 picocom.8 "${pkgdir}"/usr/share/man/man8/picocom.8
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index f07c412cf..e81aad219 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 57479 2011-10-28 13:24:44Z spupykin $
+# $Id: PKGBUILD 59579 2011-11-28 12:47:33Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
# Contributor: nofxx <x@<nick>.com>
pkgname=redis
-pkgver=2.4.2
+pkgver=2.4.4
pkgrel=1
pkgdesc="Advanced key-value store"
arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ backup=("etc/redis.conf"
source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
"redis.d"
"redis.logrotate")
-md5sums=('c4b0b5e4953a11a503cb54cf6b09670e'
+md5sums=('8aec2c38b7d70956688cbfe3a99495fa'
'9726d06d0a0c60cb5d55a31b3dc1e55d'
'9e2d75b7a9dc421122d673fe520ef17f')
diff --git a/community/rxvt/PKGBUILD b/community/rxvt/PKGBUILD
new file mode 100644
index 000000000..436fd7ae5
--- /dev/null
+++ b/community/rxvt/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Seblu <seblu+arch@seblu.net>
+# Contributor: Malte Rabenseifer <malte@zearan.de>
+# Contributor: urist <9362773@gmail.com>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: Troy Phillips <9362773@gmail.com>
+# Contributor: Judd Vinet <jvinet@zeroflux.org>
+
+pkgname=rxvt
+pkgver=2.7.10
+pkgrel=5
+pkgdesc='A colour vt102 terminal emulator'
+arch=('i686' 'x86_64')
+url='http://rxvt.sourceforge.net/'
+license=('GPL')
+depends=('libx11')
+makedepends=('libxt')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('302c5c455e64047b02d1ef19ff749141')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make prefix="$pkgdir/usr" mandir="$pkgdir/usr/share/man/man1" install
+ rm "$pkgdir/usr/bin/$pkgname-$pkgver"
+ rmdir "$pkgdir/usr/include" "$pkgdir/usr/lib"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/sshpass/PKGBUILD b/community/sshpass/PKGBUILD
new file mode 100644
index 000000000..3f18e8e76
--- /dev/null
+++ b/community/sshpass/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 59631 2011-11-28 22:18:13Z seblu $
+# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# Contributor: Timothy Redaelli <timothy.redaelli@gmail.com>
+# Contributor: Sebastien Vasey sebastien dot vasey at gmail dot com
+
+pkgname=sshpass
+pkgver=1.05
+pkgrel=1
+pkgdesc='Fool ssh into accepting an interactive password non-interactively'
+arch=('i686' 'x86_64')
+url='http://sourceforge.net/projects/sshpass/'
+license=('GPL')
+depends=('openssh')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('c52d65fdee0712af6f77eb2b60974ac7')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD
index 6655b0948..4733577cd 100644
--- a/community/sysstat/PKGBUILD
+++ b/community/sysstat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 54413 2011-08-18 09:29:38Z spupykin $
+# $Id: PKGBUILD 59567 2011-11-28 06:28:48Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Martin Devera <devik@cdi.cz>
pkgname=sysstat
-pkgver=10.0.1
-pkgrel=2
+pkgver=10.0.3
+pkgrel=1
pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)"
arch=('i686' 'x86_64')
url="http://pagesperso-orange.fr/sebastien.godard/"
@@ -16,8 +16,8 @@ options=(zipman)
backup=('etc/conf.d/sysstat'
'etc/conf.d/sysstat.ioconf')
source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz
- sysstat)
-md5sums=('a8b12230452dc0e0b6cae5fd5ec3c579'
+ sysstat)
+md5sums=('0e1ed5200f31f69a3b90ff1e81c07745'
'0241e3dd701cf7badbd3bb8408fb7bc9')
build() {
diff --git a/community/vifm/PKGBUILD b/community/vifm/PKGBUILD
index dcd4d1252..88e0f1498 100644
--- a/community/vifm/PKGBUILD
+++ b/community/vifm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 56645 2011-10-09 12:00:43Z jlichtblau $
+# $Id: PKGBUILD 59610 2007-01-01 00:15:20Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
pkgname=vifm
-pkgver=0.7.0
+pkgver=0.7.1
pkgrel=1
pkgdesc="Ncurses based file manager with vi like keybindings"
arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('GPL')
depends=('ncurses' 'gtk2')
changelog=$pkgname.changelog
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('c3e7d677c6f807dc0adefb175c5301ac0bb3cc1d1998d7928878bfe0c5eef139')
+sha256sums=('7c0f2e8949851394a0fa91a9e8509a58306ce3aebd27fed163fbec10c2258583')
build() {
cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/vifm/vifm.changelog b/community/vifm/vifm.changelog
index add2882b6..24dcb8dd5 100644
--- a/community/vifm/vifm.changelog
+++ b/community/vifm/vifm.changelog
@@ -1,3 +1,6 @@
+2011-11-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * vifm 0.7.1-1
+
2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* vifm 0.7.0-1
diff --git a/core/libevent/PKGBUILD b/core/libevent/PKGBUILD
index fefac11ee..45cf1208f 100644
--- a/core/libevent/PKGBUILD
+++ b/core/libevent/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140822 2011-10-19 21:36:39Z eric $
+# $Id: PKGBUILD 143770 2011-11-29 02:05:28Z eric $
# Maintainer:
# Contributor: Judd <jvinet@zeroflux.org>
pkgname=libevent
-pkgver=2.0.15
+pkgver=2.0.16
pkgrel=1
pkgdesc="An event notification library"
arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ depends=('openssl')
optdepends=('python2: to use event_rpcgen.py')
options=('!libtool')
source=(https://github.com/downloads/libevent/libevent/libevent-$pkgver-stable.tar.gz{,.asc})
-md5sums=('2643abe7ba242df15c08b2cc14ec8759'
- '56e52e1b6bba54102d278da59af4495e')
+sha1sums=('9eb9fe3c0ec607525ed2dee6827687efcd0696ac'
+ '679023511db0106cb84a36e4ff78604d00d0a611')
build() {
cd "${srcdir}/${pkgname}-${pkgver}-stable"
diff --git a/core/syslog-ng/PKGBUILD b/core/syslog-ng/PKGBUILD
index 5fdaa650e..ef636e51e 100644
--- a/core/syslog-ng/PKGBUILD
+++ b/core/syslog-ng/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 143107 2011-11-23 02:58:14Z dreisner $
+# $Id: PKGBUILD 143678 2011-11-28 11:05:29Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Maintainer: Aaron Griffin <aaron@archlinux.org>
pkgname=syslog-ng
-pkgver=3.3.2
-pkgrel=2
+pkgver=3.3.3
+pkgrel=1
pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -22,7 +22,7 @@ source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source
syslog-ng.conf
syslog-ng.logrotate
syslog-ng.rc)
-sha1sums=('a7cfc987cdd584e357e253d2794bad1159776638'
+sha1sums=('e2ec8ba4bde24809630a7675bf5d97f00be467f8'
'98074e0facfc6ef036202662cc86d04b38a2c142'
'949128fe3d7f77a7aab99048061f885bc758000c'
'a6ad26912b5bcbe1b47b003309945d733613b98f')
diff --git a/extra/asio/PKGBUILD b/extra/asio/PKGBUILD
index add8358e0..952b5e16d 100644
--- a/extra/asio/PKGBUILD
+++ b/extra/asio/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 115985 2011-03-22 15:04:08Z giovanni $
+# $Id: PKGBUILD 143711 2011-11-28 16:30:10Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=asio
pkgver=1.4.8
-pkgrel=1
+pkgrel=2
pkgdesc="Cross-platform C++ library for ASynchronous network I/O"
arch=('i686' 'x86_64')
url="http://asio.sourceforge.net"
diff --git a/extra/aspell-it/PKGBUILD b/extra/aspell-it/PKGBUILD
index f577080e1..f02041354 100644
--- a/extra/aspell-it/PKGBUILD
+++ b/extra/aspell-it/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 116619 2011-03-24 13:07:52Z andrea $
+# $Id: PKGBUILD 143713 2011-11-28 16:36:02Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Eric Johnson <eric@coding-zone.com>
pkgname=aspell-it
pkgver=2.2_20050523
-pkgrel=3
+pkgrel=4
pkgdesc="Italian dictionary for aspell"
arch=('i686' 'x86_64')
url="http://aspell.net/"
-license=('GPL2')
+license=('GPL')
depends=('aspell')
-source=(ftp://ftp.gnu.org/gnu/aspell/dict/it/aspell6-it-${pkgver}-0.tar.bz2)
+source=("ftp://ftp.gnu.org/gnu/aspell/dict/it/aspell6-it-${pkgver}-0.tar.bz2")
md5sums=('b1217299a0b67d1e121494d7ec18a88d')
build() {
cd "${srcdir}/aspell6-it-${pkgver}-0"
+
./configure
make
}
package() {
cd "${srcdir}/aspell6-it-${pkgver}-0"
+
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/barcode/PKGBUILD b/extra/barcode/PKGBUILD
index 99dcd7755..b69e764d5 100644
--- a/extra/barcode/PKGBUILD
+++ b/extra/barcode/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 115997 2011-03-22 15:15:09Z giovanni $
+# $Id: PKGBUILD 143715 2011-11-28 16:39:50Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
pkgname=barcode
pkgver=0.98
-pkgrel=3
+pkgrel=4
pkgdesc="A tool to convert text strings to printed bars"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/barcode/"
diff --git a/extra/cairo-perl/PKGBUILD b/extra/cairo-perl/PKGBUILD
index b697e5e16..7fb05334a 100644
--- a/extra/cairo-perl/PKGBUILD
+++ b/extra/cairo-perl/PKGBUILD
@@ -1,32 +1,31 @@
-# $Id: PKGBUILD 124873 2011-05-24 21:13:32Z remy $
+# $Id: PKGBUILD 143687 2011-11-28 11:39:04Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=cairo-perl
-_realname=Cairo
-pkgver=1.061
-pkgrel=4
+pkgver=1.081
+pkgrel=1
pkgdesc="Perl wrappers for cairo"
arch=(i686 x86_64)
license=('LGPL')
url="http://gtk2-perl.sourceforge.net/"
options=('!emptydirs')
-depends=('cairo>=1.8.10' 'perl>=5.14')
+depends=('cairo' 'perl')
makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('08cd5e847f61858651fc4de769066e88')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Cairo-${pkgver}.tar.gz)
+md5sums=('52c712b0f749f2fe232ae6e18880fe7d')
build() {
- cd "${srcdir}/${_realname}-${pkgver}"
+ cd "${srcdir}/Cairo-${pkgver}"
perl Makefile.PL INSTALLDIRS=vendor
make
}
check() {
- cd "${srcdir}/${_realname}-${pkgver}"
- make test || true
+ cd "${srcdir}/Cairo-${pkgver}"
+ make test
}
package() {
- cd "${srcdir}/${_realname}-${pkgver}"
+ cd "${srcdir}/Cairo-${pkgver}"
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/ccache/PKGBUILD b/extra/ccache/PKGBUILD
index 4edd77bf7..cef8d0dbf 100644
--- a/extra/ccache/PKGBUILD
+++ b/extra/ccache/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 136057 2011-08-22 10:10:20Z giovanni $
+# $Id: PKGBUILD 143717 2011-11-28 16:48:34Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=ccache
pkgver=3.1.6
-pkgrel=1
+pkgrel=2
pkgdesc="A compiler cache"
arch=('i686' 'x86_64')
url="http://ccache.samba.org/"
diff --git a/extra/chkrootkit/PKGBUILD b/extra/chkrootkit/PKGBUILD
index bb9303fc0..2b950dc9c 100644
--- a/extra/chkrootkit/PKGBUILD
+++ b/extra/chkrootkit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 138434 2011-09-23 03:32:41Z eric $
+# $Id: PKGBUILD 143673 2011-11-28 09:58:36Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=chkrootkit
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64')
url="http://www.chkrootkit.org"
depends=('sh' 'net-tools')
license=('BSD')
-source=(ftp://ftp.pangeia.com.br/pub/seg/pac/${pkgname}.tar.gz chkrootkit.cron \
+source=(http://www.reznor.com/tools/chkrootkit.tar.gz chkrootkit.cron \
fix-tools-path.patch backslashes.patch kallsyms.patch)
md5sums=('304d840d52840689e0ab0af56d6d3a18'
'f4b6494270f708bf016e087104681739'
diff --git a/extra/chmlib/PKGBUILD b/extra/chmlib/PKGBUILD
index 24589b4b2..00013a6b9 100644
--- a/extra/chmlib/PKGBUILD
+++ b/extra/chmlib/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 127389 2011-06-14 06:55:42Z andrea $
+# $Id: PKGBUILD 143719 2011-11-28 16:57:25Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Alexander 'dma147' Mieland <dma147@linux-stats.org>
# Contributor: Simon Morgan <simon@16hz.net>
pkgname=chmlib
pkgver=0.40
-pkgrel=2
+pkgrel=3
pkgdesc="Library for dealing with Microsoft ITSS/CHM format files"
arch=('i686' 'x86_64')
url="http://morte.jedrea.com/~jedwin/projects/chmlib/"
@@ -17,6 +17,7 @@ md5sums=('7ea49ed8c335215c1edc6fae83e6b912')
build() {
cd "${srcdir}"/${pkgname}-${pkgver}
+
./configure --prefix=/usr \
--enable-examples=yes
make
@@ -24,5 +25,6 @@ build() {
package() {
cd "${srcdir}"/${pkgname}-${pkgver}
+
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD
index fc4170c95..1c53bc6c5 100644
--- a/extra/cinepaint/PKGBUILD
+++ b/extra/cinepaint/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 131074 2011-07-10 02:10:18Z eric $
+# $Id: PKGBUILD 143685 2011-11-28 11:25:31Z eric $
# Maintainer: tobias [tobias.archlinux.org]
# Contributor: tobias [tobias.justdreams.de]
@@ -26,8 +26,12 @@ build() {
find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} +
sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in
+ aclocal -I aclocal
+ autoconf
./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \
--enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2
+ sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \
+ plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile
make
}
diff --git a/extra/cln/PKGBUILD b/extra/cln/PKGBUILD
index 67502ca6c..30f69b7a9 100644
--- a/extra/cln/PKGBUILD
+++ b/extra/cln/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 127750 2011-06-18 05:06:20Z eric $
+# $Id: PKGBUILD 143665 2011-11-28 09:23:06Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=cln
@@ -12,7 +12,7 @@ depends=('gmp')
makedepends=('texlive-core')
options=('!libtool')
install=cln.install
-source=(ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${pkgname}-${pkgver}.tar.bz2)
+source=(http://www.ginac.de/CLN/${pkgname}-${pkgver}.tar.bz2)
md5sums=('d897cce94d9c34d106575ed4ec865d71')
sha1sums=('c30dca80e75f45e2107f233075e6d0339ea884b0')
diff --git a/extra/crypto++/PKGBUILD b/extra/crypto++/PKGBUILD
index 855573288..c1869b9de 100644
--- a/extra/crypto++/PKGBUILD
+++ b/extra/crypto++/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 112753 2011-03-06 14:15:54Z giovanni $
+# $Id: PKGBUILD 143721 2011-11-28 17:06:53Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -8,28 +8,34 @@
pkgname=crypto++
pkgver=5.6.1
_srcver=561
-pkgrel=2
-pkgdesc="A free C++ class library of cryptographic schemes."
+pkgrel=3
+pkgdesc="A free C++ class library of cryptographic schemes"
arch=('i686' 'x86_64')
url="http://www.cryptopp.com/"
license=('custom')
depends=('gcc-libs')
makedepends=('unzip')
-source=(http://www.cryptopp.com/cryptopp${_srcver}.zip
- libcrypto++.pc)
+source=("http://www.cryptopp.com/cryptopp${_srcver}.zip"
+ 'libcrypto++.pc')
md5sums=('96cbeba0907562b077e26bcffb483828'
- '2337c6edbc552d9142cae8e0854715e7')
+ '2337c6edbc552d9142cae8e0854715e7')
build() {
cd ${srcdir}
+
sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
make -f GNUmakefile
make libcryptopp.so
+}
+
+package() {
+ cd ${srcdir}
+
install -d ${pkgdir}/usr/{lib/pkgconfig,include/cryptopp}
install -m644 *.h ${pkgdir}/usr/include/cryptopp/
- install -m644 libcryptopp.a ${pkgdir}/usr/lib/libcryptopp.a
- install -m644 libcryptopp.so ${pkgdir}/usr/lib/libcryptopp.so
+ install -m644 libcryptopp.a "${pkgdir}/usr/lib/libcryptopp.a"
+ install -m644 libcryptopp.so "${pkgdir}/usr/lib/libcryptopp.so"
install -m644 ${srcdir}/libcrypto++.pc "${pkgdir}/usr/lib/pkgconfig/libcrypto++.pc"
- install -D -m644 License.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/extra/ctags/PKGBUILD b/extra/ctags/PKGBUILD
index be4e9e20d..4b8996c57 100644
--- a/extra/ctags/PKGBUILD
+++ b/extra/ctags/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 101099 2010-11-27 21:03:01Z giovanni $
+# $Id: PKGBUILD 143723 2011-11-28 17:13:34Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: John Proctor <jproctor@prium.net>
pkgname=ctags
pkgver=5.8
-pkgrel=2
+pkgrel=3
pkgdesc="Generates an index file of language objects found in source files"
arch=('i686' 'x86_64')
license=('GPL')
depends=('glibc')
url="http://ctags.sourceforge.net/"
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
md5sums=('c00f82ecdcc357434731913e5b48630d')
build() {
@@ -18,6 +18,11 @@ build() {
./configure --prefix=/usr \
--disable-external-sort
- make || return 1
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
make prefix=${pkgdir}/usr install
}
diff --git a/extra/diffstat/PKGBUILD b/extra/diffstat/PKGBUILD
index b995bb41a..9cb5ec326 100644
--- a/extra/diffstat/PKGBUILD
+++ b/extra/diffstat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 137783 2011-09-10 22:56:16Z giovanni $
+# $Id: PKGBUILD 143725 2011-11-28 17:17:42Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Matthias-Christian Ott <matthias.christian.at.tiscali.de>
pkgname=diffstat
pkgver=1.54
-pkgrel=2
+pkgrel=3
pkgdesc="Display a histogram of diff changes"
arch=('i686' 'x86_64')
url="http://invisible-island.net/diffstat"
diff --git a/extra/djvulibre/PKGBUILD b/extra/djvulibre/PKGBUILD
index 6db90e526..6544542f1 100644
--- a/extra/djvulibre/PKGBUILD
+++ b/extra/djvulibre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 116498 2011-03-24 09:12:50Z jgc $
+# $Id: PKGBUILD 143707 2011-11-28 13:56:50Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: mgushee
pkgname=djvulibre
pkgver=3.5.24
-pkgrel=1
+pkgrel=2
pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents"
arch=("i686" "x86_64")
license=('GPL')
@@ -17,13 +17,20 @@ conflicts=('libdjvu')
optdepends=('djview4: Viewer application')
options=('!libtool')
install=djvulibre.install
-source=(http://downloads.sourceforge.net/djvu/${pkgname}-${pkgver}.tar.gz)
-md5sums=('af83d27af5083198432a178d22b259c5')
+source=(http://downloads.sourceforge.net/djvu/${pkgname}-${pkgver}.tar.gz
+ git-fixes.patch)
+md5sums=('af83d27af5083198432a178d22b259c5'
+ 'ff3798e383e9c3fae407455d8a51deec')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/git-fixes.patch"
./configure --prefix=/usr --disable-desktopfiles
make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
#Install icons for mime-types.
diff --git a/extra/djvulibre/git-fixes.patch b/extra/djvulibre/git-fixes.patch
new file mode 100644
index 000000000..3077cf0b4
--- /dev/null
+++ b/extra/djvulibre/git-fixes.patch
@@ -0,0 +1,1607 @@
+From 3341545edba359b292a8ef6db1b7d342caf3dcf1 Mon Sep 17 00:00:00 2001
+From: Leon Bottou <leon@bottou.org>
+Date: Wed, 4 May 2011 21:25:35 -0700
+Subject: [PATCH] Added include <stddef.h> for gcc-4.6
+
+---
+ libdjvu/BSByteStream.cpp | 1 +
+ libdjvu/BSEncodeByteStream.cpp | 1 +
+ libdjvu/ByteStream.cpp | 1 +
+ libdjvu/DjVuFileCache.cpp | 1 +
+ libdjvu/DjVuGlobal.cpp | 2 ++
+ libdjvu/DjVuGlobalMemory.cpp | 2 ++
+ libdjvu/DjVuMessage.cpp | 1 +
+ libdjvu/DjVuMessageLite.cpp | 2 +-
+ libdjvu/DjVuPalette.cpp | 2 ++
+ libdjvu/DjVuPort.h | 1 +
+ libdjvu/DjVuToPS.cpp | 1 +
+ libdjvu/GBitmap.cpp | 2 ++
+ libdjvu/GException.cpp | 1 +
+ libdjvu/GOS.cpp | 1 +
+ libdjvu/GPixmap.cpp | 2 ++
+ libdjvu/GSmartPointer.cpp | 1 +
+ libdjvu/GSmartPointer.h | 2 ++
+ libdjvu/GString.cpp | 1 +
+ libdjvu/GString.h | 1 +
+ libdjvu/GThreads.cpp | 2 ++
+ libdjvu/GURL.cpp | 1 +
+ libdjvu/GUnicode.cpp | 2 ++
+ libdjvu/IFFByteStream.h | 1 +
+ libdjvu/IW44EncodeCodec.cpp | 1 +
+ libdjvu/IW44Image.cpp | 1 +
+ libdjvu/JPEGDecoder.h | 1 +
+ libdjvu/MMX.cpp | 1 +
+ libdjvu/UnicodeByteStream.h | 1 +
+ libdjvu/XMLParser.cpp | 1 +
+ libdjvu/ZPCodec.cpp | 2 ++
+ libdjvu/atomic.cpp | 1 +
+ libdjvu/ddjvuapi.cpp | 1 +
+ libdjvu/ddjvuapi.h | 1 +
+ libdjvu/miniexp.cpp | 1 +
+ libdjvu/miniexp.h | 3 ++-
+ tools/bzz.cpp | 1 +
+ tools/c44.cpp | 1 +
+ tools/cjb2.cpp | 1 +
+ tools/cpaldjvu.cpp | 1 +
+ tools/csepdjvu.cpp | 1 +
+ tools/ddjvu.cpp | 1 +
+ tools/djvm.cpp | 2 +-
+ tools/djvmcvt.cpp | 1 +
+ tools/djvudump.cpp | 1 +
+ tools/djvuextract.cpp | 1 +
+ tools/djvumake.cpp | 1 +
+ tools/djvups.cpp | 1 +
+ tools/djvused.cpp | 1 +
+ tools/djvuserve.cpp | 1 +
+ tools/djvutxt.cpp | 1 +
+ tools/tiff2pdf.h | 1 +
+ xmltools/djvutoxml.cpp | 1 +
+ xmltools/djvuxmlparser.cpp | 1 +
+ 53 files changed, 63 insertions(+), 3 deletions(-)
+
+diff --git a/libdjvu/BSByteStream.cpp b/libdjvu/BSByteStream.cpp
+index b762ccf..d662ab0 100644
+--- a/libdjvu/BSByteStream.cpp
++++ b/libdjvu/BSByteStream.cpp
+@@ -62,6 +62,7 @@
+
+ // - Author: Leon Bottou, 07/1998
+
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+diff --git a/libdjvu/BSEncodeByteStream.cpp b/libdjvu/BSEncodeByteStream.cpp
+index 5d80e51..68bc3e3 100644
+--- a/libdjvu/BSEncodeByteStream.cpp
++++ b/libdjvu/BSEncodeByteStream.cpp
+@@ -71,6 +71,7 @@
+ #include "GOS.h"
+ #endif
+
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+diff --git a/libdjvu/ByteStream.cpp b/libdjvu/ByteStream.cpp
+index 158c33c..be01847 100644
+--- a/libdjvu/ByteStream.cpp
++++ b/libdjvu/ByteStream.cpp
+@@ -73,6 +73,7 @@
+ #include "GOS.h"
+ #include "GURL.h"
+ #include "DjVuMessage.h"
++#include <stddef.h>
+ #include <fcntl.h>
+ #if defined(WIN32) || defined(__CYGWIN32__)
+ # include <io.h>
+diff --git a/libdjvu/DjVuFileCache.cpp b/libdjvu/DjVuFileCache.cpp
+index 6b1e85d..7d7a192 100644
+--- a/libdjvu/DjVuFileCache.cpp
++++ b/libdjvu/DjVuFileCache.cpp
+@@ -63,6 +63,7 @@
+ #include "DjVuFileCache.h"
+ #include "debug.h"
+
++#include <stddef.h>
+ #include <stdlib.h>
+
+
+diff --git a/libdjvu/DjVuGlobal.cpp b/libdjvu/DjVuGlobal.cpp
+index e6d3cec..df9278e 100644
+--- a/libdjvu/DjVuGlobal.cpp
++++ b/libdjvu/DjVuGlobal.cpp
+@@ -76,6 +76,8 @@
+ #include "GThreads.h"
+ #include "GException.h"
+ #include "GContainer.h"
++
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+diff --git a/libdjvu/DjVuGlobalMemory.cpp b/libdjvu/DjVuGlobalMemory.cpp
+index 3c6012c..c8ba309 100644
+--- a/libdjvu/DjVuGlobalMemory.cpp
++++ b/libdjvu/DjVuGlobalMemory.cpp
+@@ -67,6 +67,8 @@
+
+ #include "DjVuGlobal.h"
+ #include "GException.h"
++
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include "debug.h"
+diff --git a/libdjvu/DjVuMessage.cpp b/libdjvu/DjVuMessage.cpp
+index 6f5a735..1726025 100644
+--- a/libdjvu/DjVuMessage.cpp
++++ b/libdjvu/DjVuMessage.cpp
+@@ -71,6 +71,7 @@
+ #include "debug.h"
+ #include <ctype.h>
+ #include <string.h>
++#include <stddef.h>
+ #include <stdlib.h>
+ #ifdef WIN32
+ # include <tchar.h>
+diff --git a/libdjvu/DjVuMessageLite.cpp b/libdjvu/DjVuMessageLite.cpp
+index b8c1010..5daa9d9 100644
+--- a/libdjvu/DjVuMessageLite.cpp
++++ b/libdjvu/DjVuMessageLite.cpp
+@@ -73,8 +73,8 @@
+ #include "debug.h"
+ #include <ctype.h>
+ #include <string.h>
++#include <stddef.h>
+ #include <stdlib.h>
+-// #include <stdio.h>
+ #ifdef WIN32
+ #include <tchar.h>
+ #include <windows.h>
+diff --git a/libdjvu/DjVuPalette.cpp b/libdjvu/DjVuPalette.cpp
+index c489f7b..76b0bf4 100644
+--- a/libdjvu/DjVuPalette.cpp
++++ b/libdjvu/DjVuPalette.cpp
+@@ -64,6 +64,8 @@
+ #include "ByteStream.h"
+ #include "BSByteStream.h"
+ #include "DjVuPalette.h"
++
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <math.h>
+
+diff --git a/libdjvu/DjVuPort.h b/libdjvu/DjVuPort.h
+index f6a92f6..e2b3125 100644
+--- a/libdjvu/DjVuPort.h
++++ b/libdjvu/DjVuPort.h
+@@ -65,6 +65,7 @@
+
+ #include "GThreads.h"
+ #include "GURL.h"
++#include "stddef.h"
+
+ #ifdef HAVE_NAMESPACES
+ namespace DJVU {
+diff --git a/libdjvu/DjVuToPS.cpp b/libdjvu/DjVuToPS.cpp
+index 5517bf3..6914ff9 100644
+--- a/libdjvu/DjVuToPS.cpp
++++ b/libdjvu/DjVuToPS.cpp
+@@ -72,6 +72,7 @@
+ #include "GPixmap.h"
+ #include "debug.h"
+ #include <stdarg.h>
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <time.h>
+diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp
+index ab5c0de..797edcc 100644
+--- a/libdjvu/GBitmap.cpp
++++ b/libdjvu/GBitmap.cpp
+@@ -66,6 +66,8 @@
+ #include "GString.h"
+ #include "GThreads.h"
+ #include "GException.h"
++#include <stddef.h>
++#include <stdlib.h>
+ #include <string.h>
+
+ // - Author: Leon Bottou, 05/1997
+diff --git a/libdjvu/GException.cpp b/libdjvu/GException.cpp
+index 2ea179a..89da70f 100644
+--- a/libdjvu/GException.cpp
++++ b/libdjvu/GException.cpp
+@@ -60,6 +60,7 @@
+ # pragma implementation
+ #endif
+
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+diff --git a/libdjvu/GOS.cpp b/libdjvu/GOS.cpp
+index e784932..d2088e2 100644
+--- a/libdjvu/GOS.cpp
++++ b/libdjvu/GOS.cpp
+@@ -65,6 +65,7 @@
+ #include "GOS.h"
+ #include "GURL.h"
+
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <ctype.h>
+diff --git a/libdjvu/GPixmap.cpp b/libdjvu/GPixmap.cpp
+index 392df54..4bf6f57 100644
+--- a/libdjvu/GPixmap.cpp
++++ b/libdjvu/GPixmap.cpp
+@@ -75,6 +75,8 @@
+ #include "GThreads.h"
+ #include "Arrays.h"
+ #include "JPEGDecoder.h"
++
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <math.h>
+ #include <assert.h>
+diff --git a/libdjvu/GSmartPointer.cpp b/libdjvu/GSmartPointer.cpp
+index 6e523e7..58aef5b 100644
+--- a/libdjvu/GSmartPointer.cpp
++++ b/libdjvu/GSmartPointer.cpp
+@@ -67,6 +67,7 @@
+ // Our original implementation consisted of multiple classes.
+ // <http://prdownloads.sourceforge.net/djvu/DjVu2_2b-src.tgz>.
+
++#include <stddef.h>
+ #include <string.h>
+ #if PARANOID_DEBUG
+ # include <assert.h>
+diff --git a/libdjvu/GSmartPointer.h b/libdjvu/GSmartPointer.h
+index 82781bd..8a8bb8a 100644
+--- a/libdjvu/GSmartPointer.h
++++ b/libdjvu/GSmartPointer.h
+@@ -97,6 +97,8 @@
+ #include "DjVuGlobal.h"
+ #include "atomic.h"
+
++#include <stddef.h>
++
+ #ifdef HAVE_NAMESPACES
+ namespace DJVU {
+ # ifdef NOT_DEFINED // Just to fool emacs c++ mode
+diff --git a/libdjvu/GString.cpp b/libdjvu/GString.cpp
+index 03f6226..350b11b 100644
+--- a/libdjvu/GString.cpp
++++ b/libdjvu/GString.cpp
+@@ -73,6 +73,7 @@
+ #include "GThreads.h"
+ #include "debug.h"
+
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+diff --git a/libdjvu/GString.h b/libdjvu/GString.h
+index b63b753..3aa1f76 100644
+--- a/libdjvu/GString.h
++++ b/libdjvu/GString.h
+@@ -108,6 +108,7 @@
+ #include "DjVuGlobal.h"
+ #include "GContainer.h"
+
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #ifdef WIN32
+diff --git a/libdjvu/GThreads.cpp b/libdjvu/GThreads.cpp
+index d81f3c3..253fed8 100644
+--- a/libdjvu/GThreads.cpp
++++ b/libdjvu/GThreads.cpp
+@@ -71,6 +71,8 @@
+ #include "GThreads.h"
+ #include "GException.h"
+ #include "DjVuMessageLite.h"
++
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+
+diff --git a/libdjvu/GURL.cpp b/libdjvu/GURL.cpp
+index c37bf52..a80078c 100644
+--- a/libdjvu/GURL.cpp
++++ b/libdjvu/GURL.cpp
+@@ -72,6 +72,7 @@
+ #include "GURL.h"
+ #include "debug.h"
+
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <ctype.h>
+diff --git a/libdjvu/GUnicode.cpp b/libdjvu/GUnicode.cpp
+index 415c081..a8b25b8 100644
+--- a/libdjvu/GUnicode.cpp
++++ b/libdjvu/GUnicode.cpp
+@@ -62,6 +62,8 @@
+
+ #include "GString.h"
+
++#include <stddef.h>
++
+ #if HAS_ICONV
+ #include <iconv.h>
+ #endif
+diff --git a/libdjvu/IFFByteStream.h b/libdjvu/IFFByteStream.h
+index a653f8c..e31b216 100644
+--- a/libdjvu/IFFByteStream.h
++++ b/libdjvu/IFFByteStream.h
+@@ -124,6 +124,7 @@
+
+
+ #include "DjVuGlobal.h"
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp
+index 8d7b12c..49081b7 100644
+--- a/libdjvu/IW44EncodeCodec.cpp
++++ b/libdjvu/IW44EncodeCodec.cpp
+@@ -76,6 +76,7 @@
+ #include "IFFByteStream.h"
+ #include "GRect.h"
+
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <math.h>
+diff --git a/libdjvu/IW44Image.cpp b/libdjvu/IW44Image.cpp
+index 9476726..4a19fb5 100644
+--- a/libdjvu/IW44Image.cpp
++++ b/libdjvu/IW44Image.cpp
+@@ -76,6 +76,7 @@
+ #include "IFFByteStream.h"
+ #include "GRect.h"
+
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <math.h>
+diff --git a/libdjvu/JPEGDecoder.h b/libdjvu/JPEGDecoder.h
+index bd430a0..fad1d4c 100644
+--- a/libdjvu/JPEGDecoder.h
++++ b/libdjvu/JPEGDecoder.h
+@@ -64,6 +64,7 @@
+
+ #ifdef NEED_JPEG_DECODER
+
++#include <stddef.h>
+ #include <string.h>
+ #include <setjmp.h>
+
+diff --git a/libdjvu/MMX.cpp b/libdjvu/MMX.cpp
+index 5ab60bb..528dab6 100644
+--- a/libdjvu/MMX.cpp
++++ b/libdjvu/MMX.cpp
+@@ -62,6 +62,7 @@
+
+ #include "MMX.h"
+ #include <stdio.h>
++#include <stddef.h>
+ #include <stdlib.h>
+
+
+diff --git a/libdjvu/UnicodeByteStream.h b/libdjvu/UnicodeByteStream.h
+index 0ae112b..9b49a17 100644
+--- a/libdjvu/UnicodeByteStream.h
++++ b/libdjvu/UnicodeByteStream.h
+@@ -88,6 +88,7 @@
+ #include "GString.h"
+ #include "ByteStream.h"
+
++#include <stddef.h>
+
+ #ifdef HAVE_NAMESPACES
+ namespace DJVU {
+diff --git a/libdjvu/XMLParser.cpp b/libdjvu/XMLParser.cpp
+index 84386c5..7da923a 100644
+--- a/libdjvu/XMLParser.cpp
++++ b/libdjvu/XMLParser.cpp
+@@ -75,6 +75,7 @@
+ #include "debug.h"
+ #include <stdio.h>
+ #include <ctype.h>
++#include <stddef.h>
+ #include <stdlib.h>
+
+
+diff --git a/libdjvu/ZPCodec.cpp b/libdjvu/ZPCodec.cpp
+index f6e971d..ff5b9bf 100644
+--- a/libdjvu/ZPCodec.cpp
++++ b/libdjvu/ZPCodec.cpp
+@@ -66,6 +66,8 @@
+ #include "ZPCodec.h"
+ #include "ByteStream.h"
+ #include "GException.h"
++
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <assert.h>
+ #include <math.h>
+diff --git a/libdjvu/atomic.cpp b/libdjvu/atomic.cpp
+index bdc193e..63fd483 100644
+--- a/libdjvu/atomic.cpp
++++ b/libdjvu/atomic.cpp
+@@ -28,6 +28,7 @@
+ # include "config.h"
+ #endif
+
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <assert.h>
+ #include "atomic.h"
+diff --git a/libdjvu/ddjvuapi.cpp b/libdjvu/ddjvuapi.cpp
+index b18b84b..f40f5aa 100644
+--- a/libdjvu/ddjvuapi.cpp
++++ b/libdjvu/ddjvuapi.cpp
+@@ -60,6 +60,7 @@
+ # pragma implementation "ddjvuapi.h"
+ #endif
+
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+diff --git a/libdjvu/ddjvuapi.h b/libdjvu/ddjvuapi.h
+index d0ed48f..841f223 100644
+--- a/libdjvu/ddjvuapi.h
++++ b/libdjvu/ddjvuapi.h
+@@ -64,6 +64,7 @@ extern "C" {
+ }
+ #endif
+
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+
+diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp
+index e0fb087..fc51297 100644
+--- a/libdjvu/miniexp.cpp
++++ b/libdjvu/miniexp.cpp
+@@ -23,6 +23,7 @@
+ # pragma implementation "miniexp.h"
+ #endif
+
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <ctype.h>
+diff --git a/libdjvu/miniexp.h b/libdjvu/miniexp.h
+index 91e345d..993005b 100644
+--- a/libdjvu/miniexp.h
++++ b/libdjvu/miniexp.h
+@@ -38,7 +38,8 @@ extern "C" {
+ #ifndef MINILISPAPI
+ # define MINILISPAPI /**/
+ #endif
+-
++
++#include <stddef.h>
+
+ /* -------------------------------------------------- */
+ /* LISP EXPRESSIONS */
+diff --git a/tools/bzz.cpp b/tools/bzz.cpp
+index ca092e1..2ebc7b9 100644
+--- a/tools/bzz.cpp
++++ b/tools/bzz.cpp
+@@ -94,6 +94,7 @@
+ #include "GURL.h"
+ #include "DjVuMessage.h"
+ #include <locale.h>
++#include <stddef.h>
+ #include <stdlib.h>
+
+ static const char *program = "(unknown)";
+diff --git a/tools/c44.cpp b/tools/c44.cpp
+index 6f23b53..855504b 100644
+--- a/tools/c44.cpp
++++ b/tools/c44.cpp
+@@ -226,6 +226,7 @@
+ #include <locale.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <stddef.h>
+ #include <stdlib.h>
+
+ // command line data
+diff --git a/tools/cjb2.cpp b/tools/cjb2.cpp
+index 8cf89b9..11eb662 100644
+--- a/tools/cjb2.cpp
++++ b/tools/cjb2.cpp
+@@ -120,6 +120,7 @@
+ #include "jb2tune.h"
+
+ #include <locale.h>
++#include <stddef.h>
+ #include <stdlib.h>
+ #if HAVE_TIFF
+ #include <tiffio.h>
+diff --git a/tools/cpaldjvu.cpp b/tools/cpaldjvu.cpp
+index 111cbd3..b640a7a 100644
+--- a/tools/cpaldjvu.cpp
++++ b/tools/cpaldjvu.cpp
+@@ -118,6 +118,7 @@
+ #include "jb2tune.h"
+
+ #include <locale.h>
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <math.h>
+
+diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp
+index cd721f8..d5203d5 100644
+--- a/tools/csepdjvu.cpp
++++ b/tools/csepdjvu.cpp
+@@ -162,6 +162,7 @@
+ #include "jb2tune.h"
+
+ #include <locale.h>
++#include <stddef.h>
+ #include <stdlib.h>
+
+ #undef MIN
+diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
+index 817e045..981a270 100644
+--- a/tools/ddjvu.cpp
++++ b/tools/ddjvu.cpp
+@@ -62,6 +62,7 @@
+ # include "config.h"
+ #endif
+
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+diff --git a/tools/djvm.cpp b/tools/djvm.cpp
+index 951bd66..6ea88c2 100644
+--- a/tools/djvm.cpp
++++ b/tools/djvm.cpp
+@@ -135,9 +135,9 @@
+ #include "DjVuMessage.h"
+
+ #include <locale.h>
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+-#include <stdlib.h>
+
+ static const char * progname;
+
+diff --git a/tools/djvmcvt.cpp b/tools/djvmcvt.cpp
+index 9ca1c54..20b468a 100644
+--- a/tools/djvmcvt.cpp
++++ b/tools/djvmcvt.cpp
+@@ -144,6 +144,7 @@
+
+ #include <locale.h>
+ #include <stdio.h>
++#include <stddef.h>
+ #include <stdlib.h>
+
+ static const char * progname;
+diff --git a/tools/djvudump.cpp b/tools/djvudump.cpp
+index 6a0215a..2dddbdf 100644
+--- a/tools/djvudump.cpp
++++ b/tools/djvudump.cpp
+@@ -119,6 +119,7 @@ xxx
+ #include <locale.h>
+ #include <stdio.h>
+ #include <ctype.h>
++#include <stddef.h>
+ #include <stdlib.h>
+
+ void
+diff --git a/tools/djvuextract.cpp b/tools/djvuextract.cpp
+index 4a9f381..907b99c 100644
+--- a/tools/djvuextract.cpp
++++ b/tools/djvuextract.cpp
+@@ -105,6 +105,7 @@
+ #include "GOS.h"
+ #include "DjVuMessage.h"
+ #include <locale.h>
++#include <stddef.h>
+ #include <stdlib.h>
+
+
+diff --git a/tools/djvumake.cpp b/tools/djvumake.cpp
+index 7020484..4c5fc0f 100644
+--- a/tools/djvumake.cpp
++++ b/tools/djvumake.cpp
+@@ -153,6 +153,7 @@
+
+ #include <locale.h>
+ #include <stdio.h>
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <ctype.h>
+
+diff --git a/tools/djvups.cpp b/tools/djvups.cpp
+index 51aa999..632b832 100644
+--- a/tools/djvups.cpp
++++ b/tools/djvups.cpp
+@@ -57,6 +57,7 @@
+ # include "config.h"
+ #endif
+
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+diff --git a/tools/djvused.cpp b/tools/djvused.cpp
+index de84dcd..687fdca 100644
+--- a/tools/djvused.cpp
++++ b/tools/djvused.cpp
+@@ -61,6 +61,7 @@
+ #endif
+
+ #include <stdio.h>
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <errno.h>
+diff --git a/tools/djvuserve.cpp b/tools/djvuserve.cpp
+index 19a17da..818fe78 100644
+--- a/tools/djvuserve.cpp
++++ b/tools/djvuserve.cpp
+@@ -73,6 +73,7 @@
+
+ #include <locale.h>
+ #include <stdio.h>
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <sys/stat.h>
+ #include <time.h>
+diff --git a/tools/djvutxt.cpp b/tools/djvutxt.cpp
+index ba2c745..9e9124c 100644
+--- a/tools/djvutxt.cpp
++++ b/tools/djvutxt.cpp
+@@ -61,6 +61,7 @@
+ # include "config.h"
+ #endif
+
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+diff --git a/tools/tiff2pdf.h b/tools/tiff2pdf.h
+index 082f5fb..656dc43 100644
+--- a/tools/tiff2pdf.h
++++ b/tools/tiff2pdf.h
+@@ -22,6 +22,7 @@
+ # endif
+ # if HAVE_TIFF
+ # include <stdio.h>
++# include <stddef.h>
+ # include <stdlib.h>
+ # include <tiff.h>
+ # include <tiffio.h>
+diff --git a/xmltools/djvutoxml.cpp b/xmltools/djvutoxml.cpp
+index 17c769b..b40535e 100644
+--- a/xmltools/djvutoxml.cpp
++++ b/xmltools/djvutoxml.cpp
+@@ -71,6 +71,7 @@
+
+ #include <locale.h>
+ #include <stdio.h>
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <sys/stat.h>
+ #include <assert.h>
+diff --git a/xmltools/djvuxmlparser.cpp b/xmltools/djvuxmlparser.cpp
+index bdc5768..6679a9d 100644
+--- a/xmltools/djvuxmlparser.cpp
++++ b/xmltools/djvuxmlparser.cpp
+@@ -70,6 +70,7 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <locale.h>
++#include <stddef.h>
+ #include <stdlib.h>
+
+ static void
+--
+1.7.4.1
+
+From 3cc41e2a72bbd6d34e81a9a214abbebf41cc00c7 Mon Sep 17 00:00:00 2001
+From: Leon Bottou <leon@bottou.org>
+Date: Sat, 21 May 2011 09:27:17 -0700
+Subject: [PATCH] Added ddjvu option to skip corrupted pages.
+
+---
+ tools/ddjvu.1 | 7 +++++++
+ tools/ddjvu.cpp | 49 +++++++++++++++++++++++++++++++++----------------
+ 2 files changed, 40 insertions(+), 16 deletions(-)
+
+diff --git a/tools/ddjvu.1 b/tools/ddjvu.1
+index 29285c3..7d3d105 100644
+--- a/tools/ddjvu.1
++++ b/tools/ddjvu.1
+@@ -178,6 +178,13 @@ select specific layers of a DjVu image.
+ These modes can fail if the DjVu image does
+ not contain the selected layer.
+ .RE
++.TP
++.BI "-skip"
++Instead of aborting when encountering a corrupted page,
++this option causes
++.BR ddjvu
++to simply skip the corrupted page and continue with the next.
++This is useful for processing certain damaged files.
+
+ .SH RESOLUTION OPTIONS
+ The following options control the resolution of the output image.
+diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
+index 981a270..b9cb038 100644
+--- a/tools/ddjvu.cpp
++++ b/tools/ddjvu.cpp
+@@ -132,6 +132,7 @@ ddjvu_rect_t info_size;
+ ddjvu_rect_t info_segment;
+ const char *inputfilename = 0;
+ const char *outputfilename = 0;
++int flag_skip_corrupted = 0;
+
+ #if HAVE_TIFF2PDF
+ char *tempfilename = 0;
+@@ -164,7 +165,6 @@ handle(int wait)
+ if (msg->m_error.filename)
+ fprintf(stderr,"ddjvu: '%s:%d'\n",
+ msg->m_error.filename, msg->m_error.lineno);
+- exit(10);
+ default:
+ break;
+ }
+@@ -554,8 +554,16 @@ dopage(int pageno)
+ while (! ddjvu_page_decoding_done(page))
+ handle(TRUE);
+ if (ddjvu_page_decoding_error(page))
+- die(i18n("Cannot decode page %d."), pageno);
+-
++ {
++ handle(FALSE);
++ fprintf(stderr,"ddjvu: ");
++ fprintf(stderr,i18n("Cannot decode page %d."), pageno);
++ fprintf(stderr,"\n");
++ if (flag_skip_corrupted)
++ return;
++ else
++ exit(10);
++ }
+ timingdata[1] = ticks();
+ /* Open files */
+ if (flag_format == 't')
+@@ -753,19 +761,20 @@ usage()
+ i18n("DjVu decompression utility\n\n"
+ "Usage: ddjvu [options] [<djvufile> [<outputfile>]]\n\n"
+ "Options:\n"
+- " -verbose Prints various informational messages.\n"
+- " -format=FMT Selects output format: pbm,pgm,ppm,pnm,rle,tiff.\n"
+- " -scale=N Selects display scale.\n"
+- " -size=WxH Selects size of rendered image.\n"
+- " -subsample=N Selects direct subsampling factor.\n"
+- " -aspect=no Authorizes aspect ratio changes\n"
+- " -segment=WxH+X+Y Selects which segment of the rendered image\n"
+- " -mode=black Renders a meaningful bitonal image.\n"
+- " -mode=mask Only renders the mask layer.\n"
+- " -mode=foreground Only renders the foreground layer.\n"
+- " -mode=background Only renders the background layer.\n"
+- " -page=PAGESPEC Selects page(s) to be decoded.\n"
+- " -quality=QUALITY Specifies jpeg quality for lossy tiff output.\n"
++ " -verbose Print various informational messages.\n"
++ " -format=FMT Select output format: pbm,pgm,ppm,pnm,rle,tiff.\n"
++ " -scale=N Select display scale.\n"
++ " -size=WxH Select size of rendered image.\n"
++ " -subsample=N Select direct subsampling factor.\n"
++ " -aspect=no Authorize aspect ratio changes\n"
++ " -segment=WxH+X+Y Select which segment of the rendered image\n"
++ " -mode=black Render a meaningful bitonal image.\n"
++ " -mode=mask Only render the mask layer.\n"
++ " -mode=foreground Only render the foreground layer.\n"
++ " -mode=background Only render the background layer.\n"
++ " -page=PAGESPEC Select page(s) to be decoded.\n"
++ " -skip Skip corrupted pages instead of aborting.\n"
++ " -quality=QUALITY Specify jpeg quality for lossy tiff output.\n"
+ "\n"
+ "If <outputfile> is a single dash or omitted, the decompressed image\n"
+ "is sent to the standard output. If <djvufile> is a single dash or\n"
+@@ -846,6 +855,12 @@ parse_option(int argc, char **argv, int i)
+ die(i18n(errarg), opt);
+ flag_verbose = 1;
+ }
++ if (!strcmp(opt,"skip"))
++ {
++ if (arg)
++ die(i18n(errarg), opt);
++ flag_skip_corrupted = 1;
++ }
+ else if (!strcmp(opt,"scale"))
+ {
+ if (!arg)
+@@ -1012,6 +1027,8 @@ main(int argc, char **argv)
+ die(i18n("Cannot open djvu document '%s'."), inputfilename);
+ while (! ddjvu_document_decoding_done(doc))
+ handle(TRUE);
++ if (ddjvu_document_decoding_error(doc))
++ die(i18n("Cannot decode document."));
+
+ /* Process all pages */
+ i = ddjvu_document_get_pagenum(doc);
+--
+1.7.4.1
+
+From 6a6e6a047b41a431cfc091bd71fcad554fd79437 Mon Sep 17 00:00:00 2001
+From: Leon Bottou <leon@bottou.org>
+Date: Mon, 30 May 2011 18:52:33 -0700
+Subject: [PATCH] Added option -o outputfile to djvudump.
+
+---
+ tools/djvudump.1 | 2 +-
+ tools/djvudump.cpp | 34 +++++++++++++++++++++++++---------
+ 2 files changed, 26 insertions(+), 10 deletions(-)
+
+diff --git a/tools/djvudump.1 b/tools/djvudump.1
+index c86b7d5..e39a318 100644
+--- a/tools/djvudump.1
++++ b/tools/djvudump.1
+@@ -27,7 +27,7 @@
+ djvudump \- Display internal structure of DjVu files.
+
+ .SH SYNOPSIS
+-.BI "djvudump " "djvufiles" "..."
++.BI "djvudump [-o " "outputfile" "] " "djvufiles" "..."
+
+ .SH DESCRIPTION
+ Program
+diff --git a/tools/djvudump.cpp b/tools/djvudump.cpp
+index 2dddbdf..6daaf2c 100644
+--- a/tools/djvudump.cpp
++++ b/tools/djvudump.cpp
+@@ -122,6 +122,9 @@ xxx
+ #include <stddef.h>
+ #include <stdlib.h>
+
++const char *outputfile = 0;
++FILE *outputf = stdout;
++
+ void
+ display(const GURL &url)
+ {
+@@ -134,7 +137,7 @@ display(const GURL &url)
+ obs->seek(0);
+ obs->readall(buf, size);
+ GNativeString ns = str;
+- fputs((const char*)ns, stdout);
++ fputs((const char*)ns, outputf);
+ }
+
+
+@@ -146,7 +149,7 @@ usage()
+ "DJVUDUMP --- DjVuLibre-" DJVULIBRE_VERSION "\n"
+ #endif
+ "Describes DjVu and IFF85 files\n\n"
+- "Usage: djvudump <iff_filenames>\n" );
++ "Usage: djvudump [-o outputfile] <iff_filenames>\n" );
+ exit(1);
+ }
+
+@@ -156,24 +159,37 @@ main(int argc, char **argv)
+ setlocale(LC_ALL,"");
+ setlocale(LC_NUMERIC,"C");
+ djvu_programname(argv[0]);
+- GArray<GUTF8String> dargv(0,argc-1);
++ // get output file name
++ if (argc>2 && !strcmp(argv[1],"-o"))
++ {
++ outputfile = argv[2];
++ argv += 2;
++ argc -= 2;
++ }
++ // convert iff file name
++ GArray<GUTF8String> dargv(0, argc-1);
+ for(int i=0;i<argc;++i)
+ dargv[i]=GNativeString(argv[i]);
++ if (argc <= 1)
++ usage();
++ if (outputfile && !(outputf = fopen(outputfile,"w")))
++ {
++ DjVuPrintErrorUTF8("djvudump: Cannot open output file.\n");
++ exit(1);
++ }
+ G_TRY
+ {
+- if (argc<=1)
+- usage();
+ for (int i=1; i<argc; i++)
+- {
++ {
+ const GURL::Filename::UTF8 url(dargv[i]);
+ display(url);
+- }
++ }
+ }
+ G_CATCH(ex)
+- {
++ {
+ ex.perror();
+ exit(1);
+- }
++ }
+ G_ENDCATCH;
+ return 0;
+ }
+--
+1.7.4.1
+
+From 6db359d1ad5e7e863fac53301e7ff884cfe44423 Mon Sep 17 00:00:00 2001
+From: Bill C Riemers <briemers@redhat.com>
+Date: Thu, 2 Jun 2011 13:17:27 -0400
+Subject: [PATCH] Correct error copying an error in the annotation class of assigning a tempory
+ GUTF8String directly to a const char *.
+
+---
+ libdjvu/DjVuAnno.cpp | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/libdjvu/DjVuAnno.cpp b/libdjvu/DjVuAnno.cpp
+index 6ca5b4e..e2a9108 100644
+--- a/libdjvu/DjVuAnno.cpp
++++ b/libdjvu/DjVuAnno.cpp
+@@ -261,7 +261,8 @@ GLObject::print(ByteStream & str, int compact, int indent, int * cur_pos) const
+ to_print=buffer.format("%d",number);
+ break;
+ case STRING:
+- to_print=make_c_string(string);
++ buffer=make_c_string(string);
++ to_print=(const char *)buffer;
+ break;
+ case SYMBOL:
+ to_print=buffer.format("%s",(const char *)symbol);
+--
+1.7.4.1
+
+From 2b26415c3c46ffb7532ca250990668564be62d39 Mon Sep 17 00:00:00 2001
+From: Leon Bottou <leon@bottou.org>
+Date: Thu, 2 Jun 2011 09:48:49 -0700
+Subject: [PATCH] Corrected polarity of xmp annotation saving
+
+---
+ libdjvu/DjVuAnno.cpp | 19 ++++++++++---------
+ 1 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/libdjvu/DjVuAnno.cpp b/libdjvu/DjVuAnno.cpp
+index e2a9108..8e16dd8 100644
+--- a/libdjvu/DjVuAnno.cpp
++++ b/libdjvu/DjVuAnno.cpp
+@@ -254,25 +254,24 @@ GLObject::print(ByteStream & str, int compact, int indent, int * cur_pos) const
+ if (!cur_pos) { cur_pos = &local_cur_pos; }
+
+ GUTF8String buffer;
+- const char * to_print=0;
+ switch(type)
+ {
+ case NUMBER:
+- to_print=buffer.format("%d",number);
++ buffer.format("%d",number);
+ break;
+ case STRING:
+- buffer=make_c_string(string);
+- to_print=(const char *)buffer;
++ buffer = make_c_string(string);
+ break;
+ case SYMBOL:
+- to_print=buffer.format("%s",(const char *)symbol);
++ buffer.format("%s",(const char *)symbol);
+ break;
+ case LIST:
+- to_print=buffer.format("(%s",(const char *)name);
++ buffer.format("(%s",(const char *)name);
+ break;
+ case INVALID:
+ break;
+ }
++ const char * to_print = (const char*)buffer;
+ if (!compact && *cur_pos+strlen(to_print)>70)
+ {
+ char ch='\n';
+@@ -1375,7 +1374,7 @@ DjVuANT::encode_raw(void) const
+ }
+ //*** XMP Metadata
+ del_all_items(XMP_TAG, parser);
+- if (!xmpmetadata)
++ if (!!xmpmetadata)
+ {
+ GUTF8String mdatabuffer("(");
+ mdatabuffer += XMP_TAG;
+@@ -1385,8 +1384,10 @@ DjVuANT::encode_raw(void) const
+ //*** Mapareas
+ del_all_items(GMapArea::MAPAREA_TAG, parser);
+ for(GPosition pos=map_areas;pos;++pos)
+- parser.parse(map_areas[pos]->print());
+-
++ {
++ GUTF8String mapareabuffer = map_areas[pos]->print();
++ parser.parse(mapareabuffer);
++ }
+ GP<ByteStream> gstr=ByteStream::create();
+ ByteStream &str=*gstr;
+ parser.print(str, 1);
+--
+1.7.4.1
+
+From 65600b5801d11ff8ca8db3a25bf004fc06f4515b Mon Sep 17 00:00:00 2001
+From: Leon Bottou <leon@bottou.org>
+Date: Sat, 4 Jun 2011 15:29:18 -0700
+Subject: [PATCH] Eliminate warnings with gcc-4.6.0
+
+---
+ libdjvu/Arrays.cpp | 2 -
+ libdjvu/DjVuDocEditor.cpp | 37 +++++++++----------
+ libdjvu/GString.cpp | 44 ++++++++--------------
+ libdjvu/JPEGDecoder.cpp | 2 -
+ libdjvu/XMLParser.cpp | 7 +---
+ tools/ddjvu.cpp | 2 +-
+ tools/jb2cmp/patterns.cpp | 87 +-------------------------------------------
+ tools/tiff2pdf.c | 9 ++---
+ 8 files changed, 40 insertions(+), 150 deletions(-)
+
+diff --git a/libdjvu/Arrays.cpp b/libdjvu/Arrays.cpp
+index c4f74ca..6c7f23a 100644
+--- a/libdjvu/Arrays.cpp
++++ b/libdjvu/Arrays.cpp
+@@ -239,9 +239,7 @@ ArrayRep::ins(int n, const void * what, unsigned int howmany)
+ copy(ndata, lobound-minlo, hibound-minlo,
+ data, lobound-minlo, hibound-minlo);
+ destroy(data, lobound-minlo, hibound-minlo);
+- void *tmp=data;
+ data=ndata;
+- tmp=data;
+ maxhi = nmaxhi;
+ }
+
+diff --git a/libdjvu/DjVuDocEditor.cpp b/libdjvu/DjVuDocEditor.cpp
+index 2247e40..f1d8b0d 100644
+--- a/libdjvu/DjVuDocEditor.cpp
++++ b/libdjvu/DjVuDocEditor.cpp
+@@ -555,27 +555,24 @@ DjVuDocEditor::insert_file(const GURL &file_url, bool is_page,
+ can_compress_flag);
+ }
+
+- // Oh. It does exist... Check that it has IFF structure
++ // Oh. It does exist... Check that it has IFF structure
+ {
+- const GP<IFFByteStream> giff(
+- IFFByteStream::create(file_pool->get_stream()));
+- IFFByteStream &iff=*giff;
+- GUTF8String chkid;
+-
+- int length;
+- length=iff.get_chunk(chkid);
+- if (chkid!="FORM:DJVI" && chkid!="FORM:DJVU" &&
+- chkid!="FORM:BM44" && chkid!="FORM:PM44")
+- G_THROW( ERR_MSG("DjVuDocEditor.not_1_page") "\t"+file_url.get_string());
+-
+- // Wonderful. It's even a DjVu file. Scan for NDIR chunks.
+- // If NDIR chunk is found, ignore the file
+- while(iff.get_chunk(chkid))
+- {
+- if (chkid=="NDIR")
+- return false;
+- iff.close_chunk();
+- }
++ const GP<IFFByteStream> giff(
++ IFFByteStream::create(file_pool->get_stream()));
++ IFFByteStream &iff=*giff;
++ GUTF8String chkid;
++ if (chkid!="FORM:DJVI" && chkid!="FORM:DJVU" &&
++ chkid!="FORM:BM44" && chkid!="FORM:PM44")
++ G_THROW( ERR_MSG("DjVuDocEditor.not_1_page") "\t"
++ + file_url.get_string());
++ // Wonderful. It's even a DjVu file. Scan for NDIR chunks.
++ // If NDIR chunk is found, ignore the file
++ while(iff.get_chunk(chkid))
++ {
++ if (chkid=="NDIR")
++ return false;
++ iff.close_chunk();
++ }
+ }
+ return insert_file(file_pool,file_url,is_page,file_pos,name2id,source);
+ }
+diff --git a/libdjvu/GString.cpp b/libdjvu/GString.cpp
+index 350b11b..ed92a7f 100644
+--- a/libdjvu/GString.cpp
++++ b/libdjvu/GString.cpp
+@@ -643,26 +643,22 @@ GBaseString::UTF8ToNative(
+ const char *source=(*this);
+ GP<GStringRep> retval;
+ if(source && source[0])
+- {
+-#if DO_CHANGELOCALE
+- GUTF8String lc_ctype(setlocale(LC_CTYPE,0));
+-#endif
+- bool repeat;
+- for(repeat=!currentlocale;;repeat=false)
+ {
+- retval=(*this)->toNative((GStringRep::EscapeMode)escape);
+ #if DO_CHANGELOCALE
+- if (!repeat || retval || (lc_ctype == setlocale(LC_CTYPE,"")))
++ GUTF8String lc_ctype(setlocale(LC_CTYPE,0));
++ bool repeat;
++ for(repeat=!currentlocale;;repeat=false)
++ {
+ #endif
+- break;
+- }
++ retval=(*this)->toNative((GStringRep::EscapeMode)escape);
+ #if DO_CHANGELOCALE
+- if(!repeat)
+- {
++ if (!repeat || retval || (lc_ctype == setlocale(LC_CTYPE,"")))
++ break;
++ }
++ if(!repeat)
+ setlocale(LC_CTYPE,(const char *)lc_ctype);
+- }
+ #endif
+- }
++ }
+ return GNativeString(retval);
+ }
+
+@@ -697,27 +693,19 @@ GBaseString::NativeToUTF8(void) const
+ const char *source=(*this);
+ #if DO_CHANGELOCALE
+ GUTF8String lc_ctype=setlocale(LC_CTYPE,0);
+-#endif
+ bool repeat;
+ for(repeat=true;;repeat=false)
+- {
+- if( (retval=GStringRep::NativeToUTF8(source)) )
+ {
+- if(GStringRep::cmp(retval->toNative(),source))
+- {
+- retval=GStringRep::UTF8::create((unsigned int)0);
+- }
+- }
+-#if DO_CHANGELOCALE
+- if(!repeat || retval || (lc_ctype == setlocale(LC_CTYPE,"")))
+ #endif
+- break;
+- }
++ if( (retval=GStringRep::NativeToUTF8(source)) )
++ if(GStringRep::cmp(retval->toNative(),source))
++ retval=GStringRep::UTF8::create((unsigned int)0);
+ #if DO_CHANGELOCALE
++ if(!repeat || retval || (lc_ctype == setlocale(LC_CTYPE,"")))
++ break;
++ }
+ if(!repeat)
+- {
+ setlocale(LC_CTYPE,(const char *)lc_ctype);
+- }
+ #endif
+ }
+ return GUTF8String(retval);
+diff --git a/libdjvu/JPEGDecoder.cpp b/libdjvu/JPEGDecoder.cpp
+index cb7aa97..f22f77a 100644
+--- a/libdjvu/JPEGDecoder.cpp
++++ b/libdjvu/JPEGDecoder.cpp
+@@ -153,7 +153,6 @@ JPEGDecoder::decode(ByteStream & bs,GPixmap &pix)
+
+ JSAMPARRAY buffer; /* Output row buffer */
+ int row_stride; /* physical row width in output buffer */
+- int full_buf_size;
+ int isGrey,i;
+
+ cinfo.err = jpeg_std_error(&jerr.pub);
+@@ -184,7 +183,6 @@ JPEGDecoder::decode(ByteStream & bs,GPixmap &pix)
+
+ /* JSAMPLEs per row in output buffer */
+ row_stride = cinfo.output_width * cinfo.output_components;
+- full_buf_size = row_stride * cinfo.output_height;
+
+ /* Make a one-row-high sample array that will go away when done with image */
+ buffer = (*cinfo.mem->alloc_sarray)
+diff --git a/libdjvu/XMLParser.cpp b/libdjvu/XMLParser.cpp
+index 7da923a..026b27d 100644
+--- a/libdjvu/XMLParser.cpp
++++ b/libdjvu/XMLParser.cpp
+@@ -646,17 +646,12 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags, GURL *pdjvufile)
+ GPosition datapos=args.contains("data");
+ if(datapos)
+ {
+- bool isDjVuType=false;
+ GPosition typePos(args.contains("type"));
+ if(typePos)
+- {
+- if(args[typePos] != mimetype)
+ {
+- // DjVuPrintErrorUTF8("Ignoring %s Object tag\n",mimetype);
++ if(args[typePos] != mimetype)
+ continue;
+ }
+- isDjVuType=true;
+- }
+ const GURL url = (pdjvufile) ? *pdjvufile
+ : GURL::UTF8(args[datapos],
+ (args[datapos][0] == '/') ? codebase.base() : codebase);
+diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
+index b9cb038..3b4ce16 100644
+--- a/tools/ddjvu.cpp
++++ b/tools/ddjvu.cpp
+@@ -855,7 +855,7 @@ parse_option(int argc, char **argv, int i)
+ die(i18n(errarg), opt);
+ flag_verbose = 1;
+ }
+- if (!strcmp(opt,"skip"))
++ else if (!strcmp(opt,"skip"))
+ {
+ if (arg)
+ die(i18n(errarg), opt);
+diff --git a/tools/jb2cmp/patterns.cpp b/tools/jb2cmp/patterns.cpp
+index e456902..b31cf4e 100644
+--- a/tools/jb2cmp/patterns.cpp
++++ b/tools/jb2cmp/patterns.cpp
+@@ -303,11 +303,8 @@ static int32 distance_by_pixeldiff_functions(Image *i1, Image *i2,
+ int32 (*compare_row)(byte *, byte *, int32),
+ int32 (*compare_with_white)(byte *, int32), int32 ceiling)
+ {
+- byte **p1, **p2;
+ int32 w1, w2, h1, h2;
+ int32 shift_x, shift_y; /* of i1's coordinate system with respect to i2 */
+- /*int32 s = 0, i, i_start, i_cap;
+- int32 right_margin_start, right_margin_width;*/
+
+ /* make i1 to be narrower than i2 */
+ if (i1->width > i2->width)
+@@ -317,8 +314,8 @@ static int32 distance_by_pixeldiff_functions(Image *i1, Image *i2,
+ i2 = img;
+ }
+
+- w1 = i1->width; h1 = i1->height; p1 = i1->pixels;
+- w2 = i2->width; h2 = i2->height; p2 = i2->pixels;
++ w1 = i1->width; h1 = i1->height;
++ w2 = i2->width; h2 = i2->height;
+
+ /* (shift_x, shift_y) */
+ /* is what should be added to i1's coordinates to get i2's coordinates. */
+@@ -339,86 +336,6 @@ static int32 distance_by_pixeldiff_functions(Image *i1, Image *i2,
+
+ return distance_by_pixeldiff_functions_by_shift(
+ i1, i2, compare_row, compare_with_white, ceiling, shift_x, shift_y);
+-
+-/* FIXME */
+-#if 0
+- /* Compute difference in the non-overlapping top margin */
+-
+- if (shift_y < 0)
+- {
+- /* i1 has top rows not covered by i2 */
+- i_cap = -shift_y;
+- for (i = 0; i < i_cap; i++)
+- {
+- assert(i >= 0 && i < h1);
+- s += compare_with_white(p1[i], w1);
+- if (s > ceiling) return maxint;
+- }
+- i_start = i_cap; /* topmost overlapping row in i1's coords */
+- }
+- else
+- {
+- /* i2 has top rows not covered by i1 */
+- for (i = 0; i < shift_y; i++)
+- {
+- assert(i >= 0 && i < h2);
+- s += compare_with_white(p2[i], w2);
+- if (s > ceiling) return maxint;
+- }
+- i_start = 0;
+- }
+-
+- /* Compute difference in the overlapping area */
+-
+- i_cap = h2 - shift_y;
+- if (h1 < i_cap) i_cap = h1;
+-
+- right_margin_start = shift_x + w1;
+- right_margin_width = w2 - right_margin_start;
+-
+- for (i = i_start; i < i_cap; i++) /* i is a coordinate in i1 system */
+- {
+- int32 y = i + shift_y; /* same row coordinate in i2 system */
+- assert(y >= 0 && y < h2);
+- s += compare_with_white(p2[y], shift_x);
+- if (s > ceiling) return maxint;
+- assert(i >= 0 && i < h1);
+- assert(shift_x + w1 <= w2);
+- assert(i < h1);
+- s += compare_row(p2[y] + shift_x, p1[i], w1);
+- if (s > ceiling) return maxint;
+- s += compare_with_white(p2[y] + right_margin_start, right_margin_width);
+- if (s > ceiling) return maxint;
+- }
+-
+-
+- /* Compute difference in the non-overlapping bottom margin */
+-
+- if (i_cap == h1)
+- {
+- /* i2 has bottom rows not covered by i1 */
+- i_start = i_cap + shift_y;
+- for (i = i_start; i < h2; i++)
+- {
+- assert(i >= 0 && i < h2);
+- s += compare_with_white(p2[i], w2);
+- if (s > ceiling) return maxint;
+- }
+- }
+- else
+- {
+- /* i1 has bottom rows not covered by i2 */
+- i_start = i_cap;
+- for (i = i_cap; i < h1; i++)
+- {
+- assert(i >= 0 && i < h1);
+- s += compare_with_white(p1[i], w1);
+- if (s > ceiling) return maxint;
+- }
+- }
+-
+- return s;
+-#endif
+ }
+
+ #endif
+diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
+index 36949f1..2db8703 100644
+--- a/tools/tiff2pdf.c
++++ b/tools/tiff2pdf.c
+@@ -721,7 +721,6 @@ tiff2pdf(TIFF *input, FILE *outputfile, int argc, const char **argv)
+ const char *outfilename = "<null>";
+ T2P *t2p = NULL;
+ TIFF *output = NULL;
+- tsize_t written=0;
+ int c;
+
+ /* T2P */
+@@ -874,7 +873,7 @@ tiff2pdf(TIFF *input, FILE *outputfile, int argc, const char **argv)
+ TIFFSeekFile(output, (toff_t) 0, SEEK_SET);
+
+ /* Write */
+- written = t2p_write_pdf(t2p, input, output);
++ t2p_write_pdf(t2p, input, output);
+ if(t2p->t2p_error != 0){
+ TIFFError(TIFF2PDF_MODULE, "An error occurred creating output PDF file");
+ goto fail;
+@@ -2633,7 +2632,6 @@ static tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output,
+ tsize_t read=0;
+ uint16 i=0;
+ ttile_t tilecount=0;
+- tsize_t tilesize=0;
+ ttile_t septilecount=0;
+ tsize_t septilesize=0;
+ #ifdef JPEG_SUPPORT
+@@ -2819,7 +2817,6 @@ static tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output,
+ if(t2p->pdf_sample == T2P_SAMPLE_PLANAR_SEPARATE_TO_CONTIG){
+ septilesize=TIFFTileSize(input);
+ septilecount=TIFFNumberOfTiles(input);
+- tilesize=septilesize*t2p->tiff_samplesperpixel;
+ tilecount=septilecount/t2p->tiff_samplesperpixel;
+ buffer = (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+ if(buffer==NULL){
+@@ -3802,7 +3799,6 @@ static tsize_t t2p_write_pdf_info(T2P* t2p, TIFF* input, TIFF* output){
+ tsize_t written=0;
+ char* info;
+ char buffer[512];
+- int buflen=0;
+
+ if(t2p->pdf_datetime==NULL){
+ t2p_pdf_tifftime(t2p, input);
+@@ -3815,7 +3811,8 @@ static tsize_t t2p_write_pdf_info(T2P* t2p, TIFF* input, TIFF* output){
+ }
+ written += TIFFWriteFile(output, (tdata_t) "\r/Producer ", 11);
+ _TIFFmemset((tdata_t)buffer, 0x00, 512);
+- buflen=sprintf(buffer, "libtiff / tiff2pdf - %d / %s", TIFFLIB_VERSION, T2P_VERSION);
++ sprintf(buffer, "libtiff / tiff2pdf - %d / %s",
++ TIFFLIB_VERSION, T2P_VERSION);
+ written += t2p_write_pdf_string(buffer, output);
+ written += TIFFWriteFile(output, (tdata_t) "\r", 1);
+ if(t2p->pdf_creator != NULL){
+--
+1.7.4.1
+
+From 5b3d074c2b315e7339ce279c559c3a99f26bef6a Mon Sep 17 00:00:00 2001
+From: Leon Bottou <leon@bottou.org>
+Date: Sat, 4 Jun 2011 17:37:00 -0700
+Subject: [PATCH] Fix MMX code when using gcc-4.6
+
+Fix MMX macros
+Enable MMX on x86_64
+---
+ libdjvu/MMX.cpp | 17 ++++++++++++++++-
+ libdjvu/MMX.h | 11 ++++++-----
+ tools/ddjvu.cpp | 1 -
+ 3 files changed, 22 insertions(+), 7 deletions(-)
+
+diff --git a/libdjvu/MMX.cpp b/libdjvu/MMX.cpp
+index 528dab6..e70fdd8 100644
+--- a/libdjvu/MMX.cpp
++++ b/libdjvu/MMX.cpp
+@@ -167,8 +167,23 @@ MMXControl::enable_mmx()
+ : "=m" (cpuflags) :
+ : "eax","ecx","edx");
+ #endif
++#if defined(MMX) && defined(__GNUC__) && defined(__x86_64__)
++ // Detection of MMX for GCC
++ __asm__ volatile (// Check that CR0:EM is clear
++ "xorl %%edx,%%edx\n\t"
++ "smsw %%ax\n\t"
++ "andl $4,%%eax\n\t"
++ "jnz 1f\n\t"
++ // Execute CPUID
++ "movl $1,%%eax\n\t"
++ "cpuid\n"
++ // Finish
++ "1:\tmovl %%edx, %0"
++ : "=m" (cpuflags) :
++ : "eax","ebx","ecx","edx");
++#endif
+ #if defined(MMX) && defined(_MSC_VER) && defined(_M_IX86)
+- // Detection of MMX for MSVC
++ // Detection of MMX for MSVC 32 bits
+ __asm { pushfd
+ pop ecx
+ xor edx,edx
+diff --git a/libdjvu/MMX.h b/libdjvu/MMX.h
+index b0af5e5..f8780af 100644
+--- a/libdjvu/MMX.h
++++ b/libdjvu/MMX.h
+@@ -143,17 +143,18 @@ class MMXControl
+
+ #ifndef NO_MMX
+
+-#if defined(__GNUC__) && defined(__i386__)
++#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
++typedef struct{ char c[8]; } MMX_t;
+ #define MMXemms \
+ __asm__ volatile("emms" : : : "memory" )
+ #define MMXrr(op,src,dst) \
+- __asm__ volatile( #op " %%" #src ",%%" #dst : : : "memory")
++ __asm__ volatile( #op " %%" #src ",%%" #dst : : : "memory" )
+ #define MMXir(op,imm,dst) \
+- __asm__ volatile( #op " %0,%%" #dst : : "i" (imm) : "memory")
++ __asm__ volatile( #op " %0,%%" #dst : : "i" (imm) : "memory" )
+ #define MMXar(op,addr,dst) \
+- __asm__ volatile( #op " %0,%%" #dst : : "m" (*(addr)) : "memory")
++ __asm__ volatile( #op " %0,%%" #dst : : "m" (*(MMX_t*)(addr)) : "memory" )
+ #define MMXra(op,src,addr) \
+- __asm__ volatile( #op " %%" #src ",%0" : : "m" (*(addr)) : "memory")
++ __asm__ volatile( #op " %%" #src ",%0" : "=m" (*(MMX_t*)(addr)) : : "memory")
+ #define MMX 1
+ #endif
+
+diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
+index 3b4ce16..216c6cb 100644
+--- a/tools/ddjvu.cpp
++++ b/tools/ddjvu.cpp
+@@ -846,7 +846,6 @@ parse_option(int argc, char **argv, int i)
+ arg = opt;
+ opt = "subsample";
+ }
+-
+ /* Parse options */
+ if (!strcmp(opt,"v") ||
+ !strcmp(opt,"verbose"))
+--
+1.7.4.1
+
+From fbed8e51e5970b12ce36afb0dec8c4e02992c0f8 Mon Sep 17 00:00:00 2001
+From: Leon Bottou <leon@bottou.org>
+Date: Thu, 9 Jun 2011 14:37:52 -0700
+Subject: [PATCH] Fixed regression in djvm.
+
+---
+ libdjvu/DjVuDocEditor.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/libdjvu/DjVuDocEditor.cpp b/libdjvu/DjVuDocEditor.cpp
+index f1d8b0d..baeb7dd 100644
+--- a/libdjvu/DjVuDocEditor.cpp
++++ b/libdjvu/DjVuDocEditor.cpp
+@@ -561,6 +561,7 @@ DjVuDocEditor::insert_file(const GURL &file_url, bool is_page,
+ IFFByteStream::create(file_pool->get_stream()));
+ IFFByteStream &iff=*giff;
+ GUTF8String chkid;
++ iff.get_chunk(chkid);
+ if (chkid!="FORM:DJVI" && chkid!="FORM:DJVU" &&
+ chkid!="FORM:BM44" && chkid!="FORM:PM44")
+ G_THROW( ERR_MSG("DjVuDocEditor.not_1_page") "\t"
+--
+1.7.4.1
+
+From f63327438954b8831a1a9f43afc8b6d16e1d3baf Mon Sep 17 00:00:00 2001
+From: Leon Bottou <leon@bottou.org>
+Date: Wed, 15 Jun 2011 00:05:50 -0700
+Subject: [PATCH] Encode oblique text as separate lines.
+
+---
+ tools/csepdjvu.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp
+index d5203d5..08f7a27 100644
+--- a/tools/csepdjvu.cpp
++++ b/tools/csepdjvu.cpp
+@@ -1288,7 +1288,7 @@ Comments::textmark(GP<TxtMark> mark)
+ int shx = (mark->x - lastx) * 100 / fontsize;
+ int shy = (mark->y - lasty) * 100 / fontsize;
+ int inter = dirx * shx + diry * shy;
+- if ( (dirx == lastdirx) && (diry == lastdiry) &&
++ if ( (dirx || diry) && (dirx == lastdirx) && (diry == lastdiry) &&
+ (inter > -150) && (inter < 300) &&
+ abs(diry * shx + dirx * shy) < 80 )
+ mark->inter = inter;
+--
+1.7.4.1
+
+From ea9fd2acab2e298ba721eb79f5026d34e6ef141f Mon Sep 17 00:00:00 2001
+From: Barak A. Pearlmutter <barak+git@cs.nuim.ie>
+Date: Wed, 22 Jun 2011 11:21:41 +0100
+Subject: [PATCH] consistent prototype for ddjvu_anno_get_xmp
+
+---
+ libdjvu/ddjvuapi.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libdjvu/ddjvuapi.h b/libdjvu/ddjvuapi.h
+index 841f223..14b63eb 100644
+--- a/libdjvu/ddjvuapi.h
++++ b/libdjvu/ddjvuapi.h
+@@ -1619,7 +1619,7 @@ ddjvu_anno_get_metadata(miniexp_t annotations, miniexp_t key);
+ Returns zero if no such key is present. */
+
+ DDJVUAPI const char *
+-ddjvu_anno_get_xmp(miniexp_t annotations, miniexp_t xmp);
++ddjvu_anno_get_xmp(miniexp_t annotations);
+
+
+ /* -------------------------------------------------- */
+--
+1.7.4.1
+
+From 701d1261493e175955aac97921949f4e4241750d Mon Sep 17 00:00:00 2001
+From: Leon Bottou <leon@bottou.org>
+Date: Sun, 11 Sep 2011 09:59:26 -0700
+Subject: [PATCH] Fixed typo in man page.
+
+---
+ tools/ddjvu.1 | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tools/ddjvu.1 b/tools/ddjvu.1
+index 7d3d105..cbb8307 100644
+--- a/tools/ddjvu.1
++++ b/tools/ddjvu.1
+@@ -66,7 +66,7 @@ and
+ .BR "ppm"
+ respectively produce a Portable Bitmap (PBM),
+ Portable Graymap (PGM),
+-or Portable Pixmap (PGM) file.
++or Portable Pixmap (PPM) file.
+ Format
+ .B "pnm"
+ produces a PBM, PGM, or PPM
+--
+1.7.4.1
+
diff --git a/extra/dmidecode/PKGBUILD b/extra/dmidecode/PKGBUILD
index d013758ad..6f5e9ceba 100644
--- a/extra/dmidecode/PKGBUILD
+++ b/extra/dmidecode/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 107032 2011-01-20 17:46:05Z giovanni $
+# $Id: PKGBUILD 143727 2011-11-28 17:28:42Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=dmidecode
pkgver=2.11
-pkgrel=1
+pkgrel=2
pkgdesc="Desktop Management Interface table related utilities"
arch=('i686' 'x86_64')
url="http://www.nongnu.org/dmidecode"
license=('GPL')
depends=('glibc')
-source=(http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
md5sums=('535487cc041f2db746587cf40a2059f0')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make prefix=/usr || return 1
- make prefix=/usr DESTDIR=${pkgdir} install || return 1
+ make prefix=/usr
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make prefix=/usr DESTDIR=${pkgdir} install
}
diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD
index 0138bdec1..edb8134bb 100644
--- a/extra/dvdauthor/PKGBUILD
+++ b/extra/dvdauthor/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137985 2011-09-13 21:30:02Z eric $
+# $Id: PKGBUILD 143729 2011-11-28 17:32:58Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Travis Willard <travisw@wmpub.ca>
# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
@@ -6,18 +6,19 @@
pkgname=dvdauthor
pkgver=0.7.0
-pkgrel=2
+pkgrel=3
pkgdesc="DVD authoring tools"
arch=('i686' 'x86_64')
url="http://dvdauthor.sourceforge.net/"
license=('GPL')
depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi')
options=('!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
md5sums=('33a447fb98ab3293ac40f869eedc17ff')
build() {
cd "${srcdir}/${pkgname}"
+
./configure --prefix=/usr \
--sysconfdir=/etc
make
@@ -25,5 +26,6 @@ build() {
package() {
cd "${srcdir}/${pkgname}"
+
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/dvdrip/PKGBUILD b/extra/dvdrip/PKGBUILD
index 28d6e8fe1..e3be37d2f 100644
--- a/extra/dvdrip/PKGBUILD
+++ b/extra/dvdrip/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 130924 2011-07-09 05:42:10Z giovanni $
+# $Id: PKGBUILD 143731 2011-11-28 17:39:01Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Fredrik Hammar <Horney_C86@Hotmail.com>
pkgname=dvdrip
pkgver=0.98.11
-pkgrel=9
+pkgrel=10
pkgdesc="A Gtk frontend for transcode writen in Perl"
arch=('i686' 'x86_64')
license=('custom')
@@ -15,8 +15,8 @@ depends=('perl-gtk2-ex-formfactory' 'transcode' 'imagemagick'
optdepends=('ogmtools: for ogm/odd video creation'
'lsdvd: fast reading of DVD table'
'fping: for cluster support')
-source=(http://www.exit1.org/dvdrip/dist/${pkgname}-${pkgver}.tar.gz \
- ${pkgname}.desktop)
+source=("http://www.exit1.org/dvdrip/dist/${pkgname}-${pkgver}.tar.gz"
+ 'dvdrip.desktop')
options=('!emptydirs' '!makeflags')
md5sums=('6dfa4199d451757a37eea233a07da4c0'
'e91cf411928fd0500d07a0022b4ef546')
@@ -30,6 +30,7 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
+
make install DESTDIR="${pkgdir}"
# remove perllocal.pod and .packlist
diff --git a/extra/dvgrab/PKGBUILD b/extra/dvgrab/PKGBUILD
index 13f366a06..8afb2a3ba 100644
--- a/extra/dvgrab/PKGBUILD
+++ b/extra/dvgrab/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 131663 2011-07-13 13:39:59Z giovanni $
+# $Id: PKGBUILD 143735 2011-11-28 17:46:25Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=dvgrab
pkgver=3.5
-pkgrel=3
+pkgrel=4
pkgdesc="Saves audio and video data from an IEEE (FireWire) digital source"
arch=('i686' 'x86_64')
-url="http://www.kinodv.org"
+url="http://www.kinodv.org/"
license=('GPL')
depends=('libdv' 'libavc1394' 'libjpeg-turbo' 'libiec61883' 'gcc-libs')
makedepends=('pkgconfig')
diff --git a/extra/ebook-tools/PKGBUILD b/extra/ebook-tools/PKGBUILD
index 140b9ca17..812beb3af 100644
--- a/extra/ebook-tools/PKGBUILD
+++ b/extra/ebook-tools/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 122449 2011-05-04 07:27:45Z andrea $
+# $Id: PKGBUILD 143766 2011-11-29 01:07:45Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
pkgname=ebook-tools
pkgver=0.2.1
-pkgrel=2
+pkgrel=4
pkgdesc="Tools for accessing and converting various ebook file formats"
arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/ebook-tools"
+url="http://sourceforge.net/projects/ebook-tools/"
license=('custom')
-depends=('libzip' 'libxml2')
+depends=('libzip' 'libxml2' 'convertlit')
makedepends=('pkgconfig' 'cmake')
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
md5sums=('cabbd2ef9148a61ca5f6e60ca63e6045')
build() {
cd "${srcdir}"
+
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
@@ -25,6 +26,7 @@ build() {
package() {
cd "${srcdir}/build"
+
make DESTDIR="${pkgdir}" install
install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \
diff --git a/extra/enca/PKGBUILD b/extra/enca/PKGBUILD
index f723af724..fdcea7c56 100644
--- a/extra/enca/PKGBUILD
+++ b/extra/enca/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 67989 2010-02-10 10:39:23Z giovanni $
+# $Id: PKGBUILD 143739 2011-11-28 18:10:34Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Filip Dvorak <fila@pruda.com>
pkgname=enca
pkgver=1.13
-pkgrel=1
+pkgrel=2
pkgdesc="Charset analyser and converter"
arch=('i686' 'x86_64')
url="http://freshmeat.net/projects/enca/"
options=('!libtool')
license=('GPL')
-depends=('recode' 'sh')
-source=(http://dl.cihar.com/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+depends=('recode' 'bash')
+source=("http://dl.cihar.com/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
md5sums=('762bead5d9a0a5e55024e1102baaa89d')
build() {
@@ -22,6 +22,11 @@ build() {
--mandir=/usr/share/man \
--with-librecode=/usr \
--enable-external
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD
index e28a03f4c..d24dddfcc 100644
--- a/extra/fping/PKGBUILD
+++ b/extra/fping/PKGBUILD
@@ -1,20 +1,27 @@
-# $Id: PKGBUILD 130929 2011-07-09 05:53:00Z giovanni $
+# $Id: PKGBUILD 143741 2011-11-28 19:17:54Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=fping
pkgver=2.4b2
-pkgrel=4
+pkgrel=5
pkgdesc="A utility to ping multiple hosts at once"
arch=('i686' 'x86_64')
-url="http://www.fping.com/"
+url="http://packages.qa.debian.org/"
license=('custom')
depends=('glibc')
-source=("http://fping.sourceforge.net/download/${pkgname}.tar.gz")
-md5sums=('d5e8be59e307cef76bc479e1684df705')
+source=("http://ftp.de.debian.org/debian/pool/main/f/fping/fping_2.4b2-to-ipv6.orig.tar.gz"
+ 'fping_2.4b2-to-ipv6-16.1.diff'
+ 'fping-2.4b2_p161-min-time.patch')
+md5sums=('3ad516765514249a40d3c5b6caab812a'
+ '4881e981971379a0948b31719e4505f5'
+ '36753d9556eba1a6159c20c8db3e2232')
build() {
- cd $srcdir/$pkgname-$pkgver\_to
+ cd $srcdir/$pkgname-2.4b2_to-ipv6
+
+ patch -Np1 -i ${srcdir}/fping_2.4b2-to-ipv6-16.1.diff
+ patch -Np1 -i ${srcdir}/fping-2.4b2_p161-min-time.patch
./configure --prefix=/usr \
--mandir=/usr/share/man
@@ -22,11 +29,11 @@ build() {
}
package() {
- cd $srcdir/$pkgname-$pkgver\_to
+ cd $srcdir/$pkgname-2.4b2_to-ipv6
make DESTDIR="${pkgdir}" install
# install license
install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
- chmod 4755 ${pkgdir}/usr/sbin/fping
+ chmod 4555 ${pkgdir}/usr/sbin/fping
}
diff --git a/extra/fping/fping-2.4b2_p161-min-time.patch b/extra/fping/fping-2.4b2_p161-min-time.patch
new file mode 100644
index 000000000..5e5ccd40f
--- /dev/null
+++ b/extra/fping/fping-2.4b2_p161-min-time.patch
@@ -0,0 +1,47 @@
+--- old/fping.c 2010-08-24 16:59:38.947000447 +0100
++++ new/fping.c 2010-08-24 16:55:52.101000443 +0100
+@@ -25,6 +25,7 @@
+ * Original author: Roland Schemers <schemers@stanford.edu>
+ * IPv6 Support: Jeroen Massar <jeroen@unfix.org / jeroen@ipng.nl>
+ * Bugfixes, byte order & senseful seq.-numbers: Stephan Fuhrmann (stephan.fuhrmann AT 1und1.de)
++ * Fixes: min_reply_i in splits and compiler warning. Alex Ghoth (alex AT ghoth.net)
+ *
+ *
+ * RCS header information no longer used. It has been moved to the
+@@ -743,7 +744,7 @@
+
+ if( ( ping_data_size > MAX_PING_DATA ) || ( ping_data_size < MIN_PING_DATA ) )
+ {
+- fprintf( stderr, "%s: data size %u not valid, must be between %u and %u\n",
++ fprintf( stderr, "%s: data size %u not valid, must be between %lu and %u\n",
+ prog, ping_data_size, MIN_PING_DATA, MAX_PING_DATA );
+ usage();
+
+@@ -1112,7 +1113,7 @@
+ ht = timeval_diff( &current_time, &cursor->last_send_time );
+
+ if( report_interval && ( loop_flag || count_flag ) &&
+- ( timeval_diff ( &current_time, &last_report_time ) > report_interval ) )
++ ( timeval_diff ( &current_time, &last_report_time ) >= report_interval ) )
+ {
+ print_per_system_splits();
+ gettimeofday( &current_time, &tz );
+@@ -1487,8 +1488,8 @@
+ }/* IF */
+
+ fprintf( stderr, "\n" );
+- h->num_sent_i = h->num_recv_i = h->max_reply_i =
+- h->min_reply_i = h->total_time_i = 0;
++ h->num_sent_i = h->num_recv_i = h->max_reply_i = h->total_time_i = 0;
++ h->min_reply_i = 10000000;
+
+ }/* FOR */
+
+@@ -2377,6 +2378,7 @@
+ p->timeout = timeout;
+ p->running = 1;
+ p->min_reply = 10000000;
++ p->min_reply_i = 10000000;
+
+ if( strlen( p->host ) > max_hostname_len )
+ max_hostname_len = strlen( p->host );
diff --git a/extra/fping/fping_2.4b2-to-ipv6-16.1.diff b/extra/fping/fping_2.4b2-to-ipv6-16.1.diff
new file mode 100644
index 000000000..435723832
--- /dev/null
+++ b/extra/fping/fping_2.4b2-to-ipv6-16.1.diff
@@ -0,0 +1,838 @@
+--- fping-2.4b2-to-ipv6.orig/fping.8
++++ fping-2.4b2-to-ipv6/fping.8
+@@ -1,4 +1,4 @@
+-.TH fping l
++.TH fping 8
+ .SH NAME
+ fping \- send ICMP ECHO_REQUEST packets to network hosts
+ .SH SYNOPSIS
+@@ -12,9 +12,9 @@
+
+
+ .B fping
+-is a
+-.MS ping 8
+-like program which uses the Internet Control
++is a program like
++.B ping(8)
++which uses the Internet Control
+ Message Protocol (ICMP) echo request to determine if a target host is
+ responding.
+ .B fping
+@@ -37,8 +37,7 @@
+ ).
+ .PP
+ Unlike
+-.B ping
+-,
++.B ping,
+ .B fping
+ is meant to be used in scripts, so its output is designed to be
+ easy to parse.
+@@ -130,12 +129,16 @@
+ a target will be made, not including the first try.
+ .IP \fB-s\fR 5
+ Print cumulative statistics upon exit.
++.IP \fB-S\fIaddr\fR 5
++Set source address.
+ .IP \fB-t\fIn\fR 5
+ Initial target timeout in milliseconds (default 500). In the default
+ mode, this is the amount of time that
+ .B fping
+ waits for a response to its first request. Successive timeouts are
+ multiplied by the backoff factor.
++.IP \fB-T\fIn\fR 5
++Select timeout in seconds (default 10).
+ .IP \fB-u\fR 5
+ Show targets that are unreachable.
+ .IP \fB-v\fR 5
+@@ -152,7 +155,7 @@
+ example none the less.
+ .nf
+
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ require 'open2.pl';
+
+ $MAILTO = "root";
+@@ -178,7 +181,7 @@
+ that are currently reachable.
+ .nf
+
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+
+ $hosts_to_backup = `cat /etc/hosts.backup | fping -a`;
+
+--- fping-2.4b2-to-ipv6.orig/fping.c
++++ fping-2.4b2-to-ipv6/fping.c
+@@ -24,7 +24,7 @@
+ *
+ * Original author: Roland Schemers <schemers@stanford.edu>
+ * IPv6 Support: Jeroen Massar <jeroen@unfix.org / jeroen@ipng.nl>
+- *
++ * Bugfixes, byte order & senseful seq.-numbers: Stephan Fuhrmann (stephan.fuhrmann AT 1und1.de)
+ *
+ *
+ * RCS header information no longer used. It has been moved to the
+@@ -42,7 +42,6 @@
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+-#define IPV6 1 /* This should be a compiler option, or even better be done from the Makefile... ;) */
+
+ #ifndef _NO_PROTO
+ #if !__STDC__ && !defined( __cplusplus ) && !defined( FUNCPROTO ) \
+@@ -101,13 +100,8 @@
+ #endif
+ #include <netinet/in_systm.h>
+
+-/* Linux has bizarre ip.h and ip_icmp.h */
+-#if defined( __linux__ )
+-#include "linux.h"
+-#else
+ #include <netinet/ip.h>
+ #include <netinet/ip_icmp.h>
+-#endif /* defined(__linux__) */
+
+ #include <arpa/inet.h>
+ #include <netdb.h>
+@@ -150,7 +144,11 @@
+ #define MIN_PING_DATA sizeof( PING_DATA )
+ #define MAX_IP_PACKET 65536 /* (theoretical) max IP packet size */
+ #define SIZE_IP_HDR 20
++#ifndef IPV6
+ #define SIZE_ICMP_HDR ICMP_MINLEN /* from ip_icmp.h */
++#else
++#define SIZE_ICMP_HDR sizeof(FPING_ICMPHDR)
++#endif
+ #define MAX_PING_DATA ( MAX_IP_PACKET - SIZE_IP_HDR - SIZE_ICMP_HDR )
+
+ /* sized so as to be like traditional ping */
+@@ -192,7 +190,7 @@
+ "",
+ "",
+ "ICMP Time Exceeded", /* 11 */
+- "ICMP Paramter Problem", /* 12 */
++ "ICMP Parameter Problem", /* 12 */
+ "ICMP Timestamp Request", /* 13 */
+ "ICMP Timestamp Reply", /* 14 */
+ "ICMP Information Request", /* 15 */
+@@ -283,6 +281,12 @@
+ u_int count = 1;
+ u_int trials;
+ u_int report_interval = 0;
++int src_addr_present = 0;
++#ifndef IPV6
++struct in_addr src_addr;
++#else
++struct in6_addr src_addr;
++#endif
+
+ /* global stats */
+ long max_reply = 0;
+@@ -292,6 +296,7 @@
+ int max_hostname_len = 0;
+ int num_jobs = 0; /* number of hosts still to do */
+ int num_hosts; /* total number of hosts */
++int max_seq_sent = 0; /* maximum sequence number sent so far */
+ int num_alive = 0, /* total number alive */
+ num_unreachable = 0, /* total number unreachable */
+ num_noaddress = 0; /* total number of addresses not found */
+@@ -408,6 +413,11 @@
+ struct protoent *proto;
+ char *buf;
+ uid_t uid;
++#ifndef IPV6
++ struct sockaddr_in sa;
++#else
++ struct sockaddr_in6 sa;
++#endif
+ /* check if we are root */
+
+ if( geteuid() )
+@@ -439,7 +449,7 @@
+
+ #ifdef IPV6
+ /*
+- * let the kerel pass extension headers of incoming packets,
++ * let the kernel pass extension headers of incoming packets,
+ * for privileged socket options
+ */
+ #ifdef IPV6_RECVHOPOPTS
+@@ -474,6 +484,35 @@
+ sizeof(opton)))
+ err(1, "setsockopt(IPV6_RTHDR)");
+ #endif
++#ifndef USE_SIN6_SCOPE_ID
++#ifdef IPV6_RECVPKTINFO
++ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVPKTINFO, &opton,
++ sizeof(opton)))
++ err(1, "setsockopt(IPV6_RECVPKTINFO)");
++#else /* old adv. API */
++ if (setsockopt(s, IPPROTO_IPV6, IPV6_PKTINFO, &opton,
++ sizeof(opton)))
++ err(1, "setsockopt(IPV6_PKTINFO)");
++#endif
++#endif /* USE_SIN6_SCOPE_ID */
++#ifdef IPV6_RECVHOPLIMIT
++ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &opton,
++ sizeof(opton)))
++ err(1, "setsockopt(IPV6_RECVHOPLIMIT)");
++#else /* old adv. API */
++ if (setsockopt(s, IPPROTO_IPV6, IPV6_HOPLIMIT, &opton,
++ sizeof(opton)))
++ err(1, "setsockopt(IPV6_HOPLIMIT)");
++#endif
++#ifdef IPV6_CHECKSUM
++#ifndef SOL_RAW
++#define SOL_RAW IPPROTO_IPV6
++#endif
++ opton = 2;
++ if (setsockopt(s, SOL_RAW, IPV6_CHECKSUM, &opton,
++ sizeof(opton)))
++ err(1, "setsockopt(SOL_RAW,IPV6_CHECKSUM)");
++#endif
+ #endif
+
+ if( ( uid = getuid() ) )
+@@ -491,7 +530,7 @@
+
+ /* get command line options */
+
+- while( ( c = getopt( argc, argv, "gedhlmnqusaAvz:t:i:p:f:r:c:b:C:Q:B:" ) ) != EOF )
++ while( ( c = getopt( argc, argv, "gedhlmnqusaAvz:t:i:p:f:r:c:b:C:Q:B:S:I:T:" ) ) != EOF )
+ {
+ switch( c )
+ {
+@@ -502,7 +541,7 @@
+ break;
+
+ case 'r':
+- if( !( retry = ( u_int )atoi( optarg ) ) )
++ if( ( retry = ( u_int )atoi( optarg ) ) < 0 )
+ usage();
+
+ break;
+@@ -639,6 +678,33 @@
+ generate_flag = 1;
+ break;
+
++ case 'S':
++#ifndef IPV6
++ if( ! inet_pton( AF_INET, optarg, &src_addr ) )
++#else
++ if( ! inet_pton( AF_INET6, optarg, &src_addr ) )
++#endif
++ usage();
++ src_addr_present = 1;
++ break;
++
++ case 'I':
++#ifdef SO_BINDTODEVICE
++ if (setsockopt(s, SOL_SOCKET, SO_BINDTODEVICE, optarg,
++ strlen(optarg)))
++ err(1, "setsockopt(AF_INET, SO_BINDTODEVICE)");
++#else
++ fprintf( stderr,
++ "Warning: SO_BINDTODEVICE not supported, argument -I %s ignored\n",
++ optarg );
++#endif
++ break;
++
++ case 'T':
++ if ( ! ( select_time = ( u_int )atoi( optarg ) * 100 ) )
++ usage();
++ break;
++
+ default:
+ usage();
+ break;
+@@ -821,7 +887,7 @@
+ errno_crash_and_burn( "fopen" );
+
+
+- while( fgets( line, 132, ping_file ) )
++ while( fgets( line, sizeof(line), ping_file ) )
+ {
+ if( sscanf( line, "%s", host ) != 1 )
+ continue;
+@@ -962,6 +1028,22 @@
+ if( !num_hosts )
+ exit( 2 );
+
++ /* set the source address */
++
++ if( src_addr_present )
++ {
++ memset( &sa, 0, sizeof( sa ) );
++#ifndef IPV6
++ sa.sin_family = AF_INET;
++ sa.sin_addr = src_addr;
++#else
++ sa.sin6_family = AF_INET6;
++ sa.sin6_addr = src_addr;
++#endif
++ if ( bind( s, (struct sockaddr *)&sa, sizeof( sa ) ) < 0 )
++ errno_crash_and_burn( "cannot bind source address" );
++ }
++
+ /* allocate array to hold outstanding ping requests */
+
+ table = ( HOST_ENTRY** )malloc( sizeof( HOST_ENTRY* ) * num_hosts );
+@@ -1112,7 +1194,7 @@
+ /* but allow time for the last one to come in */
+ if( count_flag )
+ {
+- if( ( cursor->num_sent >= count ) && ( ht > cursor->timeout ) )
++ if( ( cursor->num_sent >= count ) && ( cursor->num_recv >= count || ht > cursor->timeout ) )
+ {
+ remove_job( cursor );
+ continue;
+@@ -1153,6 +1235,7 @@
+
+ finish();
+
++ return 0;
+ } /* main() */
+
+
+@@ -1382,15 +1465,15 @@
+ if( h->num_recv_i <= h->num_sent_i )
+ {
+ fprintf( stderr, " xmt/rcv/%%loss = %d/%d/%d%%",
+- h->num_sent_i, h->num_recv_i,
+- ( ( h->num_sent_i - h->num_recv_i ) * 100 ) / h->num_sent_i );
++ h->num_sent_i, h->num_recv_i, h->num_sent_i > 0 ?
++ ( ( h->num_sent_i - h->num_recv_i ) * 100 ) / h->num_sent_i : 0 );
+
+ }/* IF */
+ else
+ {
+ fprintf( stderr, " xmt/rcv/%%return = %d/%d/%d%%",
+- h->num_sent_i, h->num_recv_i,
+- ( ( h->num_recv_i * 100 ) / h->num_sent_i ) );
++ h->num_sent_i, h->num_recv_i, h->num_sent_i > 0 ?
++ ( ( h->num_recv_i * 100 ) / h->num_sent_i ) : 0 );
+
+ }/* ELSE */
+
+@@ -1504,12 +1587,15 @@
+ icp = ( FPING_ICMPHDR* )buffer;
+
+ gettimeofday( &h->last_send_time, &tz );
++ int myseq = h->num_sent * num_hosts + h->i;
++ max_seq_sent = myseq > max_seq_sent ? myseq : max_seq_sent;
++
+ #ifndef IPV6
+ icp->icmp_type = ICMP_ECHO;
+ icp->icmp_code = 0;
+ icp->icmp_cksum = 0;
+- icp->icmp_seq = h->i;
+- icp->icmp_id = ident;
++ icp->icmp_seq = htons(myseq);
++ icp->icmp_id = htons(ident);
+
+ pdp = ( PING_DATA* )( buffer + SIZE_ICMP_HDR );
+ pdp->ping_ts = h->last_send_time;
+@@ -1519,8 +1605,8 @@
+ #else
+ icp->icmp6_type = ICMP6_ECHO_REQUEST;
+ icp->icmp6_code = 0;
+- icp->icmp6_seq = h->i;
+- icp->icmp6_id = ident;
++ icp->icmp6_seq = htons(myseq);
++ icp->icmp6_id = htons(ident);
+
+ pdp = ( PING_DATA* )( buffer + SIZE_ICMP_HDR );
+ pdp->ping_ts = h->last_send_time;
+@@ -1667,25 +1753,25 @@
+ }/* IF */
+
+ #ifndef IPV6
+- if( icp->icmp_id != ident )
++ if( ntohs(icp->icmp_id) != ident )
+ #else
+- if( icp->icmp6_id != ident )
++ if( ntohs(icp->icmp6_id) != ident )
+ #endif
+ return 1; /* packet received, but not the one we are looking for! */
+
+ num_pingreceived++;
+
+ #ifndef IPV6
+- if( icp->icmp_seq >= ( n_short )num_hosts )
++ if( ntohs(icp->icmp_seq) > max_seq_sent )
+ #else
+- if( icp->icmp6_seq >= ( n_short )num_hosts )
++ if( ntohs(icp->icmp6_seq) > max_seq_sent )
+ #endif
+ return( 1 ); /* packet received, don't worry about it anymore */
+
+ #ifndef IPV6
+- n = icp->icmp_seq;
++ n = ntohs(icp->icmp_seq) % num_hosts;
+ #else
+- n = icp->icmp6_seq;
++ n = ntohs(icp->icmp6_seq) % num_hosts;
+ #endif
+ h = table[n];
+
+@@ -1824,6 +1910,7 @@
+
+ }/* IF */
+
++ fflush( stdout );
+ return num_jobs;
+
+ } /* wait_for_reply() */
+@@ -1875,11 +1962,11 @@
+ sent_icmp = ( struct icmp* )( c + 28 );
+
+ if( ( sent_icmp->icmp_type == ICMP_ECHO ) &&
+- ( sent_icmp->icmp_id == ident ) &&
+- ( sent_icmp->icmp_seq < ( n_short )num_hosts ) )
++ ( ntohs(sent_icmp->icmp_id) == ident ) &&
++ ( ntohs(sent_icmp->icmp_seq) <= ( n_short )max_seq_sent ) )
+ {
+ /* this is a response to a ping we sent */
+- h = table[sent_icmp->icmp_seq];
++ h = table[ntohs(sent_icmp->icmp_seq) % num_hosts];
+
+ if( p->icmp_code > ICMP_UNREACH_MAXTYPE )
+ {
+@@ -1888,11 +1975,11 @@
+
+ #else
+ if( ( sent_icmp->icmp6_type == ICMP_ECHO ) &&
+- ( sent_icmp->icmp6_id == ident ) &&
+- ( sent_icmp->icmp6_seq < ( n_short )num_hosts ) )
++ ( ntohs(sent_icmp->icmp6_id) == ident ) &&
++ ( ntohs(sent_icmp->icmp6_seq) <= ( n_short )max_seq_sent ) )
+ {
+ /* this is a response to a ping we sent */
+- h = table[sent_icmp->icmp6_seq];
++ h = table[ntohs(sent_icmp->icmp6_seq) % num_hosts];
+
+ if( p->icmp6_code > ICMP_UNREACH_MAXTYPE )
+ {
+@@ -1930,24 +2017,24 @@
+ case ICMP_PARAMPROB:
+ sent_icmp = ( FPING_ICMPHDR* )( c + 28 );
+ #ifndef IPV6
+- if( ( sent_icmp->icmp_type = ICMP_ECHO ) &&
+- ( sent_icmp->icmp_id = ident ) &&
+- ( sent_icmp->icmp_seq < ( n_short )num_hosts ) )
++ if( ( sent_icmp->icmp_type == ICMP_ECHO ) &&
++ ( ntohs(sent_icmp->icmp_id) == ident ) &&
++ ( ntohs(sent_icmp->icmp_seq) <= ( n_short )max_seq_sent ) )
+ {
+ /* this is a response to a ping we sent */
+- h = table[sent_icmp->icmp_seq];
++ h = table[ntohs(sent_icmp->icmp_seq) % num_hosts];
+ fprintf( stderr, "%s from %s for ICMP Echo sent to %s",
+ icmp_type_str[p->icmp_type], inet_ntoa( addr->sin_addr ), h->host );
+
+ if( inet_addr( h->host ) == -1 )
+ fprintf( stderr, " (%s)", inet_ntoa( h->saddr.sin_addr ) );
+ #else
+- if( ( sent_icmp->icmp6_type = ICMP_ECHO ) &&
+- ( sent_icmp->icmp6_id = ident ) &&
+- ( sent_icmp->icmp6_seq < ( n_short )num_hosts ) )
++ if( ( sent_icmp->icmp6_type == ICMP_ECHO ) &&
++ ( ntohs(sent_icmp->icmp6_id) == ident ) &&
++ ( ntohs(sent_icmp->icmp6_seq) <= ( n_short )max_seq_sent ) )
+ {
+ /* this is a response to a ping we sent */
+- h = table[sent_icmp->icmp6_seq];
++ h = table[ntohs(sent_icmp->icmp6_seq) % num_hosts];
+ fprintf( stderr, "%s from %s for ICMP Echo sent to %s",
+ icmp_type_str[p->icmp6_type], addr_ascii, h->host );
+
+@@ -2165,20 +2252,33 @@
+ struct addrinfo *res, hints;
+ int ret_ga;
+ char *hostname;
++ size_t len;
+
+ /* getaddrinfo */
+ bzero(&hints, sizeof(struct addrinfo));
+- hints.ai_flags = AI_CANONNAME;
++ hints.ai_flags = name_flag ? AI_CANONNAME : 0;
+ hints.ai_family = AF_INET6;
+ hints.ai_socktype = SOCK_RAW;
+ hints.ai_protocol = IPPROTO_ICMPV6;
+
+ ret_ga = getaddrinfo(name, NULL, &hints, &res);
+- if (ret_ga) errx(1, "%s", gai_strerror(ret_ga));
++ if (ret_ga) {
++ if(!quiet_flag)
++ warnx("%s", gai_strerror(ret_ga));
++ num_noaddress++;
++ return;
++ }
+ if (res->ai_canonname) hostname = res->ai_canonname;
+ else hostname = name;
+- if (!res->ai_addr) errx(1, "getaddrinfo failed");
+- (void)memcpy(&dst, res->ai_addr, sizeof(FPING_SOCKADDR)); /*res->ai_addrlen);*/
++ if (!res->ai_addr) {
++ if(!quiet_flag)
++ warnx("getaddrinfo failed");
++ num_noaddress++;
++ return;
++ }
++ len = res->ai_addrlen;
++ if (len > sizeof(FPING_SOCKADDR)) len = sizeof(FPING_SOCKADDR);
++ (void)memcpy(&dst, res->ai_addr, len);
+ add_addr(name, name, &dst);
+ #endif
+ } /* add_name() */
+@@ -2730,9 +2830,11 @@
+ fprintf( stderr, " (in looping and counting modes, default %d)\n", perhost_interval / 100 );
+ fprintf( stderr, " -q quiet (don't show per-target/per-ping results)\n" );
+ fprintf( stderr, " -Q n same as -q, but show summary every n seconds\n" );
+- fprintf( stderr, " -r n number of retries (default %d)\n", retry );
++ fprintf( stderr, " -r n number of retries (default %d)\n", DEFAULT_RETRY );
+ fprintf( stderr, " -s print final stats\n" );
++ fprintf( stderr, " -S addr set source address\n" );
+ fprintf( stderr, " -t n individual target initial timeout (in millisec) (default %d)\n", timeout / 100 );
++ fprintf( stderr, " -T n set select timeout (default %d)\n", select_time / 100 );
+ fprintf( stderr, " -u show targets that are unreachable\n" );
+ fprintf( stderr, " -v show version\n" );
+ fprintf( stderr, " targets list of targets to check (if no -f specified)\n" );
+--- fping-2.4b2-to-ipv6.orig/debian/fping.docs
++++ fping-2.4b2-to-ipv6/debian/fping.docs
+@@ -0,0 +1 @@
++README
+--- fping-2.4b2-to-ipv6.orig/debian/lintian.overrides
++++ fping-2.4b2-to-ipv6/debian/lintian.overrides
+@@ -0,0 +1 @@
++fping: setuid-binary
+--- fping-2.4b2-to-ipv6.orig/debian/fping.dirs
++++ fping-2.4b2-to-ipv6/debian/fping.dirs
+@@ -0,0 +1,4 @@
++usr/bin
++usr/sbin
++usr/share/man/man8
++usr/share/lintian/overrides
+--- fping-2.4b2-to-ipv6.orig/debian/copyright
++++ fping-2.4b2-to-ipv6/debian/copyright
+@@ -0,0 +1,33 @@
++This package was split from netstd by Herbert Xu herbert@debian.org on
++Sat, 30 Oct 1999 16:39:06 +1000.
++
++It is maintained by Anibal Monsalve Salazar <anibal@debian.org>.
++
++netstd was created by Peter Tobias tobias@et-inf.fho-emden.de on
++Wed, 20 Jul 1994 17:23:21 +0200.
++
++It was downloaded from http://www.fping.com/.
++
++Copyright:
++
++Upstream maintainer: David Papp <david@remote.net>
++Original author: Roland Schemers <schemers@stanford.edu>
++IPv6 Support: Jeroen Massar <jeroen@unfix.org / jeroen@ipng.nl>
++
++
++Copyright (c) 1992, 1994, 1997
++Board of Trustees
++Leland Stanford Jr. University
++
++Redistribution and use in source and binary forms are permitted provided
++that the above copyright notice and this paragraph are duplicated in all
++such forms and that any documentation, advertising materials, and other
++materials related to such distribution and use acknowledge that the software
++was developed by Stanford University. The name of the University may not
++be used to endorse or promote products derived from this software without
++specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
++WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
++MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
++
+--- fping-2.4b2-to-ipv6.orig/debian/control
++++ fping-2.4b2-to-ipv6/debian/control
+@@ -0,0 +1,20 @@
++Source: fping
++Section: net
++Priority: optional
++Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
++Standards-Version: 3.8.0
++Build-Depends: debhelper (>= 5)
++Homepage: http://fping.sourceforge.net/
++
++Package: fping
++Architecture: any
++Depends: ${shlibs:Depends}, ${misc:Depends}
++Conflicts: suidmanager (<< 0.50)
++Replaces: netstd
++Description: sends ICMP ECHO_REQUEST packets to network hosts
++ fping is a ping like program which uses the Internet Control Message Protocol
++ (ICMP) echo request to determine if a target host is responding. fping
++ differs from ping in that you can specify any number of targets on the command
++ line, or specify a file containing the lists of targets to ping. Instead of
++ sending to one target until it times out or replies, fping will send out a
++ ping packet and move on to the next target in a round-robin fashion.
+--- fping-2.4b2-to-ipv6.orig/debian/rules
++++ fping-2.4b2-to-ipv6/debian/rules
+@@ -0,0 +1,78 @@
++#!/usr/bin/make -f
++# GNU copyright 1997 to 1999 by Joey Hess.
++# Copyright (c) 1999 Herbert Xu <herbert@debian.org>
++# Copyright (c) 2004-2005 Anibal Monsalve Salazar <anibal@debian.org>
++
++# Uncomment this to turn on verbose mode.
++export DH_VERBOSE=1
++
++configure: configure-stamp
++configure-stamp:
++ dh_testdir
++
++ mkdir build build/ipv4 build/ipv6
++ cp -a $$(find * -maxdepth 0 ! -name build) build
++ cd build/ipv4; ../configure
++ cd build/ipv6; ../configure
++
++ touch configure-stamp
++
++build: build-stamp
++build-stamp: configure-stamp
++ dh_testdir
++
++ $(MAKE) -C build/ipv4
++ $(MAKE) -C build/ipv6 CFLAGS='-g -O2 -DIPV6=1'
++
++ touch build-stamp
++
++clean:
++ dh_testdir
++ dh_testroot
++
++ rm -rf build build-stamp configure-stamp
++
++ dh_clean
++
++install: build
++ dh_testdir
++ dh_testroot
++ dh_clean -k
++ dh_installdirs
++
++ install build/ipv4/fping debian/fping/usr/bin
++ install build/ipv6/fping debian/fping/usr/bin/fping6
++ cp fping.8 debian/fping/usr/share/man/man8
++ ln -s fping.8 debian/fping/usr/share/man/man8/fping6.8
++
++ install -g 0 -o 0 -m 644 -p debian/lintian.overrides debian/fping/usr/share/lintian/overrides/fping
++
++ touch install-stamp
++
++# Build architecture-independent files here.
++binary-indep: build install
++# We have nothing to do by default.
++
++# Build architecture-dependent files here.
++binary-arch: build install
++ dh_testdir
++ dh_testroot
++ dh_installdocs
++ dh_installexamples
++ dh_installmenu
++ dh_installcron
++ dh_installinfo
++ dh_installchangelogs ChangeLog
++ dh_link
++ dh_strip
++ dh_compress
++ dh_fixperms
++ chmod 4755 debian/fping/usr/bin/fping*
++ dh_installdeb
++ dh_shlibdeps
++ dh_gencontrol
++ dh_md5sums
++ dh_builddeb
++
++binary: binary-indep binary-arch
++.PHONY: build clean configure binary-indep binary-arch binary install
+--- fping-2.4b2-to-ipv6.orig/debian/compat
++++ fping-2.4b2-to-ipv6/debian/compat
+@@ -0,0 +1 @@
++5
+--- fping-2.4b2-to-ipv6.orig/debian/changelog
++++ fping-2.4b2-to-ipv6/debian/changelog
+@@ -0,0 +1,174 @@
++fping (2.4b2-to-ipv6-16.1) unstable; urgency=low
++
++ * NMU during Moenchengladbach BSP
++ * Fixes FTBFS on kfreebsd (Closes: #555398)
++ * Fixes typo "Paramter" in binary
++
++ -- Axel Beckert <abe@deuxchevaux.org> Sat, 23 Jan 2010 16:22:02 +0100
++
++fping (2.4b2-to-ipv6-16) unstable; urgency=low
++
++ * Fix the following bugs
++ - Network byte order sensitivity was missing completely.
++ Added hopefully all missing calls.
++ - The sequence numbering scheme used led to packet drops.
++ Changed it to a more senseful numbering scheme.
++ - Some minor C programming mistakes ('=' instead of '==').
++ Patch by Stephan Fuhrmann; closes: #502569
++ * Add support for command line select timeout setting
++ Patch by Marton Balint; closes: #502575
++ * Remove symlinks in /usr/sbin; closes: #377732
++ * Standards-Version is 3.8.0
++
++ -- Anibal Monsalve Salazar <anibal@debian.org> Sat, 18 Oct 2008 12:04:52 +1100
++
++fping (2.4b2-to-ipv6-15) unstable; urgency=low
++
++ * Added interface binding (-I) for fping
++ Patch by Peter Naulls <peter@mushroomnetworks.com>
++ Closes: #439014
++ * Fixed a couple of typos in fping.8. Closes: #423180
++ * Added homepage control header
++ * Bumped Standards-Version to 3.7.3
++ * Fixed the following lintian issue:
++ - debian-rules-sets-DH_COMPAT
++
++ -- Anibal Monsalve Salazar <anibal@debian.org> Mon, 03 Mar 2008 17:46:17 +1100
++
++fping (2.4b2-to-ipv6-14) unstable; urgency=low
++
++ * Set Standards-Version to 3.7.2.
++ * Set DH_COMPAT to 5.
++
++ -- Anibal Monsalve Salazar <anibal@debian.org> Fri, 23 Jun 2006 20:56:39 +1000
++
++fping (2.4b2-to-ipv6-13) unstable; urgency=low
++
++ * Fixed stdout flush problem, closes: #340146.
++ Patch by Bart Martens <bart.martens@advalvas.be>.
++
++ -- Anibal Monsalve Salazar <anibal@debian.org> Fri, 30 Dec 2005 08:30:09 +1100
++
++fping (2.4b2-to-ipv6-12) unstable; urgency=low
++
++ * Fixed "problem with option -r (retry limit)", closes: #318402.
++ Patch by Qingning Huo <qingningh@lanware.co.uk>.
++ * Set Standards-Version to 3.6.2 in debian/control and DH_COMPAT
++ to 4 in debian/rules..
++
++ -- Anibal Monsalve Salazar <anibal@debian.org> Sat, 08 Oct 2005 21:26:35 +1000
++
++fping (2.4b2-to-ipv6-11) unstable; urgency=low
++
++ * Fixed "would be useful to specify 'source address' like ping for multi
++ homed machines", closes: #198486.
++ Patch by Marc Haber <mh+debian-bugs@zugschlus.de>.
++
++ -- Anibal Monsalve Salazar <anibal@debian.org> Thu, 02 Jun 2005 08:14:54 +1000
++
++fping (2.4b2-to-ipv6-10) unstable; urgency=low
++
++ * Fixed "unnecessary delay with the -c option after the last packet"
++ (Closes: #293856). Patch by Niko Tyni <ntyni@iki.fi>
++ * New maintainer's email address.
++
++ -- Anibal Monsalve Salazar <anibal@debian.org> Sun, 06 Feb 2005 23:25:57 +1100
++
++fping (2.4b2-to-ipv6-9) unstable; urgency=low
++
++ * Fixed "fping6 always does reverse lookup" (Closes: #273647).
++ Patch by Jeroen Massar and forwarded by Bernhard Schmidt <berni@birkenwald.de>
++
++ -- Anibal Monsalve Salazar <A.Monsalve.Salazar@IEEE.org> Mon, 10 Jan 2005 00:01:32 +1100
++
++fping (2.4b2-to-ipv6-8) unstable; urgency=low
++
++ * New maintainer.
++
++ -- Anibal Monsalve Salazar <A.Monsalve.Salazar@IEEE.org> Thu, 20 May 2004 09:42:08 +1000
++
++fping (2.4b2-to-ipv6-7) unstable; urgency=low
++
++ * Build fping in build/ipv[46] instead of build and build-ipv6.
++ * Made DNS errors non-fatal for IPv6 (closes: #198056).
++
++ -- Herbert Xu <herbert@debian.org> Fri, 20 Jun 2003 21:36:30 +1000
++
++fping (2.4b2-to-ipv6-6) unstable; urgency=low
++
++ * Do not use incorrect linux.h file (closes: #85468).
++
++ -- Herbert Xu <herbert@debian.org> Sat, 17 May 2003 14:13:11 +1000
++
++fping (2.4b2-to-ipv6-5) unstable; urgency=low
++
++ * Fixed yet another divide by zero bug (closes: #148445).
++
++ -- Herbert Xu <herbert@debian.org> Tue, 4 Jun 2002 12:18:03 +1000
++
++fping (2.4b2-to-ipv6-4) unstable; urgency=low
++
++ * Made fping6 setuid (closes: #136386).
++ * Moved fping back into bin.
++ * Partially applied IPv6 patch to fix IPv6 checksums (closes: #136479).
++
++ -- Herbert Xu <herbert@debian.org> Sun, 7 Apr 2002 20:36:56 +1000
++
++fping (2.4b2-to-ipv6-3) unstable; urgency=low
++
++ * Added compatibility symlink for fping (closes: #135203).
++
++ -- Herbert Xu <herbert@debian.org> Sat, 23 Feb 2002 08:34:11 +1100
++
++fping (2.4b2-to-ipv6-2) unstable; urgency=low
++
++ * Turned setuid bit on again since the code before dropping privilegs is
++ minimal.
++ * Fixed another divide by zero error (closes: #132370).
++
++ -- Herbert Xu <herbert@debian.org> Thu, 7 Feb 2002 20:10:48 +1100
++
++fping (2.4b2-to-ipv6-1) unstable; urgency=low
++
++ * New upstream release.
++ * Install fping into sbin as done by upstream.
++ * Turned setuid bit off.
++
++ -- Herbert Xu <herbert@debian.org> Fri, 1 Feb 2002 22:11:59 +1100
++
++fping (2.2b2-3) unstable; urgency=low
++
++ * Removed INSTALL file from package (closes: #84050).
++ * Fixed alignment bug.
++
++ -- Herbert Xu <herbert@debian.org> Sat, 10 Feb 2001 19:25:18 +1100
++
++fping (2.2b2-2) unstable; urgency=low
++
++ * Made changes for dpkg-statoverride (closes: #83838).
++
++ -- Herbert Xu <herbert@debian.org> Sun, 28 Jan 2001 21:53:05 +1100
++
++fping (2.2b2-1) unstable; urgency=low
++
++ * New upstream release.
++ * Fixed typo that prevented -d from working (closes: #83255).
++ * Drop root privileges after opening the socket (closes: #81589).
++ * Fixed the options [tip], they were out by a factor of 10
++ (Richard Kettlewell, closes: #83742).
++
++ -- Herbert Xu <herbert@debian.org> Sun, 28 Jan 2001 00:09:41 +1100
++
++fping (2.2b1-2) unstable; urgency=low
++
++ * Fixed typo in control file, spotted by William Ono (closes: #49909).
++
++ -- Herbert Xu <herbert@debian.org> Mon, 15 May 2000 12:27:03 +1000
++
++fping (2.2b1-1) unstable; urgency=low
++
++ * Initial release.
++ * Fixed divide by zero error (closes: #29902).
++
++ -- Herbert Xu <herbert@debian.org> Sat, 30 Oct 1999 16:36:19 +1000
++
diff --git a/extra/fyre/PKGBUILD b/extra/fyre/PKGBUILD
index a34415046..73f2d9a2e 100644
--- a/extra/fyre/PKGBUILD
+++ b/extra/fyre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 122717 2011-05-06 07:59:29Z eric $
+# $Id: PKGBUILD 143668 2011-11-28 09:29:53Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=fyre
@@ -10,8 +10,8 @@ url="http://fyre.navi.cx/"
license=('GPL')
depends=('openexr' 'libglade' 'gnet' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils')
install=fyre.install
-source=(http://flapjack.navi.cx/releases/fyre/fyre-${pkgver}.tar.gz)
-md5sums=('44d5830c527325c1ee6fa6ea92b4ba03')
+source=(http://releases.navi.cx/fyre/fyre-${pkgver}.tar.bz2)
+sha1sums=('41c0ec45eff16cc1bba081c5c855a3980e404835')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gamin/PKGBUILD b/extra/gamin/PKGBUILD
index 4978855d6..aaad6ef5a 100644
--- a/extra/gamin/PKGBUILD
+++ b/extra/gamin/PKGBUILD
@@ -1,11 +1,12 @@
# $Id: PKGBUILD 30749 2010-10-20 11:18:33Z schuay $
+# Maintainer:
# Contributor: Abhishek Dasgupta <abhidg@gmail.com>
# Contributor: Pulphix <crimea.v@libero.it>
pkgname=gamin
pkgver=0.1.10
-pkgrel=5
-pkgdesc='File and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor).'
+pkgrel=6
+pkgdesc='File and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor)'
url='http://www.gnome.org/~veillard/gamin'
license=('GPL')
arch=('i686' 'x86_64')
@@ -15,12 +16,16 @@ options=('libtool')
optdepends=('python2: for the python module.')
provides=('fam')
conflicts=('fam')
-source=("http://www.gnome.org/~veillard/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz")
-md5sums=('b4ec549e57da470c04edd5ec2876a028')
+source=("http://www.gnome.org/~veillard/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"
+ 'fix-deprecated-const.patch')
+md5sums=('b4ec549e57da470c04edd5ec2876a028'
+ 'f679aeb48fe9dd376c8828cc9b6941ab')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ patch -p1 -i "${srcdir}"/fix-deprecated-const.patch
+
# python 2
sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' python/gamin.py
diff --git a/extra/gamin/fix-deprecated-const.patch b/extra/gamin/fix-deprecated-const.patch
new file mode 100644
index 000000000..3d5f6133f
--- /dev/null
+++ b/extra/gamin/fix-deprecated-const.patch
@@ -0,0 +1,56 @@
+Description: Don't use deprecated G_CONST_RETURN. Fixes building with newer glib versions.
+Author: Matthias Klose <doko@ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/829504
+
+Index: gamin/server/gam_node.c
+===================================================================
+--- gamin.orig/server/gam_node.c 2011-10-18 16:09:04.873780685 +0200
++++ gamin/server/gam_node.c 2011-10-18 16:09:01.965780543 +0200
+@@ -122,7 +122,7 @@
+ * it has finished with the string. If it must keep it longer, it
+ * should makes its own copy. The returned string must not be freed.
+ */
+-G_CONST_RETURN char *
++const char *
+ gam_node_get_path(GamNode * node)
+ {
+ g_assert(node);
+Index: gamin/server/gam_node.h
+===================================================================
+--- gamin.orig/server/gam_node.h 2011-10-18 16:09:04.729780677 +0200
++++ gamin/server/gam_node.h 2011-10-18 16:09:01.961780544 +0200
+@@ -58,7 +58,7 @@
+ void gam_node_set_is_dir (GamNode *node,
+ gboolean is_dir);
+
+-G_CONST_RETURN char *gam_node_get_path (GamNode *node);
++const char *gam_node_get_path (GamNode *node);
+
+ GList *gam_node_get_subscriptions (GamNode *node);
+
+Index: gamin/server/gam_subscription.c
+===================================================================
+--- gamin.orig/server/gam_subscription.c 2011-10-18 16:09:04.817780682 +0200
++++ gamin/server/gam_subscription.c 2011-10-18 16:09:01.965780543 +0200
+@@ -141,7 +141,7 @@
+ * @param sub the GamSubscription
+ * @returns The path being monitored. It should not be freed.
+ */
+-G_CONST_RETURN char *
++const char *
+ gam_subscription_get_path(GamSubscription * sub)
+ {
+ if (sub == NULL)
+Index: gamin/server/gam_subscription.h
+===================================================================
+--- gamin.orig/server/gam_subscription.h 2011-10-18 16:09:04.929780687 +0200
++++ gamin/server/gam_subscription.h 2011-10-18 16:09:01.965780543 +0200
+@@ -21,7 +21,7 @@
+
+ int gam_subscription_get_reqno (GamSubscription *sub);
+
+-G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub);
++const char *gam_subscription_get_path (GamSubscription *sub);
+
+ GamListener *gam_subscription_get_listener (GamSubscription *sub);
+
diff --git a/extra/garcon/PKGBUILD b/extra/garcon/PKGBUILD
index 00c56c1d3..636d7eda8 100644
--- a/extra/garcon/PKGBUILD
+++ b/extra/garcon/PKGBUILD
@@ -1,34 +1,37 @@
-# $Id: PKGBUILD 138123 2011-09-17 02:21:25Z allan $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
+# $Id: PKGBUILD 143709 2011-11-28 15:22:07Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
pkgname=garcon
pkgver=0.1.9
pkgrel=1
-pkgdesc="implementation of the freedesktop.org menu specification"
+pkgdesc="Implementation of the freedesktop.org menu specification"
arch=('i686' 'x86_64')
-license=('LGPL')
url="http://wiki.xfce.org/dev/garcon"
+license=('LGPL')
groups=('xfce4')
-depends=('glib2' 'libxfce4util') # 'perl')
-makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools>=4.7.4')
+depends=('glib2' 'libxfce4util')
+makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools')
replaces=('libxfce4menu')
options=('!libtool' '!makeflags')
-source=(http://archive.xfce.org/src/libs/garcon/0.1/garcon-${pkgver}.tar.bz2)
-md5sums=('a3ca1e54ad731c98f688900f6398fc20')
+source=(http://archive.xfce.org/src/xfce/garcon/0.1/garcon-$pkgver.tar.bz2)
+sha256sums=('485e23c8ec1af0d3af423aa244e05467dd2f96afbb66efc70ca7689222cf31d5')
build() {
- cd ${srcdir}/garcon-${pkgver}
+ cd "$srcdir/garcon-$pkgver"
+
./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --disable-debug
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-debug
make
}
package() {
- cd ${srcdir}/garcon-${pkgver}
- make DESTDIR=${pkgdir} install
+ cd "$srcdir/garcon-$pkgver"
+ make DESTDIR="$pkgdir" install
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/gconf-perl/PKGBUILD b/extra/gconf-perl/PKGBUILD
index e4f58af63..6a6c96175 100644
--- a/extra/gconf-perl/PKGBUILD
+++ b/extra/gconf-perl/PKGBUILD
@@ -1,32 +1,34 @@
-# $Id: PKGBUILD 124841 2011-05-24 18:04:05Z remy $
+# $Id: PKGBUILD 143700 2011-11-28 13:20:17Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gconf-perl
-_realname=Gnome2-GConf
pkgver=1.044
-pkgrel=5
+pkgrel=6
pkgdesc="Gnome2-GConf perl bindings for gconf"
arch=('i686' 'x86_64')
license=('LGPL')
url="http://gtk2-perl.sourceforge.net/"
makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
-depends=('glib-perl' 'gconf' 'perl>=5.14')
+depends=('glib-perl' 'gconf' 'perl')
options=(!emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('ea386003b18f067524833b0eeb271330')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gnome2-GConf-${pkgver}.tar.gz
+ disable-orbit.patch)
+md5sums=('ea386003b18f067524833b0eeb271330'
+ '14852fc936ce7b552eb204913d55fd1c')
build() {
- cd "${srcdir}/${_realname}-${pkgver}"
+ cd "${srcdir}/Gnome2-GConf-${pkgver}"
+ patch -Np1 -i "${srcdir}/disable-orbit.patch"
perl Makefile.PL INSTALLDIRS=vendor
make
}
check() {
- cd "${srcdir}/${_realname}-${pkgver}"
+ cd "${srcdir}/Gnome2-GConf-${pkgver}"
dbus-launch --exit-with-session make test
}
package() {
- cd "${srcdir}/${_realname}-${pkgver}"
+ cd "${srcdir}/Gnome2-GConf-${pkgver}"
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/gconf-perl/disable-orbit.patch b/extra/gconf-perl/disable-orbit.patch
new file mode 100644
index 000000000..da526ec2e
--- /dev/null
+++ b/extra/gconf-perl/disable-orbit.patch
@@ -0,0 +1,30 @@
+Description: Disable gconf_engine_key_is_writable
+ This symbol is not available in libgconf when it is configured without
+ ORBit support, which is currently the case in Debian.
+Author: Colin Watson <cjwatson@ubuntu.com>
+Bug-Debian: http://bugs.debian.org/649055
+Forwarded: no
+Last-Update: 2011-11-17
+
+Index: b/xs/GConfEngine.xs
+===================================================================
+--- a/xs/GConfEngine.xs
++++ b/xs/GConfEngine.xs
+@@ -350,6 +350,8 @@
+ if (err)
+ gperl_croak_gerror (NULL, err);
+
++#if 0 /* requires gconf to be configured with ORBit support */
++
+ ##gboolean gconf_engine_key_is_writable (GConfEngine *conf,
+ ## const gchar *key,
+ ## GError **err);
+@@ -366,6 +368,8 @@
+ OUTPUT:
+ RETVAL
+
++#endif
++
+ guint
+ gconf_engine_notify_add (engine, namespace_section, func, data=NULL)
+ GConfEngine * engine
diff --git a/extra/gif2png/PKGBUILD b/extra/gif2png/PKGBUILD
index b2a2ecc36..3c96df76f 100644
--- a/extra/gif2png/PKGBUILD
+++ b/extra/gif2png/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 108710 2011-02-02 17:26:37Z giovanni $
+# $Id: PKGBUILD 143743 2011-11-28 19:26:51Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: eric <eric@archlinux.org>
# Contributor: Andrew Rose <ody@netrux.com>
pkgname=gif2png
pkgver=2.5.4
-pkgrel=1
+pkgrel=2
pkgdesc="A GIF to PNG image format converter"
arch=('i686' 'x86_64')
url="http://www.catb.org/~esr/gif2png/"
@@ -17,14 +17,16 @@ md5sums=('d63ea3fc6b6119589e8d4d6fead30df9')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+
sed -i 's#env python#env python2#' web2png
./configure --prefix=/usr \
- --mandir=/usr/share/man || return 1
- make || return 1
+ --mandir=/usr/share/man
+ make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install || return 1
+
+ make DESTDIR="${pkgdir}" install
install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
}
diff --git a/extra/gksu/PKGBUILD b/extra/gksu/PKGBUILD
index d48fdb3a7..37f871cae 100644
--- a/extra/gksu/PKGBUILD
+++ b/extra/gksu/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 109132 2011-02-06 11:40:19Z andyrtr $
+# $Id: PKGBUILD 143680 2011-11-28 11:06:46Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Eduardo Lopes (eduol@gmx.net)
pkgname=gksu
pkgver=2.0.2
-pkgrel=3
+pkgrel=4
pkgdesc="A graphical frontend for su"
arch=('i686' 'x86_64')
url="http://www.nongnu.org/gksu/index.html"
license=('GPL')
depends=('libgksu>=2.0.12' 'xorg-xauth')
-makedepends=('gtk-doc' 'nautilus>=2.26.0' 'intltool')
-optdepends=('nautilus')
+makedepends=('gtk-doc' 'intltool')
options=('!libtool')
source=(http://people.debian.org/~kov/gksu/${pkgname}-${pkgver}.tar.gz)
md5sums=('cacbcac3fc272dce01c6ea38354489e2')
@@ -20,14 +19,11 @@ build() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed -i -e 's|/usr/bin/x-terminal-emulator|-l gnome-terminal|g' gksu.desktop
echo "TryExec=gnome-terminal" >> gksu.desktop
-# libtoolize --force
-# aclocal
-# autoconf
-# automake
./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-static
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-nautilus-extension
make
}
diff --git a/extra/glib-perl/PKGBUILD b/extra/glib-perl/PKGBUILD
index 89610fe1e..a0dd232fc 100644
--- a/extra/glib-perl/PKGBUILD
+++ b/extra/glib-perl/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id: PKGBUILD 124651 2011-05-23 19:33:30Z remy $
+# $Id: PKGBUILD 143682 2011-11-28 11:19:06Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Sarah Hay <sarah@archlinux.org>
pkgname=glib-perl
-_realname=Glib
-pkgver=1.223
-pkgrel=3
+pkgver=1.241
+pkgrel=1
pkgdesc="Perl wrappers for glib 2.x, including GObject"
arch=(i686 x86_64)
license=('LGPL')
@@ -13,21 +12,21 @@ url="http://gtk2-perl.sourceforge.net/"
options=('!emptydirs')
depends=('glib2>=2.24.1' 'perl>=5.14')
makedepends=('perl-extutils-depends>=0.302' 'perl-extutils-pkgconfig>=1.12')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('cfdeaa8c95448f86c30b505e4701abf1')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz)
+md5sums=('412118238a372041b130c27d7992f5c3')
build() {
- cd "${srcdir}/${_realname}-${pkgver}"
+ cd "${srcdir}/Glib-${pkgver}"
perl Makefile.PL INSTALLDIRS=vendor
make
}
check() {
- cd "${srcdir}/${_realname}-${pkgver}"
+ cd "${srcdir}/Glib-${pkgver}"
make test
}
package() {
- cd "${srcdir}/${_realname}-${pkgver}"
+ cd "${srcdir}/Glib-${pkgver}"
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/gpart/PKGBUILD b/extra/gpart/PKGBUILD
index 8798449cd..65c5e9fa5 100644
--- a/extra/gpart/PKGBUILD
+++ b/extra/gpart/PKGBUILD
@@ -1,28 +1,30 @@
-# $Id: PKGBUILD 112735 2011-03-06 12:44:20Z giovanni $
+# $Id: PKGBUILD 143745 2011-11-28 20:14:39Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: dale <dale@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=gpart
pkgver=0.1h
-pkgrel=4
-pkgdesc="A program for recovering corrupt partition tables"
+pkgrel=5
+pkgdesc="Partition table rescue/guessing tool"
arch=('i686' 'x86_64')
url="http://www.stud.uni-hannover.de/user/76201/gpart/"
license=('GPL')
depends=('glibc')
-source=(http://www.sfr-fresh.com/linux/misc/${pkgname}-${pkgver}.tar.gz
- gpart-0.1h-errno.patch
- gpart-0.1h-vfat.patch
- gpart-0.1h-ntfs.patch
- gpart-0.1h-PIC.patch
- gpart-0.1h-no-_syscall.patch)
-md5sums=('ee3a2d2dde70bcf404eb354b3d1ee6d4'
- '81eee5d9985df9bf9c23624e46cf945f'
- 'ae6d86b0268618d34e618824dcd82754'
- '8161c02116ee4575906587eb09e35bde'
- 'd3f5b05d12816375f5dcd9a251f72f61'
- 'f811c6e132b2c0cd2d9cb0fd4933063a')
+source=("http://www.sfr-fresh.com/linux/misc/${pkgname}-${pkgver}.tar.gz"
+ 'gpart-0.1h-errno.patch'
+ 'gpart-0.1h-vfat.patch'
+ 'gpart-0.1h-ntfs.patch'
+ 'gpart-0.1h-reiserfs-3.6.patch'
+ 'gpart-0.1h-l64seek.patch'
+ 'gpart-0.1h-openmode.patch')
+md5sums=('ee3a2d2dde70bcf404eb354b3d1ee6d4'
+ '81eee5d9985df9bf9c23624e46cf945f'
+ 'ae6d86b0268618d34e618824dcd82754'
+ '8161c02116ee4575906587eb09e35bde'
+ '5da425c355740cbf06286755c902b996'
+ '9cd7f91c321a83cc1aa202744d1c7cd2'
+ 'c982a01385e99b86b32de536c1fbecfb')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -30,8 +32,12 @@ build() {
patch -Np1 -i ${srcdir}/gpart-0.1h-errno.patch
patch -Np1 -i ${srcdir}/gpart-0.1h-vfat.patch
patch -Np1 -i ${srcdir}/gpart-0.1h-ntfs.patch
- patch -Np1 -i ${srcdir}/gpart-0.1h-PIC.patch
- patch -Np0 -i ${srcdir}/gpart-0.1h-no-_syscall.patch
+ patch -Np2 -i ${srcdir}/gpart-0.1h-reiserfs-3.6.patch
+ patch -Np1 -i ${srcdir}/gpart-0.1h-l64seek.patch
+ patch -Np1 -i ${srcdir}/gpart-0.1h-openmode.patch
+
+ sed -i -e "/^CFLAGS/s: -O2 : ${CFLAGS} :" make.defs
+ sed -i -e "/^LDFLAGS/s:=:=${LDFLAGS} :" make.defs
make
}
diff --git a/extra/gpart/gpart-0.1h-l64seek.patch b/extra/gpart/gpart-0.1h-l64seek.patch
new file mode 100644
index 000000000..8a14411a5
--- /dev/null
+++ b/extra/gpart/gpart-0.1h-l64seek.patch
@@ -0,0 +1,71 @@
+--- gpart-0.1h.orig/src/l64seek.c
++++ gpart-0.1h/src/l64seek.c
+@@ -25,30 +25,11 @@
+ } ostck[OSTACKLEN];
+ static int osptr = -1;
+
+-#if defined(__linux__) && defined(__i386__)
+-_syscall5(int,_llseek,uint,fd,ulong,hi,ulong,lo,loff_t *,res,uint,wh)
+-#endif
+-
+-
+-
+ off64_t l64seek(int fd,off64_t offset,int whence)
+ {
+ off64_t ret = (off64_t)-1;
+
+-#if defined(__linux__) && defined(__i386__)
+- int iret;
+- unsigned long ohi, olo;
+-
+- ohi = (unsigned long)((offset >> 32) & 0xFFFFFFFF);
+- olo = (unsigned long)(offset & 0xFFFFFFFF);
+- iret = _llseek(fd,ohi,olo,&ret,whence);
+- if (iret == -1)
+- ret = (off64_t)-1;
+-#endif
+-
+-#if defined(__FreeBSD__) || (defined(__linux__) && defined(__alpha__))
+ ret = lseek(fd,offset,whence);
+-#endif
+
+ return (ret);
+ }
+--- gpart-0.1h.orig/src/l64seek.h
++++ gpart-0.1h/src/l64seek.h
+@@ -17,6 +17,8 @@
+ #ifndef _L64SEEK_H
+ #define _L64SEEK_H
+
++#include <sys/stat.h>
++#include <sys/types.h>
+ #include <unistd.h>
+
+ /*
+@@ -25,19 +27,7 @@
+ * offsets.
+ */
+
+-
+-#if defined(__linux__)
+-# include <linux/unistd.h>
+-# include <sys/types.h>
+- typedef int64_t off64_t;
+-#endif
+-
+-
+-#if defined(__FreeBSD__)
+- typedef off_t off64_t;
+-#endif
+-
+-
++typedef loff_t off64_t;
+ typedef off64_t s64_t;
+
+ off64_t l64seek(int fd, off64_t offset, int whence);
+@@ -45,5 +35,4 @@
+ int l64opush(int);
+ s64_t l64opop(int);
+
+-
+ #endif
diff --git a/extra/gpart/gpart-0.1h-openmode.patch b/extra/gpart/gpart-0.1h-openmode.patch
new file mode 100644
index 000000000..ca13cc942
--- /dev/null
+++ b/extra/gpart/gpart-0.1h-openmode.patch
@@ -0,0 +1,11 @@
+--- gpart.orig/src/gpart.c 2008-10-19 15:06:06.000000000 +0000
++++ gpart/src/gpart.c 2008-11-25 07:34:47.000000000 +0000
+@@ -1221,7 +1221,7 @@ static int make_mbr_backup(disk_desc *d,
+ {
+ int fd, ret = 0;
+
+- if ((fd = open(bfile,O_WRONLY|O_CREAT)) < 0)
++ if ((fd = open(bfile,O_WRONLY|O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) < 0)
+ return (ret);
+
+ if (write(fd,d->d_pt.t_boot,512) == 512)
diff --git a/extra/gpart/gpart-0.1h-reiserfs-3.6.patch b/extra/gpart/gpart-0.1h-reiserfs-3.6.patch
new file mode 100644
index 000000000..257015d2b
--- /dev/null
+++ b/extra/gpart/gpart-0.1h-reiserfs-3.6.patch
@@ -0,0 +1,443 @@
+diff -rupN ./gpart-0.1h.orig/README ./gpart-0.1h/README
+--- ./gpart-0.1h.orig/README Wed Feb 7 20:58:12 2001
++++ ./gpart-0.1h/README Fri Jan 10 16:29:43 2003
+@@ -24,25 +24,25 @@
+
+ - Currently recognized partitions/filesystems types ---------------------
+
+- Modname Typ Description
+- fat 0x01 "Primary DOS with 12 bit FAT"
+- 0x04 "Primary DOS with 16 bit FAT (<= 32MB)"
+- 0x06 "Primary 'big' DOS (> 32MB)"
+- 0x0B "DOS or Windows 95 with 32 bit FAT"
+- 0x0C "DOS or Windows 95 with 32 bit FAT, LBA"
+- ntfs 0x07 "OS/2 HPFS, NTFS, QNX or Advanced UNIX"
+- hpfs 0x07 "OS/2 HPFS, NTFS, QNX or Advanced UNIX"
+- ext2 0x83 "Linux ext2 filesystem"
+- lswap 0x82 "Linux swap"
+- bsddl 0xA5 "FreeBSD/NetBSD/386BSD"
+- s86dl 0x82 "Solaris/x86 disklabel"
+- minix 0x80 "Minix V1"
+- 0x81 "Minix V2"
+- rfs 0x83 "Reiser filesystem"
+- hmlvm 0xFE "Linux LVM physical volumes"
+- qnx4 0x4F "QNX 4.x"
+- beos 0xEB "BeOS fs"
+- xfs 0x83 "SGI XFS filesystem"
++ Modname Typ Description
++ fat 0x01 "Primary DOS with 12 bit FAT"
++ 0x04 "Primary DOS with 16 bit FAT (<= 32MB)"
++ 0x06 "Primary 'big' DOS (> 32MB)"
++ 0x0B "DOS or Windows 95 with 32 bit FAT"
++ 0x0C "DOS or Windows 95 with 32 bit FAT, LBA"
++ ntfs 0x07 "OS/2 HPFS, NTFS, QNX or Advanced UNIX"
++ hpfs 0x07 "OS/2 HPFS, NTFS, QNX or Advanced UNIX"
++ ext2 0x83 "Linux ext2 filesystem"
++ lswap 0x82 "Linux swap"
++ bsddl 0xA5 "FreeBSD/NetBSD/386BSD"
++ s86dl 0x82 "Solaris/x86 disklabel"
++ minix 0x80 "Minix V1"
++ 0x81 "Minix V2"
++ reiserfs 0x83 "ReiserFS filesystem"
++ hmlvm 0xFE "Linux LVM physical volumes"
++ qnx4 0x4F "QNX 4.x"
++ beos 0xEB "BeOS fs"
++ xfs 0x83 "SGI XFS filesystem"
+
+
+
+diff -rupN ./gpart-0.1h.orig/man/gpart.man ./gpart-0.1h/man/gpart.man
+--- ./gpart-0.1h.orig/man/gpart.man Wed Feb 7 20:54:18 2001
++++ ./gpart-0.1h/man/gpart.man Fri Jan 10 16:31:52 2003
+@@ -63,8 +63,8 @@ MS Windows NT/2000 filesystem.
+ .I qnx4
+ QNX 4.x filesystem.
+ .TP
+-.I rfs
+-The Reiser filesystem (version 3.5.X, X > 11).
++.I reiserfs
++The Reiser filesystem (version 3.5.X, X > 11, 3.6.X).
+ .TP
+ .I s86dl
+ Sun Solaris on Intel platforms uses a sub-partitioning
+diff -rupN ./gpart-0.1h.orig/src/Makefile ./gpart-0.1h/src/Makefile
+--- ./gpart-0.1h.orig/src/Makefile Tue Jan 30 20:01:08 2001
++++ ./gpart-0.1h/src/Makefile Fri Jan 10 16:32:24 2003
+@@ -19,7 +19,7 @@ CFLAGS+=-DGPART_LANG=\'$(GPART_LANG)\'
+ endif
+
+
+-mod=ext2 lswap fat bsddl ntfs hpfs s86dl minix rfs hmlvm qnx4 beos xfs
++mod=ext2 lswap fat bsddl ntfs hpfs s86dl minix reiserfs hmlvm qnx4 beos xfs
+ modobj=$(foreach m,$(mod),gm_$(m).o)
+ obj=gpart.o gmodules.o disku.o l64seek.o $(modobj)
+ src=$(obj:.o=.c)
+diff -rupN ./gpart-0.1h.orig/src/gm_reiserfs.c ./gpart-0.1h/src/gm_reiserfs.c
+--- ./gpart-0.1h.orig/src/gm_reiserfs.c Thu Jan 1 03:00:00 1970
++++ ./gpart-0.1h/src/gm_reiserfs.c Fri Jan 10 17:25:30 2003
+@@ -0,0 +1,91 @@
++/*
++ * gm_reiserfs.c -- gpart ReiserFS guessing module
++ *
++ * gpart (c) 1999-2001 Michail Brzitwa <mb@ichabod.han.de>
++ * Guess PC-type hard disk partitions.
++ *
++ * gpart is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published
++ * by the Free Software Foundation; either version 2, or (at your
++ * option) any later version.
++ *
++ * Created: 21.01.1999 <mb@ichabod.han.de>
++ * Modified: 26.12.2000 Francis Devereux <francis@devereux.tc>
++ * Added reiserfs 3.5.28 support.
++ * Modified: 10.01.2003 Yury Umanets <umka@namesys.com>
++ * Added reiserfs 3.6.x support.
++ *
++ */
++
++#include <string.h>
++#include <errno.h>
++#include "gpart.h"
++#include "gm_reiserfs.h"
++
++static const char rcsid[] = "$Id: gm_reiserfs.c,v 1.5 2003/01/10 16:38:08 mb Exp mb $";
++
++
++int reiserfs_init(disk_desc *d,g_module *m)
++{
++ if ((d == 0) || (m == 0))
++ return (0);
++
++ m->m_desc = "ReiserFS filesystem";
++ return (REISERFS_FIRST_BLOCK * 1024 + SB_V35_SIZE);
++}
++
++
++
++int reiserfs_term(disk_desc *d)
++{
++ return (1);
++}
++
++
++
++int reiserfs_gfun(disk_desc *d,g_module *m)
++{
++ struct reiserfs_super_block_v35 *sb;
++ dos_part_entry *pt = &m->m_part;
++ s64_t size;
++
++ m->m_guess = GM_NO;
++ sb = (struct reiserfs_super_blockv35 *)(d->d_sbuf + REISERFS_FIRST_BLOCK * 1024);
++ if (strncmp(sb->s_magic,REISERFS_SUPER_V35_MAGIC,12) == 0 ||
++ strncmp(sb->s_magic,REISERFS_SUPER_V36_MAGIC,12) == 0)
++ {
++ /*
++ * sanity checks.
++ */
++
++ if (sb->s_block_count < sb->s_free_blocks)
++ return (1);
++
++ if (sb->s_block_count < REISERFS_MIN_BLOCK_AMOUNT)
++ return (1);
++
++ if ((sb->s_state != REISERFS_VALID_FS) &&
++ (sb->s_state != REISERFS_ERROR_FS))
++ return (1);
++
++ if (sb->s_oid_maxsize % 2) /* must be even */
++ return (1);
++
++ if (sb->s_oid_maxsize < sb->s_oid_cursize)
++ return (1);
++
++ if ((sb->s_blocksize != 4096) && (sb->s_blocksize != 8192))
++ return (1);
++
++ /*
++ * ok.
++ */
++
++ m->m_guess = GM_YES;
++ pt->p_start = d->d_nsb;
++ size = sb->s_block_count; size *= sb->s_blocksize; size /= d->d_ssize;
++ pt->p_size = (unsigned long)size;
++ pt->p_typ = 0x83;
++ }
++ return (1);
++}
+diff -rupN ./gpart-0.1h.orig/src/gm_reiserfs.h ./gpart-0.1h/src/gm_reiserfs.h
+--- ./gpart-0.1h.orig/src/gm_reiserfs.h Thu Jan 1 03:00:00 1970
++++ ./gpart-0.1h/src/gm_reiserfs.h Fri Jan 10 17:25:55 2003
+@@ -0,0 +1,82 @@
++/*
++ * gm_reiserfs.h -- gpart ReiserFS guessing module header
++ *
++ * gpart (c) 1999-2001 Michail Brzitwa <mb@ichabod.han.de>
++ * Guess PC-type hard disk partitions.
++ *
++ * gpart is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published
++ * by the Free Software Foundation; either version 2, or (at your
++ * option) any later version.
++ *
++ * Created: 21.01.1999 <mb@ichabod.han.de>
++ * Modified: 26.12.2000 Francis Devereux <francis@devereux.tc>
++ * Update support reiserfs version 3.5.28
++ * Modified: 10.01.2003 Yury Umanets <umka@namesys.com>
++ * Added reiserfs 3.6.x support.
++ *
++ */
++
++#ifndef _GM_reiserfs_H
++#define _GM_reiserfs_H
++
++/* imported from asm/types.h */
++typedef __signed__ char __s8;
++typedef unsigned char __u8;
++
++typedef __signed__ short __s16;
++typedef unsigned short __u16;
++
++typedef __signed__ int __s32;
++typedef unsigned int __u32;
++
++/*
++ * taken from ReiserFS v3.5.28, v3.6.x. Reiserfs Copyright 1996-2000 Hans Reiser
++ */
++
++#define REISERFS_SUPER_V35_MAGIC "ReIsErFs"
++#define REISERFS_SUPER_V36_MAGIC "ReIsEr2Fs"
++
++#define REISERFS_FIRST_BLOCK 64
++#define REISERFS_VALID_FS 1
++#define REISERFS_ERROR_FS 2
++#define REISERFS_MIN_BLOCK_AMOUNT 100
++
++struct reiserfs_super_block_v35
++{
++ __u32 s_block_count; /* blocks count */
++ __u32 s_free_blocks; /* free blocks count */
++ __u32 s_root_block; /* root block number */
++ __u32 s_journal_block; /* journal block number */
++ __u32 s_journal_dev; /* journal device number */
++ __u32 s_orig_journal_size; /* size of the journal on FS creation. used to make sure they don't overflow it */
++ __u32 s_journal_trans_max; /* max number of blocks in a transaction. */
++ __u32 s_journal_block_count; /* total size of the journal. can change over time */
++ __u32 s_journal_max_batch; /* max number of blocks to batch into a trans */
++ __u32 s_journal_max_commit_age; /* in seconds, how old can an async commit be */
++ __u32 s_journal_max_trans_age; /* in seconds, how old can a transaction be */
++ __u16 s_blocksize; /* block size */
++ __u16 s_oid_maxsize; /* max size of object id array, see get_objectid() commentary */
++ __u16 s_oid_cursize; /* current size of object id array */
++ __u16 s_state; /* valid or error */
++ char s_magic[12]; /* reiserfs magic string indicates that file system is reiserfs */
++ __u32 s_hash_function_code; /* indicate, what hash fuction is being use to sort names in a directory*/
++ __u16 s_tree_height; /* height of disk tree */
++ __u16 s_bmap_nr; /* amount of bitmap blocks needed to address each block of file system */
++ __u16 s_reserved;
++};
++
++#define SB_V35_SIZE (sizeof(struct reiserfs_super_block_v35))
++
++struct reiserfs_super_block_v36 {
++ struct reiserfs_super_block_v35 s_v35;
++ __u32 s_inode_generation;
++ __u32 s_flags;
++ char s_uuid[16];
++ char s_label[16];
++ char s_unused[88];
++};
++
++#define SB_V36_SIZE (sizeof(struct reiserfs_super_block_v36))
++
++#endif /* _GM_REISERFS_H */
+diff -rupN ./gpart-0.1h.orig/src/gm_rfs.c ./gpart-0.1h/src/gm_rfs.c
+--- ./gpart-0.1h.orig/src/gm_rfs.c Wed Feb 7 21:08:08 2001
++++ ./gpart-0.1h/src/gm_rfs.c Thu Jan 1 03:00:00 1970
+@@ -1,88 +0,0 @@
+-/*
+- * gm_rfs.c -- gpart ReiserFS guessing module
+- *
+- * gpart (c) 1999-2001 Michail Brzitwa <mb@ichabod.han.de>
+- * Guess PC-type hard disk partitions.
+- *
+- * gpart is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published
+- * by the Free Software Foundation; either version 2, or (at your
+- * option) any later version.
+- *
+- * Created: 21.01.1999 <mb@ichabod.han.de>
+- * Modified: 26.12.2000 Francis Devereux <francis@devereux.tc>
+- * Added reiserfs 3.5.28 support.
+- *
+- */
+-
+-#include <string.h>
+-#include <errno.h>
+-#include "gpart.h"
+-#include "gm_rfs.h"
+-
+-static const char rcsid[] = "$Id: gm_rfs.c,v 1.5 2001/02/07 18:08:08 mb Exp mb $";
+-
+-
+-int rfs_init(disk_desc *d,g_module *m)
+-{
+- if ((d == 0) || (m == 0))
+- return (0);
+-
+- m->m_desc = "Reiser filesystem";
+- return (REISERFS_FIRST_BLOCK * 1024 + SB_SIZE);
+-}
+-
+-
+-
+-int rfs_term(disk_desc *d)
+-{
+- return (1);
+-}
+-
+-
+-
+-int rfs_gfun(disk_desc *d,g_module *m)
+-{
+- struct reiserfs_super_block *sb;
+- dos_part_entry *pt = &m->m_part;
+- s64_t size;
+-
+- m->m_guess = GM_NO;
+- sb = (struct reiserfs_super_block *)(d->d_sbuf + REISERFS_FIRST_BLOCK * 1024);
+- if (strncmp(sb->s_magic,REISERFS_SUPER_MAGIC,12) == 0)
+- {
+- /*
+- * sanity checks.
+- */
+-
+- if (sb->s_block_count < sb->s_free_blocks)
+- return (1);
+-
+- if (sb->s_block_count < REISERFS_MIN_BLOCK_AMOUNT)
+- return (1);
+-
+- if ((sb->s_state != REISERFS_VALID_FS) &&
+- (sb->s_state != REISERFS_ERROR_FS))
+- return (1);
+-
+- if (sb->s_oid_maxsize % 2) /* must be even */
+- return (1);
+-
+- if (sb->s_oid_maxsize < sb->s_oid_cursize)
+- return (1);
+-
+- if ((sb->s_blocksize != 4096) && (sb->s_blocksize != 8192))
+- return (1);
+-
+- /*
+- * ok.
+- */
+-
+- m->m_guess = GM_YES;
+- pt->p_start = d->d_nsb;
+- size = sb->s_block_count; size *= sb->s_blocksize; size /= d->d_ssize;
+- pt->p_size = (unsigned long)size;
+- pt->p_typ = 0x83;
+- }
+- return (1);
+-}
+diff -rupN ./gpart-0.1h.orig/src/gm_rfs.h ./gpart-0.1h/src/gm_rfs.h
+--- ./gpart-0.1h.orig/src/gm_rfs.h Mon Jan 29 16:34:35 2001
++++ ./gpart-0.1h/src/gm_rfs.h Thu Jan 1 03:00:00 1970
+@@ -1,68 +0,0 @@
+-/*
+- * gm_rfs.h -- gpart ReiserFS guessing module header
+- *
+- * gpart (c) 1999-2001 Michail Brzitwa <mb@ichabod.han.de>
+- * Guess PC-type hard disk partitions.
+- *
+- * gpart is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published
+- * by the Free Software Foundation; either version 2, or (at your
+- * option) any later version.
+- *
+- * Created: 21.01.1999 <mb@ichabod.han.de>
+- * Modified: 26.12.2000 Francis Devereux <francis@devereux.tc>
+- * Update support reiserfs version 3.5.28
+- *
+- */
+-
+-#ifndef _GM_RFS_H
+-#define _GM_RFS_H
+-
+-/* imported from asm/types.h */
+-typedef __signed__ char __s8;
+-typedef unsigned char __u8;
+-
+-typedef __signed__ short __s16;
+-typedef unsigned short __u16;
+-
+-typedef __signed__ int __s32;
+-typedef unsigned int __u32;
+-
+-/*
+- * taken from ReiserFS v3.5.28. Reiserfs Copyright 1996-2000 Hans Reiser
+- */
+-
+-#define REISERFS_SUPER_MAGIC "ReIsErFs"
+-#define REISERFS_FIRST_BLOCK 64
+-#define REISERFS_VALID_FS 1
+-#define REISERFS_ERROR_FS 2
+-#define REISERFS_MIN_BLOCK_AMOUNT 100
+-
+-struct reiserfs_super_block
+-{
+- __u32 s_block_count; /* blocks count */
+- __u32 s_free_blocks; /* free blocks count */
+- __u32 s_root_block; /* root block number */
+- __u32 s_journal_block; /* journal block number */
+- __u32 s_journal_dev; /* journal device number */
+- __u32 s_orig_journal_size; /* size of the journal on FS creation. used to make sure they don't overflow it */
+- __u32 s_journal_trans_max; /* max number of blocks in a transaction. */
+- __u32 s_journal_block_count; /* total size of the journal. can change over time */
+- __u32 s_journal_max_batch; /* max number of blocks to batch into a trans */
+- __u32 s_journal_max_commit_age; /* in seconds, how old can an async commit be */
+- __u32 s_journal_max_trans_age; /* in seconds, how old can a transaction be */
+- __u16 s_blocksize; /* block size */
+- __u16 s_oid_maxsize; /* max size of object id array, see get_objectid() commentary */
+- __u16 s_oid_cursize; /* current size of object id array */
+- __u16 s_state; /* valid or error */
+- char s_magic[12]; /* reiserfs magic string indicates that file system is reiserfs */
+- __u32 s_hash_function_code; /* indicate, what hash fuction is being use to sort names in a directory*/
+- __u16 s_tree_height; /* height of disk tree */
+- __u16 s_bmap_nr; /* amount of bitmap blocks needed to address each block of file system */
+- __u16 s_reserved;
+-};
+-
+-#define SB_SIZE (sizeof(struct reiserfs_super_block))
+-
+-
+-#endif /* _GM_RFS_H */
+diff -rupN ./gpart-0.1h.orig/src/gmodules.c ./gpart-0.1h/src/gmodules.c
+--- ./gpart-0.1h.orig/src/gmodules.c Tue Jan 30 20:01:00 2001
++++ ./gpart-0.1h/src/gmodules.c Fri Jan 10 16:31:28 2003
+@@ -154,7 +154,7 @@ void g_mod_addinternals()
+ GMODINS(bsddl);
+ GMODINS(lswap);
+ GMODINS(qnx4);
+- GMODINS(rfs);
++ GMODINS(reiserfs);
+ GMODINS(ntfs);
+ GMODINS(hpfs);
+ GMODINS(minix);
+diff -rupN ./gpart-0.1h.orig/src/gmodules.h ./gpart-0.1h/src/gmodules.h
+--- ./gpart-0.1h.orig/src/gmodules.h Tue Jan 30 20:00:47 2001
++++ ./gpart-0.1h/src/gmodules.h Fri Jan 10 16:31:23 2003
+@@ -63,7 +63,7 @@ g_module *g_mod_setweight(char *,float);
+
+ GMODDECL(bsddl); GMODDECL(ext2); GMODDECL(fat);
+ GMODDECL(hpfs); GMODDECL(lswap); GMODDECL(ntfs);
+-GMODDECL(s86dl); GMODDECL(minix); GMODDECL(rfs);
++GMODDECL(s86dl); GMODDECL(minix); GMODDECL(reiserfs);
+ GMODDECL(hmlvm); GMODDECL(qnx4); GMODDECL(beos);
+ GMODDECL(xfs);
+
diff --git a/extra/gtk-qt-engine/PKGBUILD b/extra/gtk-qt-engine/PKGBUILD
index 81cd26667..247195fa4 100644
--- a/extra/gtk-qt-engine/PKGBUILD
+++ b/extra/gtk-qt-engine/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 67433 2010-02-07 00:15:22Z giovanni $
+# $Id: PKGBUILD 143698 2011-11-28 13:17:55Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jake VanderKolk <jakevanderkolk@gmail.com>
pkgname=gtk-qt-engine
pkgver=1.1
-pkgrel=2
+pkgrel=3
pkgdesc="A GTK engine which makes your GTK2 Apps match your QT theme"
arch=('i686' 'x86_64')
license=('GPL')
url="http://code.google.com/p/gtk-qt-engine/"
depends=('libbonoboui' 'kdelibs')
-makedepends=('cmake>=2.4.7' 'automoc4' 'pkgconfig')
-source=(http://gtk-qt-engine.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2)
+makedepends=('cmake' 'automoc4' 'pkgconfig')
+source=("http://gtk-qt-engine.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
md5sums=('de8048baef7dfe6c97cd97c463d66152')
build() {
@@ -21,6 +21,11 @@ build() {
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' \
-DCMAKE_INSTALL_PREFIX=/usr
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}"
+
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/gtk2-perl/PKGBUILD b/extra/gtk2-perl/PKGBUILD
index 215b21109..84a7b8efe 100644
--- a/extra/gtk2-perl/PKGBUILD
+++ b/extra/gtk2-perl/PKGBUILD
@@ -1,25 +1,35 @@
-# $Id: PKGBUILD 124902 2011-05-25 01:27:30Z foutrelis $
+# $Id: PKGBUILD 143696 2011-11-28 13:05:23Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Sarah Hay <sarah@archlinux.org>
pkgname=gtk2-perl
-_realname=Gtk2
-pkgver=1.222
-pkgrel=3
-pkgdesc="Gtk2-Perl allows Perl developers to write GTK+ 2.x applications."
+pkgver=1.241
+pkgrel=1
+pkgdesc="Perl bindings for GTK+ 2.x"
arch=(i686 x86_64)
license=('LGPL')
url="http://gtk2-perl.sourceforge.net/"
makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
depends=('gtk2' 'pango-perl')
+checkdepends=('ttf-dejavu' 'xorg-server-xvfb')
options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('8f8a170b33dc2cf4e69769e97c05185a')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gtk2-${pkgver}.tar.gz)
+md5sums=('82ee2af46ef9ab7b560601e3ae6f8f7a')
build() {
- cd "${srcdir}/${_realname}-${pkgver}"
- # install module in vendor directories.
+ cd "${srcdir}/Gtk2-${pkgver}"
PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
make
+}
+
+check() {
+ cd "${srcdir}/Gtk2-${pkgver}"
+ LD_PRELOAD="" Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
+ LD_PRELOAD="" DISPLAY=:99 make test
+ kill $!
+}
+
+package() {
+ cd "${srcdir}/Gtk2-${pkgver}"
make install DESTDIR="${pkgdir}"
}
diff --git a/extra/gtkglextmm/PKGBUILD b/extra/gtkglextmm/PKGBUILD
index 9265e60dc..f29c74bc5 100644
--- a/extra/gtkglextmm/PKGBUILD
+++ b/extra/gtkglextmm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 137781 2011-09-10 22:38:55Z giovanni $
+# $Id: PKGBUILD 143747 2011-11-28 20:23:35Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Bastien Bouclet <bastien.bouclet@gmail.com>
# Contributor: SpepS <dreamspepser at yahoo dot it>
pkgname=gtkglextmm
pkgver=1.2.0
-pkgrel=7
+pkgrel=8
pkgdesc="Cpp C++ bindings for gtkglext"
arch=('i686' 'x86_64')
url="http://gtkglext.sourceforge.net/"
diff --git a/extra/gtkimageview/PKGBUILD b/extra/gtkimageview/PKGBUILD
index 1b90282d8..c3e235b5b 100644
--- a/extra/gtkimageview/PKGBUILD
+++ b/extra/gtkimageview/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 60213 2009-12-02 11:47:56Z giovanni $
+# $Id: PKGBUILD 143749 2011-11-28 20:31:19Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jan Blazek <appolito@gmail.com>
# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
pkgname=gtkimageview
pkgver=1.6.4
-pkgrel=1
+pkgrel=2
pkgdesc="Simple image viewer widget for GTK"
arch=('i686' 'x86_64')
url="http://trac.bjourne.webfactional.com/"
@@ -13,15 +13,20 @@ license=('LGPL2.1')
depends=('gtk2')
makedepends=('pkgconfig')
options=('!libtool')
-source=(http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/${pkgname}-${pkgver}.tar.gz?format=raw)
+source=("http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/${pkgname}-${pkgver}.tar.gz?format=raw")
md5sums=('501367b3f50e69a12208dc9c6ad00b18')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr \
- --disable-static || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
+ --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
rm -rf "${pkgdir}/usr/share"
}
diff --git a/extra/hd2u/PKGBUILD b/extra/hd2u/PKGBUILD
index be78c1ea0..19e7098d3 100644
--- a/extra/hd2u/PKGBUILD
+++ b/extra/hd2u/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 130939 2011-07-09 06:15:19Z giovanni $
+# $Id: PKGBUILD 143751 2011-11-28 20:37:55Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
pkgname=hd2u
pkgver=1.0.3
-pkgrel=3
+pkgrel=4
pkgdesc="Dos2Unix text file converter"
arch=('i686' 'x86_64')
-license=('GPL2')
+license=('GPL')
url="http://hany.sk/~hany/software/hd2u/"
depends=('popt')
source=("http://hany.sk/~hany/_data/hd2u/$pkgname-$pkgver.tgz")
diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index 525dd9a65..98c59dfc5 100644
--- a/extra/help2man/PKGBUILD
+++ b/extra/help2man/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131671 2011-07-13 13:59:50Z giovanni $
+# $Id: PKGBUILD 143753 2011-11-28 20:42:11Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Paul Mattal <paul@mattal.com>
pkgname=help2man
pkgver=1.40.4
-pkgrel=1
+pkgrel=2
pkgdesc="Conversion tool to create man files"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/help2man/"
diff --git a/extra/hexedit/PKGBUILD b/extra/hexedit/PKGBUILD
index bc2a5bfd0..f46418f04 100644
--- a/extra/hexedit/PKGBUILD
+++ b/extra/hexedit/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 128628 2011-06-24 17:38:13Z ibiru $
+# $Id: PKGBUILD 143768 2011-11-29 01:46:32Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Paul Mattal <pjmattal@elys.com>
pkgname=hexedit
pkgver=1.2.12
-pkgrel=4
+pkgrel=5
pkgdesc="Hex Editor for Linux"
arch=('i686' 'x86_64')
-url="http://merd.net/pixel/hexedit.html"
+url="http://rigaux.org/hexedit.html"
license=('GPL')
depends=('ncurses')
-source=(http://merd.net/pixel/${pkgname}-${pkgver}.src.tgz)
+source=("http://rigaux.org/${pkgname}-${pkgver}.src.tgz")
md5sums=('0d2f48610006278cd93359fea9a06d5c')
build() {
@@ -23,5 +23,6 @@ build() {
package() {
cd "${srcdir}/${pkgname}"
+
make prefix="${pkgdir}/usr" install
}
diff --git a/extra/hspell/PKGBUILD b/extra/hspell/PKGBUILD
index 81b12ed44..21ddd78d4 100644
--- a/extra/hspell/PKGBUILD
+++ b/extra/hspell/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 109025 2011-02-05 13:53:55Z andyrtr $
+# $Id: PKGBUILD 143756 2011-11-28 20:54:27Z andyrtr $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgbase=hspell
@@ -41,7 +41,7 @@ package_hunspell-he() {
pkgdesc="Hebrew hunspell dictionary"
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}/${pkgbase}-${pkgver}"
install -dm755 ${pkgdir}/usr/share/hunspell
cp -p hunspell/new_he.dic ${pkgdir}/usr/share/hunspell/he_IL.dic
diff --git a/extra/java-commons-daemon/PKGBUILD b/extra/java-commons-daemon/PKGBUILD
index 0627323e8..41d2e6c13 100644
--- a/extra/java-commons-daemon/PKGBUILD
+++ b/extra/java-commons-daemon/PKGBUILD
@@ -1,17 +1,16 @@
# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
pkgname=('java-commons-daemon' 'java-jsvc')
pkgbase=java-commons-daemon
-pkgver=1.0.7
+pkgver=1.0.8
pkgrel=1
arch=('i686' 'x86_64')
url="http://commons.apache.org/daemon/"
license=('APACHE')
_libname=commons-daemon
source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz)
-md5sums=('fb6c5e7b6544fd8400b08f0e81fc9581')
+md5sums=('323a0bd9e2786256f02c5aed4e887fed')
makedepends=('apache-ant' 'docbook2x' 'docbook-xsl')
-
build() {
# commons-daemon.jar
cd "${srcdir}/${_libname}-${pkgver}-src"
diff --git a/extra/k9copy/PKGBUILD b/extra/k9copy/PKGBUILD
index dfc334918..ee0699e14 100644
--- a/extra/k9copy/PKGBUILD
+++ b/extra/k9copy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 120930 2011-04-27 13:07:03Z giovanni $
+# $Id: PKGBUILD 143762 2011-11-29 00:20:34Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com>
pkgname=k9copy
pkgver=2.3.7
-pkgrel=1
+pkgrel=2
pkgdesc="A small utility which allows the copy of DVD under Linux"
arch=('i686' 'x86_64')
url="http://k9copy.sourceforge.net"
@@ -19,6 +19,8 @@ build() {
cd "${srcdir}/${pkgname}-${pkgver}-Source"
sed -i -e "s:Name=k9copy:Name=K9copy:g" k9copy.desktop k9copy_assistant.desktop
+ sed -i -e "s:CODEC_TYPE_VIDEO:AVMEDIA_TYPE_VIDEO:g" src/import/k9avidecode.cpp
+
cmake -DCMAKE_INSTALL_PREFIX=/usr
make
}
diff --git a/extra/libgksu/PKGBUILD b/extra/libgksu/PKGBUILD
index b4414d58a..b5d0cf67a 100644
--- a/extra/libgksu/PKGBUILD
+++ b/extra/libgksu/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 90625 2010-09-14 09:37:47Z jgc $
+# $Id: PKGBUILD 143675 2011-11-28 10:58:18Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libgksu
pkgver=2.0.12
-pkgrel=3
+pkgrel=4
pkgdesc="gksu authorization library"
arch=(i686 x86_64)
url="http://www.nongnu.org/gksu/index.html"
license=(GPL)
-depends=('libgnome-keyring>=2.30.1' 'libgtop>=2.28.1' 'startup-notification>=0.10' 'gconf>=2.28.1')
-makedepends=('gtk-doc' 'pkgconfig' 'intltool')
+depends=('gconf' 'gtk2' 'libgnome-keyring' 'libgtop' 'startup-notification')
+makedepends=('intltool' 'gtk-doc')
options=('!libtool' '!emptydirs')
install=libgksu.install
source=(http://people.debian.org/~kov/gksu/${pkgname}-${pkgver}.tar.gz
@@ -21,8 +21,12 @@ build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/libgksu-2.0.12-revert-forkpty.patch"
./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static
+ --localstatedir=/var --disable-static --disable-schemas-install
make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
rm -f ${pkgdir}/usr/lib/*.a
install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
diff --git a/extra/pango-perl/PKGBUILD b/extra/pango-perl/PKGBUILD
index ad489dec4..e0c903a57 100644
--- a/extra/pango-perl/PKGBUILD
+++ b/extra/pango-perl/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 124899 2011-05-25 01:24:25Z foutrelis $
+# $Id: PKGBUILD 143689 2011-11-28 12:08:52Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=pango-perl
-_realname=Pango
-pkgver=1.221
-pkgrel=4
+pkgver=1.223
+pkgrel=1
pkgdesc="Perl bindings for Pango"
arch=(i686 x86_64)
license=('LGPL')
@@ -12,13 +11,21 @@ url="http://gtk2-perl.sourceforge.net/"
makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
depends=('pango' 'glib-perl' 'cairo-perl')
options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('8d257209aa11bd6c3a2beb235c2f103f')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Pango-${pkgver}.tar.gz)
+md5sums=('628a6de54f47b6791c6b45edfb835215')
build() {
- cd "${srcdir}/${_realname}-${pkgver}"
- # install module in vendor directories.
+ cd "${srcdir}/Pango-${pkgver}"
PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
make
+}
+
+check() {
+ cd "${srcdir}/Pango-${pkgver}"
+ make test
+}
+
+package() {
+ cd "${srcdir}/Pango-${pkgver}"
make install DESTDIR="${pkgdir}"
}
diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD
index 42d22d211..25c82c7e0 100644
--- a/extra/perl-dbd-mysql/PKGBUILD
+++ b/extra/perl-dbd-mysql/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 125309 2011-05-25 19:54:00Z remy $
+# $Id: PKGBUILD 143774 2011-11-29 02:55:27Z kevin $
# Maintainer: kevin <kevin@archlinux.org>
# Contributor: Eric Johnson <eric@coding-zone.com>
pkgname=perl-dbd-mysql
_realname=DBD-mysql
-pkgver=4.019
+pkgver=4.020
pkgrel=1
pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD"
arch=(i686 x86_64)
@@ -14,7 +14,7 @@ depends=('libmysqlclient' 'perl-dbi' 'perl>=5.14.0')
makedepends=('mysql')
options=(!emptydirs)
source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz)
-md5sums=('566d98ab8ffac9626a31f6f6d455558e')
+md5sums=('a2bf8808bbd45298e84dde06afbd58e9')
build() {
cd ${srcdir}/${_realname}-${pkgver}
diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD
index b3bb3075d..6bef2dfd5 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142317 2011-11-08 12:30:16Z ibiru $
+# $Id: PKGBUILD 143691 2011-11-28 12:26:53Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
pkgname=telepathy-glib
-pkgver=0.16.2
+pkgver=0.16.3
pkgrel=1
pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
arch=('i686' 'x86_64')
@@ -13,11 +13,11 @@ license=('LGPL2.1')
options=('!libtool' '!emptydirs')
depends=('dbus-glib')
makedepends=('libxslt' 'vala' 'gobject-introspection')
-source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('c05e48da72f013cec86ca8a05da71ffd')
+source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('5c0cd5da2ce6257017751573e35c88ee')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "$srcdir/$pkgname-$pkgver"
PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
--libexecdir=/usr/lib/telepathy \
--enable-vala-bindings \
@@ -26,6 +26,6 @@ build() {
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR=${pkgdir} install
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
}
diff --git a/libre/lsb-release-libre/PKGBUILD b/libre/lsb-release-libre/PKGBUILD
index 5eb411a97..0f2457924 100644
--- a/libre/lsb-release-libre/PKGBUILD
+++ b/libre/lsb-release-libre/PKGBUILD
@@ -7,7 +7,7 @@
_pkgname=lsb-release
pkgname=lsb-release-libre
pkgver=1.4
-pkgrel=10
+pkgrel=11
pkgdesc="LSB version query program with Parabola name"
arch=('any')
url="http://www.linuxbase.org/"
@@ -27,7 +27,7 @@ build() {
package() {
cd "$srcdir/$_pkgname-$pkgver"
install -dm755 "$pkgdir/etc"
- echo "DISTRIB_DESCRIPTION=\"Parabola GNU/Linux-Libre\"" > "$pkgdir/etc/lsb-release"
+ echo "DISTRIB_DESCRIPTION=\"Parabola GNU/Linux-libre\"" > "$pkgdir/etc/lsb-release"
install -Dm 644 lsb_release.1.gz "$pkgdir/usr/share/man/man1/lsb_release.1.gz"
install -Dm 755 lsb_release "$pkgdir/usr/bin/lsb_release"
diff --git a/libre/lsb-release-libre/lsb-release.install b/libre/lsb-release-libre/lsb-release.install
index 6ce4fee54..62d404892 100644
--- a/libre/lsb-release-libre/lsb-release.install
+++ b/libre/lsb-release-libre/lsb-release.install
@@ -1,12 +1,14 @@
post_install() {
- echo "Parabola GNU/Linux-Libre release" >> /etc/arch-release
+ rm -f /etc/arch-release
+ echo "Parabola GNU/Linux-libre release" >> /etc/parabola-release
}
post_upgrade() {
- sed -e '/Parabola GNU\/Linux-Libre release/d' -i /etc/arch-release
- echo "Parabola GNU/Linux-Libre release" >> /etc/arch-release
+ rm -f /etc/arch-release
+ sed -e '/Parabola GNU\/Linux-[Ll]ibre release/d' -i /etc/parabola-release
+ echo "Parabola GNU/Linux-libre release" >> /etc/parabola-release
}
pre_remove() {
- sed -e '/Parabola GNU\/Linux-Libre release/d' -i /etc/arch-release
+ sed -e '/Parabola GNU\/Linux-[Ll]ibre release/d' -i /etc/parabola-release
}
diff --git a/testing/shadow/PKGBUILD b/testing/shadow/PKGBUILD
index 3486b77e4..42a553e0f 100644
--- a/testing/shadow/PKGBUILD
+++ b/testing/shadow/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 143544 2011-11-26 05:50:16Z dreisner $
+# $Id: PKGBUILD 143705 2011-11-28 13:37:43Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Maintainer: Aaron Griffin <aaron@archlinux.org>
pkgname=shadow
pkgver=4.1.4.3
-pkgrel=3
+pkgrel=4
pkgdesc="Password and account management tool suite with support for shadow files and PAM"
arch=('i686' 'x86_64')
url='http://pkg-shadow.alioth.debian.org/'
@@ -27,7 +28,7 @@ source=(ftp://ftp.archlinux.org/other/shadow/shadow_4.1.4.2+svn3283.orig.tar.gz
sha1sums=('8b704b8f07718e329205f23d457c3121c0f3679e'
'78ec184a499f9708adcfcf0b7a3b22a60bf39f91'
'4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
- '0db3819326f45d2c75042aca4315737cca39edc4'
+ '12427b1ca92a9b85ca8202239f0d9f50198b818f'
'0e56fed7fc93572c6bf0d8f3b099166558bb46f1'
'895aad07c192b288b457e19dd7b8c55841b4ad22'
'e5cab2118ecb1e61874cde842d7d04d1003f35cb'
diff --git a/testing/shadow/chpasswd b/testing/shadow/chpasswd
index 0bd61516e..5d447985a 100644
--- a/testing/shadow/chpasswd
+++ b/testing/shadow/chpasswd
@@ -3,4 +3,4 @@ auth sufficient pam_rootok.so
auth required pam_unix.so
account required pam_unix.so
session required pam_unix.so
-password required pam_unix.so 512 shadow
+password required pam_unix.so sha512 shadow