Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el

Conflicts:
	community/acpi/PKGBUILD
	community/alure/PKGBUILD
	community/ario/PKGBUILD
	community/cantata/PKGBUILD
	community/cgit/PKGBUILD
	community/chntpw/PKGBUILD
	community/clamz/PKGBUILD
	community/deadbeef/PKGBUILD
	community/dunst/PKGBUILD
	community/erlang/PKGBUILD
	community/ettercap/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/gnome-commander/PKGBUILD
	community/gq/PKGBUILD
	community/gtkimageview/PKGBUILD
	community/i3status/PKGBUILD
	community/iasl/PKGBUILD
	community/krename/PKGBUILD
	community/libesmtp/PKGBUILD
	community/liblinebreak/PKGBUILD
	community/libmilter/PKGBUILD
	community/libpaper/PKGBUILD
	community/libvirt/PKGBUILD
	community/libx86emu/PKGBUILD
	community/libxdg-basedir/PKGBUILD
	community/lightdm-gtk2-greeter/PKGBUILD
	community/lightdm-gtk3-greeter/PKGBUILD
	community/lightdm/PKGBUILD
	community/luakit/PKGBUILD
	community/lxtask/PKGBUILD
	community/marisa/PKGBUILD
	community/megaglest/PKGBUILD
	community/mumble/PKGBUILD
	community/opencolorio/PKGBUILD
	community/openssh-askpass/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/pidgin-toobars/PKGBUILD
	community/powerdns/PKGBUILD
	community/python-numexpr/PKGBUILD
	community/python-pybox2d/PKGBUILD
	community/python-pytables/PKGBUILD
	community/python2-imaging/PKGBUILD
	community/python2-pybluez/PKGBUILD
	community/remmina/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/ruby-iconv/PKGBUILD
	community/scummvm-tools/PKGBUILD
	community/shapelib/PKGBUILD
	community/sshfs/PKGBUILD
	community/subtle/PKGBUILD
	community/teeworlds/PKGBUILD
	community/uget/PKGBUILD
	community/wireshark/PKGBUILD
	community/wxcam/PKGBUILD
	community/wxgtk2.9/PKGBUILD
	community/xchm/PKGBUILD
	community/xdelta3/PKGBUILD
	community/zynaddsubfx/PKGBUILD
	core/gcc/PKGBUILD
	core/gcc/gcc_mips64el_lib.patch
	core/gdbm/PKGBUILD
	core/ldns/PKGBUILD
	core/pth/PKGBUILD
	core/systemd/PKGBUILD
	core/wireless_tools/PKGBUILD
	elementary/gtk-engine-equinox/PKGBUILD
	elementary/postler/PKGBUILD
	elementary/vala-010/PKGBUILD
	extra/aubio/PKGBUILD
	extra/audacity/PKGBUILD
	extra/bc/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/calligra/PKGBUILD
	extra/chmlib/PKGBUILD
	extra/clamav/PKGBUILD
	extra/clisp/PKGBUILD
	extra/crypto++/PKGBUILD
	extra/cups/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/ecore/PKGBUILD
	extra/edje/PKGBUILD
	extra/eet/PKGBUILD
	extra/eeze/PKGBUILD
	extra/efreet/PKGBUILD
	extra/eina/PKGBUILD
	extra/eio/PKGBUILD
	extra/embryo/PKGBUILD
	extra/emotion/PKGBUILD
	extra/enlightenment17/PKGBUILD
	extra/ethumb/PKGBUILD
	extra/evas/PKGBUILD
	extra/festival/PKGBUILD
	extra/ffcall/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/git/PKGBUILD
	extra/gmetadom/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtkmathview/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/hugin/PKGBUILD
	extra/i8kutils/PKGBUILD
	extra/id3lib/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/jack/PKGBUILD
	extra/ktorrent/PKGBUILD
	extra/libaccounts-qt/PKGBUILD
	extra/libdvdnav/PKGBUILD
	extra/libdvdread/PKGBUILD
	extra/libetpan/PKGBUILD
	extra/libgadu/PKGBUILD
	extra/libmikmod/PKGBUILD
	extra/libpst/PKGBUILD
	extra/libsecret/PKGBUILD
	extra/libssh/PKGBUILD
	extra/libvorbis/PKGBUILD
	extra/lilv/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/maxima/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/msmtp/PKGBUILD
	extra/obex-data-server/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/opencv/PKGBUILD
	extra/opengtl/PKGBUILD
	extra/perl-net-dns/PKGBUILD
	extra/perl-socket6/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postfix/PKGBUILD
	extra/purple-plugin-pack/PKGBUILD
	extra/pycurl/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/qt5/PKGBUILD
	extra/redland/PKGBUILD
	extra/ruby/PKGBUILD
	extra/shared-mime-info/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/v4l-utils/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vim/PKGBUILD
	extra/wildmidi/PKGBUILD
	extra/wxpython/PKGBUILD
	extra/x2goclient/PKGBUILD
	extra/xf86-video-siliconmotion/0001-Remove-miInitializeBackingStore.patch
	extra/xf86-video-siliconmotion/PKGBUILD
	extra/xfce4-taskmanager/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xsane/PKGBUILD
	extra/zsh/PKGBUILD
	libre-testing/unace-libre/PKGBUILD
	libre/abuse-libre/PKGBUILD
	libre/audacity-libre/PKGBUILD
	libre/audex-libre/PKGBUILD
	libre/blackbox-libre/PKGBUILD
	libre/bogofilter-libre/PKGBUILD
	libre/bumblebee-libre/PKGBUILD
	libre/crosstool-ng/PKGBUILD
	libre/dvdrip-libre/PKGBUILD
	libre/ecasound-libre/PKGBUILD
	libre/enscript/PKGBUILD
	libre/epdfview-libre/PKGBUILD
	libre/hardinfo/PKGBUILD
	libre/kile-libre/PKGBUILD
	libre/lesspipe-libre/PKGBUILD
	libre/libquicktime-libre/PKGBUILD
	libre/linux-libre-tools/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/mc-libre/PKGBUILD
	libre/mesa-demos-libre/PKGBUILD
	libre/midori-libre/PKGBUILD
	libre/oss-libre/PKGBUILD
	libre/p7zip-libre/PKGBUILD
	libre/python2-reportlab-libre/PKGBUILD
	libre/sdl-libre/PKGBUILD
	libre/seamonkey-libre/PKGBUILD
	libre/unzip-libre/PKGBUILD
	libre/xarchiver-libre/PKGBUILD
	libre/xmlstarlet/PKGBUILD
	pcr/a2jmidid/PKGBUILD
	pcr/amsynth/PKGBUILD
	pcr/anyremote/PKGBUILD
	pcr/azr3-jack/PKGBUILD
	pcr/bambus/PKGBUILD
	pcr/bamf2/PKGBUILD
	pcr/barnyard2/PKGBUILD
	pcr/bison++/PKGBUILD
	pcr/bup/PKGBUILD
	pcr/din/PKGBUILD
	pcr/django-tagging/PKGBUILD
	pcr/doxymacs/PKGBUILD
	pcr/emacs-js2-mode/PKGBUILD
	pcr/eterm/PKGBUILD
	pcr/frame/PKGBUILD
	pcr/freeipmi/PKGBUILD
	pcr/geis/PKGBUILD
	pcr/ginn/PKGBUILD
	pcr/grail/PKGBUILD
	pcr/libast/PKGBUILD
	pcr/libdshconfig/PKGBUILD
	pcr/networkmanager-openswan/PKGBUILD
	pcr/networkmanager-strongswan/PKGBUILD
	pcr/openswan/PKGBUILD
	pcr/par/PKGBUILD
	pcr/snort/PKGBUILD
	pcr/strongswan/PKGBUILD
	social/batctl/PKGBUILD
	social/bip/PKGBUILD
	social/bitcoin-daemon/PKGBUILD
	social/dropbear/PKGBUILD
	social/ffingerd/PKGBUILD
	social/haveged/PKGBUILD
	social/inadyn-opendns/PKGBUILD
	social/liblockfile/PKGBUILD
	social/libowfat/PKGBUILD
	social/lockfile-progs/PKGBUILD
	social/netatalk/PKGBUILD
	social/olsrd/PKGBUILD
	social/poco/PKGBUILD
	social/spectrum/PKGBUILD
	social/squirm/PKGBUILD
	social/tokyotyrant/PKGBUILD
	social/tomoyo-tools/PKGBUILD

3 files changed, 5 insertions, 290 deletions

diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index 22835bff0..68307b873 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 202372 2013-12-21 13:31:03Z andyrtr $
+# $Id: PKGBUILD 204369 2014-01-18 10:14:32Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=cups-filters-libre
 _pkgname=cups-filters
-pkgver=1.0.43
-pkgrel=1
+pkgver=1.0.44
+pkgrel=2
 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
@@ -20,13 +20,14 @@ source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.
 provides=("${_pkgname}=${pkgver}" 'foomatic-filters')
 replaces=("${_pkgname}" 'foomatic-filters')
 conflicts=("${_pkgname}" 'foomatic-filters')
-md5sums=('d1dbd200845db729bf18817f3a49c2c1')
+md5sums=('41d853788cf8e176f952136549488d34')
 
 build() {
   cd $_pkgname-$pkgver
   ./configure --prefix=/usr  \
     --sysconfdir=/etc \
     --sbindir=/usr/bin \
+    --localstatedir=/var \
     --with-rcdir=no \
     --enable-avahi \
     --with-browseremoteprotocols=DNSSD,CUPS \
diff --git a/libre/cups-filters-libre/cups-browsed.service b/libre/cups-filters-libre/cups-browsed.service
deleted file mode 100644
index 07b342d62..000000000
--- a/libre/cups-filters-libre/cups-browsed.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Make remote CUPS printers available locally
-After=cups.service avahi-daemon.service
-Wants=cups.service avahi-daemon.service
-
-[Service]
-ExecStart=/usr/bin/cups-browsed
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/cups-filters-libre/poppler_buildfix.diff b/libre/cups-filters-libre/poppler_buildfix.diff
deleted file mode 100644
index 18fc643f9..000000000
--- a/libre/cups-filters-libre/poppler_buildfix.diff
+++ /dev/null
@@ -1,276 +0,0 @@
-=== modified file 'filter/pdf.cxx'
---- filter/pdf.cxx	2012-08-19 22:31:27 +0000
-+++ filter/pdf.cxx	2013-08-01 15:48:06 +0000
-@@ -17,6 +17,10 @@
- #include "pdf.h"
- 
- #include <PDFDoc.h>
-+#include <config.h>
-+#ifdef HAVE_CPP_POPPLER_VERSION_H
-+#include "cpp/poppler-version.h"
-+#endif
- 
- 
- extern "C" pdf_t * pdf_load_template(const char *filename)
-@@ -343,7 +347,11 @@
-     {
-     }
- 
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+    Goffset getPos()
-+#else
-     int getPos()
-+#endif
-     {
-         return this->pos;
-     }
-
-=== modified file 'filter/pdftoijs.cxx'
---- filter/pdftoijs.cxx	2012-09-20 22:53:10 +0000
-+++ filter/pdftoijs.cxx	2013-08-01 15:48:06 +0000
-@@ -70,8 +70,13 @@
- }
- 
- #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+void CDECL myErrorFun(void *data, ErrorCategory category,
-+    Goffset pos, char *msg)
-+#else
- void CDECL myErrorFun(void *data, ErrorCategory category,
-     int pos, char *msg)
-+#endif
- {
-   if (pos >= 0) {
-     fprintf(stderr, "ERROR (%d): ", pos);
-@@ -297,19 +302,15 @@
-   if (argc == 6) {
-     /* stdin */
-     int fd;
--    Object obj;
--    BaseStream *str;
--    FILE *fp;
-+    char name[BUFSIZ];
-     char buf[BUFSIZ];
-     int n;
- 
--    fd = cupsTempFd(buf,sizeof(buf));
-+    fd = cupsTempFd(name,sizeof(name));
-     if (fd < 0) {
-       pdfError(-1,"Can't create temporary file");
-       exit(1);
-     }
--    /* remove name */
--    unlink(buf);
- 
-     /* copy stdin to the tmp file */
-     while ((n = read(0,buf,BUFSIZ)) > 0) {
-@@ -319,23 +320,10 @@
- 	exit(1);
-       }
-     }
--    if (lseek(fd,0,SEEK_SET) < 0) {
--        pdfError(-1,"Can't rewind temporary file");
--        close(fd);
--	exit(1);
--    }
--
--    if ((fp = fdopen(fd,"rb")) == 0) {
--        pdfError(-1,"Can't fdopen temporary file");
--        close(fd);
--	exit(1);
--    }
--
--    obj.initNull();
--//    parsePDFTOPDFComment(fp); // TODO?
--    rewind(fp);
--    str = new FileStream(fp,0,gFalse,0,&obj);
--    doc = new PDFDoc(str);
-+    close(fd);
-+    doc = new PDFDoc(new GooString(name));
-+    /* remove name */
-+    unlink(name);
-   } else {
-     GooString *fileName = new GooString(argv[6]);
-     /* argc == 7 filenmae is specified */
-
-=== modified file 'filter/pdftoopvp/pdftoopvp.cxx'
---- filter/pdftoopvp/pdftoopvp.cxx	2012-07-20 08:32:55 +0000
-+++ filter/pdftoopvp/pdftoopvp.cxx	2013-08-01 15:48:06 +0000
-@@ -112,8 +112,13 @@
- #define MAX_OPVP_OPTIONS 20
- 
- #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+void CDECL myErrorFun(void *data, ErrorCategory category,
-+    Goffset pos, char *msg)
-+#else
- void CDECL myErrorFun(void *data, ErrorCategory category,
-     int pos, char *msg)
-+#endif
- {
-   if (pos >= 0) {
-     fprintf(stderr, "ERROR (%d): ", pos);
-@@ -619,9 +624,6 @@
-     char *s;
-     GooString name;
-     int fd;
--    Object obj;
--    BaseStream *str;
--    FILE *fp;
-     char buf[4096];
-     int n;
- 
-@@ -633,8 +635,6 @@
-     }
-     name.append("/XXXXXX");
-     fd = mkstemp(name.getCString());
--    /* remove name */
--    unlink(name.getCString());
-     if (fd < 0) {
-       opvpError(-1,"Can't create temporary file");
-       exitCode = 2;
-@@ -675,23 +675,10 @@
- 	goto err0;
-       }
-     }
--    if (lseek(fd,0,SEEK_SET) < 0) {
--	opvpError(-1,"Can't rewind temporary file");
--	close(fd);
--	exitCode = 2;
--	goto err0;
--    }
--
--    if ((fp = fdopen(fd,"rb")) == 0) {
--	opvpError(-1,"Can't fdopen temporary file");
--	close(fd);
--	exitCode = 2;
--	goto err0;
--    }
--
--    obj.initNull();
--    str = new FileStream(fp,0,gFalse,0,&obj);
--    doc = new PDFDoc(str);
-+    close(fd);
-+    doc = new PDFDoc(&name);
-+    /* remove name */
-+    unlink(name.getCString());
-   } else {
-     /* no jcl check */
-     doc = new PDFDoc(fileName.copy());
-
-=== modified file 'filter/pdftoraster.cxx'
---- filter/pdftoraster.cxx	2013-07-30 17:00:43 +0000
-+++ filter/pdftoraster.cxx	2013-08-01 15:48:06 +0000
-@@ -186,8 +186,13 @@
- }
- 
- #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+void CDECL myErrorFun(void *data, ErrorCategory category,
-+    Goffset pos, char *msg)
-+#else
- void CDECL myErrorFun(void *data, ErrorCategory category,
-     int pos, char *msg)
-+#endif
- {
-   if (pos >= 0) {
-     fprintf(stderr, "ERROR (%d): ", pos);
-@@ -1776,19 +1781,15 @@
-   if (argc == 6) {
-     /* stdin */
-     int fd;
--    Object obj;
--    BaseStream *str;
--    FILE *fp;
-+    char name[BUFSIZ];
-     char buf[BUFSIZ];
-     int n;
- 
--    fd = cupsTempFd(buf,sizeof(buf));
-+    fd = cupsTempFd(name,sizeof(name));
-     if (fd < 0) {
-       pdfError(-1,const_cast<char *>("Can't create temporary file"));
-       exit(1);
-     }
--    /* remove name */
--    unlink(buf);
- 
-     /* copy stdin to the tmp file */
-     while ((n = read(0,buf,BUFSIZ)) > 0) {
-@@ -1798,23 +1799,10 @@
- 	exit(1);
-       }
-     }
--    if (lseek(fd,0,SEEK_SET) < 0) {
--        pdfError(-1,const_cast<char *>("Can't rewind temporary file"));
--        close(fd);
--	exit(1);
--    }
--
--    if ((fp = fdopen(fd,"rb")) == 0) {
--        pdfError(-1,const_cast<char *>("Can't fdopen temporary file"));
--        close(fd);
--	exit(1);
--    }
--
--    obj.initNull();
--    parsePDFTOPDFComment(fp);
--    rewind(fp);
--    str = new FileStream(fp,0,gFalse,0,&obj);
--    doc = new PDFDoc(str);
-+    close(fd);
-+    doc = new PDFDoc(new GooString(name));
-+    /* remove name */
-+    unlink(name);
-   } else {
-     GooString *fileName = new GooString(argv[6]);
-     /* argc == 7 filenmae is specified */
-
-=== modified file 'filter/pdftoijs.cxx'
---- filter/pdftoijs.cxx	2013-08-01 15:48:06 +0000
-+++ filter/pdftoijs.cxx	2013-08-02 13:52:04 +0000
-@@ -79,7 +79,11 @@
- #endif
- {
-   if (pos >= 0) {
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+    fprintf(stderr, "ERROR (%lld): ", pos);
-+#else
-     fprintf(stderr, "ERROR (%d): ", pos);
-+#endif
-   } else {
-     fprintf(stderr, "ERROR: ");
-   }
-
-=== modified file 'filter/pdftoraster.cxx'
---- filter/pdftoraster.cxx	2013-08-02 11:13:38 +0000
-+++ filter/pdftoraster.cxx	2013-08-02 13:52:04 +0000
-@@ -199,7 +199,11 @@
- #endif
- {
-   if (pos >= 0) {
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+    fprintf(stderr, "ERROR (%lld): ", pos);
-+#else
-     fprintf(stderr, "ERROR (%d): ", pos);
-+#endif
-   } else {
-     fprintf(stderr, "ERROR: ");
-   }
-
-=== modified file 'filter/pdftoopvp/pdftoopvp.cxx'
---- filter/pdftoopvp/pdftoopvp.cxx	2013-08-01 15:48:06 +0000
-+++ filter/pdftoopvp/pdftoopvp.cxx	2013-08-02 14:46:20 +0000
-@@ -121,7 +121,11 @@
- #endif
- {
-   if (pos >= 0) {
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+    fprintf(stderr, "ERROR (%lld): ", pos);
-+#else
-     fprintf(stderr, "ERROR (%d): ", pos);
-+#endif
-   } else {
-     fprintf(stderr, "ERROR: ");
-   }
-