Merge bk://openembedded@openembedded.bkbits.net/packages-devel

into olddog.home.treke.net:/home/ggilbert/oe/packages

2004/11/22 23:47:41-08:00 treke.net!ggilbert
  libqpe-opie: Adding nomax patch to 1.1.7 for the c7x0's
  opie-taskbar: Adding no max patch for 1.1.7

BKrev: 41a2f839DqS4pJKj1yZ9v3XXqsdXSg

diff --git a/libqpe/libqpe-opie_1.1.7.oe b/libqpe/libqpe-opie_1.1.7.oe
index e69de29..99555f7 100644 (file)
--- a/libqpe/libqpe-opie_1.1.7.oe
+++ b/libqpe/libqpe-opie_1.1.7.oe
@@ -0,0 +1,59 @@
+DESCRIPTION = "Base library for the Qt Palmtop Environment"
+SECTION = "opie/libs"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "uicmoc-native qte-for-opie"
+PROVIDES = "virtual/libqpe"
+PR = "r2"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/library \
+       file://nomax.patch;patch=1;pnum=2"
+S = "${WORKDIR}/library"
+
+inherit qmake
+
+QMAKE_PROFILES = "library.pro"
+EXTRA_QMAKEVARS_PRE  = "CONFIG+=LIBQPE_WITHROHFEEDBACK"
+EXTRA_QMAKEVARS_POST = "DESTDIR="
+
+CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC  -fno-rtti -fno-exceptions"
+
+CXXFLAGS_append_husky = " -DOPIE_NO_WINDOWED "
+CXXFLAGS_append_corgi = " -DOPIE_NO_WINDOWED "
+CXXFLAGS_append_shepherd = " -DOPIE_NO_WINDOWED "
+
+do_compile() {
+        mkdir -p ${STAGING_INCDIR}/qpe \
+                 ${STAGING_INCDIR}/qtopia \
+                 ${STAGING_INCDIR}/opie \
+                 ${STAGING_INCDIR}/opie2 \
+                 ${STAGING_INCDIR}/qtopia/private
+       for i in ${S}/*.h
+       do
+               install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i`
+               install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i`
+               install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
+       done
+       for i in ${S}/backend/*.h
+       do
+               install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i`
+               install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i`
+               install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
+       done
+       rm -f ${STAGING_INCDIR}/qtopia/*_p.h # remove private stuff out of qtopia
+       oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic
+}
+
+do_stage() {
+       oe_libinstall -so libqpe ${STAGING_LIBDIR}
+       # include files already done during do_compile
+}
+
+do_install() {
+       oe_libinstall -so libqpe ${D}/${palmtopdir}/lib
+}
+
+PACKAGES = "libqpe1"
+FILES_libqpe1 = "${palmtopdir}/lib"

diff --git a/opie-taskbar/opie-taskbar_1.1.7.oe b/opie-taskbar/opie-taskbar_1.1.7.oe
index ace0f35..d57b6ba 100644 (file)
--- a/opie-taskbar/opie-taskbar_1.1.7.oe
+++ b/opie-taskbar/opie-taskbar_1.1.7.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 DEPENDS = "opie-libqrsync"
-PR = "r1"
+PR = "r2"
 
 APPNAME = "qpe"
 
@@ -16,6 +16,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/co
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/root \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/etc \
+          file://nomax.patch;patch=1;pnum=3 \
            file://server.pro-1.1.7 \
            file://opie-reorgfiles \
            file://opie \
@@ -23,6 +24,10 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/co
 
 S = "${WORKDIR}/launcher"
 
+CXXFLAGS_append_husky = " -DOPIE_NO_WINDOWED "
+CXXFLAGS_append_corgi = " -DOPIE_NO_WINDOWED "
+CXXFLAGS_append_shepherd = " -DOPIE_NO_WINDOWED "
+
 # Caps/Numlock icons for devices with keyboard
 EXTRA_QMAKEVARS_POST_append_collie     = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
 EXTRA_QMAKEVARS_POST_append_poodle     = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"