diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-20 13:40:10 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-20 13:40:10 +0000 |
| commit | cea488b625ba85b8c4c5541ac93d1433c4883405 (patch) | |
| tree | 08430846bfcd43cbd2dc7db2cfab245edf95fffe /packages/qte | |
| parent | df447e0eaacdd3d5ac09291aaa345be09e4a4faf (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/02/20 13:17:29+00:00 rpsys.net!RP
openzaurus-2.6: Add Dirk Opfer's latest work on tosa
2005/02/20 14:06:58+01: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/02/20 14:06:39+01:00 uni-frankfurt.de!mickeyl
remove opie-inline-pics packages, 'tis was a dumb idea
2005/02/20 02:07:49+01:00 vanille.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into allanon.vanille.de:/home/mickey/oe/packages
2005/02/20 02:07:09+01:00 vanille.de!mickeyl
opie-console: package keys
2005/02/19 18:44:13+01:00 vanille.de!mickeyl
latest libqpe from Opie cvs contains support for building it without inline images
we build it like that to support different "inline" image packages for different models
2005/02/19 18:05:37+01:00 vanille.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into allanon.vanille.de:/local/pkg/oe/packages
2005/02/19 18:05:12+01:00 vanille.de!mickeyl
install qte fonts through staging
BKrev: 4218933a_t5CahsnwckaZTFUzmfryg
Diffstat (limited to 'packages/qte')
| -rw-r--r-- | packages/qte/qte-2.3.10/handhelds.patch | 60 | ||||
| -rw-r--r-- | packages/qte/qte_2.3.10.bb | 1 |
2 files changed, 61 insertions, 0 deletions
diff --git a/packages/qte/qte-2.3.10/handhelds.patch b/packages/qte/qte-2.3.10/handhelds.patch index e69de29bb2..f67766a0c9 100644 --- a/packages/qte/qte-2.3.10/handhelds.patch +++ b/packages/qte/qte-2.3.10/handhelds.patch @@ -0,0 +1,60 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-2.3.10-snapshot-20050131/src/widgets/qcommonstyle.cpp~opie ++++ qt-2.3.10-snapshot-20050131/src/widgets/qcommonstyle.cpp +@@ -572,7 +572,7 @@ + bool enabled, bool active ) + { + #ifndef QT_NO_MENUBAR +-#ifndef QT_NO_STYLE_SGI ++#if 1 // #ifndef QT_NO_STYLE_SGI + if (draw_menu_bar_impl != 0) { + QDrawMenuBarItemImpl impl = draw_menu_bar_impl; + (this->*impl)(p, x, y, w, h, mi, g, enabled, active); +--- qt-2.3.10-snapshot-20050131/src/widgets/qlistview.cpp~opie ++++ qt-2.3.10-snapshot-20050131/src/widgets/qlistview.cpp +@@ -5051,9 +5051,9 @@ + l = l->childItem ? l->childItem : l->siblingItem; + + if ( l && l->height() ) +- s.setHeight( s.height() + 10 * l->height() ); +- else +- s.setHeight( s.height() + 140 ); ++ s.setHeight( s.height() + 4 /*10*/ * l->height() ); ++ else // ^v much too big for handhelds ++ s.setHeight( s.height() + 30 /*140*/ ); + + if ( s.width() > s.height() * 3 ) + s.setHeight( s.width() / 3 ); +--- qt-2.3.10-snapshot-20050131/src/kernel/qwindowsystem_qws.cpp~opie ++++ qt-2.3.10-snapshot-20050131/src/kernel/qwindowsystem_qws.cpp +@@ -918,6 +918,18 @@ + { + } + ++static void catchSegvSignal( int ) ++{ ++#ifndef QT_NO_QWS_KEYBOARD ++ if ( qwsServer ) ++ qwsServer->closeKeyboard(); ++#endif ++ QWSServer::closedown(); ++ fprintf(stderr, "Segmentation fault.\n"); ++ exit(1); ++} ++ ++ + /*! + \class QWSServer qwindowsystem_qws.h + \brief Server-specific functionality in Qt/Embedded +@@ -1043,6 +1055,7 @@ + } + + signal(SIGPIPE, ignoreSignal); //we get it when we read ++ signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash + #endif + focusw = 0; + mouseGrabber = 0; diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index aa309dbf2e..5bb7a5e81e 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -114,6 +114,7 @@ do_stage() { rm -f include/qxt.h install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include + cp -a lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/ } do_install() { |