Correction to the sigsegv handler, & print a segmentation fault message. and increment default qt revision.

2 files changed, 5 insertions, 3 deletions

diff --git a/mkipks b/mkipks
index 3fbf160..85eeb5d 100755
--- a/mkipks
+++ b/mkipks
@@ -13,17 +13,17 @@ 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)
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~sigsegv2003-03-18 18:29:00.000000000 -0600
         +++ ./src/kernel/qwindowsystem_qws.cpp2003-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;