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

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

2 files changed, 47 insertions, 4 deletions

diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD
index a775b9b25..ba7beb938 100644
--- a/community/gambas2/PKGBUILD
+++ b/community/gambas2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 48045 2011-05-27 17:00:59Z lcarlier $
+# $Id: PKGBUILD 56943 2011-10-17 08:20:39Z ibiru $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Biru Ionut <ionut@archlinux.ro>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -20,13 +20,13 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2
          'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
          'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
 pkgver=2.23.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gambas.sourceforge.net"
 depends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'libgl' 'gtk2' 'librsvg' 'xdg-utils'
          'postgresql-libs>=8.4.1' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3'
-         'curl' 'poppler' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft'
+         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft'
          'libxcursor' 'libsm')
 makedepends=('intltool' 'mysql' 'postgresql')
 license=('GPL2')
@@ -36,10 +36,12 @@ replaces=('gambas2')
 conflicts=('gambas2')
 source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2
         'fix-gbi-gba-path.patch' 'db.firebird.gcc-4.6.0-fix.patch'
+	'poppler-0.18.patch'
 	'gambas2-script.install' 'gambas2-runtime.install')
 md5sums=('ff8d2c1f310222c150b114e7ce247dfd'
          '9dda03a1bbfb7e7ba8b6a4ae91b6752b'
          'ac9703b390502ed3242c8d34485c9236'
+         'a551b4b216bbdb3489f3c264bf73ee66'
          '870ff5b4b33cd75aa9c290539e6fdd5d'
          'ab5667175c4945282d2f40a35d0e9e5b')
 _gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc"
@@ -70,6 +72,7 @@ build() {
   patch -Np1 -i "${srcdir}/fix-gbi-gba-path.patch"
   # merged upstream
   patch -Np3 -i "${srcdir}/db.firebird.gcc-4.6.0-fix.patch"
+  patch -Np2 -i "${srcdir}/poppler-0.18.patch"
   ./reconf-all
   ##
   
@@ -677,7 +680,7 @@ package_gambas2-gb-pcre() {
 }
 
 package_gambas2-gb-pdf() {
-  depends=('gambas2-runtime' 'poppler')
+  depends=('gambas2-runtime' 'poppler-glib')
   pkgdesc="Gambas2 PDF component"
 
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
diff --git a/community/gambas2/poppler-0.18.patch b/community/gambas2/poppler-0.18.patch
new file mode 100644
index 000000000..fbcc430bf
--- /dev/null
+++ b/community/gambas2/poppler-0.18.patch
@@ -0,0 +1,40 @@
+--- gambas/trunk/gb.pdf/configure.ac	2010/07/14 01:50:18	3038
++++ gambas/trunk/gb.pdf/configure.ac	2011/08/09 10:43:30	3997
+@@ -22,6 +22,8 @@
+   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_8, $((1-$?)), Poppler version >= 0.8)
+   pkg-config --atleast-version=0.11.3 poppler
+   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3)
++  pkg-config --atleast-version=0.17.0 poppler
++  AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17)
+ fi
+ 
+ AC_OUTPUT( \
+
+--- gambas/trunk/gb.pdf/src/CPdfDocument.cpp	2011/06/03 00:51:09	3870
++++ gambas/trunk/gb.pdf/src/CPdfDocument.cpp	2011/08/09 10:43:30	3997
+@@ -44,6 +44,7 @@
+ #include <Outline.h>
+ #include <Link.h>
+ #include <Gfx.h>
++#include <glib/poppler-features.h>
+ 
+ /*****************************************************************************
+ 
+@@ -956,12 +957,17 @@
+  Bookmarks of a PDF page
+ 
+ ******************************************************************************/
++
+ void aux_fill_links(void *_object)
+ {
++	#if POPPLER_VERSION_0_17
++	THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog()));
++	#else
+ 	Object obj;
+ 	
+ 	THIS->links = new Links (THIS->page->getAnnots (&obj),THIS->doc->getCatalog()->getBaseURI ());
+ 	obj.free();
++	#endif
+ }
+ 
+ BEGIN_PROPERTY (PDFPAGELINKS_count)