Fix an abort() due to the way mutex were handled.

from upstream with help from kurt@
This commit is contained in:
ajacoutot 2013-05-01 06:57:50 +00:00
parent 72513516ca
commit 849d6e64d8
2 changed files with 22 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.141 2013/04/30 08:35:44 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.142 2013/05/01 06:57:50 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= powerful desktop search tool and indexer
GNOME_PROJECT= tracker
GNOME_VERSION= 0.16.0
REVISION= 6
REVISION= 7
# there is already audio/tracker, so this port has to live
# as meta-tracker.
@ -121,6 +121,10 @@ MODGNOME_LDFLAGS= -Wl,-rpath,${TRUEPREFIX}/lib/tracker-${MAJ_V}
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/meta-tracker/
# XXX rm when patch-src_libtracker-sparql-backend_tracker-backend_vala is removed
post-patch:
find ${WRKSRC} -name '*_vala.stamp' -exec rm {} \;
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/tracker-needle/tracker-utils.vala

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_libtracker-sparql-backend_tracker-backend_vala,v 1.1 2013/05/01 06:57:50 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=697316
XXX rm post-patch when this patch is removed
--- src/libtracker-sparql-backend/tracker-backend.vala.orig Thu Mar 14 18:25:30 2013
+++ src/libtracker-sparql-backend/tracker-backend.vala Wed May 1 08:48:30 2013
@@ -209,7 +209,7 @@ class Tracker.Sparql.Backend : Connection {
static weak Connection? singleton;
static bool log_initialized;
- static Mutex door = Mutex ();
+ static Mutex door;
static new Connection get (Cancellable? cancellable = null) throws Sparql.Error, IOError, DBusError, SpawnError {
door.lock ();