Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in xfce-extra/xfce4-cpugraph-plugin/files: xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch
Date: Mon, 30 Aug 2010 14:49:28
Message-Id: 20100830144921.D2F2420051@flycatcher.gentoo.org
1 ssuominen 10/08/30 14:49:21
2
3 Modified: xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch
4 xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch
5 Log:
6 clean up patches, add some bug references etc.
7
8 (Portage version: 2.2_rc69/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.2 xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch?r1=1.1&r2=1.2
16
17 Index: xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch 25 Aug 2009 12:15:35 -0000 1.1
24 +++ xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch 30 Aug 2010 14:49:21 -0000 1.2
25 @@ -1,6 +1,5 @@
26 -diff -ur xfce4-cpugraph-plugin-0.4.0.orig/panel-plugin/cpu.c xfce4-cpugraph-plugin-0.4.0/panel-plugin/cpu.c
27 ---- xfce4-cpugraph-plugin-0.4.0.orig/panel-plugin/cpu.c 2007-11-22 07:18:32.000000000 +0200
28 -+++ xfce4-cpugraph-plugin-0.4.0/panel-plugin/cpu.c 2009-08-25 15:12:14.000000000 +0300
29 +--- panel-plugin/cpu.c
30 ++++ panel-plugin/cpu.c
31 @@ -27,6 +27,7 @@
32 #include "settings.h"
33 #include "cpu_os.h"
34
35
36
37 1.2 xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch
38
39 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch?rev=1.2&view=markup
40 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch?rev=1.2&content-type=text/plain
41 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch?r1=1.1&r2=1.2
42
43 Index: xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch,v
46 retrieving revision 1.1
47 retrieving revision 1.2
48 diff -u -r1.1 -r1.2
49 --- xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch 30 Aug 2010 14:44:21 -0000 1.1
50 +++ xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch 30 Aug 2010 14:49:21 -0000 1.2
51 @@ -1,6 +1,11 @@
52 -diff -ur xfce4-cpugraph-plugin-0.4.0.orig/configure.ac xfce4-cpugraph-plugin-0.4.0/configure.ac
53 ---- xfce4-cpugraph-plugin-0.4.0.orig/configure.ac 2007-11-22 07:42:28.000000000 +0200
54 -+++ xfce4-cpugraph-plugin-0.4.0/configure.ac 2010-08-30 17:40:40.000000000 +0300
55 +Fix building/linking problem as reported in: http://bugs.gentoo.org/334891
56 +
57 +Not reported to upstream because the patch in upstream bug[1] should be applied instead.
58 +
59 +[1] http://bugzilla.xfce.org/show_bug.cgi?id=6575
60 +
61 +--- configure.ac
62 ++++ configure.ac
63 @@ -31,6 +31,7 @@
64
65 dnl configure the panel plugin
66 @@ -9,9 +14,8 @@
67
68 dnl translations
69 XDT_I18N([be ca cs en_GB eu fr hu nb_NO pl pt_PT sq uk])
70 -diff -ur xfce4-cpugraph-plugin-0.4.0.orig/panel-plugin/Makefile.am xfce4-cpugraph-plugin-0.4.0/panel-plugin/Makefile.am
71 ---- xfce4-cpugraph-plugin-0.4.0.orig/panel-plugin/Makefile.am 2007-11-22 09:13:34.000000000 +0200
72 -+++ xfce4-cpugraph-plugin-0.4.0/panel-plugin/Makefile.am 2010-08-30 17:41:07.000000000 +0300
73 +--- panel-plugin/Makefile.am
74 ++++ panel-plugin/Makefile.am
75 @@ -3,10 +3,12 @@
76
77 xfce4_cpugraph_plugin_CFLAGS = \