diff options
Diffstat (limited to 'recipes-opie/libqpe')
-rw-r--r-- | recipes-opie/libqpe/libqpe-opie.inc | 62 | ||||
-rw-r--r-- | recipes-opie/libqpe/libqpe-opie/citytime-path-2.patch | 11 | ||||
-rw-r--r-- | recipes-opie/libqpe/libqpe-opie/fix-titleheight.patch | 19 | ||||
-rw-r--r-- | recipes-opie/libqpe/libqpe-opie/no-include-pro.patch | 11 | ||||
-rw-r--r-- | recipes-opie/libqpe/libqpe-opie/unbreak-logging-2.patch | 21 | ||||
-rw-r--r-- | recipes-opie/libqpe/libqpe-opie_1.2.5.bb | 12 | ||||
-rw-r--r-- | recipes-opie/libqpe/libqpe-opie_cvs.bb | 17 |
7 files changed, 153 insertions, 0 deletions
diff --git a/recipes-opie/libqpe/libqpe-opie.inc b/recipes-opie/libqpe/libqpe-opie.inc new file mode 100644 index 0000000..1673588 --- /dev/null +++ b/recipes-opie/libqpe/libqpe-opie.inc @@ -0,0 +1,62 @@ +DESCRIPTION = "Base library for the Qt/Embedded based palmtop environments" +HOMEPAGE = "http://www.trolltech.com" +AUTHOR = "The Trolls" +SECTION = "opie/libs" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "uicmoc-native virtual/libqte2 sysfsutils" +PROVIDES = "virtual/libqpe1" +INC_PR = "r9" +S = "${WORKDIR}/library" + +inherit palmtop + +OE_QMAKE_CXXFLAGS := "${@oe_filter_out('-fno-rtti', '${OE_QMAKE_CXXFLAGS}', d)}" +QMAKE_PROFILES = "library.pro" +EXTRA_QMAKEVARS_PRE += "CONFIG+=LIBQPE_WITHROHFEEDBACK" +EXTRA_QMAKEVARS_POST += "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES" + +CXXFLAGS_append = " -frtti -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC" + +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_NATIVE}/moc UIC=${STAGING_BINDIR_NATIVE}/uic +} + +do_install() { + oe_libinstall -so libqpe ${D}${libdir} + + install -d ${D}${includedir}/qpe \ + ${D}${includedir}/qtopia/private + + for i in ${S}/*.h + do + install -m 0644 $i ${D}${includedir}/qpe/`basename $i` + install -m 0644 $i ${D}${includedir}/qtopia/`basename $i` + install -m 0644 $i ${D}${includedir}/qtopia/private/`basename $i` + done + for i in ${S}/backend/*.h + do + install -m 0644 $i ${D}${includedir}/qpe/`basename $i` + install -m 0644 $i ${D}${includedir}/qtopia/`basename $i` + install -m 0644 $i ${D}${includedir}/qtopia/private/`basename $i` + done + rm -f ${D}${includedir}/qtopia/*_p.h # remove private stuff out of qtopia +} diff --git a/recipes-opie/libqpe/libqpe-opie/citytime-path-2.patch b/recipes-opie/libqpe/libqpe-opie/citytime-path-2.patch new file mode 100644 index 0000000..27cb963 --- /dev/null +++ b/recipes-opie/libqpe/libqpe-opie/citytime-path-2.patch @@ -0,0 +1,11 @@ +--- library/tzselect.cpp 12 Jan 2008 10:14:42 -0000 1.13 ++++ library/tzselect.cpp 30 Aug 2008 15:32:13 -0000 +@@ -270,7 +270,7 @@ + void TimeZoneSelector::slotExecute( void ) + { + // execute the world time application... +- if (QFile::exists(QPEApplication::qpeDir()+"bin/citytime")) ++ if (QFile::exists(OPIE_BINDIR "/citytime")) + Global::execute( "citytime" ); + else + QMessageBox::warning(this,tr("citytime executable not found"), diff --git a/recipes-opie/libqpe/libqpe-opie/fix-titleheight.patch b/recipes-opie/libqpe/libqpe-opie/fix-titleheight.patch new file mode 100644 index 0000000..da8d91e --- /dev/null +++ b/recipes-opie/libqpe/libqpe-opie/fix-titleheight.patch @@ -0,0 +1,19 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- library/qpedecoration_qws.cpp~fix-titleheight ++++ library/qpedecoration_qws.cpp +@@ -326,9 +326,9 @@ + switch ( m ) { + case TitleHeight: + if ( QApplication::desktop()->height() > 320 ) +- return 19; ++ return 28; + else +- return 15; ++ return 14; + case LeftBorder: + case RightBorder: + case TopBorder: diff --git a/recipes-opie/libqpe/libqpe-opie/no-include-pro.patch b/recipes-opie/libqpe/libqpe-opie/no-include-pro.patch new file mode 100644 index 0000000..5a836ca --- /dev/null +++ b/recipes-opie/libqpe/libqpe-opie/no-include-pro.patch @@ -0,0 +1,11 @@ +--- library/library.pro.old 2008-10-01 23:43:30.000000000 +0100 ++++ library/library.pro 2008-10-01 23:43:49.000000000 +0100 +@@ -134,8 +134,6 @@ + DESTDIR = $(OPIEDIR)/lib$(PROJMAK) + VERSION = 1.5.0.1 + +-include( $(OPIEDIR)/include.pro ) +- + contains( CONFIG, LIBQPE_WITHROHFEEDBACK ){ + DEFINES += OPIE_WITHROHFEEDBACK + SOURCES += backend/rohfeedback.cpp diff --git a/recipes-opie/libqpe/libqpe-opie/unbreak-logging-2.patch b/recipes-opie/libqpe/libqpe-opie/unbreak-logging-2.patch new file mode 100644 index 0000000..fe4bb88 --- /dev/null +++ b/recipes-opie/libqpe/libqpe-opie/unbreak-logging-2.patch @@ -0,0 +1,21 @@ +--- library/qpeapplication.cpp ++++ library/qpeapplication.cpp +@@ -803,14 +803,14 @@ static void qtopiaMsgHandler(QtMsgType type, const char* msg) + { + switch ( type ) { + case QtDebugMsg: +-#ifdef QT_DEBUG ++//#ifdef QT_DEBUG + fprintf( stderr, "Debug: %s\n", msg ); +-#endif ++//#endif + break; + case QtWarningMsg: +-#ifdef QT_DEBUG ++//#ifdef QT_DEBUG + fprintf( stderr, "Warning: %s\n", msg ); +-#endif ++//#endif + break; + case QtFatalMsg: + fprintf( stderr, "Fatal: %s\n", msg ); diff --git a/recipes-opie/libqpe/libqpe-opie_1.2.5.bb b/recipes-opie/libqpe/libqpe-opie_1.2.5.bb new file mode 100644 index 0000000..f31bdb0 --- /dev/null +++ b/recipes-opie/libqpe/libqpe-opie_1.2.5.bb @@ -0,0 +1,12 @@ +require ${PN}.inc + +PR = "${INC_PR}.0" + +SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_library.tar.bz2;name=split_library \ + file://fix-titleheight.patch \ + file://unbreak-logging-2.patch \ + file://citytime-path-2.patch \ + file://no-include-pro.patch \ + " +SRC_URI[split_library.md5sum] = "195ede745b2d1b2111f97654151b7af4" +SRC_URI[split_library.sha256sum] = "aace8f512c0f8f0e23509599c60ec12cf41145bc583d814228db0fcb356a0ea0" diff --git a/recipes-opie/libqpe/libqpe-opie_cvs.bb b/recipes-opie/libqpe/libqpe-opie_cvs.bb new file mode 100644 index 0000000..41a6e33 --- /dev/null +++ b/recipes-opie/libqpe/libqpe-opie_cvs.bb @@ -0,0 +1,17 @@ +require ${PN}.inc + +# OPIE_GIT_PV is defined in opie.bbclass +# but this recipe does not inherit opie +# so any updates to OPIE_GIT_PV should happen +# in both places. + +OPIE_GIT_PV ?= "1.2.2+cvs${SRCDATE}" +PV = "${OPIE_GIT_PV}" +PR = "${INC_PR}.0" + +SRC_URI = "${OPIE_GIT};protocol=git;subpath=library \ + file://fix-titleheight.patch \ + file://unbreak-logging-2.patch \ + file://citytime-path-2.patch \ + file://no-include-pro.patch \ + " |