Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/openinventor/files: gentoo-paths-v2.patch
Date: Wed, 05 Jun 2013 13:18:00
Message-Id: 20130605131753.76AAA2171E@flycatcher.gentoo.org
1 jer 13/06/05 13:17:53
2
3 Modified: gentoo-paths-v2.patch
4 Log:
5 Fix relative paths in patch (bug #472252 by Robert Penny).
6
7 (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key A792A613)
8
9 Revision Changes Path
10 1.2 media-libs/openinventor/files/gentoo-paths-v2.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openinventor/files/gentoo-paths-v2.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openinventor/files/gentoo-paths-v2.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openinventor/files/gentoo-paths-v2.patch?r1=1.1&r2=1.2
15
16 Index: gentoo-paths-v2.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-libs/openinventor/files/gentoo-paths-v2.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- gentoo-paths-v2.patch 15 Nov 2005 13:13:40 -0000 1.1
23 +++ gentoo-paths-v2.patch 5 Jun 2013 13:17:53 -0000 1.2
24 @@ -1,6 +1,5 @@
25 -diff -ur ../1/inventor/apps/demos/SceneViewer/SoSceneViewer.c++ ./inventor/apps/demos/SceneViewer/SoSceneViewer.c++
26 ---- ../1/inventor/apps/demos/SceneViewer/SoSceneViewer.c++ 2003-06-11 03:20:09.000000000 +0200
27 -+++ ./inventor/apps/demos/SceneViewer/SoSceneViewer.c++ 2005-11-15 13:33:06.000000000 +0100
28 +--- a/inventor/apps/demos/SceneViewer/SoSceneViewer.c++ 2003-06-11 03:20:09.000000000 +0200
29 ++++ b/inventor/apps/demos/SceneViewer/SoSceneViewer.c++ 2005-11-15 13:33:06.000000000 +0100
30 @@ -4734,10 +4734,10 @@
31 //
32 ////////////////////////////////////////////////////////////////////////
33 @@ -23,9 +22,8 @@
34 system(command);
35 }
36
37 -diff -ur ../1/inventor/apps/demos/gview/DisplayGraph.c++ ./inventor/apps/demos/gview/DisplayGraph.c++
38 ---- ../1/inventor/apps/demos/gview/DisplayGraph.c++ 2002-06-01 04:22:20.000000000 +0200
39 -+++ ./inventor/apps/demos/gview/DisplayGraph.c++ 2005-11-15 13:33:06.000000000 +0100
40 +--- a/inventor/apps/demos/gview/DisplayGraph.c++ 2002-06-01 04:22:20.000000000 +0200
41 ++++ b/inventor/apps/demos/gview/DisplayGraph.c++ 2005-11-15 13:33:06.000000000 +0100
42 @@ -67,7 +67,7 @@
43 SbDict *DisplayGraph::iconDict;
44
45 @@ -35,9 +33,8 @@
46 #define ICON_ENV_VAR "IV_GRAPH_DIR"
47
48 ////////////////////////////////////////////////////////////////////////
49 -diff -ur ../1/inventor/apps/demos/noodle/Interface.c++ ./inventor/apps/demos/noodle/Interface.c++
50 ---- ../1/inventor/apps/demos/noodle/Interface.c++ 2002-06-01 04:22:20.000000000 +0200
51 -+++ ./inventor/apps/demos/noodle/Interface.c++ 2005-11-15 13:33:06.000000000 +0100
52 +--- a/inventor/apps/demos/noodle/Interface.c++ 2002-06-01 04:22:20.000000000 +0200
53 ++++ b/inventor/apps/demos/noodle/Interface.c++ 2005-11-15 13:33:06.000000000 +0100
54 @@ -399,9 +399,9 @@
55 void
56 Interface::showAboutDialog()
57 @@ -59,9 +56,8 @@
58 system(command);
59 }
60
61 -diff -ur ../1/inventor/apps/demos/qmorf/qmorf.c++ ./inventor/apps/demos/qmorf/qmorf.c++
62 ---- ../1/inventor/apps/demos/qmorf/qmorf.c++ 2002-06-01 04:22:20.000000000 +0200
63 -+++ ./inventor/apps/demos/qmorf/qmorf.c++ 2005-11-15 13:33:06.000000000 +0100
64 +--- a/inventor/apps/demos/qmorf/qmorf.c++ 2002-06-01 04:22:20.000000000 +0200
65 ++++ b/inventor/apps/demos/qmorf/qmorf.c++ 2005-11-15 13:33:06.000000000 +0100
66 @@ -414,7 +414,7 @@
67 "they must contain QuadMeshes (qmorf can\n");
68 fprintf(stderr, "only morph QuadMesh nodes).\n");
69 @@ -93,9 +89,8 @@
70 system(command);
71 }
72
73 -diff -ur ../1/inventor/apps/demos/revo/revo.c++ ./inventor/apps/demos/revo/revo.c++
74 ---- ../1/inventor/apps/demos/revo/revo.c++ 2002-06-01 04:22:21.000000000 +0200
75 -+++ ./inventor/apps/demos/revo/revo.c++ 2005-11-15 13:33:06.000000000 +0100
76 +--- a/inventor/apps/demos/revo/revo.c++ 2002-06-01 04:22:21.000000000 +0200
77 ++++ b/inventor/apps/demos/revo/revo.c++ 2005-11-15 13:33:06.000000000 +0100
78 @@ -78,10 +78,10 @@
79 void
80 showAboutDialog(Widget, XtPointer, XtPointer)
81 @@ -118,9 +113,8 @@
82 system(command);
83 }
84
85 -diff -ur ../1/inventor/apps/demos/textomatic/textomatic.c++ ./inventor/apps/demos/textomatic/textomatic.c++
86 ---- ../1/inventor/apps/demos/textomatic/textomatic.c++ 2003-07-12 00:40:53.000000000 +0200
87 -+++ ./inventor/apps/demos/textomatic/textomatic.c++ 2005-11-15 13:33:06.000000000 +0100
88 +--- a/inventor/apps/demos/textomatic/textomatic.c++ 2003-07-12 00:40:53.000000000 +0200
89 ++++ b/inventor/apps/demos/textomatic/textomatic.c++ 2005-11-15 13:33:06.000000000 +0100
90 @@ -160,10 +160,10 @@
91 void
92 showAboutDialog(Widget, XtPointer, XtPointer)
93 @@ -143,9 +137,8 @@
94 system(command);
95 }
96
97 -diff -ur ../1/inventor/apps/samples/widgets/MyMtlPal.c++ ./inventor/apps/samples/widgets/MyMtlPal.c++
98 ---- ../1/inventor/apps/samples/widgets/MyMtlPal.c++ 2002-06-01 04:22:21.000000000 +0200
99 -+++ ./inventor/apps/samples/widgets/MyMtlPal.c++ 2005-11-15 13:33:06.000000000 +0100
100 +--- a/inventor/apps/samples/widgets/MyMtlPal.c++ 2002-06-01 04:22:21.000000000 +0200
101 ++++ b/inventor/apps/samples/widgets/MyMtlPal.c++ 2005-11-15 13:33:06.000000000 +0100
102 @@ -193,7 +193,7 @@
103 };
104
105 @@ -155,9 +148,8 @@
106
107
108 static char *geometryBuffer = "\
109 -diff -ur ../1/inventor/apps/samples/widgets/MyTextureEd.c++ ./inventor/apps/samples/widgets/MyTextureEd.c++
110 ---- ../1/inventor/apps/samples/widgets/MyTextureEd.c++ 2002-06-01 04:22:21.000000000 +0200
111 -+++ ./inventor/apps/samples/widgets/MyTextureEd.c++ 2005-11-15 13:33:06.000000000 +0100
112 +--- a/inventor/apps/samples/widgets/MyTextureEd.c++ 2002-06-01 04:22:21.000000000 +0200
113 ++++ b/inventor/apps/samples/widgets/MyTextureEd.c++ 2005-11-15 13:33:06.000000000 +0100
114 @@ -228,7 +228,7 @@
115
116
117 @@ -167,9 +159,8 @@
118 static char *editorTitle = "Texture Editor";
119 static char *noFileNameStr = "<empty>";
120
121 -diff -ur ../1/inventor/apps/tools/ivview/ivview.c++ ./inventor/apps/tools/ivview/ivview.c++
122 ---- ../1/inventor/apps/tools/ivview/ivview.c++ 2002-06-01 04:22:21.000000000 +0200
123 -+++ ./inventor/apps/tools/ivview/ivview.c++ 2005-11-15 13:33:06.000000000 +0100
124 +--- a/inventor/apps/tools/ivview/ivview.c++ 2002-06-01 04:22:21.000000000 +0200
125 ++++ b/inventor/apps/tools/ivview/ivview.c++ 2005-11-15 13:33:06.000000000 +0100
126 @@ -715,9 +715,9 @@
127 static void
128 showAboutDialog()
129 @@ -191,9 +182,8 @@
130 system(command);
131 }
132
133 -diff -ur ../1/inventor/libFL/ang/fl.c ./inventor/libFL/ang/fl.c
134 ---- ../1/inventor/libFL/ang/fl.c 2003-07-12 00:40:53.000000000 +0200
135 -+++ ./inventor/libFL/ang/fl.c 2005-11-15 13:33:06.000000000 +0100
136 +--- a/inventor/libFL/ang/fl.c 2003-07-12 00:40:53.000000000 +0200
137 ++++ b/inventor/libFL/ang/fl.c 2005-11-15 13:33:06.000000000 +0100
138 @@ -95,7 +95,7 @@
139 NULL
140 };
141 @@ -203,9 +193,8 @@
142 int fl_debug = FALSE;
143
144 /*
145 -diff -ur ../1/inventor/libSoXt/src/SoXtComponent.c++ ./inventor/libSoXt/src/SoXtComponent.c++
146 ---- ../1/inventor/libSoXt/src/SoXtComponent.c++ 2002-06-01 04:16:10.000000000 +0200
147 -+++ ./inventor/libSoXt/src/SoXtComponent.c++ 2005-11-15 13:33:06.000000000 +0100
148 +--- a/inventor/libSoXt/src/SoXtComponent.c++ 2002-06-01 04:16:10.000000000 +0200
149 ++++ b/inventor/libSoXt/src/SoXtComponent.c++ 2005-11-15 13:33:06.000000000 +0100
150 @@ -622,7 +622,7 @@
151 }
152
153 @@ -215,9 +204,8 @@
154 strcat(cardPath, cardName);
155 if ( access(cardPath, R_OK) == 0 ) {
156 strcat(pgrCmd, cardPath);
157 -diff -ur ../1/inventor/libSoXt/src/mtlEdit/SoXtMtlEdit.c++ ./inventor/libSoXt/src/mtlEdit/SoXtMtlEdit.c++
158 ---- ../1/inventor/libSoXt/src/mtlEdit/SoXtMtlEdit.c++ 2002-06-01 04:16:10.000000000 +0200
159 -+++ ./inventor/libSoXt/src/mtlEdit/SoXtMtlEdit.c++ 2005-11-15 13:33:06.000000000 +0100
160 +--- a/inventor/libSoXt/src/mtlEdit/SoXtMtlEdit.c++ 2002-06-01 04:16:10.000000000 +0200
161 ++++ b/inventor/libSoXt/src/mtlEdit/SoXtMtlEdit.c++ 2005-11-15 13:33:06.000000000 +0100
162 @@ -156,7 +156,7 @@
163 "Material Emissive Color"
164 };
165 @@ -227,9 +215,8 @@
166
167 static char *slider_labels[] = { (char *)NULL, (char *)NULL, (char *)NULL,
168 (char *)NULL, (char *)NULL, (char *)NULL
169 -diff -ur ../1/inventor/libSoXt/src/mtlEdit/SoXtMtlList.c++ ./inventor/libSoXt/src/mtlEdit/SoXtMtlList.c++
170 ---- ../1/inventor/libSoXt/src/mtlEdit/SoXtMtlList.c++ 2002-06-01 04:16:10.000000000 +0200
171 -+++ ./inventor/libSoXt/src/mtlEdit/SoXtMtlList.c++ 2005-11-15 13:33:06.000000000 +0100
172 +--- a/inventor/libSoXt/src/mtlEdit/SoXtMtlList.c++ 2002-06-01 04:16:10.000000000 +0200
173 ++++ b/inventor/libSoXt/src/mtlEdit/SoXtMtlList.c++ 2005-11-15 13:33:06.000000000 +0100
174 @@ -264,7 +264,7 @@
175 setClassName("SoXtMaterialList");
176 if (dir != NULL)
177 @@ -239,9 +226,8 @@
178
179 callbackList = new SoCallbackList;
180 curPalette = -1;
181 -diff -ur ../1/inventor/make/ivcommondefs ./inventor/make/ivcommondefs
182 ---- ../1/inventor/make/ivcommondefs 2003-07-12 00:40:54.000000000 +0200
183 -+++ ./inventor/make/ivcommondefs 2005-11-15 13:35:19.000000000 +0100
184 +--- a/inventor/make/ivcommondefs 2003-07-12 00:40:54.000000000 +0200
185 ++++ b/inventor/make/ivcommondefs 2005-11-15 13:35:19.000000000 +0100
186 @@ -192,11 +192,11 @@
187 IVDLIBDIR = $(IVLIBDIR)/InventorDebug
188 IVHDRTOP = $(IVROOT)/$(IVPREFIX)/include/Inventor
Report Message
Find on MARC Find on Google Groups