← Back to branch summary

~ubuntu-branches/ubuntu/precise/graphviz/precise-security

« back to all changes in this revision

Viewing changes to macosx/prebuild/fontconfig.patch

  • Committer: Bazaar Package Importer
  • Author(s): David Claughton
  • Date: 2010-03-24 22:45:18 UTC
  • mfrom: (1.2.7 upstream) (6.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100324224518-do441tthbqjaqjzd
Tags: 2.26.3-4
http://bugs.debian.org/575255
Add patch to fix segfault in circo. Backported from upstream snapshot
release.  Thanks to Francis Russell for his work on this.
(Closes: #575255)

Show diffs side-by-side

added added

removed removed

Lines of Context:
macosx/prebuild/fontconfig.patch
 
1
diff -ru fontconfig-2.6.0/fc-arch/fc-arch.c fontconfig-2.6.0.patched/fc-arch/fc-arch.c
 
2
--- fontconfig-2.6.0/fc-arch/fc-arch.c  2006-09-04 06:37:14.000000000 +0800
 
3
+++ fontconfig-2.6.0.patched/fc-arch/fc-arch.c  2009-02-19 10:48:05.000000000 +0900
 
4
@@ -92,6 +92,20 @@
 
5
     
 
6
     if (strcmp (arch, "auto") == 0)
 
7
     {
 
8
+#if defined(__APPLE__) && defined(__MACH__)
 
9
+       printf(
 
10
+               "#if defined(__ppc__)\n"
 
11
+               "#define FC_ARCHITECTURE \"ppc\"\n"
 
12
+               "#elif defined(__ppc64__)\n"
 
13
+               "#define FC_ARCHITECTURE \"ppc64\"\n"
 
14
+               "#elif defined(__i386__)\n"
 
15
+               "#define FC_ARCHITECTURE \"x86\"\n"
 
16
+               "#elif defined(__x86_64__)\n"
 
17
+               "#define FC_ARCHITECTURE \"x86-64\"\n"
 
18
+               "#endif\n");
 
19
+       fflush (stdout);
 
20
+       exit (ferror (stdout));
 
21
+#endif
 
22
        arch = NULL;
 
23
        /*
 
24
         * Search for signature
 
25
diff -ru fontconfig-2.6.0/src/fcdbg.c fontconfig-2.6.0.patched/src/fcdbg.c
 
26
--- fontconfig-2.6.0/src/fcdbg.c        2006-09-05 16:56:47.000000000 +0800
 
27
+++ fontconfig-2.6.0.patched/src/fcdbg.c        2009-02-19 21:35:23.000000000 +0900
 
28
@@ -396,7 +396,7 @@
 
29
     }
 
30
 }
 
31
 
 
32
-int FcDebugVal;
 
33
+int FcDebugVal = 0;
 
34
 
 
35
 void
 
36
 FcInitDebug (void)