From 34849e4587abf875b101a780d9e3147479e36942 Mon Sep 17 00:00:00 2001 From: Mike Gardiner Date: Thu, 25 Nov 2004 05:44:56 +0000 Subject: [PATCH] New version, removed old version --- gnome-extra/gnome-system-monitor/ChangeLog | 9 ++++++++- gnome-extra/gnome-system-monitor/Manifest | 7 +++---- .../files/digest-gnome-system-monitor-2.7.0 | 1 - .../files/digest-gnome-system-monitor-2.8.0 | 1 + ...e-system-monitor-2.0.5-fix-startup-crash.patch | 12 ------------ ...0.ebuild => gnome-system-monitor-2.8.0.ebuild} | 15 ++++++++++++--- 6 files changed, 24 insertions(+), 21 deletions(-) delete mode 100644 gnome-extra/gnome-system-monitor/files/digest-gnome-system-monitor-2.7.0 create mode 100644 gnome-extra/gnome-system-monitor/files/digest-gnome-system-monitor-2.8.0 delete mode 100644 gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.0.5-fix-startup-crash.patch rename gnome-extra/gnome-system-monitor/{gnome-system-monitor-2.7.0.ebuild => gnome-system-monitor-2.8.0.ebuild} (67%) diff --git a/gnome-extra/gnome-system-monitor/ChangeLog b/gnome-extra/gnome-system-monitor/ChangeLog index 8d44e404939c..01be382a4e97 100644 --- a/gnome-extra/gnome-system-monitor/ChangeLog +++ b/gnome-extra/gnome-system-monitor/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-extra/gnome-system-monitor # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.49 2004/11/12 04:12:19 obz Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.50 2004/11/25 05:44:56 obz Exp $ + +*gnome-system-monitor-2.8.0 (25 Nov 2004) + + 25 Nov 2004; Mike Gardiner + -files/gnome-system-monitor-2.0.5-fix-startup-crash.patch, + -gnome-system-monitor-2.7.0.ebuild, +gnome-system-monitor-2.8.0.ebuild: + New version, removed old version 12 Nov 2004; Mike Gardiner gnome-system-monitor-2.7.0-r1.ebuild: diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest index 29ff42bb7aef..d5ffadb752fa 100644 --- a/gnome-extra/gnome-system-monitor/Manifest +++ b/gnome-extra/gnome-system-monitor/Manifest @@ -1,14 +1,13 @@ -MD5 104b833484dd1a2a0f56d12750188b6e gnome-system-monitor-2.7.0.ebuild 760 +MD5 a0ff715b3a1e8e4c78c275fed92d8e31 gnome-system-monitor-2.8.0.ebuild 895 MD5 0c299594f2298bc18c00d22305126735 gnome-system-monitor-2.4.0.ebuild 893 MD5 4853aadd08d06138920a29287a6385e8 gnome-system-monitor-2.7.0-r1.ebuild 902 -MD5 d22a912b37bb2a4b77d93934e3d53c3c ChangeLog 6341 +MD5 dc69b3b86752f871bad126cad575aea3 ChangeLog 6601 MD5 de6e9fbc941d9b5fad86d7d17d335bba gnome-system-monitor-2.6.0.ebuild 758 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 a154a9f86e926ea00a0779b875cebc67 files/digest-gnome-system-monitor-2.7.0-r1 79 -MD5 19acc82cb5fc63387b37c71ddf4c09c6 files/gnome-system-monitor-2.0.5-fix-startup-crash.patch 616 MD5 b39b1d001c6cfb36a860351aed50ddb3 files/gnome-system-monitor-devicesviewimprovements.patch 20935 MD5 9948d4c847a49ac1a9db168f46c0d376 files/gnome-system-monitor-execlp.patch 365 MD5 dd79207af7cf6082732128db4d74c083 files/digest-gnome-system-monitor-2.4.0 79 MD5 944c4f8bbb9ce7f3a74df3f85d3dc4ac files/digest-gnome-system-monitor-2.6.0 79 -MD5 a154a9f86e926ea00a0779b875cebc67 files/digest-gnome-system-monitor-2.7.0 79 +MD5 67bd440a0a6bbd96815b8a68d623ea28 files/digest-gnome-system-monitor-2.8.0 79 MD5 f63333f7df598d3202491c069b5f6a99 files/gnome-system-monitor-2.4.0-fix_gtk+-2.4_build.patch 1173 diff --git a/gnome-extra/gnome-system-monitor/files/digest-gnome-system-monitor-2.7.0 b/gnome-extra/gnome-system-monitor/files/digest-gnome-system-monitor-2.7.0 deleted file mode 100644 index 3007117e2050..000000000000 --- a/gnome-extra/gnome-system-monitor/files/digest-gnome-system-monitor-2.7.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 e2e46c3ee26458a808d52071b7420413 gnome-system-monitor-2.7.0.tar.bz2 654517 diff --git a/gnome-extra/gnome-system-monitor/files/digest-gnome-system-monitor-2.8.0 b/gnome-extra/gnome-system-monitor/files/digest-gnome-system-monitor-2.8.0 new file mode 100644 index 000000000000..dbec5787a59c --- /dev/null +++ b/gnome-extra/gnome-system-monitor/files/digest-gnome-system-monitor-2.8.0 @@ -0,0 +1 @@ +MD5 9aec14e8c549b26b2d2cd0e997038d8f gnome-system-monitor-2.8.0.tar.bz2 681242 diff --git a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.0.5-fix-startup-crash.patch b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.0.5-fix-startup-crash.patch deleted file mode 100644 index 4d6dd142594c..000000000000 --- a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.0.5-fix-startup-crash.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- gnome-system-monitor-2.0.5/src/procman.c.orig 2003-06-29 14:17:58.000000000 +0200 -+++ gnome-system-monitor-2.0.5/src/procman.c 2003-06-29 14:38:07.000000000 +0200 -@@ -389,7 +389,8 @@ - visible = gconf_client_get_bool (client, key, NULL); - g_free (key); - -- column = gtk_tree_view_get_column (GTK_TREE_VIEW (tree), i); -+ if (NULL == (column = gtk_tree_view_get_column (GTK_TREE_VIEW (tree), i))) -+ column = (gtk_tree_view_get_columns (GTK_TREE_VIEW (tree)))->data; - gtk_tree_view_column_set_visible (column, visible); - if (width > 0) - gtk_tree_view_column_set_fixed_width (column, width); diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.7.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.8.0.ebuild similarity index 67% rename from gnome-extra/gnome-system-monitor/gnome-system-monitor-2.7.0.ebuild rename to gnome-extra/gnome-system-monitor/gnome-system-monitor-2.8.0.ebuild index 799c7c31d548..00059378a9fe 100644 --- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.7.0.ebuild +++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.8.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.7.0.ebuild,v 1.2 2004/10/08 22:01:59 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.8.0.ebuild,v 1.1 2004/11/25 05:44:56 obz Exp $ -inherit gnome2 +inherit gnome2 eutils DESCRIPTION="The Gnome System Monitor" HOMEPAGE="http://www.gnome.org/" @@ -24,4 +24,13 @@ DEPEND=">=dev-util/pkgconfig-0.12.0 >=dev-util/intltool-0.29 ${RDEPEND}" -DOCS="AUTHORS ChangeLog COPYING HACKING README INSTALL NEWS TODO" +DOCS="AUTHORS ChangeLog HACKING README NEWS TODO" + +src_unpack() { + unpack ${A} + cd ${S} + # fix the "can't kill an un-owned process bug, + # see bug #17880 + epatch ${FILESDIR}/${PN}-execlp.patch +} + -- 2.26.2