Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/cdemu-client/PKGBUILD
	community/dcron/PKGBUILD
	community/freevo/PKGBUILD
	community/gmerlin-avdecoder/PKGBUILD
	community/hacburn/PKGBUILD
	community/htmldoc/PKGBUILD
	community/ibus-table/PKGBUILD
	community/iksemel/PKGBUILD
	community/isomaster/PKGBUILD
	community/libmatio/PKGBUILD
	community/libtlen/PKGBUILD
	community/luarocks/PKGBUILD
	community/lxde-common/PKGBUILD
	community/multipath-tools/PKGBUILD
	community/nvclock/PKGBUILD
	community/pam-krb5/PKGBUILD
	community/pidgin-musictracker/PKGBUILD
	community/pkgfile/PKGBUILD
	community/pkgtools/PKGBUILD
	community/print-manager/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python-pyxmpp/PKGBUILD
	community/python2-simplejson/PKGBUILD
	community/rsnapshot/PKGBUILD
	community/setconf/PKGBUILD
	community/tagpy/PKGBUILD
	community/terminator/PKGBUILD
	community/udunits/PKGBUILD
	community/vlock/PKGBUILD
	community/winefish/PKGBUILD
	core/nss-myhostname/PKGBUILD
	extra/avfs/PKGBUILD
	extra/bmp-musepack/PKGBUILD
	extra/bmp-wma/PKGBUILD
	extra/bochs/PKGBUILD
	extra/botan/PKGBUILD
	extra/cdargs/PKGBUILD
	extra/cx_freeze/PKGBUILD
	extra/dcfldd/PKGBUILD
	extra/devilspie/PKGBUILD
	extra/emelfm2/PKGBUILD
	extra/evilwm/PKGBUILD
	extra/fssos-nsvs/PKGBUILD
	extra/gimp-dbp/PKGBUILD
	extra/gimp-gap/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gmpc/PKGBUILD
	extra/gtkpod/PKGBUILD
	extra/hercules/PKGBUILD
	extra/herqq/PKGBUILD
	extra/hydrogen/PKGBUILD
	extra/kdegames/PKGBUILD
	extra/kradio/PKGBUILD
	extra/kshutdown/PKGBUILD
	extra/libmusicbrainz4/PKGBUILD
	extra/mahjong/PKGBUILD
	extra/mcrypt/PKGBUILD
	extra/monica/PKGBUILD
	extra/mpck/PKGBUILD
	extra/mrtg/PKGBUILD
	extra/nicotine/PKGBUILD
	extra/normalize/PKGBUILD
	extra/oprofile/PKGBUILD
	extra/perl-event/PKGBUILD
	extra/perl-unicode-string/PKGBUILD
	extra/pidgin-encryption/PKGBUILD
	extra/proftpd/PKGBUILD
	extra/pymad/PKGBUILD
	extra/qiv/PKGBUILD
	extra/quodlibet/PKGBUILD
	extra/ratpoison/PKGBUILD
	extra/rox/PKGBUILD
	extra/scrot/PKGBUILD
	extra/stardict/PKGBUILD
	extra/terminal/PKGBUILD
	extra/usbview/PKGBUILD
	extra/xdelta/PKGBUILD
	extra/xdelta3/PKGBUILD
	extra/xorg-xlsfonts/PKGBUILD
	extra/zile/PKGBUILD
	mozilla-testing/iceweasel-libre/mozconfig
	mozilla-testing/iceweasel-libre/vendor.js
	social/tokyocabinet/PKGBUILD
	~fauno/notmuch/PKGBUILD
	~mtjm/thinkfan/PKGBUILD
	~mtjm/zbar/PKGBUILD

1 files changed, 0 insertions, 69 deletions

diff --git a/community/pdf2djvu/poppler-0.20.patch b/community/pdf2djvu/poppler-0.20.patch
deleted file mode 100644
index 36d23f73a..000000000
--- a/community/pdf2djvu/poppler-0.20.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -wbBur pdf2djvu-0.7.12/configure pdf2djvu-0.7.12.my/configure
---- pdf2djvu-0.7.12/configure	2012-01-22 03:17:01.000000000 +0400
-+++ pdf2djvu-0.7.12.my/configure	2012-05-17 20:44:06.000000000 +0400
-@@ -6653,7 +6653,7 @@
- 
- if test "$GXX" = yes
- then
--  CXXFLAGS="$CXXFLAGS -Werror=overloaded-virtual"
-+  CXXFLAGS="$CXXFLAGS "
- fi
- 
- # Output files
-diff -wbBur pdf2djvu-0.7.12/configure.ac pdf2djvu-0.7.12.my/configure.ac
---- pdf2djvu-0.7.12/configure.ac	2012-01-22 03:16:50.000000000 +0400
-+++ pdf2djvu-0.7.12.my/configure.ac	2012-05-17 20:43:37.000000000 +0400
-@@ -225,7 +225,7 @@
- AX_CXXFLAGS_WARN_ALL(CXXFLAGS)
- if test "$GXX" = yes
- then
--  CXXFLAGS="$CXXFLAGS -Werror=overloaded-virtual"
-+  CXXFLAGS="$CXXFLAGS "
- fi
- 
- # Output files
-diff -wbBur pdf2djvu-0.7.12/pdf-backend.cc pdf2djvu-0.7.12.my/pdf-backend.cc
---- pdf2djvu-0.7.12/pdf-backend.cc	2012-01-22 03:16:50.000000000 +0400
-+++ pdf2djvu-0.7.12.my/pdf-backend.cc	2012-05-17 20:47:24.000000000 +0400
-@@ -32,10 +32,10 @@
-  * ======================
-  */
- 
--static void poppler_error_handler(int pos, char *message, va_list args)
-+static void poppler_error_handler(void *data, ErrorCategory ec, int pos, char *message)
- {
-   std::string format;
--  std::string expanded_message = string_vprintf(message, args);
-+  std::string expanded_message = message;
-   const char *c_message = expanded_message.c_str();
-   if (pos >= 0)
-   {
-@@ -61,7 +61,7 @@
-   Cwd cwd(argv0_dir_name);
- #endif
-   globalParams = new GlobalParams();
--  setErrorFunction(poppler_error_handler);
-+  setErrorCallback(poppler_error_handler, 0);
- }
- 
- void pdf::Environment::set_antialias(bool value)
-diff -wbBur pdf2djvu-0.7.12/pdf2djvu.cc pdf2djvu-0.7.12.my/pdf2djvu.cc
---- pdf2djvu-0.7.12/pdf2djvu.cc	2012-01-22 03:16:50.000000000 +0400
-+++ pdf2djvu-0.7.12.my/pdf2djvu.cc	2012-05-17 20:55:07.000000000 +0400
-@@ -1387,13 +1387,13 @@
-         debug(0)++;
-       }
-       out1.reset(new pdf::Renderer(paper_color, config.monochrome));
--      out1->startDoc(doc->getXRef());
-+      out1->startDoc((PDFDoc*)doc->getXRef());
-       outm.reset(new MutedRenderer(paper_color, config.monochrome, *page_files));
--      outm->startDoc(doc->getXRef());
-+      outm->startDoc((PDFDoc*)doc->getXRef());
-       if (!config.monochrome)
-       {
-         outs.reset(new MutedRenderer(paper_color, config.monochrome, *page_files));
--        outs->startDoc(doc->getXRef());
-+        outs->startDoc((PDFDoc*)doc->getXRef());
-       }
-     }
-     assert(doc.get() != NULL);