summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-03-25 19:43:58 (UTC)
committer kergoth <kergoth>2003-03-25 19:43:58 (UTC)
commit75131f3afecb643b945ed349465f697efdf293ad (patch) (side-by-side diff)
treefb0428474c4de0ac1477d758fae2b9816ded3a24
parentd3b3e04ed7e4ee191a666202ca90769875a70a5d (diff)
downloadopie-75131f3afecb643b945ed349465f697efdf293ad.zip
opie-75131f3afecb643b945ed349465f697efdf293ad.tar.gz
opie-75131f3afecb643b945ed349465f697efdf293ad.tar.bz2
Correction to the sigsegv handler, & print a segmentation fault message. and increment default qt revision.
Diffstat (more/less context) (show whitespace changes)
-rwxr-xr-xmkipks2
-rw-r--r--qt/qte234-for-opie091-sigsegv.patch6
2 files changed, 5 insertions, 3 deletions
diff --git a/mkipks b/mkipks
index 3fbf160..85eeb5d 100755
--- a/mkipks
+++ b/mkipks
@@ -17,9 +17,9 @@ then
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
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,7 +1,7 @@
--- ./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 )
@@ -10,15 +10,17 @@
+ 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