summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/opie.bbclass2
-rw-r--r--conf/machine/include/LAB-settings.conf2
-rw-r--r--packages/irda-utils/irda-utils_0.9.16.bb4
-rw-r--r--packages/libopie/libopie2/exports.patch11
-rw-r--r--packages/libopie/libopie2_cvs.bb7
-rw-r--r--packages/libqpe/libqpe-opie.inc10
-rw-r--r--packages/libqpe/libqpe-opie/save-windows-pos-dynamic.patch113
-rw-r--r--packages/libqpe/libqpe-opie_1.2.2.bb3
-rw-r--r--packages/libqpe/libqpe-opie_cvs.bb5
9 files changed, 141 insertions, 16 deletions
diff --git a/classes/opie.bbclass b/classes/opie.bbclass
index c3b9d13226..92cde5487b 100644
--- a/classes/opie.bbclass
+++ b/classes/opie.bbclass
@@ -15,7 +15,7 @@
inherit palmtop
-OPIE_CVS_PV = "1.2.2+cvs${SRCDATE}"
+OPIE_CVS_PV ?= "1.2.2+cvs${SRCDATE}"
DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2')]}"
diff --git a/conf/machine/include/LAB-settings.conf b/conf/machine/include/LAB-settings.conf
index 576846fbdf..d0100c9968 100644
--- a/conf/machine/include/LAB-settings.conf
+++ b/conf/machine/include/LAB-settings.conf
@@ -5,4 +5,4 @@
#
# LAB can only resolve relative symlinks
-ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; "
+#ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; "
diff --git a/packages/irda-utils/irda-utils_0.9.16.bb b/packages/irda-utils/irda-utils_0.9.16.bb
index 95a15d7d23..ee5580b1de 100644
--- a/packages/irda-utils/irda-utils_0.9.16.bb
+++ b/packages/irda-utils/irda-utils_0.9.16.bb
@@ -3,7 +3,7 @@ IrDA allows communication over Infrared with other devices \
such as phones and laptops."
SECTION = "base"
LICENSE = "GPL"
-PR = "r6"
+PR = "r7"
SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
file://configure.patch;patch=1 \
@@ -28,5 +28,5 @@ do_install () {
oe_runmake -C irdaping ROOT="${D}" install
install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/irattach
+ install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
}
diff --git a/packages/libopie/libopie2/exports.patch b/packages/libopie/libopie2/exports.patch
new file mode 100644
index 0000000000..2ff06287be
--- /dev/null
+++ b/packages/libopie/libopie2/exports.patch
@@ -0,0 +1,11 @@
+--- libopie2/opiecore/ostorageinfo.h.org 2007-03-09 11:20:17.000000000 +0000
++++ libopie2/opiecore/ostorageinfo.h 2007-03-08 23:43:56.000000000 +0000
+@@ -35,7 +35,7 @@
+ namespace Opie {
+ namespace Core {
+
+-class OStorageInfo : public StorageInfo
++class Q_EXPORT OStorageInfo : public StorageInfo
+ {
+ Q_OBJECT
+
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index d6403d645a..1979f5e95e 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -1,13 +1,14 @@
require ${PN}.inc
PV = "1.2.2+cvs${SRCDATE}"
-PR = "r4"
+PR = "r6"
DEFAULT_PREFERENCE = "-1"
SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
- file://ipaq-2.6-sys-class-backlight-support.patch;patch=1 \
- file://ipaq-lcd-rotate-cleanup.patch;patch=1 \
+ file://exports.patch;patch=1 \
file://include.pro"
+# file://ipaq-lcd-rotate-cleanup.patch;patch=1 \
+
SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc
index 342c7d643b..77ba0f62ec 100644
--- a/packages/libqpe/libqpe-opie.inc
+++ b/packages/libqpe/libqpe-opie.inc
@@ -16,10 +16,10 @@ EXTRA_QMAKEVARS_PRE += "CONFIG+=LIBQPE_WITHROHFEEDBACK"
EXTRA_QMAKEVARS_POST += "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES"
CXXFLAGS_append = " -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC"
-CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_spitz = " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_akita = " -DOPIE_NO_WINDOWED "
+#CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED "
+#CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
+#CXXFLAGS_append_spitz = " -DOPIE_NO_WINDOWED "
+#CXXFLAGS_append_akita = " -DOPIE_NO_WINDOWED "
do_compile_prepend_mnci () {
ln -s custom-ramses.h custom.h
@@ -76,4 +76,4 @@ do_install() {
FILES_${PN} = "${palmtopdir}/lib/libqpe.so.*"
FILES_${PN}-dev = "${includedir} ${palmtopdir}/lib/*"
FILES_${PN}-dbg = "${palmtopdir}/lib/.debug/"
-PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+#PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
diff --git a/packages/libqpe/libqpe-opie/save-windows-pos-dynamic.patch b/packages/libqpe/libqpe-opie/save-windows-pos-dynamic.patch
new file mode 100644
index 0000000000..54dd5947de
--- /dev/null
+++ b/packages/libqpe/libqpe-opie/save-windows-pos-dynamic.patch
@@ -0,0 +1,113 @@
+? 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_1.2.2.bb b/packages/libqpe/libqpe-opie_1.2.2.bb
index 21ffea194e..009a075091 100644
--- a/packages/libqpe/libqpe-opie_1.2.2.bb
+++ b/packages/libqpe/libqpe-opie_1.2.2.bb
@@ -1,7 +1,8 @@
require ${PN}.inc
-PR = "r1"
+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_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index 3dafddcf0a..8545f9506e 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -1,8 +1,7 @@
require ${PN}.inc
-# Remove the dash below when 1.2.1 changes
-PV = "1.2.2+cvs-${SRCDATE}"
-PR = "r1"
+PV = "${OPIE_CVS_PV}"
+PR = "r6"
SRC_URI = "${HANDHELDS_CVS};module=opie/library \
file://fix-titleheight.patch;patch=1"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 07:42:05 +0000