summaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-03-16 22:21:54 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-03-16 22:21:54 +0000
commit08df871869b76c2e2d04e2c1a1909934011361f6 (patch)
treea7d04ef7cae92cb30ce40a087313c15a140cb31d /x11-toolkits
parentAdd instructions for fixing portability issues with the new freetype2. (diff)
Fix some build issues with the new freetype2.
Notes
Notes: svn path=/head/; revision=104219
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/gtk20/files/patch-ae16
-rw-r--r--x11-toolkits/gtk30/files/patch-ae16
2 files changed, 26 insertions, 6 deletions
diff --git a/x11-toolkits/gtk20/files/patch-ae b/x11-toolkits/gtk20/files/patch-ae
index f195f07b43c6..b1750b724600 100644
--- a/x11-toolkits/gtk20/files/patch-ae
+++ b/x11-toolkits/gtk20/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig Wed Dec 11 18:31:51 2002
-+++ configure Thu Dec 12 12:07:17 2002
-@@ -7414,6 +7414,7 @@
+--- configure.orig Thu Sep 4 13:17:19 2003
++++ configure Tue Mar 16 17:14:34 2004
+@@ -18367,6 +18367,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,3 +8,13 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -24746,7 +24747,8 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include FT_ERRORS_H
+
+ int
diff --git a/x11-toolkits/gtk30/files/patch-ae b/x11-toolkits/gtk30/files/patch-ae
index f195f07b43c6..b1750b724600 100644
--- a/x11-toolkits/gtk30/files/patch-ae
+++ b/x11-toolkits/gtk30/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig Wed Dec 11 18:31:51 2002
-+++ configure Thu Dec 12 12:07:17 2002
-@@ -7414,6 +7414,7 @@
+--- configure.orig Thu Sep 4 13:17:19 2003
++++ configure Tue Mar 16 17:14:34 2004
+@@ -18367,6 +18367,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,3 +8,13 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -24746,7 +24747,8 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include FT_ERRORS_H
+
+ int