1 |
axs 12/08/29 14:54:50 |
2 |
|
3 |
Modified: freewrl-1.22.13-fontconfig-match.patch |
4 |
Log: |
5 |
fixed bad patch in last commit |
6 |
|
7 |
(Portage version: 2.1.11.9/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: freewrl-1.22.13-fontconfig-match.patch |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- freewrl-1.22.13-fontconfig-match.patch 29 Aug 2012 14:25:19 -0000 1.1 |
23 |
+++ freewrl-1.22.13-fontconfig-match.patch 29 Aug 2012 14:54:50 -0000 1.2 |
24 |
@@ -0,0 +1,19 @@ |
25 |
+--- src/lib/scenegraph/Component_Text.c 15 Aug 2012 13:31:45 -0000 1.56 |
26 |
++++ src/lib/scenegraph/Component_Text.c 29 Aug 2012 14:18:43 -0000 1.57 |
27 |
+@@ -370,6 +370,7 @@ |
28 |
+ FcPattern *FW_fp=NULL; |
29 |
+ FcPattern *FW_fm=NULL; |
30 |
+ FcChar8 *FW_file=NULL; |
31 |
++ FcResult fcjunkresult; |
32 |
+ #else |
33 |
+ |
34 |
+ if (!p->font_directory) { |
35 |
+@@ -487,7 +488,7 @@ |
36 |
+ #ifdef HAVE_FONTCONFIG |
37 |
+ FcConfigSubstitute(0,FW_fp,FcMatchPattern); |
38 |
+ FcDefaultSubstitute(FW_fp); |
39 |
+- if (!(FW_fm = FcFontMatch(0,FW_fp,0))) { |
40 |
++ if (!(FW_fm = FcFontMatch(0,FW_fp,&fcjunkresult))) { |
41 |
+ /* do whatever is done when no match found */ |
42 |
+ printf ("could not find font for id %x\n",num); |
43 |
+ } else { |