summaryrefslogtreecommitdiff
path: root/editors/lyx-qt
diff options
context:
space:
mode:
authorreed <reed>2005-11-16 18:06:12 +0000
committerreed <reed>2005-11-16 18:06:12 +0000
commit4ea5015db5997b9bd6863a006f465307bf33b61c (patch)
tree49940379b460bad27237e6a1b52cdc5b7a60da2b /editors/lyx-qt
parent725319dc01ae3f8062ad6237319ed518a56bda00 (diff)
downloadpkgsrc-4ea5015db5997b9bd6863a006f465307bf33b61c.tar.gz
Add patch so on NetBSD, it will not core dump on exit.
According to trolltech's support, the QT code for Lyx was done wrong and so the locked() doesn't return with true and so the unlock() is never done causing NetBSD's Error detected by libpthread: Destroying locked mutex. I contacted lyx developers about this several times. This is for PR 26454.
Diffstat (limited to 'editors/lyx-qt')
-rw-r--r--editors/lyx-qt/Makefile3
-rw-r--r--editors/lyx-qt/distinfo3
-rw-r--r--editors/lyx-qt/patches/patch-ab17
3 files changed, 21 insertions, 2 deletions
diff --git a/editors/lyx-qt/Makefile b/editors/lyx-qt/Makefile
index 84a6e16cb20..56f0c3017e2 100644
--- a/editors/lyx-qt/Makefile
+++ b/editors/lyx-qt/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2005/07/19 17:49:33 drochner Exp $
+# $NetBSD: Makefile,v 1.20 2005/11/16 18:06:13 reed Exp $
#
.include "./Makefile.common"
PKGNAME= ${DISTNAME:S/lyx-/lyx-qt-/}
+PKGREVISION= 1
COMMENT+= (QT version)
diff --git a/editors/lyx-qt/distinfo b/editors/lyx-qt/distinfo
index 560b6cf212a..5f9801ce5b7 100644
--- a/editors/lyx-qt/distinfo
+++ b/editors/lyx-qt/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.9 2005/07/19 17:49:33 drochner Exp $
+$NetBSD: distinfo,v 1.10 2005/11/16 18:06:13 reed Exp $
SHA1 (lyx-1.3.6.tar.gz) = 9a0045bf007e4ebc4ca024536e03b3d95acb5ace
RMD160 (lyx-1.3.6.tar.gz) = c05c106fdf4159fbde70747eced9b3685121ac5f
Size (lyx-1.3.6.tar.gz) = 7782849 bytes
SHA1 (patch-aa) = 90a09a1adbb899cbaf063d4d7f46dc77f78a62da
+SHA1 (patch-ab) = e46def6f52b4c1c3c5197795454867c6bc2dbed6
SHA1 (patch-ah) = 278f5deaf94c1082b755af3cb9511bc2f68231ba
SHA1 (patch-ai) = ddd905f335293fa510745c5fe4f8011a5b3a1d9e
SHA1 (patch-aj) = bfbd7b6f0a512a5034009c221b4851309ca6fb56
diff --git a/editors/lyx-qt/patches/patch-ab b/editors/lyx-qt/patches/patch-ab
new file mode 100644
index 00000000000..b2fc54516e0
--- /dev/null
+++ b/editors/lyx-qt/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.5 2005/11/16 18:06:12 reed Exp $
+
+--- src/frontends/qt2/lyx_gui.C.orig 2005-10-12 16:16:12.000000000 -0700
++++ src/frontends/qt2/lyx_gui.C 2005-10-12 16:19:15.000000000 -0700
+@@ -123,7 +123,12 @@
+ LQApplication::~LQApplication()
+ {
+ #ifdef QT_THREAD_SUPPORT
++/* For some reason it doesn't indicate it is locked on NetBSD
++ resulting in a Error detected by libpthread: Destroying locked mutex.
++*/
++#if !defined(__NetBSD__)
+ if (locked())
++#endif
+ unlock();
+ #endif
+ }