[oe-commits] org.oe.dev webkit-gtk: catch up with gdk->gtk rename
koen commit
openembedded-commits at lists.openembedded.org
Sat Sep 29 22:36:01 UTC 2007
webkit-gtk: catch up with gdk->gtk rename
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: ab9178fffd711f7ee9718ac0469fc41d9307ddf7
ViewMTN: http://monotone.openembedded.org/revision/info/ab9178fffd711f7ee9718ac0469fc41d9307ddf7
Files:
1
packages/webkit/files/WebKit.pri
packages/webkit/files/WebKit.pro
packages/webkit/webkit-gtk_svn.bb
Diffs:
#
# mt diff -r933038dc95b657cfc7a99b1681b0081340d4e62d -rab9178fffd711f7ee9718ac0469fc41d9307ddf7
#
#
#
# patch "packages/webkit/files/WebKit.pri"
# from [8dbdde1c26386f94aaaad0b70b380b22fe554a69]
# to [d4f18e0823c66401beee4dbbcd1fc56aff2946b9]
#
# patch "packages/webkit/files/WebKit.pro"
# from [c4db9377c267835f4ec934a4d53207e26c25b99c]
# to [7fde7771b08345471dc5a3ad308348efcc505e0f]
#
# patch "packages/webkit/webkit-gtk_svn.bb"
# from [008e6c30c931818b5c30910b4b8ab87468bcfcd7]
# to [a62c3f3db6387db3b0fc192bcde946966eca90f5]
#
============================================================
--- packages/webkit/files/WebKit.pri 8dbdde1c26386f94aaaad0b70b380b22fe554a69
+++ packages/webkit/files/WebKit.pri d4f18e0823c66401beee4dbbcd1fc56aff2946b9
@@ -6,14 +6,17 @@ isEmpty(OUTPUT_DIR) {
CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug
}
-!gdk-port:CONFIG += qt-port
+!gtk-port:CONFIG += qt-port
qt-port:DEFINES += BUILDING_QT__=1
-qt-port:!building-libs:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit
-gdk-port:CONFIG += link_pkgconfig
-gdk-port:PKGCONFIG += cairo 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 -lcurl
-gdk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
+qt-port:!building-libs {
+ QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
+ LIBS += -lQtWebKit
+}
+gtk-port:CONFIG += link_pkgconfig
+gtk-port:PKGCONFIG += cairo cairo-ft gdk-2.0 gtk+-2.0 libcurl
+gtk-port:DEFINES += BUILDING_GTK__=1 BUILDING_CAIRO__
+gtk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGtk $$system(icu-config --ldflags) -ljpeg -lpng
+gtk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
DEFINES += USE_SYSTEM_MALLOC
CONFIG(release) {
@@ -23,12 +26,12 @@ qt-port:INCLUDEPATH += \
BASE_DIR = $$PWD
qt-port:INCLUDEPATH += \
$$PWD/WebKitQt/Api
-gdk-port:INCLUDEPATH += \
- $$BASE_DIR/WebCore/platform/gdk \
+gtk-port:INCLUDEPATH += \
+ $$BASE_DIR/WebCore/platform/gtk \
$$BASE_DIR/WebCore/platform/network/curl \
$$BASE_DIR/WebCore/platform/graphics/cairo \
- $$BASE_DIR/WebCore/loader/gdk \
- $$BASE_DIR/WebCore/page/gdk \
+ $$BASE_DIR/WebCore/loader/gtk \
+ $$BASE_DIR/WebCore/page/gtk \
$$BASE_DIR/WebKit/gtk/Api \
$$BASE_DIR/WebKit/gtk/WebCoreSupport
INCLUDEPATH += \
============================================================
--- packages/webkit/files/WebKit.pro c4db9377c267835f4ec934a4d53207e26c25b99c
+++ packages/webkit/files/WebKit.pro 7fde7771b08345471dc5a3ad308348efcc505e0f
@@ -1,13 +1,16 @@ CONFIG += ordered
TEMPLATE = subdirs
CONFIG += ordered
-!gdk-port:CONFIG += qt-port
-qt-port:SUBDIRS += WebKitQt/Plugins
+!gtk-port:CONFIG += qt-port
+qt-port:!win32-*:SUBDIRS += WebKitQt/Plugins
SUBDIRS += \
WebCore \
JavaScriptCore/kjs/testkjs.pro
+qt-port {
+ SUBDIRS += WebKitQt/QtLauncher
+
+ !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
+}
+
+gtk-port:SUBDIRS += \
+ WebKitTools/GtkLauncher
-qt-port:SUBDIRS += \
- WebKitQt/QtLauncher \
- WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
-gdk-port:SUBDIRS += \
- WebKitTools/GdkLauncher
============================================================
--- packages/webkit/webkit-gtk_svn.bb 008e6c30c931818b5c30910b4b8ab87468bcfcd7
+++ packages/webkit/webkit-gtk_svn.bb a62c3f3db6387db3b0fc192bcde946966eca90f5
@@ -23,10 +23,10 @@ do_configure() {
S = "${WORKDIR}/"
do_configure() {
- qmake2 -spec ${QMAKESPEC} CONFIG+=gdk-port CONFIG-=qt CONFIG-=release CONFIG+=debug
+ qmake2 -spec ${QMAKESPEC} CONFIG+=gtk-port CONFIG-=qt CONFIG-=release CONFIG+=debug
mkdir -p WebKitBuilds/Debug
cd WebKitBuilds/Debug
- PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro \
+ PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gtk-port $PWD/../../WebKit.pro \
WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir}
}
@@ -43,9 +43,9 @@ do_install() {
install -d ${D}${libdir}
install -d ${D}${libdir}/pkgconfig
- install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GdkLauncher/GdkLauncher ${D}${bindir}
+ install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GtkLauncher/GtkLauncher ${D}${bindir}
cd ${S}/WebKitBuilds/Debug
- PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro \
+ PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gtk-port $PWD/../../WebKit.pro \
WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir}
oe_runmake install
}
@@ -54,12 +54,12 @@ do_stage() {
install -d ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}
cd ${S}/WebKitBuilds/Debug
- PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro \
+ PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gtk-port $PWD/../../WebKit.pro \
WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR}
oe_runmake install
}
-PACKAGES =+ "webkit-gdklauncher-dbg webkit-gdklauncher"
+PACKAGES =+ "webkit-gtklauncher-dbg webkit-gtklauncher"
+FILES_webkit-gtklauncher = "${bindir}/GtkLauncher"
+FILES_webkit-gtklauncher-dbg = "${bindir}/.debug/GtkLauncher"
-FILES_webkit-gdklauncher = "${bindir}/GdkLauncher"
-FILES_webkit-gdklauncher-dbg = "${bindir}/.debug/GdkLauncher"
More information about the Openembedded-commits
mailing list