/[pkgs]/devel/MagicPoint/magicpoint-1.11b-64bit.patch
ViewVC logotype

Contents of /devel/MagicPoint/magicpoint-1.11b-64bit.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Sat Oct 21 14:39:38 2006 UTC (3 years, 1 month ago) by jwrdegoede
Branch: MAIN
CVS Tags: MagicPoint-1_11b-9_fc12, FC-6-split, F-7-split, F-12-split, MagicPoint-1_11b-4_fc8, MagicPoint-1_11b-6_fc9, MagicPoint-1_11b-10_fc12, F-10-split, MagicPoint-1_11b-4_fc7, MagicPoint-1_11b-7_fc10, MagicPoint-1_11b-5_fc9, F-11-split, F-8-split, F-9-split, MagicPoint-1_11b-8_fc11, HEAD
File MIME type: text/x-patch 
* Sat Oct 21 2006 Hans de Goede <j.w.r.degoede@hhs.nl> 1.11b-4
- Unorphan
- Take some patches from Debian
- Actually make ./configure detect and use freetype1, it was testing for it
  but the test failed
- Package mgp2html and mgp2latex from the contrib dir
1 --- magicpoint-1.11b/draw.c.64bit 2006-10-21 13:29:24.000000000 +0200
2 +++ magicpoint-1.11b/draw.c 2006-10-21 13:27:28.000000000 +0200
3 @@ -4884,8 +4884,8 @@
4 char *registry;
5 {
6 char *xfont;
7 - static XftFont *last_xftfont;
8 - static char lastfont[100];
9 + static XftFont *last_xftfont = NULL;
10 + static char lastfont[100] = "";
11 static int lastsize = 0;
12 XftFont *xftfont;
13 char *p, *p2;
14 @@ -4934,12 +4934,12 @@
15 XFT_FAMILY, XftTypeString, font,
16 XFT_ENCODING, XftTypeString, registry,
17 XFT_STYLE, XftTypeString, style,
18 - XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, 0);
19 + XFT_PIXEL_SIZE, XftTypeDouble, (double)csize, NULL);
20 } else {
21 xftfont = XftFontOpen(display, screen,
22 XFT_FAMILY, XftTypeString, font,
23 XFT_ENCODING, XftTypeString, registry,
24 - XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, 0);
25 + XFT_PIXEL_SIZE, XftTypeDouble, (double)csize, NULL);
26 }
27 if (xftfont == 0) {
28 free(xfont);
29 @@ -4950,6 +4950,9 @@
30 fprintf(stderr, "using xftfont [%s] size: %d\n", lastfont,
31 csize);
32 }
33 + if (last_xftfont)
34 + XftFontClose(display, last_xftfont);
35 +
36 lastsize = csize;
37 last_xftfont = xftfont;
38 free(xfont);
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2