| -rwxr-xr-x | mkipks | 2 | ||||
| -rw-r--r-- | qt/qte234-for-opie091-sigsegv.patch | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -1,45 +1,45 @@ #!/bin/sh if [ -z "$QTE_BASEVERSION" ] then if [ -e $QTDIR/include/qglobal.h ] then QTE_BASEVERSION=`cat $QTDIR/include/qglobal.h|grep '^#define QT_VERSION'|grep -v STR|sed -e 's,#define QT_VERSION\t*,,;' -e 's,.*\([0-9]\)\([0-9]\)\([0-9]\).*,\1.\2.\3,;'` else QTE_BASEVERSION=2.3.4 fi fi if [ -z "$QTE_VERSION" ] then if [ -e $QTDIR/include/qglobal.h ] then QTE_VERSION=`cat $QTDIR/include/qglobal.h|grep '^#define QT_VERSION_STR'|sed -e 's,#define QT_VERSION_STR\t*,,;' -e 's,.*"\([^"]*\)".*,\1,;'` else QTE_VERSION=2.3.4 fi fi -[ -z "$QTE_REVISION" ] && QTE_REVISION=3 +[ -z "$QTE_REVISION" ] && QTE_REVISION=4 DEB_VERSION=2.0 # Have to do this here, since CVS can't store symlinks mkdir -p $OPIEDIR/etc/rcS.d ln -sf ../init.d/bootsplash $OPIEDIR/etc/rcS.d/S01bootsplash VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h) SUB_VERSION=$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$OPIEDIR/include/qpe/version.h) if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h then [ -z "$VERSION_CVS" ] && VERSION_CVS="$(date +%Y%m%d)" SUB_VERSION=$VERSION_CVS else VERSION_CVS="" fi QPE_VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT ARCH=arm STRIP=arm-linux-strip STRIP_FILES="*ARM*not stripped" diff --git a/qt/qte234-for-opie091-sigsegv.patch b/qt/qte234-for-opie091-sigsegv.patch index 9111b42..085de91 100644 --- a/qt/qte234-for-opie091-sigsegv.patch +++ b/qt/qte234-for-opie091-sigsegv.patch @@ -1,27 +1,29 @@ --- ./src/kernel/qwindowsystem_qws.cpp~sigsegv 2003-03-18 18:29:00.000000000 -0600 +++ ./src/kernel/qwindowsystem_qws.cpp 2003-03-18 19:09:08.000000000 -0600 -@@ -843,6 +843,16 @@ +@@ -843,6 +843,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 -@@ -912,6 +922,7 @@ +@@ -912,6 +924,7 @@ } signal(SIGPIPE, ignoreSignal); //we get it when we read + signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash #endif focusw = 0; mouseGrabber = 0; |