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

2 files changed, 2 insertions, 223 deletions

diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index 2cb265268..9005c3be8 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 199075 2013-11-08 14:49:13Z heftig $
+# $Id: PKGBUILD 204422 2014-01-19 16:28:55Z bpiotrowski $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
 pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-goa' 'gvfs-mtp')
 pkgver=1.18.3
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('avahi' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray')
diff --git a/extra/gvfs/imobiledevice-1.1.5.patch b/extra/gvfs/imobiledevice-1.1.5.patch
deleted file mode 100644
index 00e9358dc..000000000
--- a/extra/gvfs/imobiledevice-1.1.5.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From d71c6108901460842de25012d5ece727a0c70d27 Mon Sep 17 00:00:00 2001
-From: Ondrej Holy <oholy@redhat.com>
-Date: Tue, 11 Jun 2013 11:33:23 +0000
-Subject: afc: Update to libimobiledevice new api
-
-https://bugzilla.redhat.com/show_bug.cgi?id=951731
-https://bugzilla.gnome.org/show_bug.cgi?id=702577
----
-diff --git a/configure.ac b/configure.ac
-index 12dbdcd..2846d82 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -372,14 +372,11 @@ AFC_LIBS=
- AFC_CFLAGS=
- 
- if test "x$enable_afc" != "xno" ; then
--  PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.0 libplist >= 0.15, msg_afc=yes)
-+  PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.5 libplist >= 0.15, msg_afc=yes)
- 
-   if test "x$msg_afc" = "xyes"; then
-     PKG_CHECK_MODULES(AFC, libimobiledevice-1.0 libplist)
-     AC_DEFINE(HAVE_AFC, 1, [Define to 1 if AFC is going to be built])
--    PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.2,
--                     [AC_DEFINE(HAVE_LIBIMOBILEDEVICE_1_1_2, 1,
--                                [Define to 1 if libimobiledevice-1.1.2 found])])
-   fi
- fi
- 
-diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c
-index ab4a9ce..6b0b64f 100644
---- a/daemon/gvfsbackendafc.c
-+++ b/daemon/gvfsbackendafc.c
-@@ -349,12 +349,7 @@ _idevice_event_cb (const idevice_event_t *event, void *user_data)
-   if (event->event != IDEVICE_DEVICE_REMOVE)
-     return;
- 
--#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2
-   event_udid = event->udid;
--#else
--  event_udid = event->uuid;
--#endif
--
-   if (g_str_equal (event_udid, afc_backend->uuid) == FALSE)
-     return;
- 
-@@ -401,7 +396,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
-   const char *str;
-   char *tmp;
-   char *display_name = NULL;
--  guint16 port;
-+  lockdownd_service_descriptor_t lockdown_service = NULL;
-   int virtual_port;
-   GMountSpec *real_spec;
-   GVfsBackendAfc *self;
-@@ -414,6 +409,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
-   char **dcim_afcinfo;
-   plist_t value;
-   lockdownd_error_t lerr;
-+  afc_error_t aerr;
-   const gchar *choices[] = {_("Try again"), _("Cancel"), NULL}; /* keep in sync with the enum above */
-   gboolean aborted = FALSE;
-   gchar *message = NULL;
-@@ -649,41 +645,38 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
- 
-   switch (self->mode) {
-     case ACCESS_MODE_AFC:
--      lerr = lockdownd_start_service (lockdown_cli, self->service, &port);
-+      lerr = lockdownd_start_service (lockdown_cli, self->service, &lockdown_service);
-       if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job))))
-         {
-           goto out_destroy_lockdown;
-         }
--      if (G_UNLIKELY(g_vfs_backend_afc_check (afc_client_new (self->dev,
--                                                              port, &self->afc_cli),
--                                              G_VFS_JOB(job))))
-+      aerr = afc_client_new (self->dev, lockdown_service, &self->afc_cli);
-+      if (G_UNLIKELY(g_vfs_backend_afc_check (aerr, G_VFS_JOB(job))))
-         {
-           goto out_destroy_lockdown;
-         }
-       break;
-     case ACCESS_MODE_HOUSE_ARREST:
--      lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.installation_proxy", &port);
-+      lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.installation_proxy", &lockdown_service);
-       if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job))))
-         {
-           g_warning ("couldn't start inst proxy");
-           goto out_destroy_lockdown;
-         }
--      if (G_UNLIKELY(g_vfs_backend_inst_check (instproxy_client_new (self->dev,
--                                                                     port, &self->inst),
--                                               G_VFS_JOB(job))))
-+      aerr = instproxy_client_new (self->dev, lockdown_service, &self->inst);
-+      if (G_UNLIKELY(g_vfs_backend_inst_check (aerr, G_VFS_JOB(job))))
-         {
-           g_warning ("couldn't create inst proxy instance");
-           goto out_destroy_lockdown;
-         }
--      lerr = lockdownd_start_service (lockdown_cli, "com.apple.springboardservices", &port);
-+      lerr = lockdownd_start_service (lockdown_cli, "com.apple.springboardservices", &lockdown_service);
-       if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job))))
-         {
-           g_warning ("couldn't start SBServices proxy");
-           goto out_destroy_lockdown;
-         }
--      if (G_UNLIKELY(g_vfs_backend_sbs_check (sbservices_client_new (self->dev,
--                                                                     port, &self->sbs),
--                                              G_VFS_JOB(job))))
-+      aerr = sbservices_client_new (self->dev, lockdown_service, &self->sbs);
-+      if (G_UNLIKELY(g_vfs_backend_sbs_check (aerr, G_VFS_JOB(job))))
-         {
-           g_warning ("couldn't create SBServices proxy instance");
-           goto out_destroy_lockdown;
-@@ -705,6 +698,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
- 
-   /* lockdown connection is not needed anymore */
-   lockdownd_client_free (lockdown_cli);
-+  lockdownd_service_descriptor_free (lockdown_service);
- 
-   /* Add camera item if necessary */
-   if (self->mode == ACCESS_MODE_AFC)
-@@ -723,6 +717,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
- 
- out_destroy_lockdown:
-   lockdownd_client_free (lockdown_cli);
-+  lockdownd_service_descriptor_free (lockdown_service);
- 
- out_destroy_dev:
-   idevice_free (self->dev);
-@@ -794,10 +789,11 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self,
- {
-   AppInfo *info;
-   lockdownd_client_t lockdown_cli;
--  guint16 port;
-+  lockdownd_service_descriptor_t lockdown_service = NULL;
-   house_arrest_client_t house_arrest;
-   afc_client_t afc;
-   plist_t dict, error;
-+  lockdownd_error_t lerr;
- 
-   info = g_hash_table_lookup (self->apps, id);
- 
-@@ -812,7 +808,8 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self,
-       g_warning ("Failed to get a lockdown to start house arrest for app %s", info->id);
-       return;
-     }
--  if (lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &port) != LOCKDOWN_E_SUCCESS)
-+  lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &lockdown_service);
-+  if (lerr != LOCKDOWN_E_SUCCESS)
-     {
-       lockdownd_client_free (lockdown_cli);
-       g_warning ("Failed to start house arrest for app %s", info->id);
-@@ -820,14 +817,17 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self,
-     }
- 
-   house_arrest = NULL;
--  house_arrest_client_new (self->dev, port, &house_arrest);
-+  house_arrest_client_new (self->dev, lockdown_service, &house_arrest);
-   if (house_arrest == NULL)
-     {
-       g_warning ("Failed to start house arrest for app %s", info->id);
-       lockdownd_client_free (lockdown_cli);
-+      lockdownd_service_descriptor_free (lockdown_service);
-       return;
-     }
- 
-+  lockdownd_service_descriptor_free (lockdown_service);
-+
-   dict = NULL;
-   if (house_arrest_send_command (house_arrest, "VendContainer", info->id) != HOUSE_ARREST_E_SUCCESS ||
-       house_arrest_get_result (house_arrest, &dict) != HOUSE_ARREST_E_SUCCESS)
-diff --git a/monitor/afc/afcvolume.c b/monitor/afc/afcvolume.c
-index 9829077..b7284b0 100644
---- a/monitor/afc/afcvolume.c
-+++ b/monitor/afc/afcvolume.c
-@@ -80,6 +80,8 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
-   guint retries;
-   plist_t value;
-   char *model, *display_name;
-+  lockdownd_service_descriptor_t lockdown_service = NULL;
-+  lockdownd_error_t lerr;
- 
-   retries = 0;
-   do {
-@@ -94,14 +96,14 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
- 
-   if (self->service != NULL)
-     {
--      guint16 port;
--
-       if (lockdownd_client_new_with_handshake (dev, &lockdown_cli, "gvfs-afc-volume-monitor") != LOCKDOWN_E_SUCCESS)
-         {
-           idevice_free (dev);
-           return 0;
-         }
--      if (lockdownd_start_service(lockdown_cli, "com.apple.mobile.house_arrest", &port) != LOCKDOWN_E_SUCCESS)
-+      lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &lockdown_service);
-+      lockdownd_service_descriptor_free (lockdown_service);
-+      if (lerr != LOCKDOWN_E_SUCCESS)
-         {
-           idevice_free (dev);
-           return 0;
-diff --git a/monitor/afc/afcvolumemonitor.c b/monitor/afc/afcvolumemonitor.c
-index 3545bdf..995ef4d 100644
---- a/monitor/afc/afcvolumemonitor.c
-+++ b/monitor/afc/afcvolumemonitor.c
-@@ -89,12 +89,7 @@ g_vfs_afc_monitor_idevice_event (const idevice_event_t *event, void *user_data)
- 
-   self = G_VFS_AFC_VOLUME_MONITOR(user_data);
- 
--#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2
-   event_udid = event->udid;
--#else
--  event_udid = event->uuid;
--#endif
--
-   if (event->event == IDEVICE_DEVICE_ADD)
-     g_vfs_afc_monitor_create_volume (self, event_udid);
-   else
---
-cgit v0.9.2