[gentoo-commits] repo/gentoo:master commit in: lxde-base/lxtask/, lxde-base/lxtask/files/

[gentoo-commits] repo/gentoo:master commit in: lxde-base/lxtask/, lxde-base/lxtask/files/

[Hanno Boeck]

commit:     5f034c30288a6df8ba711d4b1909dd84b5336755
Author:     Hanno <hanno <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 22:45:58 2016 +0000
Commit:     Hanno Boeck <hanno <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 22:45:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f034c30

lxde-base/lxtask: version bump to 0.1.7

Add patch to fix compilation with -fno-common.

Package-Manager: portage-2.3.0

 lxde-base/lxtask/Manifest                          |  1 +
 .../lxtask/files/lxtask-0.1.7-fix-no-common.patch  | 73 ++++++++++++++++++++++
 lxde-base/lxtask/lxtask-0.1.7.ebuild               | 30 +++++++++
 3 files changed, 104 insertions(+)

diff --git a/lxde-base/lxtask/Manifest b/lxde-base/lxtask/Manifest
index a5bd758..3fe8345 100644
--- a/lxde-base/lxtask/Manifest
+++ b/lxde-base/lxtask/Manifest
@@ -1 +1,2 @@
 DIST lxtask-0.1.6.tar.xz 135480 SHA256 f78d6a9953dfbedfa00f69b3e908e326398cd40f541bc8a6a08f5f0a06894345 SHA512 e3c139cea8260b1f1af9c3fb524beefedaac440eef6bc1efdeac73ecdbe4d44dcd277160e64306b681ddbd9eb0f5bc5077957a492f7a06ffcd0c844aad88f827 WHIRLPOOL 9aa64ea0b6d6bc108cfa18f5b3dd7c2bb63ac48287a00a8825e715ce2fb90e6058e06187456397759b71fc2e0969ef4863b9b005e2d39659abe1c674c48dcd3e
+DIST lxtask-0.1.7.tar.xz 137152 SHA256 f0b65a6b145856000383badafd14ab7944fd98e95c9efdc03474a5a7ff8630fe SHA512 eb5c6af2d0953d09d62b53efda1f88140cc6d5734ef98effd9a72b896e397d0c29ff4263b93c12fd23fcb0ec129b31eb769b0a8c769ae92ed9fc1d2f2689a4ef WHIRLPOOL fdb4cbad73aa232dcf918f3f245f7a3185273f18b39161ab27629fbf46aafa097d8574f454d3b1419269fe1a2119c8b1605de18460794538a7ab8ad4645c8cb3

diff --git a/lxde-base/lxtask/files/lxtask-0.1.7-fix-no-common.patch b/lxde-base/lxtask/files/lxtask-0.1.7-fix-no-common.patch
new file mode 100644
index 00000000..d986741
--- /dev/null
+++ b/lxde-base/lxtask/files/lxtask-0.1.7-fix-no-common.patch
@@ -0,0 +1,73 @@
+diff -Naur a/src/interface.c b/src/interface.c
+--- a/src/interface.c	2016-02-21 01:06:17.000000000 +0100
++++ b/src/interface.c	2016-09-13 19:37:28.038350050 +0200
+@@ -26,6 +26,18 @@
+ #include <glib/gi18n.h>
+ #include "interface.h"
+ 
++GtkTreeStore *list_store;
++GtkTreeSelection *selection;
++GtkWidget *treeview;
++GtkWidget *mainmenu;
++GtkWidget *taskpopup;
++GtkWidget *cpu_usage_progress_bar;
++GtkWidget *mem_usage_progress_bar;
++GtkWidget *cpu_usage_progress_bar_box;
++GtkWidget *mem_usage_progress_bar_box;
++
++GtkTreeViewColumn *column;
++
+ #define GLADE_HOOKUP_OBJECT(component,widget,name) \
+   g_object_set_data_full (G_OBJECT (component), name, \
+     gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
+diff -Naur a/src/interface.h b/src/interface.h
+--- a/src/interface.h	2014-09-16 14:27:52.000000000 +0200
++++ b/src/interface.h	2016-09-13 19:32:22.816372893 +0200
+@@ -38,16 +38,15 @@
+ #include "callbacks.h"
+ #include "types.h"
+ 
+-GtkTreeStore *list_store;
+-GtkTreeSelection *selection;
+-GtkWidget *treeview;
+-GtkWidget *mainmenu;
+-GtkWidget *taskpopup;
+-GtkWidget *priopopup;
+-GtkWidget *cpu_usage_progress_bar;
+-GtkWidget *mem_usage_progress_bar;
+-GtkWidget *cpu_usage_progress_bar_box;
+-GtkWidget *mem_usage_progress_bar_box;
++extern GtkTreeStore *list_store;
++extern GtkTreeSelection *selection;
++extern GtkWidget *treeview;
++extern GtkWidget *mainmenu;
++extern GtkWidget *taskpopup;
++extern GtkWidget *cpu_usage_progress_bar;
++extern GtkWidget *mem_usage_progress_bar;
++extern GtkWidget *cpu_usage_progress_bar_box;
++extern GtkWidget *mem_usage_progress_bar_box;
+ 
+ enum {
+     COLUMN_NAME = 0,
+@@ -61,7 +60,7 @@
+     COLUMN_PPID
+ };
+ 
+-GtkTreeViewColumn *column;
++extern GtkTreeViewColumn *column;
+ 
+ void change_list_store_view(void);
+ void create_list_store(void);
+diff -Naur a/src/types.h b/src/types.h
+--- a/src/types.h	2014-09-16 14:27:52.000000000 +0200
++++ b/src/types.h	2016-09-13 19:25:51.014402217 +0200
+@@ -77,9 +77,6 @@
+ extern gint win_width;
+ extern gint win_height;
+ 
+-const gchar *custom_signal_0;
+-const gchar *custom_signal_1;
+-
+ extern int page_size;
+ 
+ #endif

diff --git a/lxde-base/lxtask/lxtask-0.1.7.ebuild b/lxde-base/lxtask/lxtask-0.1.7.ebuild
new file mode 100644
index 00000000..a91695e
--- /dev/null
+++ b/lxde-base/lxtask/lxtask-0.1.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+DESCRIPTION="LXDE Task manager"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~arm-linux ~x86-linux"
+SLOT="0"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	dev-libs/glib:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+	>=dev-util/intltool-0.40.0"
+
+# Upstream report:
+# https://sourceforge.net/p/lxde/patches/535/
+PATCHES=( "${FILESDIR}/lxtask-0.1.7-fix-no-common.patch" )
+
+src_install () {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README
+}

[gentoo-commits] repo/gentoo:master commit in: lxde-base/lxtask/, lxde-base/lxtask/files/

[Hanno Boeck]

commit:     30f4ceb8205a0fdb390f10b34ee949b808bd3af3
Author:     Hanno <hanno <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 22:38:51 2016 +0000
Commit:     Hanno Boeck <hanno <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 22:38:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f4ceb8

lxde-base/lxtask: Remove old versions and patches

Package-Manager: portage-2.3.0

 lxde-base/lxtask/Manifest                          |  2 --
 .../files/lxtask-0.1.4-remove-broken-linguas.patch | 13 --------
 lxde-base/lxtask/files/lxtask-0.1.4-sandbox.patch  | 21 ------------
 lxde-base/lxtask/lxtask-0.1.4-r1.ebuild            | 39 ----------------------
 lxde-base/lxtask/lxtask-0.1.4.ebuild               | 35 -------------------
 lxde-base/lxtask/lxtask-0.1.5.ebuild               | 28 ----------------
 6 files changed, 138 deletions(-)

diff --git a/lxde-base/lxtask/Manifest b/lxde-base/lxtask/Manifest
index 584bcc3..a5bd758 100644
--- a/lxde-base/lxtask/Manifest
+++ b/lxde-base/lxtask/Manifest
@@ -1,3 +1 @@
-DIST lxtask-0.1.4.tar.gz 241034 SHA256 39110c99e9e56101e25be35628abafd81b1e3ea47e2d8bea45b2cb12c1e3cd61 SHA512 60a9b55880ee0a5b86043edacefb93b83caddbb045e781537b6fd04d2e3259e4fa5117fc84c7f0ca0dd914d9e14b602a9ab0022a74d9b634b72fdf4f950189c5 WHIRLPOOL 7f4b1c8aab45de3e7e6c62b11907db678ab7cbb246d345cfad229e99ef32304b04c47f277988857326e0f8cc7aa986ef144b7540a4bd4ed4b18f4f3298bc3a8a
-DIST lxtask-0.1.5.tar.xz 135600 SHA256 07dd2cc9aa80d161cfbc223c9187da145cc472b067f429734675bf018e95f265 SHA512 3868a933746117b5c71b23d06a16e894bfe4b365308005f7a2f730b692e4cc8484bfd8bcba6b88a765f007477c1a4607834459c6fdb601e9d1ba12ca26fb5e5b WHIRLPOOL 1fc0b5267acae1311802ad76dd9aef339620c80ad5761777f9cc72606674d20274f1bcfb509498429b6308acf1d9124c2d5f43beaaf33a6557b23a59942ed283
 DIST lxtask-0.1.6.tar.xz 135480 SHA256 f78d6a9953dfbedfa00f69b3e908e326398cd40f541bc8a6a08f5f0a06894345 SHA512 e3c139cea8260b1f1af9c3fb524beefedaac440eef6bc1efdeac73ecdbe4d44dcd277160e64306b681ddbd9eb0f5bc5077957a492f7a06ffcd0c844aad88f827 WHIRLPOOL 9aa64ea0b6d6bc108cfa18f5b3dd7c2bb63ac48287a00a8825e715ce2fb90e6058e06187456397759b71fc2e0969ef4863b9b005e2d39659abe1c674c48dcd3e

diff --git a/lxde-base/lxtask/files/lxtask-0.1.4-remove-broken-linguas.patch b/lxde-base/lxtask/files/lxtask-0.1.4-remove-broken-linguas.patch
deleted file mode 100644
index 71bf545..00000000
--- a/lxde-base/lxtask/files/lxtask-0.1.4-remove-broken-linguas.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lxtask-0.1.4/configure.ac
-===================================================================
---- lxtask-0.1.4.orig/configure.ac
-+++ lxtask-0.1.4/configure.ac
-@@ -44,7 +44,7 @@ AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
- 
- #These codes are NOT maintained by Pootle ca el en_GB lv sq
--ALL_LINGUAS="af ar ca cs da de el en_GB es et eu fa fi fr gl hr hu id it ja ko lt lv ml nb nl nn pl ps pt pt_BR ru sk sl sq sv tr uk ur ur_PK vi zh_CN zh_TW"
-+ALL_LINGUAS="af ar ca cs da de el es et eu fa fi fr gl hr hu id it ja ko lt ml nb nl nn pl ps pt pt_BR ru sk sl sv tr uk ur ur_PK vi zh_CN zh_TW"
- AM_GLIB_GNU_GETTEXT
- 
- AC_OUTPUT([

diff --git a/lxde-base/lxtask/files/lxtask-0.1.4-sandbox.patch b/lxde-base/lxtask/files/lxtask-0.1.4-sandbox.patch
deleted file mode 100644
index 98f0bdd..00000000
--- a/lxde-base/lxtask/files/lxtask-0.1.4-sandbox.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ua a/configure.ac b/configure.ac
---- a/configure.ac	2013-09-19 15:10:33.339982117 -0700
-+++ b/configure.ac	2013-09-19 15:12:09.759981997 -0700
-@@ -6,6 +6,8 @@
- 
- AM_CONFIG_HEADER(config.h)
- 
-+AC_CONFIG_MACRO_DIR([m4])
-+
- AC_PROG_CC
- AC_PROG_INSTALL
- AM_PROG_CC_C_O
-diff -ua a/Makefile.am b/Makefile.am
---- a/Makefile.am	2013-09-19 15:10:45.569982101 -0700
-+++ b/Makefile.am	2013-09-19 15:12:19.639981985 -0700
-@@ -1,3 +1,5 @@
-+ACLOCAL_AMFLAGS= -I m4
-+
- SUBDIRS =	po src
- 
- desktopdir = $(datadir)/applications

diff --git a/lxde-base/lxtask/lxtask-0.1.4-r1.ebuild b/lxde-base/lxtask/lxtask-0.1.4-r1.ebuild
deleted file mode 100644
index c2cab7b..00000000
--- a/lxde-base/lxtask/lxtask-0.1.4-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils autotools
-
-DESCRIPTION="LXDE Task manager"
-HOMEPAGE="http://lxde.sf.net/"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ppc x86 ~arm-linux ~x86-linux"
-SLOT="0"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0"
-
-src_prepare() {
-	# use new patch to remove broken linguas
-	epatch "${FILESDIR}"/${P}-remove-broken-linguas.patch
-
-	# bug #485348
-	epatch "${FILESDIR}"/${P}-sandbox.patch
-
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-	eautoreconf
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README ChangeLog
-}

diff --git a/lxde-base/lxtask/lxtask-0.1.4.ebuild b/lxde-base/lxtask/lxtask-0.1.4.ebuild
deleted file mode 100644
index d2e8067..00000000
--- a/lxde-base/lxtask/lxtask-0.1.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils autotools
-
-DESCRIPTION="LXDE Task manager"
-HOMEPAGE="http://lxde.sf.net/"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ppc x86 ~arm-linux ~x86-linux"
-SLOT="0"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0"
-
-src_prepare() {
-	# use new patch to remove broken linguas
-	epatch "${FILESDIR}"/${P}-remove-broken-linguas.patch
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-	eautoreconf
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README
-}

diff --git a/lxde-base/lxtask/lxtask-0.1.5.ebuild b/lxde-base/lxtask/lxtask-0.1.5.ebuild
deleted file mode 100644
index 69b9a37..00000000
--- a/lxde-base/lxtask/lxtask-0.1.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="LXDE Task manager"
-HOMEPAGE="http://lxde.sf.net/"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux"
-SLOT="0"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0"
-
-src_install () {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README
-}