diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2013-10-20 11:23:14 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-10-20 11:23:14 +0000 |
commit | b54749fd136e0fc0a0276fd0add49f76e5b22b88 (patch) | |
tree | 66b36b008ffb7c78c156230c87e023ce36b7679a /xfce-extra | |
parent | Stable for x86, wrt bug #476958 (diff) | |
download | gentoo-2-b54749fd136e0fc0a0276fd0add49f76e5b22b88.tar.gz gentoo-2-b54749fd136e0fc0a0276fd0add49f76e5b22b88.tar.bz2 gentoo-2-b54749fd136e0fc0a0276fd0add49f76e5b22b88.zip |
Include pango related UTF-8 fix wrt #488626 by Michael Kurinnoy
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'xfce-extra')
3 files changed, 69 insertions, 3 deletions
diff --git a/xfce-extra/xfce4-taskmanager/ChangeLog b/xfce-extra/xfce4-taskmanager/ChangeLog index a5fc1cfdfcbd..a11aaf05e8d7 100644 --- a/xfce-extra/xfce4-taskmanager/ChangeLog +++ b/xfce-extra/xfce4-taskmanager/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for xfce-extra/xfce4-taskmanager -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskmanager/ChangeLog,v 1.60 2012/11/28 12:22:56 ssuominen Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskmanager/ChangeLog,v 1.61 2013/10/20 11:23:14 ssuominen Exp $ + +*xfce4-taskmanager-1.0.0-r1 (20 Oct 2013) + + 20 Oct 2013; Samuli Suominen <ssuominen@gentoo.org> + +files/xfce4-taskmanager-1.0.0-UTF-8.patch, + +xfce4-taskmanager-1.0.0-r1.ebuild: + Include pango related UTF-8 fix wrt #488626 by Michael Kurinnoy 28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> xfce4-taskmanager-1.0.0.ebuild: @@ -262,4 +269,3 @@ 19 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-taskmanager-0.0.1.ebuild: Initial import. - diff --git a/xfce-extra/xfce4-taskmanager/files/xfce4-taskmanager-1.0.0-UTF-8.patch b/xfce-extra/xfce4-taskmanager/files/xfce4-taskmanager-1.0.0-UTF-8.patch new file mode 100644 index 000000000000..a43e77f85f5c --- /dev/null +++ b/xfce-extra/xfce4-taskmanager/files/xfce4-taskmanager-1.0.0-UTF-8.patch @@ -0,0 +1,24 @@ +http://bugs.gentoo.org/488626 +http://bugzilla.xfce.org/show_bug.cgi?id=10417 + +--- src/task-manager-linux.c ++++ src/task-manager-linux.c +@@ -128,7 +128,7 @@ + FILE *file; + gchar filename[96]; + gint i; +- gchar c; ++ gint c; + + snprintf (filename, 96, "/proc/%i/cmdline", task->pid); + if ((file = fopen (filename, "r")) == NULL) +@@ -136,7 +136,7 @@ + + /* Read full command byte per byte until EOF */ + for (i = 0; (c = fgetc (file)) != EOF && i < (gint)sizeof (task->cmdline) - 1; i++) +- task->cmdline[i] = (c == '\0') ? ' ' : c; ++ task->cmdline[i] = (c == '\0') ? ' ' : (gchar)c; + task->cmdline[i] = '\0'; + if (task->cmdline[i-1] == ' ') + task->cmdline[i-1] = '\0'; + diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.0-r1.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.0-r1.ebuild new file mode 100644 index 000000000000..4d7a17aa2251 --- /dev/null +++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.0-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.0-r1.ebuild,v 1.1 2013/10/20 11:23:14 ssuominen Exp $ + +EAPI=5 +inherit xfconf + +DESCRIPTION="Task Manager" +HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-taskmanager" +SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" +IUSE="debug" + +RDEPEND="x11-libs/cairo + >=x11-libs/gtk+-2.12:2 + x11-libs/libwnck:1" +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +pkg_setup() { + PATCHES=( + "${FILESDIR}"/${P}-UTF-8.patch + ) + + XFCONF=( + --enable-wnck + $(xfconf_use_debug) + ) + + DOCS=( AUTHORS ChangeLog NEWS README THANKS ) +} |