Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/31 15:19:19+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/03/31 15:18:58+02:00 uni-frankfurt.de!mickeyl
Opie: fix the titleheight for most qpedecoration derived decorations

2005/03/31 15:05:39+02:00 local!hrw
kdepimpi: It looks like I have a conflict with author so I drop maintaining

2005/03/31 15:03:13+02:00 local!hrw
updated kdepimpi (development) to 2.0.22

BKrev: 424bfe063yugz_2wlqHEhwgbv0jppA

4 files changed, 4 insertions, 58 deletions

diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc
index 127f97dc31..fa7378eb00 100644
--- a/packages/libqpe/libqpe-opie.inc
+++ b/packages/libqpe/libqpe-opie.inc
@@ -58,3 +58,4 @@ do_install() {
 
 PACKAGES = "libqpe1"
 FILES_libqpe1 = "${palmtopdir}/lib"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/libqpe/libqpe-opie/fix-titleheight.patch b/packages/libqpe/libqpe-opie/fix-titleheight.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libqpe/libqpe-opie/fix-titleheight.patch
diff --git a/packages/libqpe/libqpe-opie/nomax.patch b/packages/libqpe/libqpe-opie/nomax.patch
deleted file mode 100644
index bf03cc2a33..0000000000
--- a/packages/libqpe/libqpe-opie/nomax.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-
-#
-# 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.2.0.bb b/packages/libqpe/libqpe-opie_1.2.0.bb
index 2affdef28c..a20071b8fc 100644
--- a/packages/libqpe/libqpe-opie_1.2.0.bb
+++ b/packages/libqpe/libqpe-opie_1.2.0.bb
@@ -1,8 +1,9 @@
 include ${PN}.inc
     
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
-	file://fix-nomax.patch;patch=1"
+	file://fix-nomax.patch;patch=1 \
+	file://fix-titleheight.patch;patch=1"