[oe-commits] org.oe.dev merge of '65bea2472f8d53c3d2f8f8e784ede9b9a84f0af8'
oe commit
openembedded-commits at lists.openembedded.org
Thu Oct 25 23:06:17 UTC 2007
merge of '65bea2472f8d53c3d2f8f8e784ede9b9a84f0af8'
and 'cc0f788a513b8c6fcf2e55f8c9e0fb35c6f5c016'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 764653a5078b9cdda8d16318bf2c6fbf96356c2f
ViewMTN: http://monotone.openembedded.org/revision/info/764653a5078b9cdda8d16318bf2c6fbf96356c2f
Files:
1
packages/tea
packages/tea/tea
packages/tea/tea/move-endif.patch
packages/tea/tea_17.3.5.bb
classes/module.bbclass
conf/machine/bd-neon.conf
packages/hostap/hostap-conf_1.0.bb
packages/linux/linux.inc
packages/orinoco/orinoco-conf_1.0.bb
packages/webkit/files/qt-api-changes.diff
packages/uicmoc/uicmoc4-native_4.3.0.bb
packages/uicmoc/uicmoc4-native_4.3.1.bb
packages/uicmoc/uicmoc4-native_4.3.2.bb
packages/webkit/webkit-gtk_svn.bb
packages/webkit/webkit-qt.inc
packages/webkit/webkit-qt_svn.bb
packages/webkit/webkit-qtopia_svn.bb
packages/webkit/webkit.inc
Diffs:
#
# mt diff -r65bea2472f8d53c3d2f8f8e784ede9b9a84f0af8 -r764653a5078b9cdda8d16318bf2c6fbf96356c2f
#
#
#
# add_dir "packages/tea"
#
# add_dir "packages/tea/tea"
#
# add_file "packages/tea/tea/move-endif.patch"
# content [1810cc96cb58b974b909b6e8dee14455fb388816]
#
# add_file "packages/tea/tea_17.3.5.bb"
# content [659e70bcc2fcc43692a31aca58af3daa0607db53]
#
# patch "classes/module.bbclass"
# from [b4a2435539a6183bfff6b02bc73785bbceeadef6]
# to [04ebb27c817750a39f3c15612ebc60e9fad68bc8]
#
# patch "conf/machine/bd-neon.conf"
# from [5f66259e09dda4c0f07e8bcf1fa3eb1c2f8e5e2b]
# to [9fa6c07cfe1ff6d86ec74eb25fb64f830946df9d]
#
# patch "packages/hostap/hostap-conf_1.0.bb"
# from [1867bc11b1fe449c1247c06ce2003b49eff01c6a]
# to [6e6b5d5713579f084a9bcb38dd6ba833af13b8dd]
#
# patch "packages/linux/linux.inc"
# from [298b302b609dd5c2979ac36bbc09faad929ec6bb]
# to [725c2f919e6f7ef208779c7e133aaa60648fb1b3]
#
# patch "packages/orinoco/orinoco-conf_1.0.bb"
# from [f349f21b724b3613e76dd365283e2693ca2bdd3b]
# to [0a8e6f6e947d589c1a97624037da47b71b12a41c]
#
============================================================
--- packages/tea/tea/move-endif.patch 1810cc96cb58b974b909b6e8dee14455fb388816
+++ packages/tea/tea/move-endif.patch 1810cc96cb58b974b909b6e8dee14455fb388816
@@ -0,0 +1,20 @@
+--- src/callbacks.c~ 2007-10-23 18:43:04.000000000 +0200
++++ src/callbacks.c 2007-10-23 18:43:04.000000000 +0200
+@@ -5609,8 +5609,6 @@
+
+ #if defined (HAVE_LIBASPELL) || defined (ENCHANT_SUPPORTED)
+ GList *l = get_suggestions_list (p->prefix);
+-#endif
+-
+ if (l)
+ {
+ build_menu_wudata_from_glist (l, mni_suggestions, on_mni_suggestion_select, temp_text_part);
+@@ -5620,6 +5618,8 @@
+ }
+
+ glist_strings_free (l);
++#endif
++
+ }
+
+
============================================================
--- packages/tea/tea_17.3.5.bb 659e70bcc2fcc43692a31aca58af3daa0607db53
+++ packages/tea/tea_17.3.5.bb 659e70bcc2fcc43692a31aca58af3daa0607db53
@@ -0,0 +1,11 @@
+DESCRIPTION = "Tea - a GTK based text editor tith highlighting and a lot of processing features"
+SECTION = "gpe"
+LICENSE = "GPL"
+DEPENDS = "gtk+ gtksourceview"
+
+inherit autotools
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/tea-editor/${P}.tar.bz2 \
+ file://move-endif.patch;patch=1;pnum=0"
+
+EXTRA_OECONF = "--enable-legacy"
============================================================
--- classes/module.bbclass b4a2435539a6183bfff6b02bc73785bbceeadef6
+++ classes/module.bbclass 04ebb27c817750a39f3c15612ebc60e9fad68bc8
@@ -1,4 +1,4 @@
-RDEPENDS += "kernel (${KERNEL_VERSION})"
+RDEPENDS += "kernel (${KERNEL_VERSION}) update-modules"
DEPENDS += "virtual/kernel"
inherit module-base
============================================================
--- conf/machine/bd-neon.conf 5f66259e09dda4c0f07e8bcf1fa3eb1c2f8e5e2b
+++ conf/machine/bd-neon.conf 9fa6c07cfe1ff6d86ec74eb25fb64f830946df9d
@@ -24,6 +24,8 @@ PERFERRED_VERSION_linux = "2.6.22"
#
PREFERRED_PROVIDER_virtual/kernel = "linux"
PERFERRED_VERSION_linux = "2.6.22"
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "a0008000"
MODUTILS = "26"
XSERVER = "xserver-kdrive-fbdev"
============================================================
--- packages/hostap/hostap-conf_1.0.bb 1867bc11b1fe449c1247c06ce2003b49eff01c6a
+++ packages/hostap/hostap-conf_1.0.bb 6e6b5d5713579f084a9bcb38dd6ba833af13b8dd
@@ -1,9 +1,10 @@ LICENSE = "GPL"
DESCRIPTION = "PCMCIA-cs configuration files for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset"
SECTION = "kernel/modules"
PRIORITY = "optional"
LICENSE = "GPL"
+RDEPENDS = "update-modules"
PACKAGE_ARCH = "all"
-PR = "r8"
+PR = "r9"
SRC_URI = "file://hostap_cs.conf \
file://hostap_cs.modalias \
============================================================
--- packages/linux/linux.inc 298b302b609dd5c2979ac36bbc09faad929ec6bb
+++ packages/linux/linux.inc 725c2f919e6f7ef208779c7e133aaa60648fb1b3
@@ -1,23 +1,12 @@ inherit kernel
DESCRIPTION = "Linux Kernel"
SECTION = "kernel"
LICENSE = "GPL"
inherit kernel
-# These devices need mkimage to generate a kernel image
-DEPENDS_append_kb9202 = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_at32stk1000 = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_atngw100 = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_at91sam9263ek = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_at91sam9261ek = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_at91sam9260ek = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_sarge-at91 = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_gumstix-connex = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_gumstix-verdex = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_fic-gta01 = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_fic-gta02 = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_mpc8313e-rdb = " u-boot "
-DEPENDS_append_mpc8323e-rdb = " u-boot "
+# Not every device needs mkimage to generate a kernel image, but lets make OE a bit more
+# friendly and increase the "Just Works(TM) factor. Building uboot takes only a minute.
+DEPENDS += " u-boot-mkimage-openmoko-native "
RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
@@ -46,7 +35,7 @@ do_configure_prepend() {
#
if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then
echo "CONFIG_AEABI=y" >> ${S}/.config
- echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config
+ echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config
else
echo "# CONFIG_AEABI is not set" >> ${S}/.config
echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config
============================================================
--- packages/orinoco/orinoco-conf_1.0.bb f349f21b724b3613e76dd365283e2693ca2bdd3b
+++ packages/orinoco/orinoco-conf_1.0.bb 0a8e6f6e947d589c1a97624037da47b71b12a41c
@@ -1,9 +1,10 @@ LICENSE = "GPL"
DESCRIPTION = "PCMCIA-cs configuration files for Hermes (Orinoco) wireless LAN cards"
SECTION = "kernel/modules"
PRIORITY = "optional"
LICENSE = "GPL"
+RDEPENDS = "update-modules"
PACKAGE_ARCH = "all"
-PR = "r2"
+PR = "r3"
SRC_URI = "file://spectrum.conf \
file://hermes.conf \
#
# mt diff -rcc0f788a513b8c6fcf2e55f8c9e0fb35c6f5c016 -r764653a5078b9cdda8d16318bf2c6fbf96356c2f
#
#
#
# add_file "packages/webkit/files/qt-api-changes.diff"
# content [dc7ee944ed723b1b75bc409eab71659312add2ba]
#
# patch "packages/uicmoc/uicmoc4-native_4.3.0.bb"
# from [bd07c0050ef051ca21f2712499797670879d8879]
# to [12d984f9a3bcf4b4839856e6082b27e21c3cbcd9]
#
# patch "packages/uicmoc/uicmoc4-native_4.3.1.bb"
# from [83b84a6976c32c4c094913143c9ed28a2b37c610]
# to [e89d594107d11cad2c66dd25e8bd9673cb40f450]
#
# patch "packages/uicmoc/uicmoc4-native_4.3.2.bb"
# from [83b84a6976c32c4c094913143c9ed28a2b37c610]
# to [e89d594107d11cad2c66dd25e8bd9673cb40f450]
#
# patch "packages/webkit/webkit-gtk_svn.bb"
# from [84963a3b5a31a26c3902cc1010efa9df33f746a5]
# to [cda8f2a66ffa21e54d42abd299bfb7e2162a58a5]
#
# patch "packages/webkit/webkit-qt.inc"
# from [1e75c2b1f67c6626edb8f9754c73d92cd0152d1a]
# to [cf87668b6c6100c92f3789cfdab99d05b6699d3d]
#
# patch "packages/webkit/webkit-qt_svn.bb"
# from [cf3e31f4d11e142196490cbd0faf5942d102bc94]
# to [98285c7285a74018daa1107a3757b71a0a8767bd]
#
# patch "packages/webkit/webkit-qtopia_svn.bb"
# from [03fe45bc1271170d30d12a7d3a2b54d0955974f3]
# to [ccce4fbb6f4178fbe8f5c34728cd43ed24d10433]
#
# patch "packages/webkit/webkit.inc"
# from [79c94f59fcfca65105a65eb52f4bf24d076f2d1f]
# to [7592351db1bfac2d0bb7c3317216d74aa14bbf0c]
#
============================================================
--- packages/webkit/files/qt-api-changes.diff dc7ee944ed723b1b75bc409eab71659312add2ba
+++ packages/webkit/files/qt-api-changes.diff dc7ee944ed723b1b75bc409eab71659312add2ba
@@ -0,0 +1,27 @@
+Index: WebKit/qt/Api/qwebkitglobal.h
+===================================================================
+--- WebKit/qt/Api/qwebkitglobal.h (revision 26079)
++++ WebKit/qt/Api/qwebkitglobal.h (working copy)
+@@ -25,15 +25,13 @@
+ #include <qglobal.h>
+
+ #if defined(Q_OS_WIN)
+-# if defined(BUILD_WEBKIT)
+-# define QWEBKIT_EXPORT Q_DECL_EXPORT
+-# else
+-# define QWEBKIT_EXPORT Q_DECL_IMPORT
+-# endif
++ #ifdef BUILD_WEBKIT
++ #define QWEBKIT_EXPORT __declspec(dllexport)
++ #else
++ #define QWEBKIT_EXPORT __declspec(dllimport)
++ #endif
++#else
++ #define QWEBKIT_EXPORT __attribute__((visibility("default")))
+ #endif
+
+-#if !defined(QWEBKIT_EXPORT)
+-#define QWEBKIT_EXPORT Q_DECL_EXPORT
+-#endif
+-
+ #endif // QWEBKITGLOBAL_H
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.0.bb bd07c0050ef051ca21f2712499797670879d8879
+++ packages/uicmoc/uicmoc4-native_4.3.0.bb 12d984f9a3bcf4b4839856e6082b27e21c3cbcd9
@@ -1,5 +1,5 @@ DESCRIPTION = "User-Interface-, Meta-Obj
DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
-DEPENDS = "libx11-native libxext-native"
+DEPENDS = "libx11-native libxext-native zlib-native"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL QPL"
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.1.bb 83b84a6976c32c4c094913143c9ed28a2b37c610
+++ packages/uicmoc/uicmoc4-native_4.3.1.bb e89d594107d11cad2c66dd25e8bd9673cb40f450
@@ -1,4 +1,5 @@ DESCRIPTION = "User-Interface-, Meta-Obj
DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "zlib-native"
SECTION = "libs"
HOMEPAGE = "http://www.trolltech.com"
PRIORITY = "optional"
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.2.bb 83b84a6976c32c4c094913143c9ed28a2b37c610
+++ packages/uicmoc/uicmoc4-native_4.3.2.bb e89d594107d11cad2c66dd25e8bd9673cb40f450
@@ -1,4 +1,5 @@ DESCRIPTION = "User-Interface-, Meta-Obj
DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "zlib-native"
SECTION = "libs"
HOMEPAGE = "http://www.trolltech.com"
PRIORITY = "optional"
============================================================
--- packages/webkit/webkit-gtk_svn.bb 84963a3b5a31a26c3902cc1010efa9df33f746a5
+++ packages/webkit/webkit-gtk_svn.bb cda8f2a66ffa21e54d42abd299bfb7e2162a58a5
@@ -1,14 +1,16 @@ DEPENDS = "curl icu libxml2 cairo libxsl
DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+"
+
WEBKIT_PORT = "gtk-port"
WEBKIT_EXTRA_OPTIONS = "CONFIG-=qt"
-PACKAGES =+ "webkit-gtklauncher-dbg webkit-gtklauncher"
FILES_webkit-gtklauncher = "${bindir}/GtkLauncher"
FILES_webkit-gtklauncher-dbg = "${bindir}/.debug/GtkLauncher"
require webkit.inc
+PR = "r3"
+
do_install() {
install -d ${D}${bindir}
install -d ${D}${libdir}
============================================================
--- packages/webkit/webkit-qt.inc 1e75c2b1f67c6626edb8f9754c73d92cd0152d1a
+++ packages/webkit/webkit-qt.inc cf87668b6c6100c92f3789cfdab99d05b6699d3d
@@ -1,12 +1,15 @@ WEBKIT_EXTRA_OPTIONS = ""
WEBKIT_PORT = "qt"
WEBKIT_EXTRA_OPTIONS = ""
-PACKAGES =+ "${PN}launcher-dbg ${PN}launcher"
FILES_${PN}launcher = "${bindir}/QtLauncher"
FILES_${PN}launcher-dbg = "${bindir}/.debug/*"
+RDEPENDS += "openssl"
+
require webkit.inc
+SRC_URI += " file://qt-api-changes.diff;patch=0;pnum=0 "
+
do_install() {
install -d ${D}${bindir}
install -d ${D}${libdir}
@@ -16,5 +19,12 @@ do_install() {
cd ${S}/WebKitBuilds/Debug
PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir} $PWD/../../WebKit.pro
oe_runmake install
+
+ oe_libinstall -C ${S}/WebKitBuilds/Debug/lib libQtWebKit ${D}${libdir}
}
+# disabled as Qt and Qtopia will not like each other...
+#do_stage_prepend() {
+# oe_libinstall -C ${S}/WebKitBuilds/Debug/lib libQtWebKit ${D}${libdir}
+#}
+
============================================================
--- packages/webkit/webkit-qt_svn.bb cf3e31f4d11e142196490cbd0faf5942d102bc94
+++ packages/webkit/webkit-qt_svn.bb 98285c7285a74018daa1107a3757b71a0a8767bd
@@ -1,4 +1,4 @@ inherit qt4x11
require webkit-qt.inc
inherit qt4x11
+PR = "r5"
-PR = "r1"
============================================================
--- packages/webkit/webkit-qtopia_svn.bb 03fe45bc1271170d30d12a7d3a2b54d0955974f3
+++ packages/webkit/webkit-qtopia_svn.bb ccce4fbb6f4178fbe8f5c34728cd43ed24d10433
@@ -1,4 +1,6 @@ inherit qtopia4core
require webkit-qt.inc
inherit qtopia4core
+WEBKIT_EXTRA_OPTIONS += "QT+=xml QT+=network"
+
+PR = "r5"
-PR = "r1"
============================================================
--- packages/webkit/webkit.inc 79c94f59fcfca65105a65eb52f4bf24d076f2d1f
+++ packages/webkit/webkit.inc 7592351db1bfac2d0bb7c3317216d74aa14bbf0c
@@ -1,9 +1,10 @@ SRCREV_FORMAT = "webcore-rwebkit"
DEPENDS += "flex-native gperf-native perl-native sqlite3"
SRCREV_FORMAT = "webcore-rwebkit"
+PACKAGES =+ "${PN}launcher-dbg ${PN}launcher"
+
# Yes, this is wrong...
PV = "0.1+svnr${SRCREV}"
-PR = "r1"
inherit qmake2 pkgconfig
@@ -46,3 +47,11 @@ do_stage() {
oe_runmake install
}
+python populate_packages_prepend() {
+ print "foooo"
+ print bb.data.getVar("DEBIAN_NAMES", d, True)
+ if bb.data.getVar("DEBIAN_NAMES", d, True):
+ base = bb.data.expand("${PN}launcher", d, True)
+ bb.data.setVar("PKG_%s" % base, base, d)
+ bb.data.setVar("PKG_%s-dbg" % base, "%s-dbg" % base, d)
+}
More information about the Openembedded-commits
mailing list