Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/esmtp/PKGBUILD
	community/geany-plugins/PKGBUILD
	community/giggle/PKGBUILD
	community/guichan/PKGBUILD
	community/mxml/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	core/libtool/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	core/udev/PKGBUILD
	extra/audacious/PKGBUILD
	extra/conky/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtk3/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/kdeutils/PKGBUILD
	extra/kino/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postfix/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/qtcurve-gtk2/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xfburn/PKGBUILD
	extra/xfce4-xkb-plugin/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/yelp/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/libtool-multilib/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine/wine.install

3 files changed, 88 insertions, 0 deletions

diff --git a/community/sdcv/PKGBUILD b/community/sdcv/PKGBUILD
new file mode 100644
index 000000000..dd1d87971
--- /dev/null
+++ b/community/sdcv/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 57381 2011-10-26 16:44:58Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+
+pkgname=sdcv
+pkgver=0.4.2
+pkgrel=6
+pkgdesc="StarDict Console Version"
+arch=('i686' 'x86_64')
+url="http://sdcv.sourceforge.net/"
+license=('GPL')
+depends=('glib2' 'readline' 'zlib')
+makedepends=('patch')
+provides=('stardict')
+changelog=$pkgname.changelog
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 \
+        $pkgname-$pkgver-headers.patch)
+sha256sums=('a164f079e93986814ea2d39f3a49cf9d1b71b01aad908254457fe3d0ded9deb2'
+            '4746e32a6aaddf7744f373b539879598b48219a3b35f41ceb839f04c27921eb4')
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver
+
+  patch -Np1 -i ${srcdir}/$pkgname-$pkgver-headers.patch
+
+  ./configure --prefix=/usr  --mandir=/usr/share/man
+
+#quick fix for x86_64
+  if [ "${CARCH}" == "x86_64" ]; then
+    sed -i 's|guint32 page_size|guint64 page_size|' src/lib/lib.cpp
+  fi
+
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+
+  make DESTDIR=${pkgdir} install
+}
diff --git a/community/sdcv/sdcv-0.4.2-headers.patch b/community/sdcv/sdcv-0.4.2-headers.patch
new file mode 100644
index 000000000..9affec151
--- /dev/null
+++ b/community/sdcv/sdcv-0.4.2-headers.patch
@@ -0,0 +1,46 @@
+diff -ruN sdcv-0.4.2-orig/src/lib/lib.cpp sdcv-0.4.2/src/lib/lib.cpp
+--- sdcv-0.4.2-orig/src/lib/lib.cpp	2006-04-24 10:17:27.000000000 +0200
++++ sdcv-0.4.2/src/lib/lib.cpp	2009-12-19 21:15:37.000000000 +0100
+@@ -513,7 +513,7 @@
+ {
+ 	fseek(idxfile, wordoffset[page_idx], SEEK_SET);
+ 	guint32 page_size=wordoffset[page_idx+1]-wordoffset[page_idx];
+-	fread(wordentry_buf, std::min(sizeof(wordentry_buf), page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255.
++	fread(wordentry_buf, std::min(sizeof(wordentry_buf), (size_t)page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255.
+ 	return wordentry_buf;
+ }
+
+diff -ruN sdcv-0.4.2-orig/src/libwrapper.cpp sdcv-0.4.2/src/libwrapper.cpp
+--- sdcv-0.4.2-orig/src/libwrapper.cpp	2006-04-24 12:40:29.000000000 +0200
++++ sdcv-0.4.2/src/libwrapper.cpp	2009-12-19 21:15:37.000000000 +0100
+@@ -24,6 +24,7 @@
+ 
+ #include <glib/gi18n.h>
+ #include <map>
++#include <cstring>
+ 
+ #include "utils.hpp"
+ 
+diff -ruN sdcv-0.4.2-orig/src/readline.cpp sdcv-0.4.2/src/readline.cpp
+--- sdcv-0.4.2-orig/src/readline.cpp	2005-12-07 23:07:23.000000000 +0100
++++ sdcv-0.4.2/src/readline.cpp	2009-12-19 21:15:37.000000000 +0100
+@@ -23,6 +23,7 @@
+ #endif
+ 
+ #include <cstdio>
++#include <cstdlib>
+ #ifdef WITH_READLINE
+ #  include <readline/readline.h>
+ #  include <readline/history.h>
+diff -ruN sdcv-0.4.2-orig/src/utils.cpp sdcv-0.4.2/src/utils.cpp
+--- sdcv-0.4.2-orig/src/utils.cpp	2006-04-24 11:03:47.000000000 +0200
++++ sdcv-0.4.2/src/utils.cpp	2009-12-19 21:15:37.000000000 +0100
+@@ -22,6 +22,8 @@
+ #  include "config.h"
+ #endif
+ 
++#include <cstdio>
++#include <cstdlib>
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ 
diff --git a/community/sdcv/sdcv.changelog b/community/sdcv/sdcv.changelog
new file mode 100644
index 000000000..f742d12c7
--- /dev/null
+++ b/community/sdcv/sdcv.changelog
@@ -0,0 +1,3 @@
+2011-10-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* sdcv 0.4.2-6
+	* moved to [community] with 206 votes