2007-07-29 Brian Mastenbrook <brian@mastenbrook.net>

        Build fix for WebKit/Gtk to compile on Fedora 7 as described in
        http://bugs.webkit.org/show_bug.cgi?id=14557

        * WebKit.pri: cairo-ft is used by the WebKit/Gtk port

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@24765 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 1004c21fe115236f2c00c28ab407b6227670f3bc..3edb879121349e4411ef658cb337dfa1665a2366 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-29  Brian Mastenbrook  <brian@mastenbrook.net>
+
+        Build fix for WebKit/Gtk to compile on Fedora 7 as described in
+        http://bugs.webkit.org/show_bug.cgi?id=14557
+
+        * WebKit.pri: cairo-ft is used by the WebKit/Gtk port
+

 2007-07-27  Simon Hausmann  <hausmann@kde.org>
 
         Done with and reviewed by Lars and Zack.
 2007-07-27  Simon Hausmann  <hausmann@kde.org>
 
         Done with and reviewed by Lars and Zack.

diff --git a/WebKit.pri b/WebKit.pri
index 03699ef2a3fdad64ec74058e4e59ab1926f9a20a..6719e7cc45cb36a0bed26d823c6e593902a72d98 100644 (file)
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -13,7 +13,7 @@ qt-port:!building-libs {
     LIBS += -lQtWebKit
 }
 gdk-port:CONFIG += link_pkgconfig
     LIBS += -lQtWebKit
 }
 gdk-port:CONFIG += link_pkgconfig

-gdk-port:PKGCONFIG += cairo gdk-2.0 gtk+-2.0 libcurl
+gdk-port:PKGCONFIG += cairo cairo-ft gdk-2.0 gtk+-2.0 libcurl

 gdk-port:DEFINES += BUILDING_GDK__=1 BUILDING_CAIRO__
 gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags) -ljpeg -lpng
 gdk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
 gdk-port:DEFINES += BUILDING_GDK__=1 BUILDING_CAIRO__
 gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags) -ljpeg -lpng
 gdk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags)