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

Conflicts:
	community/asciijump/PKGBUILD
	community/cairo-compmgr/PKGBUILD
	community/cwiid/PKGBUILD
	community/darcs/PKGBUILD
	community/gadmin-samba/PKGBUILD
	community/gstm/PKGBUILD
	community/haskell-dbus/PKGBUILD
	community/haskell-mmap/PKGBUILD
	community/lastfm-client/PKGBUILD
	community/libtar/PKGBUILD
	community/mget/PKGBUILD
	community/nexuiz/PKGBUILD
	community/pstreams/PKGBUILD
	community/pyglet/PKGBUILD
	community/python-html5lib/PKGBUILD
	community/python-pychm/PKGBUILD
	community/qoauth/PKGBUILD
	community/quilt/PKGBUILD
	community/stormbaancoureur/PKGBUILD
	community/winegame/PKGBUILD
	community/winestuff/PKGBUILD
	community/xdg-user-dirs/PKGBUILD
	core/libfetch/PKGBUILD
	extra/acpi/PKGBUILD
	extra/alex/PKGBUILD
	extra/allegro/PKGBUILD
	extra/capi4k-utils/PKGBUILD
	extra/erlang/PKGBUILD
	extra/ettercap/PKGBUILD
	extra/gftp/PKGBUILD
	extra/gimp-refocus/PKGBUILD
	extra/happy/PKGBUILD
	extra/haskell-cgi/PKGBUILD
	extra/haskell-deepseq/PKGBUILD
	extra/haskell-fgl/PKGBUILD
	extra/haskell-glut/PKGBUILD
	extra/haskell-haskell-src/PKGBUILD
	extra/haskell-html/PKGBUILD
	extra/haskell-hunit/PKGBUILD
	extra/haskell-opengl/PKGBUILD
	extra/haskell-parallel/PKGBUILD
	extra/haskell-platform/PKGBUILD
	extra/haskell-quickcheck/PKGBUILD
	extra/haskell-regex-base/PKGBUILD
	extra/haskell-regex-compat/PKGBUILD
	extra/haskell-regex-posix/PKGBUILD
	extra/haskell-stm/PKGBUILD
	extra/haskell-syb/PKGBUILD
	extra/haskell-xhtml/PKGBUILD
	extra/libnet/PKGBUILD
	extra/linux_logo/PKGBUILD
	extra/mailman/PKGBUILD
	extra/midori/PKGBUILD
	extra/ntrack/PKGBUILD
	extra/pwgen/PKGBUILD
	extra/qtcurve-gtk2/PKGBUILD
	extra/qtcurve-kde4/PKGBUILD
	extra/ristretto/PKGBUILD
	extra/rxvt-unicode/PKGBUILD
	extra/telepathy-sofiasip/PKGBUILD
	extra/tightvnc/PKGBUILD
	extra/vsftpd/PKGBUILD
	extra/windowmaker-crm-git/PKGBUILD
	libre/aufs2-libre/PKGBUILD
	libre/calibre-libre/PKGBUILD
	libre/calibre-libre/calibre-mount-helper
	libre/calibre-libre/calibre.install
	libre/calibre-libre/desktop_integration.patch
	libre/ffmpeg-libre/PKGBUILD
	mozilla-testing/iceweasel-libre/PKGBUILD
	mozilla-testing/iceweasel-libre/libre.patch
	mozilla-testing/iceweasel-libre/mozconfig
	~lukeshu/openni-unstable/PKGBUILD

2 files changed, 0 insertions, 118 deletions

diff --git a/extra/bluez/fix-a2dp.patch b/extra/bluez/fix-a2dp.patch
deleted file mode 100644
index e4bb1372a..000000000
--- a/extra/bluez/fix-a2dp.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 0109fa0b6fa731c00b4c6b78d5694b2aaa088862 Mon Sep 17 00:00:00 2001
-From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Date: Thu, 26 Jan 2012 23:39:02 +0200
-Subject: [PATCH] audio: Fix disabling local A2DP endpoints when UNIX socket
- is disabled
-
-Local endpoints can only be used when UNIX socket API is available.
----
- audio/a2dp.c |   15 +++++++--------
- 1 files changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/audio/a2dp.c b/audio/a2dp.c
-index 5ca105c..bbb91ce 100644
---- a/audio/a2dp.c
-+++ b/audio/a2dp.c
-@@ -1388,9 +1388,9 @@ static struct a2dp_server *find_server(GSList *list, const bdaddr_t *src)
- 
- int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- {
--	int sbc_srcs = 1, sbc_sinks = 1;
-+	int sbc_srcs = 0, sbc_sinks = 0;
- 	int mpeg12_srcs = 0, mpeg12_sinks = 0;
--	gboolean source = TRUE, sink = FALSE, socket = TRUE;
-+	gboolean source = TRUE, sink = FALSE, socket = FALSE;
- 	gboolean delay_reporting = FALSE;
- 	char *str;
- 	GError *err = NULL;
-@@ -1410,6 +1410,8 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- 			source = TRUE;
- 		if (strstr(str, "Source"))
- 			sink = TRUE;
-+		if (strstr(str, "Socket"))
-+			socket = TRUE;
- 		g_free(str);
- 	}
- 
-@@ -1429,18 +1431,14 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- 	}
- 
- 	/* Don't register any local sep if Socket is disabled */
--	if (socket == FALSE) {
--		sbc_srcs = 0;
--		sbc_sinks = 0;
--		mpeg12_srcs = 0;
--		mpeg12_sinks = 0;
-+	if (socket == FALSE)
- 		goto proceed;
--	}
- 
- 	str = g_key_file_get_string(config, "A2DP", "SBCSources", &err);
- 	if (err) {
- 		DBG("audio.conf: %s", err->message);
- 		g_clear_error(&err);
-+		sbc_srcs = 1;
- 	} else {
- 		sbc_srcs = atoi(str);
- 		g_free(str);
-@@ -1459,6 +1457,7 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- 	if (err) {
- 		DBG("audio.conf: %s", err->message);
- 		g_clear_error(&err);
-+		sbc_sinks = 1;
- 	} else {
- 		sbc_sinks = atoi(str);
- 		g_free(str);
--- 
-1.7.6.5
-
diff --git a/extra/bluez/fix-compile-issue.patch b/extra/bluez/fix-compile-issue.patch
deleted file mode 100644
index ddb5d94e8..000000000
--- a/extra/bluez/fix-compile-issue.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4002cf271e3939714296c535a1ed8d4f0d5ac005 Mon Sep 17 00:00:00 2001
-From: Patrick Ohly <patrick.ohly@intel.com>
-Date: Mon, 16 Jan 2012 11:11:55 +0100
-Subject: [PATCH] lib: Fix compile issue when using in C++
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-The compiler error is:
- /usr/include/bluetooth/bluetooth.h::131:9: error: invalid conversion from 'void*' to 'bt_get_le64(void*)::<anonymous struct>*'
- ...
-
-The reason is that C++, in contrast to C, does not allow conversion of
-void * to anything, and this code gets compiled as C++ when the app is
-written in C++. The macro with the assignment itself is older, but only
-recent Bluez starts to use it in inline functions, thus triggering the
-problem.
-
-This patch keeps the "struct __attribute__((packed))" magic and merely
-changes the typecast so that it works in C and C++. Like the existing
-macro this patch relies on support for typeof.
----
- lib/bluetooth.h |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/bluetooth.h b/lib/bluetooth.h
-index ea7373d..0541842 100644
---- a/lib/bluetooth.h
-+++ b/lib/bluetooth.h
-@@ -141,7 +141,7 @@ enum {
- ({						\
- 	struct __attribute__((packed)) {	\
- 		typeof(*(ptr)) __v;		\
--	} *__p = (void *) (ptr);		\
-+	} *__p = (typeof(__p)) (ptr);		\
- 	__p->__v;				\
- })
- 
-@@ -149,7 +149,7 @@ enum {
- do {						\
- 	struct __attribute__((packed)) {	\
- 		typeof(*(ptr)) __v;		\
--	} *__p = (void *) (ptr);		\
-+	} *__p = (typeof(__p)) (ptr);		\
- 	__p->__v = (val);			\
- } while(0)
- 
--- 
-1.7.6.5
-