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

Conflicts:
	community/bird/PKGBUILD
	community/drbd/PKGBUILD
	community/etherape/PKGBUILD
	community/ext4magic/PKGBUILD
	community/fcron/PKGBUILD
	community/fcron/systab.orig
	community/gnome-panel/PKGBUILD
	community/libident/PKGBUILD
	community/libtorrent/PKGBUILD
	community/linux-tools/PKGBUILD
	community/linux-tools/usbipd.service
	community/makedev/PKGBUILD
	community/minbif/PKGBUILD
	community/noip/PKGBUILD
	community/notmuch/PKGBUILD
	community/pam_pwcheck/PKGBUILD
	community/pound/PKGBUILD
	community/preload/PKGBUILD
	community/python-cchardet/PKGBUILD
	community/rtorrent/PKGBUILD
	community/tor/PKGBUILD
	community/ude/PKGBUILD
	core/openldap/PKGBUILD
	core/sysvinit/PKGBUILD
	extra/cd-discid/PKGBUILD
	extra/cvs/PKGBUILD
	extra/epiphany-extensions/PKGBUILD
	extra/fbset/PKGBUILD
	extra/fluidsynth/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/libical/PKGBUILD
	extra/mutt/PKGBUILD
	extra/netkit-bsd-finger/PKGBUILD
	extra/ossp/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/rtkit/PKGBUILD
	extra/samba/PKGBUILD
	extra/totem/PKGBUILD
	extra/webkitgtk/PKGBUILD
	libre/liferea-libre/PKGBUILD
	libre/mplayer-vaapi-libre/PKGBUILD

2 files changed, 5 insertions, 69 deletions

diff --git a/extra/xfce4-xkb-plugin/PKGBUILD b/extra/xfce4-xkb-plugin/PKGBUILD
index eca650431..8571f0b4c 100644
--- a/extra/xfce4-xkb-plugin/PKGBUILD
+++ b/extra/xfce4-xkb-plugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168753 2012-10-15 14:42:49Z foutrelis $
+# $Id: PKGBUILD 185421 2013-05-14 08:06:15Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-xkb-plugin
-pkgver=0.5.4.3
-pkgrel=3
+pkgver=0.5.5
+pkgrel=1
 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
@@ -14,17 +14,12 @@ groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libxklavier' 'librsvg')
 makedepends=('intltool')
 options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2
-        xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch)
-sha256sums=('ca4801bb2edfe04eeceb71879b3cf79a0674e8311c39117efdb9d3521307396d'
-            'f5e6e5964df897045ed8c3443f632033689409459acdc54c0351264edc11b4ce')
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2)
+sha256sums=('c97306298b0c804d4797c431bb9b698f123c0437ec845930bf938dc5d24ea8c9')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # https://bugs.archlinux.org/task/31880
-  patch -Np1 -i "$srcdir/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch"
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch b/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch
deleted file mode 100644
index 16f684b12..000000000
--- a/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From ac73bc9de624d322b318c2eda0ace7f0bee97a64 Mon Sep 17 00:00:00 2001
-From: Igor Slepchin <igor.slepchin@gmail.com>
-Date: Thu, 19 Jul 2012 05:59:40 +0000
-Subject: Fix memory corruption.
-
-g_free(c) in the original code was freeing memory at the pointer
-that was incremented a few times since the allocation.
-
-This is similar to ubuntu bug #899290 and fedora bug 589898.
----
-diff --git a/panel-plugin/xkb-util.c b/panel-plugin/xkb-util.c
-index d0d0230..324928f 100644
---- a/panel-plugin/xkb-util.c
-+++ b/panel-plugin/xkb-util.c
-@@ -66,11 +66,10 @@ xkb_util_get_layout_string (const gchar *group_name, const gchar *variant)
- gchar*
- xkb_util_normalize_group_name (const gchar* group_name)
- {
--    gchar *c;
-+    const gchar *c;
-     gchar *result;
-     gint cut_length;
-     gint index_of_na = -1;
--    gint index_tmp = -1;
- 
-     if (!group_name)
-         return NULL;
-@@ -78,27 +77,19 @@ xkb_util_normalize_group_name (const gchar* group_name)
-     if (strlen (group_name) <= 3)
-         return g_strdup (group_name);
- 
--    c = g_strdup (group_name);
--
--    while (*c)
-+    for (c = group_name; *c; c++)
-     {
--        index_tmp++;
--
-         if (!((*c >= 'a' && *c <= 'z') || (*c >= 'A' && *c <= 'Z')))
-         {
--            index_of_na = index_tmp;
-+            index_of_na = group_name - c;
-             break;
-         }
--
--        c++;
-     }
- 
-     cut_length = (index_of_na != -1 && index_of_na <= 3) ? index_of_na : 3;
- 
-     result = g_strndup (group_name, cut_length);
- 
--    g_free (c);
--
-     return result;
- }
- 
---
-cgit v0.9.0.3