[oe-commits] org.oe.dev packages/qt4/qt4-x11-free, qtopia-core: Work on properly packaging Qt4
freyther commit
openembedded-commits at lists.openembedded.org
Wed Dec 26 12:18:24 UTC 2007
packages/qt4/qt4-x11-free,qtopia-core: Work on properly packaging Qt4
-QT_LIBRARY_NAME lost the lib prefix to make it usable with .pc files
-Add headers to the -dev packages
-Look in the right directory for the plugins remains
-Get rid off the mkspecs before packaging
-Attempt to package translations
Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: efd90f8b1dfa5f6c6f3a39eb0269ede1f3bb768e
ViewMTN: http://monotone.openembedded.org/revision/info/efd90f8b1dfa5f6c6f3a39eb0269ede1f3bb768e
Files:
1
packages/qt4/qt4-x11-free.inc
packages/qt4/qt_packaging.inc
packages/qt4/qtopia-core.inc
Diffs:
#
# mt diff -r8b7d9bf894c6e25f723225814bacfb01936c07fc -refd90f8b1dfa5f6c6f3a39eb0269ede1f3bb768e
#
#
#
# patch "packages/qt4/qt4-x11-free.inc"
# from [8f1c730bd198cdca0bf99e38837e38fd3b0fae28]
# to [e036ae34d1fabdd344679ade9c3d17c89e77645a]
#
# patch "packages/qt4/qt_packaging.inc"
# from [a0fc23aa0457e23dc5a7c0069fe1780a63688a01]
# to [0b0f264425c7f75c51769586c6d2bbb2d374c97b]
#
# patch "packages/qt4/qtopia-core.inc"
# from [441d19da7b57dbb5d5e85b013ba4a65cc7fa5cff]
# to [43362ed93891f96b27e12fea9a81198cc5d99b6d]
#
============================================================
--- packages/qt4/qt4-x11-free.inc 8f1c730bd198cdca0bf99e38837e38fd3b0fae28
+++ packages/qt4/qt4-x11-free.inc e036ae34d1fabdd344679ade9c3d17c89e77645a
@@ -18,7 +18,7 @@ QT_BASE_LIB = "libqt"
QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl"
QT_BASE_NAME = "qt4"
QT_BASE_LIB = "libqt"
-QT_LIBRARY_NAME = "libQt"
+QT_LIBRARY_NAME = "Qt"
QT_DIR_NAME = "qt4"
require qt_depends.inc
require qt_configuration.inc
============================================================
--- packages/qt4/qt_packaging.inc a0fc23aa0457e23dc5a7c0069fe1780a63688a01
+++ packages/qt4/qt_packaging.inc 0b0f264425c7f75c51769586c6d2bbb2d374c97b
@@ -1,8 +1,8 @@ NONDEV_PACKAGES = "${QT_BASE_LIB}core4 $
NONDEV_PACKAGES = "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network4 \
${QT_BASE_LIB}sql4 ${QT_BASE_LIB}svg4 ${QT_BASE_LIB}test4 ${QT_BASE_LIB}xml4 \
${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}dbus4 ${QT_BASE_LIB}opengl4 \
${QT_BASE_NAME}-assistant ${QT_BASE_NAME}-common \
${QT_BASE_NAME}-designer \
${QT_BASE_NAME}-demos ${QT_BASE_NAME}-examples \
@@ -17,70 +17,95 @@ NONDEV_PACKAGES = "${QT_BASE_LIB}core4 $
${QT_BASE_NAME}-plugins-iconengines \
${QT_BASE_NAME}-fonts "
-DEV_PACKAGES += "${QT_BASE_LIB}core4-dev ${QT_BASE_LIB}core4-dbg \
- ${QT_BASE_LIB}gui4-dev ${QT_BASE_LIB}gui4-dbg \
- ${QT_BASE_LIB}network4-dev ${QT_BASE_LIB}network4-dbg \
- ${QT_BASE_LIB}sql4-dev ${QT_BASE_LIB}sql4-dbg \
- ${QT_BASE_LIB}svg4-dev ${QT_BASE_LIB}svg4-dbg \
- ${QT_BASE_LIB}test4-dev ${QT_BASE_LIB}test4-dbg \
- ${QT_BASE_LIB}xml4-dev ${QT_BASE_LIB}xml4-dbg \
- ${QT_BASE_LIB}designer4-dev ${QT_BASE_LIB}designer4-dbg \
- ${QT_BASE_LIB}designercomponents4-dev ${QT_BASE_LIB}designercomponents4-dbg \
- ${QT_BASE_LIB}3support4-dev ${QT_BASE_LIB}3support4-dbg \
- ${QT_BASE_LIB}assistantclient4-dev ${QT_BASE_LIB}assistantclient4-dbg \
- ${QT_BASE_LIB}script4-dev ${QT_BASE_LIB}script4-dbg \
- ${QT_BASE_LIB}dbus4-dev ${QT_BASE_LIB}dbus4-dbg "
+DEV_PACKAGES += "${QT_BASE_LIB}core4-dev \
+ ${QT_BASE_LIB}gui4-dev \
+ ${QT_BASE_LIB}network4-dev \
+ ${QT_BASE_LIB}sql4-dev \
+ ${QT_BASE_LIB}svg4-dev \
+ ${QT_BASE_LIB}test4-dev \
+ ${QT_BASE_LIB}xml4-dev \
+ ${QT_BASE_LIB}designer4-dev \
+ ${QT_BASE_LIB}designercomponents4-dev \
+ ${QT_BASE_LIB}3support4-dev \
+ ${QT_BASE_LIB}assistantclient4-dev \
+ ${QT_BASE_LIB}script4-dev \
+ ${QT_BASE_LIB}dbus4-dev \
+ ${QT_BASE_LIB}opengl4-dev \
+ ${QT_BASE_LIB}uitools4-dev \
+ ${QT_BASE_LIB}-documentation"
-PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES}"
+DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg \
+ ${QT_BASE_LIB}gui4-dbg \
+ ${QT_BASE_LIB}network4-dbg \
+ ${QT_BASE_LIB}sql4-dbg \
+ ${QT_BASE_LIB}svg4-dbg \
+ ${QT_BASE_LIB}test4-dbg \
+ ${QT_BASE_LIB}xml4-dbg \
+ ${QT_BASE_LIB}designer4-dbg \
+ ${QT_BASE_LIB}designercomponents4-dbg \
+ ${QT_BASE_LIB}3support4-dbg \
+ ${QT_BASE_LIB}assistantclient4-dbg \
+ ${QT_BASE_LIB}script4-dbg \
+ ${QT_BASE_LIB}dbus4-dbg \
+ ${QT_BASE_LIB}opengl4-dbg "
+
+PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES} ${DBG_PACKAGES}"
+
ALLOW_EMPTY_${PN} = "1"
-ALLOW_EMPTY_${PN}-dev = "1"
-FILES_${PN} = ""
-FILES_${PN}-dev = ""
+FILES_${PN} = ""
+FILES_${PN}-dev = " ${includedir}/${QT_DIR_NAME}/Qt/*"
+FILES_${PN}-dbg = "${bindir}/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/*/.debug/*.so"
RDEPENDS_${PN} = "${NONDEV_PACKAGES}"
RDEPENDS_${PN}-dev = "${DEV_PACKAGES}"
+RDEPENDS_${PN}-dbg = "${DBG_PACKAGES}"
-FILES_${QT_BASE_LIB}core4 = "${libdir}/${QT_LIBRARY_NAME}Core.so.*"
-FILES_${QT_BASE_LIB}core4-dev = "${libdir}/${QT_LIBRARY_NAME}Core.so"
-FILES_${QT_BASE_LIB}core4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Core*"
-FILES_${QT_BASE_LIB}gui4 = "${libdir}/${QT_LIBRARY_NAME}Gui.so.*"
-FILES_${QT_BASE_LIB}gui4-dev = "${libdir}/${QT_LIBRARY_NAME}Gui.so"
-FILES_${QT_BASE_LIB}gui4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Gui*"
-FILES_${QT_BASE_LIB}network4 = "${libdir}/${QT_LIBRARY_NAME}Network.so.*"
-FILES_${QT_BASE_LIB}network4-dev = "${libdir}/${QT_LIBRARY_NAME}Network.so"
-FILES_${QT_BASE_LIB}network4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Network*"
-FILES_${QT_BASE_LIB}sql4 = "${libdir}/${QT_LIBRARY_NAME}Sql.so.*"
-FILES_${QT_BASE_LIB}sql4-dev = "${libdir}/${QT_LIBRARY_NAME}Sql.so"
-FILES_${QT_BASE_LIB}sql4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Sql*"
-FILES_${QT_BASE_LIB}svg4 = "${libdir}/${QT_LIBRARY_NAME}Svg.so.*"
-FILES_${QT_BASE_LIB}svg4-dev = "${libdir}/${QT_LIBRARY_NAME}Svg.so"
-FILES_${QT_BASE_LIB}svg4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Svg*"
-FILES_${QT_BASE_LIB}test4 = "${libdir}/${QT_LIBRARY_NAME}Test.so.*"
-FILES_${QT_BASE_LIB}test4-dev = "${libdir}/${QT_LIBRARY_NAME}Test.so"
-FILES_${QT_BASE_LIB}test4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Test"
-FILES_${QT_BASE_LIB}xml4 = "${libdir}/${QT_LIBRARY_NAME}Xml.so.*"
-FILES_${QT_BASE_LIB}xml4-dev = "${libdir}/${QT_LIBRARY_NAME}Xml.so"
-FILES_${QT_BASE_LIB}xml4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Xml*"
-FILES_${QT_BASE_LIB}designer4 = "${libdir}/${QT_LIBRARY_NAME}Designer.so.*"
-FILES_${QT_BASE_LIB}designer4-dev = "${libdir}/${QT_LIBRARY_NAME}Designer.so"
-FILES_${QT_BASE_LIB}designer4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Designer*"
-FILES_${QT_BASE_LIB}designercomponents4 = "${libdir}/${QT_LIBRARY_NAME}DesignerComponents.so.*"
-FILES_${QT_BASE_LIB}designercomponents4-dev = "${libdir}/${QT_LIBRARY_NAME}DesignerComponents.so"
-FILES_${QT_BASE_LIB}designercomponents4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}DesignerComponents*"
-FILES_${QT_BASE_LIB}3support4 = "${libdir}/${QT_LIBRARY_NAME}3Support.so.*"
-FILES_${QT_BASE_LIB}3support4-dev = "${libdir}/${QT_LIBRARY_NAME}3Support.so"
-FILES_${QT_BASE_LIB}3support4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}3Support*"
-FILES_${QT_BASE_LIB}assistantclient4 = "${libdir}/${QT_LIBRARY_NAME}AssistantClient.so.*"
-FILES_${QT_BASE_LIB}assistantclient4-dev = "${libdir}/${QT_LIBRARY_NAME}AssistantClient.so"
-FILES_${QT_BASE_LIB}assistantclient4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}AssistantClient*"
-FILES_${QT_BASE_LIB}script4 = "${libdir}/${QT_LIBRARY_NAME}Script.so.*"
-FILES_${QT_BASE_LIB}script4-dev = "${libdir}/${QT_LIBRARY_NAME}Script.so"
-FILES_${QT_BASE_LIB}script4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Script*"
-FILES_${QT_BASE_LIB}dbus4 = "${libdir}/${QT_LIBRARY_NAME}DBus.so.*"
-FILES_${QT_BASE_LIB}dbus4-dev = "${libdir}/${QT_LIBRARY_NAME}DBus.so"
-FILES_${QT_BASE_LIB}dbus4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}DBus*"
+FILES_${QT_BASE_LIB}core4 = "${libdir}/lib${QT_LIBRARY_NAME}Core.so.*"
+FILES_${QT_BASE_LIB}core4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Core.so ${includedir}/${QT_DIR_NAME}/QtCore* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Core.pc"
+FILES_${QT_BASE_LIB}core4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Core*"
+FILES_${QT_BASE_LIB}gui4 = "${libdir}/lib${QT_LIBRARY_NAME}Gui.so.*"
+FILES_${QT_BASE_LIB}gui4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Gui.so ${includedir}/${QT_DIR_NAME}/QtGui* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Gui.pc"
+FILES_${QT_BASE_LIB}gui4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Gui*"
+FILES_${QT_BASE_LIB}network4 = "${libdir}/lib${QT_LIBRARY_NAME}Network.so.*"
+FILES_${QT_BASE_LIB}network4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Network.so ${includedir}/${QT_DIR_NAME}/QtNetwork* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Network.pc"
+FILES_${QT_BASE_LIB}network4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Network*"
+FILES_${QT_BASE_LIB}sql4 = "${libdir}/lib${QT_LIBRARY_NAME}Sql.so.*"
+FILES_${QT_BASE_LIB}sql4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Sql.so ${includedir}/${QT_DIR_NAME}/QtSql* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Sql.pc"
+FILES_${QT_BASE_LIB}sql4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Sql*"
+FILES_${QT_BASE_LIB}svg4 = "${libdir}/lib${QT_LIBRARY_NAME}Svg.so.*"
+FILES_${QT_BASE_LIB}svg4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Svg.so ${includedir}/${QT_DIR_NAME}/QtSvg* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Svg.pc"
+FILES_${QT_BASE_LIB}svg4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Svg*"
+FILES_${QT_BASE_LIB}test4 = "${libdir}/lib${QT_LIBRARY_NAME}Test.so.*"
+FILES_${QT_BASE_LIB}test4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Test.so ${includedir}/${QT_DIR_NAME}/QtTest* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Test.pc"
+FILES_${QT_BASE_LIB}test4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Test*"
+FILES_${QT_BASE_LIB}xml4 = "${libdir}/lib${QT_LIBRARY_NAME}Xml.so.*"
+FILES_${QT_BASE_LIB}xml4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Xml.so ${includedir}/${QT_DIR_NAME}/QtXml* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Xml.pc"
+FILES_${QT_BASE_LIB}xml4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Xml*"
+FILES_${QT_BASE_LIB}designer4 = "${libdir}/lib${QT_LIBRARY_NAME}Designer.so.*"
+FILES_${QT_BASE_LIB}designer4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Designer.so ${includedir}/${QT_DIR_NAME}/QtDesigner* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Designer.pc"
+FILES_${QT_BASE_LIB}designer4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Designer*"
+FILES_${QT_BASE_LIB}designercomponents4 = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.so.*"
+FILES_${QT_BASE_LIB}designercomponents4-dev = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.so"
+FILES_${QT_BASE_LIB}designercomponents4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DesignerComponents*"
+FILES_${QT_BASE_LIB}3support4 = "${libdir}/lib${QT_LIBRARY_NAME}3Support.so.*"
+FILES_${QT_BASE_LIB}3support4-dev = "${libdir}/lib${QT_LIBRARY_NAME}3Support.so ${includedir}/${QT_DIR_NAME}/Qt3Support* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}3Support.pc"
+FILES_${QT_BASE_LIB}3support4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}3Support*"
+FILES_${QT_BASE_LIB}assistantclient4 = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.so.*"
+FILES_${QT_BASE_LIB}assistantclient4-dev = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.so ${includedir}/${QT_DIR_NAME}/QtAssistant* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}AssistantClient.pc"
+FILES_${QT_BASE_LIB}assistantclient4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}AssistantClient*"
+FILES_${QT_BASE_LIB}script4 = "${libdir}/lib${QT_LIBRARY_NAME}Script.so.*"
+FILES_${QT_BASE_LIB}script4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Script.so ${includedir}/${QT_DIR_NAME}/QtScript* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Script.pc"
+FILES_${QT_BASE_LIB}script4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Script*"
+FILES_${QT_BASE_LIB}dbus4 = "${libdir}/lib${QT_LIBRARY_NAME}DBus.so.*"
+FILES_${QT_BASE_LIB}dbus4-dev = "${libdir}/lib${QT_LIBRARY_NAME}DBus.sp ${includedir}/${QT_DIR_NAME}/QtDBus* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}DBus.pc"
+FILES_${QT_BASE_LIB}dbus4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DBus*"
+FILES_${QT_BASE_LIB}opengl4 = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.so.*"
+FILES_${QT_BASE_LIB}opengl4-dev = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.so ${includedir}/${QT_DIR_NAME}/QtOpenGL* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}OpenGL.pc"
+FILES_${QT_BASE_LIB}opengl4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}OpenGL*"
+FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/lib${QT_LIBRARY_NAME}* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}UiTools.pc"
+
FILES_${QT_BASE_NAME}-plugins-accessible = "${libdir}/${QT_DIR_NAME}/plugins/accessible/*.so"
FILES_${QT_BASE_NAME}-plugins-codecs = "${libdir}/${QT_DIR_NAME}/plugins/codecs/*.so"
FILES_${QT_BASE_NAME}-plugins-designer = "${libdir}/${QT_DIR_NAME}/plugins/designer/*.so"
@@ -101,16 +126,12 @@ FILES_${QT_BASE_NAME}-fonts
FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts"
-FILES_${PN}-dev += "${bindir}/rcc ${bindir}/uic* ${bindir}/moc ${bindir}/qmake ${bindir}/syncqt \
- ${bindir}/qt3to4 ${bindir}/findtr"
-FILES_${PN}-dbg += "${bindir}/*/.debug ${plugindir}/.debug"
+FILES_${QT_BASE_NAME}-documentation = "${docdir}/${QT_DIR_NAME}/html/*"
+
python populate_packages_prepend() {
- import os
- if os.path.exists(bb.data.expand('${D}/${datadir}/qtopia/translationdir', d)):
-
- translationdir = bb.data.expand('${datadir}/qtopia/translations/', d)
- do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' )
+ translationdir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d)
+ do_split_packages(d, translationdir, '^qt_(.*)\.qm$', '${QT_DIR_NAME}-translation-%s', '{PN} translation for %s', extra_depends='' )
}
@@ -119,7 +140,7 @@ do_install() {
# These are host binaries, we should only use them in staging
rm -rf ${D}/${bindir}
- rm -rf ${D}/${datadir}/mkspecs
+ rm -rf ${D}/${datadir}/${QT_DIR_NAME}/mkspecs
install -d ${D}/${libdir}/fonts
touch ${D}/${libdir}/fonts/fontdir
============================================================
--- packages/qt4/qtopia-core.inc 441d19da7b57dbb5d5e85b013ba4a65cc7fa5cff
+++ packages/qt4/qtopia-core.inc 43362ed93891f96b27e12fea9a81198cc5d99b6d
@@ -17,7 +17,7 @@ QT_BASE_LIB = "libqtopiacore"
-qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}"
QT_BASE_NAME = "qtopiacore"
QT_BASE_LIB = "libqtopiacore"
-QT_LIBRARY_NAME = "libQt"
+QT_LIBRARY_NAME = "Qt"
QT_DIR_NAME = "qtopia"
require qt_depends.inc
require qt_configuration.inc
More information about the Openembedded-commits
mailing list