[arch-commits] Commit in foxtrotgps/repos/community-x86_64 (4 files)

Balló György bgyorgy at archlinux.org
Tue Apr 10 11:09:31 UTC 2018


    Date: Tuesday, April 10, 2018 @ 11:09:30
  Author: bgyorgy
Revision: 315560

archrelease: copy trunk to community-x86_64

Added:
  foxtrotgps/repos/community-x86_64/PKGBUILD
    (from rev 315559, foxtrotgps/trunk/PKGBUILD)
Deleted:
  foxtrotgps/repos/community-x86_64/PKGBUILD
  foxtrotgps/repos/community-x86_64/fixes.patch
  foxtrotgps/repos/community-x86_64/maps-for-free.patch

---------------------+
 PKGBUILD            |   81 +++++++++++++++++++++-----------------------------
 fixes.patch         |   50 ------------------------------
 maps-for-free.patch |   13 --------
 3 files changed, 35 insertions(+), 109 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-10 11:09:22 UTC (rev 315559)
+++ PKGBUILD	2018-04-10 11:09:30 UTC (rev 315560)
@@ -1,46 +0,0 @@
-# $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{,.asc}
-        fixes.patch
-        maps-for-free.patch)
-validpgpkeys=('F0378BFD8385C9968DCBC56CFF7E9E83954BE38A') # Joshua Judson Rosen
-sha256sums=('aa1ffbbf299b7b0f305a0bdbe395266e18305bb9449d621fb88bf8760b55505a'
-            'SKIP'
-            '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
-}

Copied: foxtrotgps/repos/community-x86_64/PKGBUILD (from rev 315559, foxtrotgps/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-04-10 11:09:30 UTC (rev 315560)
@@ -0,0 +1,35 @@
+# $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.1
+pkgrel=1
+pkgdesc="Lightweight and fast mapping application"
+arch=('x86_64')
+url="https://www.foxtrotgps.org/"
+license=('GPL')
+depends=('curl' 'dconf' 'gpsd' 'libexif' 'libglade')
+makedepends=('intltool')
+optdepends=('gpscorrelate: geotag photos'
+            'jhead: add photos to database'
+            'python: gpx2osm and osb2foxtrot tools'
+            'python-beautifulsoup4: georss2foxtrotgps-poi tool'
+            'python-feedparser: georss2foxtrotgps-poi tool'
+            'python-sqlalchemy: poi2osm tool')
+source=(https://www.foxtrotgps.org/releases/$pkgname-$pkgver.tar.gz{,.asc})
+validpgpkeys=('F0378BFD8385C9968DCBC56CFF7E9E83954BE38A') # Joshua Judson Rosen
+sha256sums=('3ffbe60dd09890e3228bc71a0337b27e69e26e52225c47bd75968b580b19f489'
+            'SKIP')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: fixes.patch
===================================================================
--- fixes.patch	2018-04-10 11:09:22 UTC (rev 315559)
+++ fixes.patch	2018-04-10 11:09:30 UTC (rev 315560)
@@ -1,50 +0,0 @@
-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:

Deleted: maps-for-free.patch
===================================================================
--- maps-for-free.patch	2018-04-10 11:09:22 UTC (rev 315559)
+++ maps-for-free.patch	2018-04-10 11:09:30 UTC (rev 315560)
@@ -1,13 +0,0 @@
-=== 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,
-



More information about the arch-commits mailing list