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

Conflicts:
	community/bwbar/PKGBUILD
	community/directfb/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gnash/PKGBUILD
	community/guake/PKGBUILD
	community/pidgin-libnotify/PKGBUILD
	community/png2ico/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/torcs/PKGBUILD
	community/virtualbox/PKGBUILD
	extra/abiword/PKGBUILD
	extra/alsaplayer/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-desktop2/PKGBUILD
	extra/gnome-python/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gnugo/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/koffice/PKGBUILD
	extra/lcms/PKGBUILD
	extra/libao/PKGBUILD
	extra/libcue/PKGBUILD
	extra/libdaemon/PKGBUILD
	extra/libgnome-media-profiles/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libots/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxfcegui4/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/rssh/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim-pinyin/PKGBUILD
	extra/scim-tables/PKGBUILD
	extra/scim-uim/PKGBUILD
	extra/tsocks/PKGBUILD
	extra/vigra/PKGBUILD
	extra/w3m/PKGBUILD
	extra/wv/PKGBUILD
	extra/xclip/PKGBUILD
	extra/xfce4-datetime-plugin/PKGBUILD
	extra/xfce4-notes-plugin/PKGBUILD
	extra/xfce4-quicklauncher-plugin/PKGBUILD
	extra/xfce4-sensors-plugin/PKGBUILD
	extra/xorg-font-util/PKGBUILD
	extra/xorg-setxkbmap/PKGBUILD
	extra/xorg-xev/PKGBUILD
	extra/xsane/PKGBUILD
	extra/yakuake/PKGBUILD
	extra/zvbi/PKGBUILD
	multilib/lib32-cairo/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-libcanberra/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-libglade/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-sdl_image/PKGBUILD
	multilib/wine/PKGBUILD
	testing/vlc/PKGBUILD
	testing/xulrunner/PKGBUILD

1 files changed, 0 insertions, 196 deletions

diff --git a/testing/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch b/testing/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch
deleted file mode 100644
index 7019e5132..000000000
--- a/testing/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 133132b6129f86c1f0aabdf3e807f56ea0190f8a Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Tue, 31 Jan 2012 00:13:43 -0500
-Subject: [PATCH 2/8] libkmod-module: used shared code in module creation
-
----
- libkmod/libkmod-module.c |  135 ++++++++++++++++++++++++++-------------------
- 1 files changed, 78 insertions(+), 57 deletions(-)
-
-diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
-index 47b1709..48e4aa1 100644
---- a/libkmod/libkmod-module.c
-+++ b/libkmod/libkmod-module.c
-@@ -162,6 +162,76 @@ fail:
- 	return err;
- }
- 
-+/*
-+ * Memory layout with alias:
-+ *
-+ * struct kmod_module {
-+ *        hashkey -----.
-+ *        alias -----. |
-+ *        name ----. | |
-+ * }               | | |
-+ * name <----------' | |
-+ * alias <-----------' |
-+ * name\alias <--------'
-+ *
-+ * Memory layout without alias:
-+ *
-+ * struct kmod_module {
-+ *        hashkey ---.
-+ *        alias -----|----> NULL
-+ *        name ----. |
-+ * }               | |
-+ * name <----------'-'
-+ *
-+ * @key is "name\alias" or "name" (in which case alias == NULL)
-+ */
-+static int kmod_module_new(struct kmod_ctx *ctx, const char *key,
-+				const char *name, size_t namelen,
-+				const char *alias, size_t aliaslen,
-+				struct kmod_module **mod)
-+{
-+	struct kmod_module *m;
-+	size_t keylen;
-+
-+	m = kmod_pool_get_module(ctx, key);
-+	if (m != NULL) {
-+		*mod = kmod_module_ref(m);
-+		return 0;
-+	}
-+
-+	if (alias == NULL)
-+		keylen = namelen;
-+	else
-+		keylen = namelen + aliaslen + 1;
-+
-+	m = malloc(sizeof(*m) + (alias == NULL ? 1 : 2) * (keylen + 1));
-+	if (m == NULL) {
-+		free(m);
-+		return -ENOMEM;
-+	}
-+
-+	memset(m, 0, sizeof(*m));
-+
-+	m->ctx = kmod_ref(ctx);
-+	m->name = (char *)m + sizeof(*m);
-+	memcpy(m->name, key, keylen + 1);
-+	if (alias == NULL) {
-+		m->hashkey = m->name;
-+		m->alias = NULL;
-+	} else {
-+		m->name[namelen] = '\0';
-+		m->alias = m->name + namelen + 1;
-+		m->hashkey = m->name + keylen + 1;
-+		memcpy(m->hashkey, key, keylen + 1);
-+	}
-+
-+	m->refcount = 1;
-+	kmod_pool_add_module(ctx, m, m->hashkey);
-+	*mod = m;
-+
-+	return 0;
-+}
-+
- /**
-  * kmod_module_new_from_name:
-  * @ctx: kmod library context
-@@ -188,54 +258,15 @@ KMOD_EXPORT int kmod_module_new_from_name(struct kmod_ctx *ctx,
- 						const char *name,
- 						struct kmod_module **mod)
- {
--	struct kmod_module *m;
- 	size_t namelen;
- 	char name_norm[PATH_MAX];
--	char *namesep;
- 
- 	if (ctx == NULL || name == NULL || mod == NULL)
- 		return -ENOENT;
- 
--	if (alias_normalize(name, name_norm, &namelen) < 0) {
--		DBG(ctx, "invalid alias: %s\n", name);
--		return -EINVAL;
--	}
-+	modname_normalize(name, name_norm, &namelen);
- 
--	m = kmod_pool_get_module(ctx, name_norm);
--	if (m != NULL) {
--		*mod = kmod_module_ref(m);
--		return 0;
--	}
--
--	namesep = strchr(name_norm, '/');
--	m = malloc(sizeof(*m) + (namesep == NULL ? 1 : 2) * namelen + 2);
--	if (m == NULL) {
--		free(m);
--		return -ENOMEM;
--	}
--
--	memset(m, 0, sizeof(*m));
--
--	m->ctx = kmod_ref(ctx);
--	m->name = (char *)m + sizeof(*m);
--	memcpy(m->name, name_norm, namelen + 1);
--
--	if (namesep) {
--		size_t len = namesep - name_norm;
--
--		m->name[len] = '\0';
--		m->alias = m->name + len + 1;
--		m->hashkey = m->name + namelen + 1;
--		memcpy(m->hashkey, name_norm, namelen + 1);
--	} else {
--		m->hashkey = m->name;
--	}
--
--	m->refcount = 1;
--	kmod_pool_add_module(ctx, m, m->hashkey);
--	*mod = m;
--
--	return 0;
-+	return kmod_module_new(ctx, name_norm, name_norm, namelen, NULL, 0, mod);
- }
- 
- int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias,
-@@ -251,9 +282,9 @@ int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias,
- 
- 	memcpy(key, name, namelen);
- 	memcpy(key + namelen + 1, alias, aliaslen + 1);
--	key[namelen] = '/';
-+	key[namelen] = '\\';
- 
--	err = kmod_module_new_from_name(ctx, key, mod);
-+	err = kmod_module_new(ctx, key, name, namelen, alias, aliaslen, mod);
- 	if (err < 0)
- 		return err;
- 
-@@ -323,7 +354,7 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx,
- 			free(abspath);
- 		else {
- 			ERR(ctx, "kmod_module '%s' already exists with different path: new-path='%s' old-path='%s'\n",
--									name, abspath, m->path);
-+							name, abspath, m->path);
- 			free(abspath);
- 			return -EEXIST;
- 		}
-@@ -332,21 +363,11 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx,
- 		return 0;
- 	}
- 
--	m = malloc(sizeof(*m) + namelen + 1);
--	if (m == NULL)
--		return -errno;
--
--	memset(m, 0, sizeof(*m));
-+	err = kmod_module_new(ctx, name, name, namelen, NULL, 0, &m);
-+	if (err < 0)
-+		return err;
- 
--	m->ctx = kmod_ref(ctx);
--	m->name = (char *)m + sizeof(*m);
--	memcpy(m->name, name, namelen + 1);
- 	m->path = abspath;
--	m->hashkey = m->name;
--	m->refcount = 1;
--
--	kmod_pool_add_module(ctx, m, m->hashkey);
--
- 	*mod = m;
- 
- 	return 0;
--- 
-1.7.9
-