[arch-commits] Commit in xfce4-xkb-plugin/trunk (2 files)
Evangelos Foutras
foutrelis at nymeria.archlinux.org
Tue May 14 08:06:06 UTC 2013
Date: Tuesday, May 14, 2013 @ 10:06:05
Author: foutrelis
Revision: 185420
upgpkg: xfce4-xkb-plugin 0.5.5-1
New upstream release.
Modified:
xfce4-xkb-plugin/trunk/PKGBUILD
Deleted:
xfce4-xkb-plugin/trunk/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch
--------------------------------------------------------+
PKGBUILD | 13 +--
xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch | 59 ---------------
2 files changed, 4 insertions(+), 68 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-14 03:47:45 UTC (rev 185419)
+++ PKGBUILD 2013-05-14 08:06:05 UTC (rev 185420)
@@ -4,8 +4,8 @@
# 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')
url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
@@ -14,17 +14,12 @@
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 \
Deleted: xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch
===================================================================
--- xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch 2013-05-14 03:47:45 UTC (rev 185419)
+++ xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch 2013-05-14 08:06:05 UTC (rev 185420)
@@ -1,59 +0,0 @@
-From ac73bc9de624d322b318c2eda0ace7f0bee97a64 Mon Sep 17 00:00:00 2001
-From: Igor Slepchin <igor.slepchin at 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
More information about the arch-commits
mailing list