aboutsummaryrefslogtreecommitdiffstats
path: root/packages/libqpe
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/libqpe
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
downloadopenembedded-709c4d66e0b107ca606941b988bad717c0b45d9b.tar.gz
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/libqpe')
-rw-r--r--packages/libqpe/libqpe-opie.inc67
-rw-r--r--packages/libqpe/libqpe-opie/citytime-path-2.patch11
-rw-r--r--packages/libqpe/libqpe-opie/citytime-path.patch11
-rw-r--r--packages/libqpe/libqpe-opie/fix-sd-card-path.patch17
-rw-r--r--packages/libqpe/libqpe-opie/fix-titleheight.patch19
-rw-r--r--packages/libqpe/libqpe-opie/no-include-pro.patch11
-rw-r--r--packages/libqpe/libqpe-opie/save-windows-pos-dynamic.patch113
-rw-r--r--packages/libqpe/libqpe-opie/unbreak-logging.patch21
-rw-r--r--packages/libqpe/libqpe-opie_1.2.2.bb8
-rw-r--r--packages/libqpe/libqpe-opie_1.2.3.bb12
-rw-r--r--packages/libqpe/libqpe-opie_1.2.4.bb12
-rw-r--r--packages/libqpe/libqpe-opie_cvs.bb11
12 files changed, 0 insertions, 313 deletions
diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc
deleted file mode 100644
index ebb49c0658..0000000000
--- a/packages/libqpe/libqpe-opie.inc
+++ /dev/null
@@ -1,67 +0,0 @@
-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"
-PROVIDES = "virtual/libqpe1"
-
-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_stage() {
- oe_libinstall -so libqpe ${STAGING_LIBDIR}
- # include files already done during do_compile
-}
-
-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/packages/libqpe/libqpe-opie/citytime-path-2.patch b/packages/libqpe/libqpe-opie/citytime-path-2.patch
deleted file mode 100644
index 27cb9634c9..0000000000
--- a/packages/libqpe/libqpe-opie/citytime-path-2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/packages/libqpe/libqpe-opie/citytime-path.patch b/packages/libqpe/libqpe-opie/citytime-path.patch
deleted file mode 100644
index 0abaf146d7..0000000000
--- a/packages/libqpe/libqpe-opie/citytime-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- library/tzselect.cpp.orig 2008-01-12 21:05:49.000000000 +1300
-+++ library/tzselect.cpp 2008-01-12 21:06:01.000000000 +1300
-@@ -273,7 +273,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/packages/libqpe/libqpe-opie/fix-sd-card-path.patch b/packages/libqpe/libqpe-opie/fix-sd-card-path.patch
deleted file mode 100644
index 32be5d2e7c..0000000000
--- a/packages/libqpe/libqpe-opie/fix-sd-card-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: library/storage.cpp
-===================================================================
-RCS file: /cvs/opie/library/storage.cpp,v
-retrieving revision 1.25
-retrieving revision 1.26
-diff -U3 -r1.25 -r1.26
---- library/storage.cpp 7 Mar 2005 14:32:58 -0000 1.25
-+++ library/storage.cpp 29 Dec 2007 02:14:09 -0000 1.26
-@@ -307,7 +307,7 @@
- bool hasMmc=false;
- if( deviceTab("/dev/mmc/part"))
- hasMmc=true;
-- if( deviceTab("/dev/mmcd"))
-+ else if( deviceTab("/dev/mmcblk"))
- hasMmc=true;
- return hasMmc;
- }
diff --git a/packages/libqpe/libqpe-opie/fix-titleheight.patch b/packages/libqpe/libqpe-opie/fix-titleheight.patch
deleted file mode 100644
index da8d91e32a..0000000000
--- a/packages/libqpe/libqpe-opie/fix-titleheight.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#
-# 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/packages/libqpe/libqpe-opie/no-include-pro.patch b/packages/libqpe/libqpe-opie/no-include-pro.patch
deleted file mode 100644
index 5a836ca795..0000000000
--- a/packages/libqpe/libqpe-opie/no-include-pro.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/packages/libqpe/libqpe-opie/save-windows-pos-dynamic.patch b/packages/libqpe/libqpe-opie/save-windows-pos-dynamic.patch
deleted file mode 100644
index 54dd5947de..0000000000
--- a/packages/libqpe/libqpe-opie/save-windows-pos-dynamic.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-? 1.diff
-? library/1.diff
-Index: library/qpeapplication.cpp
-===================================================================
-RCS file: /cvs/opie/library/qpeapplication.cpp,v
-retrieving revision 1.115
-diff -u -r1.115 qpeapplication.cpp
---- library/qpeapplication.cpp 27 Sep 2005 21:04:59 -0000 1.115
-+++ library/qpeapplication.cpp 11 Jan 2007 06:12:50 -0000
-@@ -101,6 +101,7 @@
-
-
- static bool useBigPixmaps = 0;
-+static bool saveWindowsPos = 0;
-
- class HackWidget : public QWidget
- {
-@@ -129,6 +130,7 @@
- fontSize = cfg.readNumEntry( "FontSize", 10 );
- smallIconSize = cfg.readNumEntry( "SmallIconSize", 14 );
- bigIconSize = cfg.readNumEntry( "BigIconSize", 32 );
-+ saveWindowsPos = cfg.readBoolEntry( "AllowWindowed", false );
- #ifdef OPIE_WITHROHFEEDBACK
- RoH = 0;
- #endif
-@@ -250,7 +252,8 @@
-
- static bool read_widget_rect(const QString &app, bool &maximized, QPoint &p, QSize &s)
- {
--#ifndef OPIE_NO_WINDOWED
-+ if (!saveWindowsPos)
-+ return FALSE;
- maximized = TRUE;
- // 350 is the trigger in qwsdefaultdecoration for providing a resize button
- if ( qApp->desktop()->width() <= 350 )
-@@ -272,8 +275,6 @@
-
- return TRUE;
- }
--#endif
-- return FALSE;
- }
-
-
-@@ -322,7 +323,8 @@
- {
- if( !w )
- return;
--#ifndef OPIE_NO_WINDOWED
-+ if (!saveWindowsPos)
-+ return;
- // 350 is the trigger in qwsdefaultdecoration for providing a resize button
- if ( qApp->desktop()->width() <= 350 )
- return;
-@@ -343,7 +345,6 @@
- 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*/ )
-@@ -2207,6 +2208,11 @@
- quit();
- }
-
-+bool QPEApplication::isSaveWindowsPos()
-+{
-+ return saveWindowsPos;
-+}
-+
- #if (__GNUC__ > 2 ) && !defined(_OS_MACX_)
- extern "C" void __cxa_pure_virtual();
-
-Index: library/qpeapplication.h
-===================================================================
-RCS file: /cvs/opie/library/qpeapplication.h,v
-retrieving revision 1.35
-diff -u -r1.35 qpeapplication.h
---- library/qpeapplication.h 4 Oct 2005 19:38:19 -0000 1.35
-+++ library/qpeapplication.h 11 Jan 2007 06:12:50 -0000
-@@ -137,6 +137,8 @@
-
- int exec();
-
-+ static bool isSaveWindowsPos();
-+
- signals:
- void clientMoused();
- void timeChanged();
-Index: library/widget_showing.cpp
-===================================================================
-RCS file: /cvs/opie/library/widget_showing.cpp,v
-retrieving revision 1.4
-diff -u -r1.4 widget_showing.cpp
---- library/widget_showing.cpp 19 Apr 2005 13:27:29 -0000 1.4
-+++ library/widget_showing.cpp 11 Jan 2007 06:12:50 -0000
-@@ -52,13 +52,8 @@
- return;
- }
-
--#ifdef OPIE_NO_WINDOWED
-- Q_UNUSED( nomax )
-- if ( TRUE ) {
--#else
-- if ( !nomax
-- && ( qApp->desktop()->width() <= 320 ) ){
--#endif
-+ if ( !isSaveWindowsPos() || (!nomax
-+ && ( qApp->desktop()->width() <= 30 )) ){
- wg->showMaximized();
- } else {
- #ifdef Q_WS_QWS
diff --git a/packages/libqpe/libqpe-opie/unbreak-logging.patch b/packages/libqpe/libqpe-opie/unbreak-logging.patch
deleted file mode 100644
index fedd73be35..0000000000
--- a/packages/libqpe/libqpe-opie/unbreak-logging.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- library/qpeapplication.cpp.org 2007-01-24 19:54:07.000000000 +0000
-+++ library/qpeapplication.cpp 2007-05-03 03:34:10.000000000 +0000
-@@ -792,14 +792,14 @@
- {
- 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/packages/libqpe/libqpe-opie_1.2.2.bb b/packages/libqpe/libqpe-opie_1.2.2.bb
deleted file mode 100644
index 009a075091..0000000000
--- a/packages/libqpe/libqpe-opie_1.2.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require ${PN}.inc
-
-PR = "r3"
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
- file://save-windows-pos-dynamic.patch;patch=1 \
- file://fix-titleheight.patch;patch=1"
diff --git a/packages/libqpe/libqpe-opie_1.2.3.bb b/packages/libqpe/libqpe-opie_1.2.3.bb
deleted file mode 100644
index 0822385b9d..0000000000
--- a/packages/libqpe/libqpe-opie_1.2.3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ${PN}.inc
-
-PR = "r3"
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
- file://fix-titleheight.patch;patch=1 \
- file://unbreak-logging.patch;patch=1 \
- file://citytime-path.patch;patch=1 \
- file://fix-sd-card-path.patch;patch=1 \
- "
-
diff --git a/packages/libqpe/libqpe-opie_1.2.4.bb b/packages/libqpe/libqpe-opie_1.2.4.bb
deleted file mode 100644
index 8c2abc7af6..0000000000
--- a/packages/libqpe/libqpe-opie_1.2.4.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ${PN}.inc
-
-PR = "r0"
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
- file://fix-titleheight.patch;patch=1 \
- file://unbreak-logging.patch;patch=1 \
- file://citytime-path-2.patch;patch=1 \
- file://no-include-pro.patch;patch=1 \
- "
-
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
deleted file mode 100644
index d3b17ac7ee..0000000000
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require ${PN}.inc
-
-PV = "${OPIE_CVS_PV}"
-PR = "r5"
-
-SRC_URI = "${HANDHELDS_CVS};module=opie/library \
- file://fix-titleheight.patch;patch=1 \
- file://unbreak-logging.patch;patch=1 \
- file://citytime-path-2.patch;patch=1 \
- "
-