Attachment #148815 for bug #194602




# $FreeBSD: head/astro/foxtrotgps/Makefile 360588 2014-07-04 09:40:59Z tijl $

PORTNAME=	foxtrotgps
PORTVERSION=	1.2.0
PORTREVISION=	7
CATEGORIES=	astro geography
MASTER_SITES=	http://www.foxtrotgps.org/releases/


USES=		gettext gmake pkgconfig shebangfix
SHEBANG_FILES=	contrib/convert2gpx \
		contrib/convert2osm \
		contrib/georss2foxtrotgps-poi\
		contrib/gpx2osm
		

USE_GNOME=	gtk20 gconf2 libxml2 intltool libglade2
USE_SQLITE=	3

Lines 1-2 Link Here

(-)foxtrotgps_devel/distinfo (-2 / +2 lines)
1	SHA256 (foxtrotgps-1.1.1.tar.gz) = ae9706285510554cc0813ac92522e0d1672b0ddb065307bfacfcff3c328f6adb	1	SHA256 (foxtrotgps-1.2.0.tar.gz) = aa1ffbbf299b7b0f305a0bdbe395266e18305bb9449d621fb88bf8760b55505a
2	SIZE (foxtrotgps-1.1.1.tar.gz) = 589091	2	SIZE (foxtrotgps-1.2.0.tar.gz) = 2115329




=== modified file 'src/main.c'
--- src/main.c	2013-01-06 01:48:33 +0000
+++ src/main.c	2013-06-12 04:48:57 +0000
@@ -77,7 +77,7 @@
 	if (!g_thread_supported ())
 		g_thread_init (NULL);
 	gdk_threads_init ();
-
+	gdk_threads_enter ();
 	gtk_init (&argc, &argv);
 
 	setlocale (LC_NUMERIC, "C");
@@ -203,7 +203,7 @@
 	
 	gtk_main ();
 
-
+	gdk_threads_leave ();
 	
 	return 0;
 }

Lines 2-9 bin/convert2gpx Link Here

(-)foxtrotgps_devel/pkg-plist (-29 / +17 lines)
2	bin/convert2osm	2	bin/convert2osm
3	bin/foxtrotgps	3	bin/foxtrotgps
4	bin/georss2foxtrotgps-poi	4	bin/georss2foxtrotgps-poi
		5	bin/gpx2osm
5	bin/osb2foxtrot	6	bin/osb2foxtrot
6	bin/poi2osm	7	bin/poi2osm
		8	info/foxtrotgps.info
7	share/locale/bg/LC_MESSAGES/foxtrotgps.mo	9	share/locale/bg/LC_MESSAGES/foxtrotgps.mo
8	share/locale/cs/LC_MESSAGES/foxtrotgps.mo	10	share/locale/cs/LC_MESSAGES/foxtrotgps.mo
9	share/locale/de/LC_MESSAGES/foxtrotgps.mo	11	share/locale/de/LC_MESSAGES/foxtrotgps.mo
Lines 11-25 share/locale/es/LC_MESSAGES/foxtrotgps.m Link Here
11	share/locale/fi/LC_MESSAGES/foxtrotgps.mo	13	share/locale/fi/LC_MESSAGES/foxtrotgps.mo
12	share/locale/fr/LC_MESSAGES/foxtrotgps.mo	14	share/locale/fr/LC_MESSAGES/foxtrotgps.mo
13	share/locale/hu/LC_MESSAGES/foxtrotgps.mo	15	share/locale/hu/LC_MESSAGES/foxtrotgps.mo
		16	share/locale/it/LC_MESSAGES/foxtrotgps.mo
		17	share/locale/ja/LC_MESSAGES/foxtrotgps.mo
14	share/locale/nl/LC_MESSAGES/foxtrotgps.mo	18	share/locale/nl/LC_MESSAGES/foxtrotgps.mo
		19	share/locale/pl/LC_MESSAGES/foxtrotgps.mo
		20	share/locale/pt_BR/LC_MESSAGES/foxtrotgps.mo
15	share/locale/ru/LC_MESSAGES/foxtrotgps.mo	21	share/locale/ru/LC_MESSAGES/foxtrotgps.mo
16	share/locale/sk/LC_MESSAGES/foxtrotgps.mo	22	share/locale/sk/LC_MESSAGES/foxtrotgps.mo
17	share/locale/ja/LC_MESSAGES/foxtrotgps.mo
18	share/locale/sr/LC_MESSAGES/foxtrotgps.mo	23	share/locale/sr/LC_MESSAGES/foxtrotgps.mo
19	man/man1/convert2gpx.1.gz	24	man/man1/convert2gpx.1.gz
20	man/man1/convert2osm.1.gz	25	man/man1/convert2osm.1.gz
21	man/man1/foxtrotgps.1.gz	26	man/man1/foxtrotgps.1.gz
22	share/applications/foxtrotgps.desktop	27	share/applications/foxtrotgps.desktop
		28	%%PORTDOCS%%%%DOCSDIR%%/cc-by-sa.png
		29	%%PORTDOCS%%%%DOCSDIR%%/cc-by-sa_small.png
		30	%%PORTDOCS%%%%DOCSDIR%%/foxtrotgps-logo.png
		31	%%PORTDOCS%%%%DOCSDIR%%/foxtrotgps.html
		32	%%PORTDOCS%%%%DOCSDIR%%/screenshots/found-route.png
		33	%%PORTDOCS%%%%DOCSDIR%%/screenshots/get-route.png
		34	%%PORTDOCS%%%%DOCSDIR%%/screenshots/main-window.png
		35	%%PORTDOCS%%%%DOCSDIR%%/screenshots/map-download.png
		36	%%PORTDOCS%%%%DOCSDIR%%/screenshots/route-planning.png
		37	%%PORTDOCS%%%%DOCSDIR%%/screenshots/tracking.png
23	%%DOCSDIR%%/AUTHORS	38	%%DOCSDIR%%/AUTHORS
24	%%DOCSDIR%%/COPYING	39	%%DOCSDIR%%/COPYING
25	%%DOCSDIR%%/ChangeLog	40	%%DOCSDIR%%/ChangeLog
Lines 27-34 share/applications/foxtrotgps.desktop Link Here
27	%%DOCSDIR%%/INSTALL	42	%%DOCSDIR%%/INSTALL
28	%%DOCSDIR%%/NEWS	43	%%DOCSDIR%%/NEWS
29	%%DOCSDIR%%/README	44	%%DOCSDIR%%/README
30	%%DOCSDIR%%/TODO
31	%%DOCSDIR%%/README.osb2foxtrot	45	%%DOCSDIR%%/README.osb2foxtrot
		46	%%DOCSDIR%%/TODO
32	%%DATADIR%%/foxtrotgps.glade	47	%%DATADIR%%/foxtrotgps.glade
33	share/pixmaps/foxtrotgps-friend.png	48	share/pixmaps/foxtrotgps-friend.png
34	share/pixmaps/foxtrotgps-myposition.png	49	share/pixmaps/foxtrotgps-myposition.png
Lines 36-65 share/pixmaps/foxtrotgps-photo.png Link Here
36	share/pixmaps/foxtrotgps-poi.png	51	share/pixmaps/foxtrotgps-poi.png
37	share/pixmaps/foxtrotgps-wp.png	52	share/pixmaps/foxtrotgps-wp.png
38	share/pixmaps/foxtrotgps.png	53	share/pixmaps/foxtrotgps.png
39	@dirrm %%DATADIR%%
40	@dirrm %%DOCSDIR%%
41	@dirrmtry share/locale/sk/LC_MESSAGES
42	@dirrmtry share/locale/sk
43	@dirrmtry share/locale/ru/LC_MESSAGES
44	@dirrmtry share/locale/ru
45	@dirrmtry share/locale/nl/LC_MESSAGES
46	@dirrmtry share/locale/nl
47	@dirrmtry share/locale/hu/LC_MESSAGES
48	@dirrmtry share/locale/hu
49	@dirrmtry share/locale/fr/LC_MESSAGES
50	@dirrmtry share/locale/fr
51	@dirrmtry share/locale/fi/LC_MESSAGES
52	@dirrmtry share/locale/fi
53	@dirrmtry share/locale/es/LC_MESSAGES
54	@dirrmtry share/locale/es
55	@dirrmtry share/locale/de/LC_MESSAGES
56	@dirrmtry share/locale/de
57	@dirrmtry share/locale/cs/LC_MESSAGES
58	@dirrmtry share/locale/cs
59	@dirrmtry share/locale/bg/LC_MESSAGES
60	@dirrmtry share/locale/bg
61	@dirrmtry share/locale/ja/LC_MESSAGES
62	@dirrmtry share/locale/ja
63	@dirrmtry share/locale/sr/LC_MESSAGES
64	@dirrmtry share/locale/sr
65	@dirrmtry share/locale

Return to bug 194602

Lines 2-9 Link Here

(-)foxtrotgps_devel/Makefile (-3 / +4 lines)
2	# $FreeBSD: head/astro/foxtrotgps/Makefile 360588 2014-07-04 09:40:59Z tijl $	2	# $FreeBSD: head/astro/foxtrotgps/Makefile 360588 2014-07-04 09:40:59Z tijl $
3		3
4	PORTNAME= foxtrotgps	4	PORTNAME= foxtrotgps
5	PORTVERSION= 1.1.1	5	PORTVERSION= 1.2.0
6	PORTREVISION= 7
7	CATEGORIES= astro geography	6	CATEGORIES= astro geography
8	MASTER_SITES= http://www.foxtrotgps.org/releases/	7	MASTER_SITES= http://www.foxtrotgps.org/releases/
9		8
Lines 23-29 CONFIGURE_ARGS= --disable-schemas-instal Link Here
23	USES= gettext gmake pkgconfig shebangfix	22	USES= gettext gmake pkgconfig shebangfix
24	SHEBANG_FILES= contrib/convert2gpx \	23	SHEBANG_FILES= contrib/convert2gpx \
25	contrib/convert2osm \	24	contrib/convert2osm \
26	contrib/georss2foxtrotgps-poi	25	contrib/georss2foxtrotgps-poi\
		26	contrib/gpx2osm
		27
27		28
28	USE_GNOME= gtk20 gconf2 libxml2 intltool libglade2	29	USE_GNOME= gtk20 gconf2 libxml2 intltool libglade2
29	USE_SQLITE= 3	30	USE_SQLITE= 3

Lines 1-21 Link Here

(-)foxtrotgps_devel/files/patch-src-main (-21 lines)
1	=== modified file 'src/main.c'
2	--- src/main.c 2013-01-06 01:48:33 +0000
3	+++ src/main.c 2013-06-12 04:48:57 +0000
4	@@ -77,7 +77,7 @@
5	if (!g_thread_supported ())
6	g_thread_init (NULL);
7	gdk_threads_init ();
8	-
9	+ gdk_threads_enter ();
10	gtk_init (&argc, &argv);
11
12	setlocale (LC_NUMERIC, "C");
13	@@ -203,7 +203,7 @@
14
15	gtk_main ();
16
17	-
18	+ gdk_threads_leave ();
19
20	return 0;
21	}