On Fri, October 12, 2012 11:47, David Coppa wrote:
> On Thu, 11 Oct 2012, David Coppa wrote:
>
>> I'm sorry. I completely misunderstood the problem here...
>>
>> The following diff should work:

Thanks David, it works like a charm now.

>
> ...With a bit of cleanup too:
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/geo/tangogps/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile  23 Apr 2012 17:15:18 -0000      1.15
> +++ Makefile  12 Oct 2012 07:46:44 -0000
> @@ -3,13 +3,13 @@
>  COMMENT =            lightweight mapping application for use with or without 
> GPS
>
>  DISTNAME =           tangogps-0.99.4
> -REVISION =           7
> +REVISION =           8
>
>  CATEGORIES =         geo
>
> -HOMEPAGE =           http://www.tangogps.org/
> +HOMEPAGE =           http://wiki.openstreetmap.org/wiki/TangoGPS
>
> -MASTER_SITES =               ${HOMEPAGE}/downloads/
> +MASTER_SITES =               http://sources.angstrom-distribution.org/
>
>  MAINTAINER =         Kirill Bychkov <ya...@linklevel.net>
>
> @@ -19,17 +19,20 @@ PERMIT_PACKAGE_FTP =      Yes
>  PERMIT_DISTFILES_CDROM =Yes
>  PERMIT_DISTFILES_FTP =       Yes
>
> -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
> -
> -MODULES =            devel/gettext
> -LIB_DEPENDS =                devel/atk \
> -                     net/curl \
> +WANTLIB =            GL X11 Xcomposite Xcursor Xdamage Xext \
> +                     Xfixes Xi Xinerama Xrandr Xrender atk-1.0 \
> +                     c cairo crypto curl dbus-1 dbus-glib-1 exif \
> +                     expat ffi fontconfig freetype gconf-2 \
> +                     gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
> +                     gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 \
> +                     harfbuzz icudata icule icuuc idn m pango-1.0 \
> +                     pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \
> +                     png pthread pthread-stubs soup-2.4 sqlite3 \
> +                     ssl xcb xcb-render xcb-shm xml2 z
> +

I prefer an output from make port-lib-depends-check.

> +MODULES =            devel/gettext
> +
> +LIB_DEPENDS =                net/curl \
>                       graphics/libexif \
>                       devel/gconf2 \
>                       devel/libsoup \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/geo/tangogps/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo  1 Sep 2010 07:12:17 -0000       1.2
> +++ distinfo  12 Oct 2012 07:46:44 -0000
> @@ -1,5 +1,2 @@
> -MD5 (tangogps-0.99.4.tar.gz) = Dwft6Uoh64T14Bf6iKH8PQ==
> -RMD160 (tangogps-0.99.4.tar.gz) = orTMqq94MV08Zd2YA2e1K6rMY28=
> -SHA1 (tangogps-0.99.4.tar.gz) = e3w4FH9AC99F5rBzZf8e5r2y0DM=
>  SHA256 (tangogps-0.99.4.tar.gz) =
> Zg/fie88N58vwMKp0MnTv6U0WDV4a3K/n1E7qewsgSo=
>  SIZE (tangogps-0.99.4.tar.gz) = 518475
> Index: patches/patch-src_main_c
> ===================================================================
> RCS file: patches/patch-src_main_c
> diff -N patches/patch-src_main_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_main_c  12 Oct 2012 07:46:44 -0000
> @@ -0,0 +1,18 @@
> +$OpenBSD$
> +
> +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();
> +
> +
> +
>


Reply via email to