Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-visualization/ggobi/files: ggobi-2.1.10-desktop.patch ggobi-2.1.10-hardened.patch
Date: Mon, 25 Feb 2013 06:32:51
Message-Id: 20130225063247.F00322171D@flycatcher.gentoo.org
1 bicatali 13/02/25 06:32:47
2
3 Added: ggobi-2.1.10-desktop.patch
4 ggobi-2.1.10-hardened.patch
5 Log:
6 Version bump (tar ball from Debian). Added a desktop file patch and some m4 macro cleanup before autoreconf (bug #448824)
7
8 (Portage version: 2.2.01.21688-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
9
10 Revision Changes Path
11 1.1 sci-visualization/ggobi/files/ggobi-2.1.10-desktop.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/ggobi/files/ggobi-2.1.10-desktop.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/ggobi/files/ggobi-2.1.10-desktop.patch?rev=1.1&content-type=text/plain
15
16 Index: ggobi-2.1.10-desktop.patch
17 ===================================================================
18 --- xdg/ggobi.desktop.orig 2013-02-24 22:20:02.616872402 -0800
19 +++ xdg/ggobi.desktop 2013-02-24 22:20:13.293924862 -0800
20 @@ -6,6 +6,6 @@
21 Comment=Multivariate interactive graphics for exploratory data analysis
22 TryExec=ggobi
23 Exec=ggobi
24 -Icon=ggobi.png
25 -Categories=Graphics;2DGraphics
26 +Icon=ggobi
27 +Categories=Graphics;2DGraphics;
28 MimeType=text/comma-separated-values;text/csv;application/csv;
29
30
31
32 1.1 sci-visualization/ggobi/files/ggobi-2.1.10-hardened.patch
33
34 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/ggobi/files/ggobi-2.1.10-hardened.patch?rev=1.1&view=markup
35 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/ggobi/files/ggobi-2.1.10-hardened.patch?rev=1.1&content-type=text/plain
36
37 Index: ggobi-2.1.10-hardened.patch
38 ===================================================================
39 Description: Upstream changes introduced in version 2.1.10-4
40 This patch has been created by dpkg-source during the package build.
41 Here's the last changelog entry, hopefully it gives details on why
42 those changes were made:
43 .
44 ggobi (2.1.10-4) unstable; urgency=low
45 .
46 * src/ggobi.c: Applied patch kindly supplied by Michael Lawrence to
47 address issues found under hardened compiler flags (Closes: #646260)
48 .
49 The person named in the Author field signed this changelog entry.
50 Author: Dirk Eddelbuettel <edd@××××××.org>
51 Bug-Debian: http://bugs.debian.org/646260
52
53 ---
54 The information above should follow the Patch Tagging Guidelines, please
55 checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
56 are templates for supplementary fields that you might want to add:
57
58 Origin: <vendor|upstream|other>, <url of original patch>
59 Bug: <url in upstream bugtracker>
60 Bug-Debian: http://bugs.debian.org/<bugnumber>
61 Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
62 Forwarded: <no|not-needed|url proving that it has been forwarded>
63 Reviewed-By: <name and email of someone who approved the patch>
64 Last-Update: <YYYY-MM-DD>
65
66 --- ggobi-2.1.10.orig/src/ggobi.c
67 +++ ggobi-2.1.10/src/ggobi.c
68 @@ -698,10 +698,10 @@ ValidateGGobiRef (ggobid * gg, gboolean
69 }
70
71 if (fatal) {
72 - g_error (error_msg);
73 + g_error ("%s", error_msg);
74 }
75 else
76 - g_critical (error_msg);
77 + g_critical ("%s", error_msg);
78
79 return (NULL);
80 }
81 @@ -718,9 +718,9 @@ ValidateDatadRef (GGobiData * d, ggobid
82 }
83
84 if (fatal)
85 - g_error (error_msg);
86 + g_error ("%s", error_msg);
87 else
88 - g_critical (error_msg);
89 + g_critical ("%s", error_msg);
90
91 return (NULL);
92 }
93 @@ -739,9 +739,9 @@ ValidateDisplayRef (displayd * d, ggobid
94 }
95
96 if (fatal)
97 - g_error (error_msg);
98 + g_error ("%s", error_msg);
99 else
100 - g_critical (error_msg);
101 + g_critical ("%s", error_msg);
102
103 return (NULL);
104 }