Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 225 → Rev 226

/branches/7.8-stable/debian/patches/series
13,3 → 13,4
pcre_info_obsolete.patch
undefined_htons.patch
bad_size_t_redef.patch
freetype_2.6_typeof.patch
/branches/7.8-stable/debian/patches/freetype_2.6_typeof.patch
0,0 → 1,39
Subject: FreeType: Fix compilation with Freetype 2.6.
Freetype 2.6 defines a conflicting TYPEOF() macro.
Author: Henrik Grubbström (Grubba) <grubba@grubba.org>
Origin: upstream, commit 49709fae3241094df4ecde51b52d6abaeb128041
 
--- a/src/modules/_Image_FreeType/freetype.c
+++ b/src/modules/_Image_FreeType/freetype.c
@@ -6,9 +6,6 @@
*/
#include "config.h"
-#include "global.h"
-#include "module.h"
-#include "pike_error.h"
#ifdef HAVE_LIBFT2
#ifndef HAVE_FT_FT2BUILD
@@ -22,6 +19,13 @@
#include FT_TRUETYPE_IDS_H
#endif
+/* Freetype 2.6 defines a conflicting TYPEOF() macro. */
+#undef TYPEOF
+#endif /* HAVE_LIBFT2 */
+
+#include "global.h"
+#include "module.h"
+#include "pike_error.h"
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
@@ -35,7 +39,6 @@
#include "module_support.h"
#include "operators.h"
#include "../Image/image.h"
-#endif /* HAVE_LIBFT2 */
#ifdef HAVE_LIBFT2
/branches/7.8-stable/debian/changelog
1,6 → 1,7
pike7.8 (7.8.866-4) unstable; urgency=medium
 
* Update Homepage URL to http://pike.lysator.liu.se.
* freetype_2.6_typeof.patch (new): Fix FTBFS with Freetype 2.6.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 20 Sep 2015 18:13:55 +0200