[arch-commits] Commit in (9 files)
Balló György
bgyorgy at archlinux.org
Tue Jun 27 00:01:12 UTC 2017
Date: Tuesday, June 27, 2017 @ 00:01:11
Author: bgyorgy
Revision: 241058
Add foxtrotgps 12 votes
And its optional gpscorrelate dependency.
Added:
foxtrotgps/
foxtrotgps/trunk/
foxtrotgps/trunk/PKGBUILD
foxtrotgps/trunk/fixes.patch
foxtrotgps/trunk/maps-for-free.patch
gpscorrelate/
gpscorrelate/trunk/
gpscorrelate/trunk/PKGBUILD
gpscorrelate/trunk/gtk3-port.patch
--------------------------------------+
foxtrotgps/trunk/PKGBUILD | 44 +++++++
foxtrotgps/trunk/fixes.patch | 50 ++++++++
foxtrotgps/trunk/maps-for-free.patch | 13 ++
gpscorrelate/trunk/PKGBUILD | 36 +++++
gpscorrelate/trunk/gtk3-port.patch | 202 +++++++++++++++++++++++++++++++++
5 files changed, 345 insertions(+)
Added: foxtrotgps/trunk/PKGBUILD
===================================================================
--- foxtrotgps/trunk/PKGBUILD (rev 0)
+++ foxtrotgps/trunk/PKGBUILD 2017-06-27 00:01:11 UTC (rev 241058)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Elena ``of Valhalla'' Grandi <elena.valhalla at gmail.com>
+
+pkgname=foxtrotgps
+pkgver=1.2.0
+pkgrel=2
+pkgdesc="Lightweight and fast mapping application"
+arch=('x86_64' 'i686')
+url="https://www.foxtrotgps.org/"
+license=('GPL')
+depends=('curl' 'gconf' 'gpsd' 'libexif' 'libglade')
+makedepends=('intltool')
+optdepends=('gpscorrelate: geotag photos'
+ 'jhead: add photos to database'
+ 'python2-beautifulsoup4: georss2foxtrotgps-poi tool'
+ 'python2-feedparser: georss2foxtrotgps-poi tool'
+ 'python2-sqlalchemy: poi2osm tool')
+source=(https://www.foxtrotgps.org/releases/$pkgname-$pkgver.tar.gz
+ fixes.patch
+ maps-for-free.patch)
+sha256sums=('aa1ffbbf299b7b0f305a0bdbe395266e18305bb9449d621fb88bf8760b55505a'
+ 'd9f52319d89fb51fd8a493477a97fe7bec554555bc38f83904ef29b1e6314b3f'
+ '19290db3cd2d6826b0cad7bfa45f309e13d6ba413d9da2573edae6d8e02919e8')
+
+prepare() {
+ cd $pkgname-$pkgver
+ sed -i 's@^#!.*python$@#!/usr/bin/python2@' contrib/*
+ patch -Np1 -i ../fixes.patch
+ patch -Np0 -i ../maps-for-free.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --disable-schemas-install \
+ --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Property changes on: foxtrotgps/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: foxtrotgps/trunk/fixes.patch
===================================================================
--- foxtrotgps/trunk/fixes.patch (rev 0)
+++ foxtrotgps/trunk/fixes.patch 2017-06-27 00:01:11 UTC (rev 241058)
@@ -0,0 +1,50 @@
+diff -Naur foxtrotgps-1.2.0.orig/contrib/georss2foxtrotgps-poi foxtrotgps-1.2.0/contrib/georss2foxtrotgps-poi
+--- foxtrotgps-1.2.0.orig/contrib/georss2foxtrotgps-poi 2014-10-24 06:57:10.000000000 +0200
++++ foxtrotgps-1.2.0/contrib/georss2foxtrotgps-poi 2017-06-25 16:26:22.472440359 +0200
+@@ -30,7 +30,7 @@
+ import random
+ import sqlite3
+ import feedparser
+-from BeautifulSoup import BeautifulSoup, BeautifulStoneSoup
++from bs4 import BeautifulSoup
+
+ def link2txt(a):
+ a_text = ''.join(a).strip()
+@@ -76,11 +76,11 @@
+ rand2 = random.randint(100000000,1000000000)
+ rand = '%s%s' % (rand1,rand2)
+ desc = e.description
+- soup = BeautifulSoup(desc,convertEntities=BeautifulStoneSoup.HTML_ENTITIES,smartQuotesTo=None)
+- [img.extract() for img in soup.findAll('img')]
+- [br.replaceWith('\n') for br in soup.findAll('br')]
+- [a.replaceWith(link2txt(a)) for a in soup.findAll('a')]
+- desc = ''.join(soup.findAll(text=True)).strip()
++ soup = BeautifulSoup(desc)
++ [img.extract() for img in soup.find_all('img')]
++ [br.replaceWith('\n') for br in soup.find_all('br')]
++ [a.replaceWith(link2txt(a)) for a in soup.find_all('a')]
++ desc = ''.join(soup.find_all(text=True)).strip()
+ poi.append((rand,lat,lon,e.title,desc))
+
+ cur.executemany('INSERT INTO poi (idmd5,lat,lon,keywords,desc,visibility,cat,subcat,price_range,extended_open) VALUES (?,?,?,?,?,1.0,0.0,0.0,1.0,0.0)', poi)
+diff -Naur foxtrotgps-1.2.0.orig/contrib/osb2foxtrot foxtrotgps-1.2.0/contrib/osb2foxtrot
+--- foxtrotgps-1.2.0.orig/contrib/osb2foxtrot 2014-10-24 06:57:10.000000000 +0200
++++ foxtrotgps-1.2.0/contrib/osb2foxtrot 2017-06-25 16:28:16.822909562 +0200
+@@ -2,7 +2,7 @@
+
+ from xml.etree.ElementTree import parse
+ import sys, re, hashlib
+-from pysqlite2 import dbapi2 as sqlite
++import sqlite3
+
+ if len(sys.argv) <3:
+ print "usage:"
+@@ -18,7 +18,7 @@
+ gpx = open(sys.argv[1])
+ xml = parse(gpx).getroot()
+
+-con = sqlite.connect(sys.argv[2])
++con = sqlite3.connect(sys.argv[2])
+ cur = con.cursor()
+
+ for wpt in xml:
Added: foxtrotgps/trunk/maps-for-free.patch
===================================================================
--- foxtrotgps/trunk/maps-for-free.patch (rev 0)
+++ foxtrotgps/trunk/maps-for-free.patch 2017-06-27 00:01:11 UTC (rev 241058)
@@ -0,0 +1,13 @@
+=== modified file 'src/tile_management.c'
+--- src/tile_management.c 2014-11-08 17:55:34 +0000
++++ src/tile_management.c 2017-04-11 09:20:47 +0000
+@@ -181,7 +181,7 @@
+ if(strcmp(repo->uri,"maps-for-free")==0)
+ {
+ g_snprintf(tile_data_tmp, sizeof tile_data_tmp,
+- "http://maps-for-free.com/layer/relief/z%d/row%d/%d_%d-%d.jpg"
++ "https://maps-for-free.com/layer/relief/z%d/row%d/%d_%d-%d.jpg"
+ "|%s/%d/%d/%d.png|%s/%d/%d/",
+ zoom,y,zoom,x,y,
+ repo->dir, zoom, x, y,
+
Added: gpscorrelate/trunk/PKGBUILD
===================================================================
--- gpscorrelate/trunk/PKGBUILD (rev 0)
+++ gpscorrelate/trunk/PKGBUILD 2017-06-27 00:01:11 UTC (rev 241058)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Hinrich Harms <arch at hinrich.de>
+# Contributor: sylvain alborini <sylvain.alborini at gmail.com>
+
+pkgname=gpscorrelate
+pkgver=1.6.2
+_gitrev=365f6e1b3fbf7015f80f0a19334f701d0482e095
+pkgrel=1
+pkgdesc="Correlate (geotagging) digital camera photos with GPS data in GPX format"
+arch=('x86_64' 'i686')
+url="https://github.com/freefoote/gpscorrelate"
+license=('GPL2')
+depends=('exiv2' 'gtk3')
+makedepends=('libxslt')
+source=($pkgname-$_gitrev.tar.gz::https://github.com/freefoote/$pkgname/archive/$_gitrev.tar.gz
+ gtk3-port.patch)
+sha256sums=('449023f21f5dd0a2149592754d7f94635697653b6dcfcd4432986e85c1155a4f'
+ '19a707fae49d83e30cd71b3eead9345ca316fde8a1c3c960b90a05228a2765f8')
+
+prepare() {
+ cd $pkgname-$_gitrev
+ patch -Np1 -i ../gtk3-port.patch
+}
+
+build() {
+ cd $pkgname-$_gitrev
+ make prefix=/usr
+}
+
+package() {
+ cd $pkgname-$_gitrev
+ make prefix=/usr DESTDIR="$pkgdir" install
+ install -Dm644 gpscorrelate.desktop "$pkgdir/usr/share/applications/gpscorrelate.desktop"
+ install -Dm644 gpscorrelate-gui.svg "$pkgdir/usr/share/pixmaps/gpscorrelate-gui.svg"
+}
Property changes on: gpscorrelate/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: gpscorrelate/trunk/gtk3-port.patch
===================================================================
--- gpscorrelate/trunk/gtk3-port.patch (rev 0)
+++ gpscorrelate/trunk/gtk3-port.patch 2017-06-27 00:01:11 UTC (rev 241058)
@@ -0,0 +1,202 @@
+diff --git a/Makefile b/Makefile
+index ef2cf74..9313f0d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -11,10 +11,10 @@ GOBJS = main-gui.o gui.o unixtime.o gpx-read.o correlate.o exif-gps.o
+ CFLAGS = -Wall -O2
+ CFLAGSINC := $(shell pkg-config --cflags libxml-2.0 exiv2)
+ # Add the gtk+ flags only when building the GUI
+-gpscorrelate-gui: CFLAGSINC += $(shell pkg-config --cflags gtk+-2.0)
++gpscorrelate-gui: CFLAGSINC += $(shell pkg-config --cflags gtk+-3.0)
+ LDFLAGS = -Wall -O2
+ LDFLAGSALL := $(shell pkg-config --libs libxml-2.0 exiv2) -lm
+-LDFLAGSGUI := $(shell pkg-config --libs gtk+-2.0)
++LDFLAGSGUI := $(shell pkg-config --libs gtk+-3.0)
+
+ # Put --nonet here to avoid downloading DTDs while building documentation
+ XSLTFLAGS =
+diff --git a/gui.c b/gui.c
+index 652993d..4b46d80 100644
+--- a/gui.c
++++ b/gui.c
+@@ -99,7 +99,6 @@ GtkWidget *StripGPSButton;
+ GtkWidget *PhotoListVBox;
+ GtkWidget *PhotoListScroll;
+ GtkWidget *PhotoList;
+-GtkTooltips *tooltips;
+
+ /* Enum and other stuff for the Photo list box. */
+ enum
+@@ -236,9 +235,6 @@ GtkWidget* CreateMatchWindow (void)
+ /* Load the settings. */
+ LoadSettings();
+
+- /* Get our tooltips ready. */
+- tooltips = gtk_tooltips_new ();
+-
+ /* Start with the window itself. */
+ MatchWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ char title[40];
+@@ -275,14 +271,14 @@ GtkWidget* CreateMatchWindow (void)
+ PhotoAddButton = gtk_button_new_with_mnemonic (_("Add..."));
+ gtk_widget_show (PhotoAddButton);
+ gtk_box_pack_start (GTK_BOX (AddPhotosVBox), PhotoAddButton, FALSE, FALSE, 0);
+- gtk_tooltips_set_tip (tooltips, PhotoAddButton, _("Add photos to be correlated."), NULL);
++ gtk_widget_set_tooltip_text (PhotoAddButton, _("Add photos to be correlated."));
+ g_signal_connect (G_OBJECT (PhotoAddButton), "clicked",
+ G_CALLBACK (AddPhotosButtonPress), NULL);
+
+ PhotoRemoveButton = gtk_button_new_with_mnemonic (_("Remove"));
+ gtk_widget_show (PhotoRemoveButton);
+ gtk_box_pack_start (GTK_BOX (AddPhotosVBox), PhotoRemoveButton, FALSE, FALSE, 0);
+- gtk_tooltips_set_tip (tooltips, PhotoRemoveButton, _("Remove selected photos from the list."), NULL);
++ gtk_widget_set_tooltip_text (PhotoRemoveButton, _("Remove selected photos from the list."));
+ g_signal_connect (G_OBJECT (PhotoRemoveButton), "clicked",
+ G_CALLBACK (RemovePhotosButtonPress), NULL);
+
+@@ -315,9 +311,9 @@ GtkWidget* CreateMatchWindow (void)
+ SelectGPSButton = gtk_button_new_with_mnemonic (_("Choose..."));
+ gtk_widget_show (SelectGPSButton);
+ gtk_box_pack_start (GTK_BOX (GPSDataVBox), SelectGPSButton, FALSE, FALSE, 0);
+- gtk_tooltips_set_tip (tooltips, SelectGPSButton,
++ gtk_widget_set_tooltip_text (SelectGPSButton,
+ _("Choose GPX file to read GPS data from. If the GPS data is not in the "
+- "GPX format, use a converter like GPSBabel to convert it to GPX."), NULL);
++ "GPX format, use a converter like GPSBabel to convert it to GPX."));
+ g_signal_connect (G_OBJECT (SelectGPSButton), "clicked",
+ G_CALLBACK (SelectGPSButtonPress), NULL);
+
+@@ -343,40 +339,40 @@ GtkWidget* CreateMatchWindow (void)
+ InterpolateCheck = gtk_check_button_new_with_mnemonic (_("Interpolate"));
+ gtk_widget_show (InterpolateCheck);
+ gtk_box_pack_start (GTK_BOX (OptionsVBox), InterpolateCheck, FALSE, FALSE, 0);
+- gtk_tooltips_set_tip (tooltips, InterpolateCheck,
++ gtk_widget_set_tooltip_text (InterpolateCheck,
+ _("Interpolate between points. If disabled, points will be rounded to "
+- "the nearest recorded point."), NULL);
++ "the nearest recorded point."));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (InterpolateCheck), g_key_file_get_boolean(GUISettings, "default", "interpolate", NULL));
+
+ NoWriteCheck = gtk_check_button_new_with_mnemonic (_("Don't write"));
+ gtk_widget_show (NoWriteCheck);
+ gtk_box_pack_start (GTK_BOX (OptionsVBox), NoWriteCheck, FALSE, FALSE, 0);
+- gtk_tooltips_set_tip (tooltips, NoWriteCheck, _("Don't write EXIF data back to the photos."), NULL);
++ gtk_widget_set_tooltip_text (NoWriteCheck, _("Don't write EXIF data back to the photos."));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (NoWriteCheck), g_key_file_get_boolean(GUISettings, "default", "dontwrite", NULL));
+
+ NoMtimeCheck = gtk_check_button_new_with_mnemonic (_("Don't change mtime"));
+ gtk_widget_show (NoMtimeCheck);
+ gtk_box_pack_start (GTK_BOX (OptionsVBox), NoMtimeCheck, FALSE, FALSE, 0);
+- gtk_tooltips_set_tip (tooltips, NoMtimeCheck,
+- _("Don't change file modification time of the photos."), NULL);
++ gtk_widget_set_tooltip_text (NoMtimeCheck,
++ _("Don't change file modification time of the photos."));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (NoMtimeCheck), g_key_file_get_boolean(GUISettings, "default", "nochangemtime", NULL));
+
+ BetweenSegmentsCheck = gtk_check_button_new_with_mnemonic (_("Between Segments"));
+ gtk_widget_show (BetweenSegmentsCheck);
+ gtk_box_pack_start (GTK_BOX (OptionsVBox), BetweenSegmentsCheck, FALSE, FALSE, 0);
+- gtk_tooltips_set_tip (tooltips, BetweenSegmentsCheck,
++ gtk_widget_set_tooltip_text (BetweenSegmentsCheck,
+ _("Interpolate between track segments. Generally the data is segmented "
+ "to show where data was available and not available, but you might "
+- "still want to interpolate between segments."), NULL);
++ "still want to interpolate between segments."));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (BetweenSegmentsCheck), g_key_file_get_boolean(GUISettings, "default", "betweensegments", NULL));
+
+ DegMinSecsCheck = gtk_check_button_new_with_mnemonic (_("Write DD MM SS.SS"));
+ gtk_widget_show (DegMinSecsCheck);
+ gtk_box_pack_start (GTK_BOX (OptionsVBox), DegMinSecsCheck, FALSE, FALSE, 0);
+- gtk_tooltips_set_tip (tooltips, DegMinSecsCheck,
++ gtk_widget_set_tooltip_text (DegMinSecsCheck,
+ _("Write the latitude and longitude values as DD MM SS.SS; this is "
+ "the new default. The old behaviour was to write it as "
+- "DD MM.MM, which will occur if you uncheck this box."), NULL);
++ "DD MM.MM, which will occur if you uncheck this box."));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (DegMinSecsCheck), g_key_file_get_boolean(GUISettings, "default", "writeddmmss", NULL));
+
+ OptionsTable = gtk_table_new (4, 2, FALSE);
+@@ -416,10 +412,10 @@ GtkWidget* CreateMatchWindow (void)
+ gtk_table_attach (GTK_TABLE (OptionsTable), GapTimeEntry, 1, 2, 0, 1,
+ (GtkAttachOptions) (0),
+ (GtkAttachOptions) (0), 0, 0);
+- gtk_tooltips_set_tip (tooltips, GapTimeEntry,
++ gtk_widget_set_tooltip_text (GapTimeEntry,
+ _("Maximum time \"away\" from a point that the photo will be matched, "
+ "in seconds. If a photos time is outside this value from any point, "
+- "it will not be matched."), NULL);
++ "it will not be matched."));
+ gtk_entry_set_text (GTK_ENTRY (GapTimeEntry), g_key_file_get_value(GUISettings, "default", "maxgap", NULL));
+ gtk_entry_set_width_chars (GTK_ENTRY (GapTimeEntry), 7);
+
+@@ -428,11 +424,11 @@ GtkWidget* CreateMatchWindow (void)
+ gtk_table_attach (GTK_TABLE (OptionsTable), TimeZoneEntry, 1, 2, 1, 2,
+ (GtkAttachOptions) (0),
+ (GtkAttachOptions) (0), 0, 0);
+- gtk_tooltips_set_tip (tooltips, TimeZoneEntry,
++ gtk_widget_set_tooltip_text (TimeZoneEntry,
+ _("The timezone that the cameras time was set to when the photos were "
+ "taken. For example, if a camera is set to AWST or +8:00 hours. "
+ "Enter +8:00 here so that the correct adjustment to the photos time "
+- "can be made. GPS data is always in UTC."), NULL);
++ "can be made. GPS data is always in UTC."));
+ gtk_entry_set_text (GTK_ENTRY (TimeZoneEntry), g_key_file_get_value(GUISettings, "default", "timezone", NULL));
+ gtk_entry_set_width_chars (GTK_ENTRY (TimeZoneEntry), 7);
+
+@@ -441,10 +437,10 @@ GtkWidget* CreateMatchWindow (void)
+ gtk_table_attach (GTK_TABLE (OptionsTable), PhotoOffsetEntry, 1, 2, 2, 3,
+ (GtkAttachOptions) (0),
+ (GtkAttachOptions) (0), 0, 0);
+- gtk_tooltips_set_tip (tooltips, PhotoOffsetEntry,
++ gtk_widget_set_tooltip_text (PhotoOffsetEntry,
+ _("The number of seconds to add to the photo's time to make it match "
+ "the GPS data. Calculate this with (GPS - Photo). "
+- "Can be negative or positive."), NULL);
++ "Can be negative or positive."));
+ gtk_entry_set_text (GTK_ENTRY (PhotoOffsetEntry), g_key_file_get_value(GUISettings, "default", "photooffset", NULL));
+ gtk_entry_set_width_chars (GTK_ENTRY (PhotoOffsetEntry), 7);
+
+@@ -453,9 +449,9 @@ GtkWidget* CreateMatchWindow (void)
+ gtk_table_attach (GTK_TABLE (OptionsTable), GPSDatumEntry, 1, 2, 4, 5,
+ (GtkAttachOptions) (0),
+ (GtkAttachOptions) (0), 0, 0);
+- gtk_tooltips_set_tip (tooltips, GPSDatumEntry,
++ gtk_widget_set_tooltip_text (GPSDatumEntry,
+ _("The datum used for the GPS data. This text here is recorded in the "
+- "EXIF tags as the source datum. WGS-84 is very commonly used."), NULL);
++ "EXIF tags as the source datum. WGS-84 is very commonly used."));
+ gtk_entry_set_text (GTK_ENTRY (GPSDatumEntry), g_key_file_get_value(GUISettings, "default", "gpsdatum", NULL));
+ gtk_entry_set_width_chars (GTK_ENTRY (GPSDatumEntry), 7);
+
+@@ -477,9 +473,9 @@ GtkWidget* CreateMatchWindow (void)
+ CorrelateButton = gtk_button_new_with_mnemonic (_("Correlate Photos"));
+ gtk_widget_show (CorrelateButton);
+ gtk_container_add (GTK_CONTAINER (CorrelateAlignment), CorrelateButton);
+- gtk_tooltips_set_tip (tooltips, CorrelateButton,
++ gtk_widget_set_tooltip_text (CorrelateButton,
+ _("Begin the correlation process, writing back into the photos' "
+- "EXIF tags (unless Don't write is selected)."), NULL);
++ "EXIF tags (unless Don't write is selected)."));
+ g_signal_connect (G_OBJECT (CorrelateButton), "clicked",
+ G_CALLBACK (CorrelateButtonPress), NULL);
+
+@@ -501,8 +497,8 @@ GtkWidget* CreateMatchWindow (void)
+ StripGPSButton = gtk_button_new_with_mnemonic (_("Strip GPS tags"));
+ gtk_widget_show (StripGPSButton);
+ gtk_container_add (GTK_CONTAINER (OtherOptionsAlignment), StripGPSButton);
+- gtk_tooltips_set_tip (tooltips, StripGPSButton,
+- _("Strip GPS tags from the selected photos."), NULL);
++ gtk_widget_set_tooltip_text (StripGPSButton,
++ _("Strip GPS tags from the selected photos."));
+ g_signal_connect (G_OBJECT (StripGPSButton), "clicked",
+ G_CALLBACK (StripGPSButtonPress), NULL);
+
+@@ -642,7 +638,7 @@ gboolean DestroyWindow(GtkWidget *Widget,
+ free(GPSData);
+
+ /* Tell GTK that we're done. */
+- gtk_exit(0);
++ exit(0);
+
+ /* And return FALSE so that GTK knows we have not
+ * vetoed the close. */
More information about the arch-commits
mailing list