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

Conflicts:
	community/apvlv/PKGBUILD
	community/i3-wm/PKGBUILD
	community/jack2/PKGBUILD
	community/perl-list-moreutils/PKGBUILD
	community/qc-usb-messenger/PKGBUILD
	community/sword/PKGBUILD
	community/virtualbox/PKGBUILD
	community/vuze/PKGBUILD
	extra/archboot/PKGBUILD
	extra/ardour/PKGBUILD
	extra/boost/PKGBUILD
	extra/digikam/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdebase-konsole/PKGBUILD
	extra/kdebase-runtime/PKGBUILD
	extra/kdebindings-kimono/PKGBUILD
	extra/kdebindings-korundum/PKGBUILD
	extra/kdebindings-kross/PKGBUILD
	extra/kdebindings-perlkde/PKGBUILD
	extra/kdebindings-perlqt/PKGBUILD
	extra/kdebindings-python/PKGBUILD
	extra/kdebindings-qtruby/PKGBUILD
	extra/kdebindings-qyoto/PKGBUILD
	extra/kdebindings-smokegen/PKGBUILD
	extra/kdebindings-smokekde/PKGBUILD
	extra/kdebindings-smokeqt/PKGBUILD
	extra/kdebindings/PKGBUILD
	extra/kdeedu-blinken/PKGBUILD
	extra/kdeedu-blinken/kdeedu-blinken.install
	extra/kdeedu-cantor/PKGBUILD
	extra/kdeedu-cantor/kdeedu-cantor.install
	extra/kdeedu-kalgebra/PKGBUILD
	extra/kdeedu-kalgebra/kdeedu-kalgebra.install
	extra/kdeedu-kalzium/PKGBUILD
	extra/kdeedu-kalzium/kdeedu-kalzium.install
	extra/kdeedu-kanagram/PKGBUILD
	extra/kdeedu-kanagram/kdeedu-kanagram.install
	extra/kdeedu-kbruch/PKGBUILD
	extra/kdeedu-kbruch/kdeedu-kbruch.install
	extra/kdeedu-kgeography/PKGBUILD
	extra/kdeedu-kgeography/kdeedu-kgeography.install
	extra/kdeedu-khangman/PKGBUILD
	extra/kdeedu-khangman/kdeedu-khangman.install
	extra/kdeedu-kig/PKGBUILD
	extra/kdeedu-kig/kdeedu-kig.install
	extra/kdeedu-kiten/PKGBUILD
	extra/kdeedu-kiten/kdeedu-kiten.install
	extra/kdeedu-klettres/PKGBUILD
	extra/kdeedu-klettres/kdeedu-klettres.install
	extra/kdeedu-kmplot/PKGBUILD
	extra/kdeedu-kmplot/kdeedu-kmplot.install
	extra/kdeedu-kstars/PKGBUILD
	extra/kdeedu-kstars/kdeedu-kstars.install
	extra/kdeedu-ktouch/PKGBUILD
	extra/kdeedu-ktouch/kdeedu-ktouch.install
	extra/kdeedu-kturtle/PKGBUILD
	extra/kdeedu-kturtle/kdeedu-kturtle.install
	extra/kdeedu-kwordquiz/PKGBUILD
	extra/kdeedu-kwordquiz/kdeedu-kwordquiz.install
	extra/kdeedu-marble/PKGBUILD
	extra/kdeedu-marble/gpsd-2.96.patch
	extra/kdeedu-marble/kdeedu-marble.install
	extra/kdeedu-parley/PKGBUILD
	extra/kdeedu-parley/kdeedu-parley.install
	extra/kdeedu-rocs/PKGBUILD
	extra/kdeedu-step/PKGBUILD
	extra/kdeedu-step/kdeedu-step.install
	extra/kdegraphics-gwenview/PKGBUILD
	extra/kdegraphics-gwenview/kdegraphics-gwenview.install
	extra/kdegraphics-kamera/PKGBUILD
	extra/kdegraphics-kcolorchooser/PKGBUILD
	extra/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
	extra/kdegraphics-kgamma/PKGBUILD
	extra/kdegraphics-kolourpaint/PKGBUILD
	extra/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
	extra/kdegraphics-kruler/PKGBUILD
	extra/kdegraphics-kruler/kdegraphics-kruler.install
	extra/kdegraphics-ksaneplugin/PKGBUILD
	extra/kdegraphics-ksnapshot/PKGBUILD
	extra/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
	extra/kdegraphics-okular/PKGBUILD
	extra/kdegraphics-okular/kdegraphics-okular.install
	extra/kdegraphics-strigi-analyzer/PKGBUILD
	extra/kdegraphics-svgpart/PKGBUILD
	extra/kdegraphics-thumbnailers/PKGBUILD
	extra/kdegraphics/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdemultimedia/PKGBUILD
	extra/kdepim-runtime/PKGBUILD
	extra/kdeplasma-addons/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/kdesdk-kate/kdebase-kwrite.install
	extra/kdesdk-kate/kdesdk-kate.install
	extra/kdesdk-kate/pkgbuild-syntax-highlight.patch
	extra/kdeutils/PKGBUILD
	extra/kipi-plugins/PKGBUILD
	extra/koffice/PKGBUILD
	extra/konq-plugins/PKGBUILD
	extra/libkdcraw/PKGBUILD
	extra/libkdcraw/libkdcraw.install
	extra/libkdeedu/PKGBUILD
	extra/libkdeedu/libkdeedu.install
	extra/libkexiv2/PKGBUILD
	extra/libkipi/PKGBUILD
	extra/libkipi/libkipi.install
	extra/libksane/PKGBUILD
	extra/libksane/libksane.install
	extra/liblrdf/PKGBUILD
	extra/maxima/PKGBUILD
	extra/mysql/PKGBUILD
	extra/partitionmanager/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/samba/PKGBUILD
	extra/sbcl/PKGBUILD
	extra/texlive-bin/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	multilib/lib32-freetype2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libsndfile/PKGBUILD
	testing/mesa/PKGBUILD
	~fauno/notmuch/PKGBUILD

2 files changed, 22 insertions, 25 deletions

diff --git a/community/apvlv/PKGBUILD b/community/apvlv/PKGBUILD
index 1cdc7680c..3e6844dd2 100644
--- a/community/apvlv/PKGBUILD
+++ b/community/apvlv/PKGBUILD
@@ -1,27 +1,25 @@
-# $Id: PKGBUILD 41378 2011-03-05 14:39:13Z lcarlier $
+# $Id: PKGBUILD 52879 2011-07-29 15:22:56Z shusmann $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: tocer.deng <tocer.deng@gmail.com>
 
 pkgname=apvlv
-pkgver=0.1.1
+pkgver=0.1.2
 pkgrel=1
 pkgdesc="A PDF Viewer which behaves like Vim"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/apvlv/"
+url="http://naihe2010.github.com/apvlv/"
 license=('GPL')
-depends=('poppler-glib' 'libdjvu')
-makedepends=('cmake')
-source=(http://apvlv.googlecode.com/files/$pkgname-${pkgver}-Source.tar.gz
-        apvlv-poppler015.patch)
-md5sums=('221b25fd34ebf398047424459d8e5131'
-         '809aea91e13032663d6533892757891a')
+depends=('poppler-glib' 'djvulibre')
+source=(https://github.com/downloads/naihe2010/$pkgname/$pkgname-${pkgver}-Source.tar.gz apvlv-poppler015.patch)
+md5sums=('381d83aa9c253fac5e0be165fca39222'
+         '308b17a563ed470ea47d408f324ab745')
+
+makedepends=('cmake') 
 
 build() {
   cd $srcdir/$pkgname-$pkgver-Source
-
-  patch -Np0 -i $srcdir/apvlv-poppler015.patch
-
+  patch -Np1 -i $srcdir/apvlv-poppler015.patch
   mkdir -p build
   cd build
 
@@ -30,7 +28,6 @@ build() {
         -DAPVLV_WITH_UMD=no  ..
   make
 }
-
 package() {
   cd $srcdir/$pkgname-$pkgver-Source/build
 
diff --git a/community/apvlv/apvlv-poppler015.patch b/community/apvlv/apvlv-poppler015.patch
index 96cb099a6..0a261b1db 100644
--- a/community/apvlv/apvlv-poppler015.patch
+++ b/community/apvlv/apvlv-poppler015.patch
@@ -1,12 +1,12 @@
-diff -aur src/ApvlvFile.cpp.orig src/ApvlvFile.cpp
---- src/ApvlvFile.cpp.orig	2010-09-14 07:28:44.000000000 +0100
-+++ src/ApvlvFile.cpp		2010-10-29 22:29:21.128949529 +0100
-@@ -275,7 +275,7 @@
-   {
-     PopplerRectangle rect = { x1, y1, x2, y2 };
-     PopplerPage *page = poppler_document_get_page (mDoc, pn);
--    *out = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect);
-+    *out = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect);
-     if (*out != NULL)
-       {
- 	return true;
+diff -Naur apvlv-0.1.2-Source.orig//src/ApvlvFile.cpp apvlv-0.1.2-Source.new//src/ApvlvFile.cpp
+--- apvlv-0.1.2-Source.orig//src/ApvlvFile.cpp	2011-07-29 17:19:13.000000000 +0200
++++ apvlv-0.1.2-Source.new//src/ApvlvFile.cpp	2011-07-29 17:22:22.000000000 +0200
+@@ -304,7 +304,7 @@
+ {
+   PopplerRectangle rect = { x1, y1, x2, y2 };
+   PopplerPage *page = poppler_document_get_page (mDoc, pn);
+-  *out = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect);
++  *out = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect);
+   if (*out != NULL)
+     {
+       return true;