CVS commit: pkgsrc/x11/gtk3

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Mon Oct 29 21:35:17 UTC 2018

Modified Files:
        pkgsrc/x11/gtk3: distinfo
Added Files:
        pkgsrc/x11/gtk3/patches: patch-gtk_gtkfontchooserwidget.c

Log Message:
gtk3: Correctly include freetype2 headers

Only <ft2build.h> should be included, all the other header files should be
included via FT_*_H macros.

Fixes PR pkg/53690.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/x11/gtk3/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/gtk3/patches/patch-gtk_gtkfontchooserwidget.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/gtk3/distinfo
diff -u pkgsrc/x11/gtk3/distinfo:1.57 pkgsrc/x11/gtk3/distinfo:1.58
--- pkgsrc/x11/gtk3/distinfo:1.57       Tue Oct 23 07:42:23 2018
+++ pkgsrc/x11/gtk3/distinfo    Mon Oct 29 21:35:17 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.57 2018/10/23 07:42:23 leot Exp $
+$NetBSD: distinfo,v 1.58 2018/10/29 21:35:17 leot Exp $
 
 SHA1 (gtk+-3.24.1.tar.xz) = 0a5ce28ba6065a484308093bdb56ff6056b0db3c
 RMD160 (gtk+-3.24.1.tar.xz) = f1e26685ff6a267ad0a81e0f8dd06112b6a5a5b8
@@ -12,3 +12,4 @@ SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 4
 SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64
 SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 13232c85bd570f21ea03153dacde4ca98c7c76a8
 SHA1 (patch-gtk_fallback-c89.c) = eaf5ac8aace9eab673eed0e265d4cb2617bf1fcd
+SHA1 (patch-gtk_gtkfontchooserwidget.c) = 6ede4fce683b70808c5d611dfb53312bf092665d

Added files:

Index: pkgsrc/x11/gtk3/patches/patch-gtk_gtkfontchooserwidget.c
diff -u /dev/null pkgsrc/x11/gtk3/patches/patch-gtk_gtkfontchooserwidget.c:1.1
--- /dev/null   Mon Oct 29 21:35:17 2018
+++ pkgsrc/x11/gtk3/patches/patch-gtk_gtkfontchooserwidget.c    Mon Oct 29 21:35:17 2018
@@ -0,0 +1,19 @@
+$NetBSD: patch-gtk_gtkfontchooserwidget.c,v 1.1 2018/10/29 21:35:17 leot Exp $
+
+Correctly include freetype2 headers (<ft2build.h> and then macros
+should be used instead of directly including the headers).
+
+--- gtk/gtkfontchooserwidget.c.orig    2018-07-18 11:04:31.000000000 +0000
++++ gtk/gtkfontchooserwidget.c
+@@ -58,8 +58,9 @@
+ #include <hb.h>
+ #include <hb-ot.h>
+ #include <hb-ft.h>
+-#include <freetype/freetype.h>
+-#include <freetype/ftmm.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
++#include FT_MULTIPLE_MASTERS_H
+ #include "language-names.h"
+ #include "script-names.h"
+ #endif