[oe-commits] org.oe.dev qt4: add webkit, help and clucene packaging

[koen commit]

qt4: add webkit, help and clucene packaging

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: d8e61e9a9b25998f42c8f798ffaafd6d2458e1c9
ViewMTN: http://monotone.openembedded.org/revision/info/d8e61e9a9b25998f42c8f798ffaafd6d2458e1c9
Files:
1
packages/qt4/qt-embedded_4.4.0.bb
packages/qt4/qt_packaging.inc
Diffs:

#
# mt diff -r6125661efb16990f855bdc02ed3c842dfff504c9 -rd8e61e9a9b25998f42c8f798ffaafd6d2458e1c9
#
#
#
# patch "packages/qt4/qt-embedded_4.4.0.bb"
#  from [86a85e11531033206bab2d45354a54a342a83cff]
#    to [b3fd96b4c982a4079cf3887ba981dfbb0b6e4fb7]
# 
# patch "packages/qt4/qt_packaging.inc"
#  from [39f09b583e2e9f61e01f5d75bf57e75690501ed4]
#    to [7b72707c1db55b351f4ce0cccad9d7a738ac0425]
#
============================================================
--- packages/qt4/qt-embedded_4.4.0.bb	86a85e11531033206bab2d45354a54a342a83cff
+++ packages/qt4/qt-embedded_4.4.0.bb	b3fd96b4c982a4079cf3887ba981dfbb0b6e4fb7
@@ -21,5 +21,7 @@ QT_CONFIG_FLAGS += " \
 	-DQT_KEYPAD_NAVIGATION \
  "
 
+QT_BASE_NAME = "qt-embedded"
+QT_BASE_LIB  = "libqt-embedded"
 
 
============================================================
--- packages/qt4/qt_packaging.inc	39f09b583e2e9f61e01f5d75bf57e75690501ed4
+++ packages/qt4/qt_packaging.inc	7b72707c1db55b351f4ce0cccad9d7a738ac0425
@@ -3,6 +3,7 @@ NONDEV_PACKAGES += "${QT_BASE_LIB}core4 
              ${QT_BASE_LIB}designer4 ${QT_BASE_LIB}designercomponents4 \
              ${QT_BASE_LIB}3support4 ${QT_BASE_LIB}assistantclient4 ${QT_BASE_LIB}script4 \
              ${QT_BASE_LIB}dbus4 ${QT_BASE_LIB}opengl4 \
+             ${QT_BASE_LIB}help ${QT_BASE_LIB}clucene ${QT_BASE_LIB}webkit \
              ${QT_BASE_NAME}-assistant ${QT_BASE_NAME}-common \
              ${QT_BASE_NAME}-designer \
              ${QT_BASE_NAME}-demos ${QT_BASE_NAME}-examples \
@@ -24,7 +25,11 @@ DEV_PACKAGES += "${QT_BASE_LIB}core4-dev
              ${QT_BASE_LIB}script4-dev \
              ${QT_BASE_LIB}dbus4-dev \
              ${QT_BASE_LIB}opengl4-dev \
-             ${QT_BASE_LIB}uitools4-dev"
+             ${QT_BASE_LIB}uitools4-dev \
+             ${QT_BASE_LIB}help-dev \
+             ${QT_BASE_LIB}clucene-dev \
+             ${QT_BASE_LIB}webkit-dev \
+             "
 
 DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg \
              ${QT_BASE_LIB}gui4-dbg \
@@ -39,7 +44,11 @@ DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg
              ${QT_BASE_LIB}assistantclient4-dbg \
              ${QT_BASE_LIB}script4-dbg \
              ${QT_BASE_LIB}dbus4-dbg \
-             ${QT_BASE_LIB}opengl4-dbg"
+             ${QT_BASE_LIB}opengl4-dbg \
+             ${QT_BASE_LIB}help-dbg \
+             ${QT_BASE_LIB}clucene-dbg \
+             ${QT_BASE_LIB}webkit-dbg \
+             "
 
 
 PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES} ${DBG_PACKAGES}"
@@ -103,8 +112,16 @@ FILES_${QT_BASE_LIB}uitools4-dev        
 FILES_${QT_BASE_LIB}opengl4-dev             = "${@qt_default_dev('OpenGL')}"
 FILES_${QT_BASE_LIB}opengl4-dbg             = "${libdir}/.debug/libQtOpenGL*"
 FILES_${QT_BASE_LIB}uitools4-dev            = "${libdir}/libQtUiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/QtUiTools${QT_LIBINFIX}.pc"
+FILES_${QT_BASE_LIB}Hhlp                    = "${libdir}/libQtHelp${QT_LIBINFIX}.so.*"
+FILES_${QT_BASE_LIB}help-dev                = "${@qt_default_dev('Help')}"
+FILES_${QT_BASE_LIB}help-dbg                = "${libdir}/.debug/libQtHelp*"
+FILES_${QT_BASE_LIB}clucene                 = "${libdir}/libQtClucene${QT_LIBINFIX}.so.*"
+FILES_${QT_BASE_LIB}clucene-dev             = "${@qt_default_dev('Clucene')}"
+FILES_${QT_BASE_LIB}clucene-dbg             = "${libdir}/.debug/libQtClucene*"
+FILES_${QT_BASE_LIB}webkit                  = "${libdir}/libQtWebKit${QT_LIBINFIX}.so.*"
+FILES_${QT_BASE_LIB}webkit-dev              = "${@qt_default_dev('Webkit')}"
+FILES_${QT_BASE_LIB}webkit-dbg              = "${libdir}/.debug/libQtWebkit*"
 
-
 FILES_${QT_BASE_NAME}-assistant            = "${bindir}/*assistant*"
 FILES_${QT_BASE_NAME}-designer             = "${bindir}/*designer*"
 FILES_${QT_BASE_NAME}-linguist             = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts"