- Properly call gdk_threads_enter() and gdk_threads_leave() to prevent

abort() on startup due to gtk trying to unlock a uninitialized mutex
 - regen WANTLIB
 - sort LIB_DEPENDS
Fix from dcoppa@, thanks!
This commit is contained in:
kirby 2012-10-12 09:09:46 +00:00
parent 21469b28e1
commit 22f4c3cc5c
2 changed files with 27 additions and 7 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.15 2012/04/23 17:15:18 espie Exp $
# $OpenBSD: Makefile,v 1.16 2012/10/12 09:09:46 kirby Exp $
COMMENT = lightweight mapping application for use with or without GPS
DISTNAME = tangogps-0.99.4
REVISION = 7
REVISION = 8
CATEGORIES = geo
@ -23,16 +23,18 @@ WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 c cairo crypto curl dbus-1 dbus-glib-1
WANTLIB += exif expat ffi fontconfig freetype gconf-2 gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gthread-2.0 gtk-x11-2.0 idn m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB += soup-2.4 sqlite3 ssl xcb xcb-render xcb-shm xml2 z
WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz icudata icule icuuc
WANTLIB += idn m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += png pthread pthread-stubs soup-2.4 sqlite3 ssl xcb
WANTLIB += xcb-render xcb-shm xml2 z
MODULES = devel/gettext
LIB_DEPENDS = devel/atk \
net/curl \
graphics/libexif \
devel/gconf2 \
devel/libsoup \
graphics/libexif \
net/curl \
x11/gtk+2
RUN_DEPENDS = devel/desktop-file-utils

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_main_c,v 1.1 2012/10/12 09:09:46 kirby Exp $
Properly call gdk_threads_enter() and gdk_threads_leave() to prevent
abort() on startup due to gtk trying to unlock a uninitialized
mutex
--- src/main.c.orig Thu Oct 11 19:40:20 2012
+++ src/main.c Thu Oct 11 19:40:41 2012
@@ -124,7 +124,9 @@ main (int argc, char *argv[])
init();
+ gdk_threads_enter();
gtk_main ();
+ gdk_threads_leave();