Attachment 148815 Details for Bug 194602 – updated patch

[patch] updated patch

foxtrotgps-1.2-files.patch (text/plain), 4.80 KB, created by crwhipp on 2014-10-31 04:15:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: crwhipp

Created: 2014-10-31 04:15:07 UTC

Size: 4.80 KB

patch

obsolete

>diff -rupN foxtrotgps/Makefile foxtrotgps_devel/Makefile
>--- foxtrotgps/Makefile	2014-07-04 02:40:59.000000000 -0700
>+++ foxtrotgps_devel/Makefile	2014-10-30 21:08:08.029815034 -0700
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/astro/foxtrotgps/Makefile 360588 2014-07-04 09:40:59Z tijl $
> 
> PORTNAME=	foxtrotgps
>-PORTVERSION=	1.1.1
>-PORTREVISION=	7
>+PORTVERSION=	1.2.0
> CATEGORIES=	astro geography
> MASTER_SITES=	http://www.foxtrotgps.org/releases/
> 
>@@ -23,7 +22,9 @@ CONFIGURE_ARGS=	--disable-schemas-instal
> USES=		gettext gmake pkgconfig shebangfix
> SHEBANG_FILES=	contrib/convert2gpx \
> 		contrib/convert2osm \
>-		contrib/georss2foxtrotgps-poi
>+		contrib/georss2foxtrotgps-poi\
>+		contrib/gpx2osm
>+		
> 
> USE_GNOME=	gtk20 gconf2 libxml2 intltool libglade2
> USE_SQLITE=	3
>diff -rupN foxtrotgps/distinfo foxtrotgps_devel/distinfo
>--- foxtrotgps/distinfo	2014-01-22 08:30:13.000000000 -0700
>+++ foxtrotgps_devel/distinfo	2014-10-30 21:08:08.028814198 -0700
>@@ -1,2 +1,2 @@
>-SHA256 (foxtrotgps-1.1.1.tar.gz) = ae9706285510554cc0813ac92522e0d1672b0ddb065307bfacfcff3c328f6adb
>-SIZE (foxtrotgps-1.1.1.tar.gz) = 589091
>+SHA256 (foxtrotgps-1.2.0.tar.gz) = aa1ffbbf299b7b0f305a0bdbe395266e18305bb9449d621fb88bf8760b55505a
>+SIZE (foxtrotgps-1.2.0.tar.gz) = 2115329
>diff -rupN foxtrotgps/files/patch-src-main foxtrotgps_devel/files/patch-src-main
>--- foxtrotgps/files/patch-src-main	2014-01-22 10:40:44.000000000 -0700
>+++ foxtrotgps_devel/files/patch-src-main	1969-12-31 17:00:00.000000000 -0700
>@@ -1,21 +0,0 @@
>-=== 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;
>- }
>diff -rupN foxtrotgps/pkg-plist foxtrotgps_devel/pkg-plist
>--- foxtrotgps/pkg-plist	2014-03-04 08:34:12.000000000 -0700
>+++ foxtrotgps_devel/pkg-plist	2014-10-30 21:08:08.028814198 -0700
>@@ -2,8 +2,10 @@ bin/convert2gpx
> bin/convert2osm
> bin/foxtrotgps
> bin/georss2foxtrotgps-poi
>+bin/gpx2osm
> bin/osb2foxtrot
> bin/poi2osm
>+info/foxtrotgps.info
> share/locale/bg/LC_MESSAGES/foxtrotgps.mo
> share/locale/cs/LC_MESSAGES/foxtrotgps.mo
> share/locale/de/LC_MESSAGES/foxtrotgps.mo
>@@ -11,15 +13,28 @@ share/locale/es/LC_MESSAGES/foxtrotgps.m
> share/locale/fi/LC_MESSAGES/foxtrotgps.mo
> share/locale/fr/LC_MESSAGES/foxtrotgps.mo
> share/locale/hu/LC_MESSAGES/foxtrotgps.mo
>+share/locale/it/LC_MESSAGES/foxtrotgps.mo
>+share/locale/ja/LC_MESSAGES/foxtrotgps.mo
> share/locale/nl/LC_MESSAGES/foxtrotgps.mo
>+share/locale/pl/LC_MESSAGES/foxtrotgps.mo
>+share/locale/pt_BR/LC_MESSAGES/foxtrotgps.mo
> share/locale/ru/LC_MESSAGES/foxtrotgps.mo
> share/locale/sk/LC_MESSAGES/foxtrotgps.mo
>-share/locale/ja/LC_MESSAGES/foxtrotgps.mo
> share/locale/sr/LC_MESSAGES/foxtrotgps.mo
> man/man1/convert2gpx.1.gz
> man/man1/convert2osm.1.gz
> man/man1/foxtrotgps.1.gz
> share/applications/foxtrotgps.desktop
>+%%PORTDOCS%%%%DOCSDIR%%/cc-by-sa.png
>+%%PORTDOCS%%%%DOCSDIR%%/cc-by-sa_small.png
>+%%PORTDOCS%%%%DOCSDIR%%/foxtrotgps-logo.png
>+%%PORTDOCS%%%%DOCSDIR%%/foxtrotgps.html
>+%%PORTDOCS%%%%DOCSDIR%%/screenshots/found-route.png
>+%%PORTDOCS%%%%DOCSDIR%%/screenshots/get-route.png
>+%%PORTDOCS%%%%DOCSDIR%%/screenshots/main-window.png
>+%%PORTDOCS%%%%DOCSDIR%%/screenshots/map-download.png
>+%%PORTDOCS%%%%DOCSDIR%%/screenshots/route-planning.png
>+%%PORTDOCS%%%%DOCSDIR%%/screenshots/tracking.png
> %%DOCSDIR%%/AUTHORS
> %%DOCSDIR%%/COPYING
> %%DOCSDIR%%/ChangeLog
>@@ -27,8 +42,8 @@ share/applications/foxtrotgps.desktop
> %%DOCSDIR%%/INSTALL
> %%DOCSDIR%%/NEWS
> %%DOCSDIR%%/README
>-%%DOCSDIR%%/TODO
> %%DOCSDIR%%/README.osb2foxtrot
>+%%DOCSDIR%%/TODO
> %%DATADIR%%/foxtrotgps.glade
> share/pixmaps/foxtrotgps-friend.png
> share/pixmaps/foxtrotgps-myposition.png
>@@ -36,30 +51,3 @@ share/pixmaps/foxtrotgps-photo.png
> share/pixmaps/foxtrotgps-poi.png
> share/pixmaps/foxtrotgps-wp.png
> share/pixmaps/foxtrotgps.png
>-@dirrm %%DATADIR%%
>-@dirrm %%DOCSDIR%%
>-@dirrmtry share/locale/sk/LC_MESSAGES
>-@dirrmtry share/locale/sk
>-@dirrmtry share/locale/ru/LC_MESSAGES
>-@dirrmtry share/locale/ru
>-@dirrmtry share/locale/nl/LC_MESSAGES
>-@dirrmtry share/locale/nl
>-@dirrmtry share/locale/hu/LC_MESSAGES
>-@dirrmtry share/locale/hu
>-@dirrmtry share/locale/fr/LC_MESSAGES
>-@dirrmtry share/locale/fr
>-@dirrmtry share/locale/fi/LC_MESSAGES
>-@dirrmtry share/locale/fi
>-@dirrmtry share/locale/es/LC_MESSAGES
>-@dirrmtry share/locale/es
>-@dirrmtry share/locale/de/LC_MESSAGES
>-@dirrmtry share/locale/de
>-@dirrmtry share/locale/cs/LC_MESSAGES
>-@dirrmtry share/locale/cs
>-@dirrmtry share/locale/bg/LC_MESSAGES
>-@dirrmtry share/locale/bg
>-@dirrmtry share/locale/ja/LC_MESSAGES
>-@dirrmtry share/locale/ja
>-@dirrmtry share/locale/sr/LC_MESSAGES
>-@dirrmtry share/locale/sr
>-@dirrmtry share/locale

Actions: View | Diff

Attachments on bug 194602: 148652 | 148815 | 148898 | 148899 | 149001 | 149002