[BACK]Return to patch-ae CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / editors / elvis / patches

File: [cvs.NetBSD.org] / pkgsrc / editors / elvis / patches / patch-ae (download)

Revision 1.2, Tue Dec 29 04:22:33 2015 UTC (4 years, 11 months ago) by dholland
Branch: MAIN
CVS Tags: pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, HEAD
Changes since 1.1: +3 -1 lines

Add patch comments.

$NetBSD: patch-ae,v 1.2 2015/12/29 04:22:33 dholland Exp $

Fix symbol name conflict with freetype.

--- guix11/xdialog.h.orig	2006-06-26 12:17:12.000000000 +0200
+++ guix11/xdialog.h	2006-06-26 12:19:24.000000000 +0200
@@ -1,5 +1,9 @@
 /* xdialog.h */
 
+/* Let's hope that there will be no conflict with FreeType,
+ * which had defined this to FILE. */
+#undef FT_FILE
+
 typedef enum {
 	FT_DEFAULT,	/* dummy value, for fields with no explicit type */
 	FT_ONEOF,	/* one of a preset list; includes boolean */