diff options
| -rw-r--r-- | packages/libqpe/libqpe-opie/nomax.patch | 56 | ||||
| -rw-r--r-- | packages/libqpe/libqpe-opie_1.1.8.bb | 60 | ||||
| -rw-r--r-- | packages/libqpe/libqpe-opie_cvs.bb | 5 |
3 files changed, 119 insertions, 2 deletions
diff --git a/packages/libqpe/libqpe-opie/nomax.patch b/packages/libqpe/libqpe-opie/nomax.patch index e69de29bb2..bf03cc2a33 100644 --- a/packages/libqpe/libqpe-opie/nomax.patch +++ b/packages/libqpe/libqpe-opie/nomax.patch @@ -0,0 +1,56 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- library/widget_showing.cpp~nomax ++++ library/widget_showing.cpp +@@ -51,9 +51,12 @@ + wg->show(); + return; + } +- ++#ifndef OPIE_NO_WINDOWED ++ if ( TRUE ) { ++#else + if ( !nomax + && ( qApp->desktop()->width() <= 320 ) ){ ++#endif + wg->showMaximized(); + } else { + #ifdef Q_WS_QWS +--- library/qpeapplication.cpp~nomax ++++ library/qpeapplication.cpp +@@ -251,6 +251,7 @@ + + static bool read_widget_rect(const QString &app, bool &maximized, QPoint &p, QSize &s) + { ++#ifndef OPIE_NO_WINDOWED + maximized = TRUE; + // 350 is the trigger in qwsdefaultdecoration for providing a resize button + if ( qApp->desktop()->width() <= 350 ) +@@ -272,7 +273,7 @@ + + return TRUE; + } +- ++#endif + return FALSE; + } + +@@ -320,6 +321,7 @@ + + static void store_widget_rect(QWidget *w, QString &app) + { ++#ifndef OPIE_NO_WINDOWED + // 350 is the trigger in qwsdefaultdecoration for providing a resize button + if ( qApp->desktop()->width() <= 350 ) + return; +@@ -340,6 +342,7 @@ + QString s; + s.sprintf("%d,%d,%d,%d,%d", r.left() + offsetX, r.top() + offsetY, r.width(), r.height(), w->isMaximized() ); + cfg.writeEntry( app, s ); ++#endif + } + + static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ ) diff --git a/packages/libqpe/libqpe-opie_1.1.8.bb b/packages/libqpe/libqpe-opie_1.1.8.bb index e69de29bb2..37290c0b12 100644 --- a/packages/libqpe/libqpe-opie_1.1.8.bb +++ b/packages/libqpe/libqpe-opie_1.1.8.bb @@ -0,0 +1,60 @@ +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 = "r3" + +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" +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 " +CXXFLAGS_append_tosa = " -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/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb index 4ace49f8c1..fa81149f40 100644 --- a/packages/libqpe/libqpe-opie_cvs.bb +++ b/packages/libqpe/libqpe-opie_cvs.bb @@ -6,9 +6,10 @@ LICENSE = "GPL" DEPENDS = "uicmoc-native qte-for-opie" PROVIDES = "virtual/libqpe" PV = "1.1.8+cvs-${CVSDATE}" +PR = "r1" -SRC_URI = "${HANDHELDS_CVS};module=opie/library" -# file://nomax.patch;patch=1;pnum=2" +SRC_URI = "${HANDHELDS_CVS};module=opie/library \ + file://nomax.patch;patch=1;pnum=1" S = "${WORKDIR}/library" inherit qmake |