The following commit has been merged in the master branch: commit 36def3a16a40165e2d0a40bc7accb039eb78567a Author: Vincent Legout <vinc...@legout.info> Date: Fri May 25 11:33:01 2012 +0200
Add debian/patches/fontconfig.patch diff --git a/debian/changelog b/debian/changelog index 1d84107..1641bc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gplanarity (17906-3) unstable; urgency=low + + * debian/patches/fontconfig.patch: Fix crash with current fontconfig + (Closes: #673968) + + -- Vincent Legout <vleg...@debian.org> Fri, 25 May 2012 11:09:57 +0200 + gplanarity (17906-2) unstable; urgency=low * Update my email address diff --git a/debian/patches/fontconfig.patch b/debian/patches/fontconfig.patch new file mode 100644 index 0000000..b119ce2 --- /dev/null +++ b/debian/patches/fontconfig.patch @@ -0,0 +1,28 @@ +Description: Fix crash with current fontconfig + fontconfig no longer allows the last parameter of FcFontMatch to be + zero, an assert has been added to prevent this. +Author: Vincent Legout <vleg...@debian.org> +Last-Update: 2012-05-25 +Bug-Debian: http://bugs.debian.org/673968 + +Index: gplanarity/main.c +=================================================================== +--- gplanarity.orig/main.c 2012-05-22 19:28:21.000000000 +0200 ++++ gplanarity/main.c 2012-05-22 19:40:41.267366470 +0200 +@@ -124,6 +124,7 @@ + char *fontface; + FcPattern *fc_pattern; + FcBool scalable; ++ FcResult res; + + fc_pattern = FcNameParse((unsigned char *)list); + +@@ -140,7 +141,7 @@ + // fill in missing defaults + FcDefaultSubstitute(fc_pattern); + // find a font face on our list if possible +- fc_pattern = FcFontMatch(0, fc_pattern, 0); ++ fc_pattern = FcFontMatch(0, fc_pattern, &res); + + if(!fc_pattern){ + fprintf(stderr,_("\nUnable to find any suitable %s fonts!\n" diff --git a/debian/patches/series b/debian/patches/series index 1b253d9..94bff8c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ nls.patch makefile.patch fix_makefile_flags.patch +fontconfig.patch -- Packaging for gplanarity _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits