From 967c90dd504f7994176dc8a6297364ae9b79e551 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Tue, 4 Jan 2005 06:40:08 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/03 22:15:14-08:00 (none)!ggilbert Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into olddog.(none):/home/ggilbert/oe/openembedded 2005/01/03 22:14:20-08:00 (none)!ggilbert libqpe-opie_1.1.8.bb: libqpe-opie_1.1.8: Backport a patch from current CVS that fixes the use of compiled in pixmaps. Fixes the problem where many toolbar icons are not found. resource.patch: new file 2005/01/03 22:14:15-08:00 (none)!emte kbdd-patched changed to single init BKrev: 41da3a48qPihtYGzrFPsd60tZdQbCg --- packages/libqpe/libqpe-opie/resource.patch | 0 packages/libqpe/libqpe-opie_1.1.8.bb | 7 ++++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 packages/libqpe/libqpe-opie/resource.patch (limited to 'packages/libqpe') diff --git a/packages/libqpe/libqpe-opie/resource.patch b/packages/libqpe/libqpe-opie/resource.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libqpe/libqpe-opie_1.1.8.bb b/packages/libqpe/libqpe-opie_1.1.8.bb index 37290c0b12..0c12765d88 100644 --- a/packages/libqpe/libqpe-opie_1.1.8.bb +++ b/packages/libqpe/libqpe-opie_1.1.8.bb @@ -5,11 +5,12 @@ MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" DEPENDS = "uicmoc-native qte-for-opie" PROVIDES = "virtual/libqpe" -PR = "r3" +PR = "r4" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ - file://nomax.patch;patch=1;pnum=1" + file://nomax.patch;patch=1;pnum=1 \ + file://resource.patch;patch=1;pnum=1" S = "${WORKDIR}/library" inherit qmake @@ -23,7 +24,7 @@ CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC -fno-r CXXFLAGS_append_husky = " -DOPIE_NO_WINDOWED " CXXFLAGS_append_corgi = " -DOPIE_NO_WINDOWED " CXXFLAGS_append_shepherd = " -DOPIE_NO_WINDOWED " -CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED " +XXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED " do_compile() { mkdir -p ${STAGING_INCDIR}/qpe \ -- cgit v1.2.3