[arch-commits] Commit in viking/repos/community-x86_64 (6 files)
Jaroslav Lichtblau
jlichtblau at archlinux.org
Mon Jul 1 21:19:41 UTC 2019
Date: Monday, July 1, 2019 @ 21:19:40
Author: jlichtblau
Revision: 487222
archrelease: copy trunk to community-x86_64
Added:
viking/repos/community-x86_64/PKGBUILD
(from rev 487221, viking/trunk/PKGBUILD)
viking/repos/community-x86_64/viking.changelog
(from rev 487221, viking/trunk/viking.changelog)
Deleted:
viking/repos/community-x86_64/PKGBUILD
viking/repos/community-x86_64/remove-mapquest.patch
viking/repos/community-x86_64/viking-1.6.2-gpsd-3.18-fix.patch
viking/repos/community-x86_64/viking.changelog
----------------------------------+
PKGBUILD | 79 +++++++++++----------------
remove-mapquest.patch | 56 -------------------
viking-1.6.2-gpsd-3.18-fix.patch | 25 --------
viking.changelog | 107 +++++++++++++++++++------------------
4 files changed, 87 insertions(+), 180 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-07-01 21:19:29 UTC (rev 487221)
+++ PKGBUILD 2019-07-01 21:19:40 UTC (rev 487222)
@@ -1,47 +0,0 @@
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: Nick Østergaard <oe.nick at gmail.com>
-# Contributor: Jonny Gerold <jonny at fsk141.com>
-
-pkgname=viking
-pkgver=1.6.2
-pkgrel=7
-pkgdesc="GTK+2 application to manage GPS data"
-arch=('x86_64')
-url="https://sourceforge.net/projects/viking/"
-license=('GPL2')
-depends=('curl' 'file' 'gpsd' 'gtk2' 'libgexiv2' 'mapnik')
-makedepends=('boost' 'gnome-doc-utils' 'intltool')
-optdepends=('gpsbabel: import and export GPS tracks from various formats')
-options=('!emptydirs')
-changelog=$pkgname.changelog
-source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
- remove-mapquest.patch
- viking-1.6.2-gpsd-3.18-fix.patch)
-sha256sums=('dfe223b1cd3a1fed3616a70e732321db9013c89df3fd6e1ad0f733a1bb067826'
- '07d78e7b86a494a3bb3e0389e4a8b42fc2f916aaa66e5b06fc9146ebfa932dc5'
- '78cc5cd6ea8ea38c6fc6be589b7828b30295ea2925f16fa89f2ae1dd15a49c88')
-
-prepare() {
- cd "${srcdir}"/$pkgname-$pkgver
-
-# Remove discontinued mapquest service
- patch -Np1 -i "${srcdir}"/remove-mapquest.patch
-
-# gpsd 3.18 build fix, with the help of
-# https://github.com/viking-gps/viking/commit/d570cfcfc643b701dd71e8b718784e02c953dace
- patch -Np0 -i "${srcdir}"/viking-1.6.2-gpsd-3.18-fix.patch
-}
-
-build() {
- cd "${srcdir}"/$pkgname-$pkgver
-
- export CXXFLAGS="$CXXFLAGS -I/usr/include/mapnik"
- ./configure --prefix=/usr --enable-expedia --enable-geocaches
- make
-}
-
-package(){
- cd "${srcdir}"/$pkgname-$pkgver
-
- make DESTDIR="${pkgdir}" install
-}
Copied: viking/repos/community-x86_64/PKGBUILD (from rev 487221, viking/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-07-01 21:19:40 UTC (rev 487222)
@@ -0,0 +1,32 @@
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Nick Østergaard <oe.nick at gmail.com>
+# Contributor: Jonny Gerold <jonny at fsk141.com>
+
+pkgname=viking
+pkgver=1.7
+pkgrel=1
+pkgdesc="GTK+2 application to manage GPS data"
+arch=('x86_64')
+url="https://sourceforge.net/projects/viking/"
+license=('GPL2')
+depends=('curl' 'file' 'gpsd' 'gtk2' 'libgexiv2' 'mapnik' 'geoclue' 'liboauth')
+makedepends=('boost' 'gnome-doc-utils' 'intltool')
+optdepends=('gpsbabel: import and export GPS tracks from various formats')
+options=('!emptydirs')
+changelog=$pkgname.changelog
+source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha256sums=('7c791e8cdb62dbf4776e37f95fdb2825ac48550e3f6829a015e1b30c76135824')
+
+build() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ export CXXFLAGS="$CXXFLAGS -I/usr/include/mapnik"
+ ./configure --prefix=/usr --enable-expedia --enable-geocaches
+ make
+}
+
+package(){
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ make DESTDIR="${pkgdir}" install
+}
Deleted: remove-mapquest.patch
===================================================================
--- remove-mapquest.patch 2019-07-01 21:19:29 UTC (rev 487221)
+++ remove-mapquest.patch 2019-07-01 21:19:40 UTC (rev 487222)
@@ -1,56 +0,0 @@
-diff -Naur viking-1.6.2.orig/src/map_ids.h viking-1.6.2/src/map_ids.h
---- viking-1.6.2.orig/src/map_ids.h 2015-11-10 22:01:35.000000000 +0100
-+++ viking-1.6.2/src/map_ids.h 2017-07-01 11:25:32.496994499 +0200
-@@ -35,7 +35,6 @@
- #define MAP_ID_OSM_MAPNIK 13
- #define MAP_ID_BLUE_MARBLE 15
- #define MAP_ID_OSM_CYCLE 17
--#define MAP_ID_MAPQUEST_OSM 19
- #define MAP_ID_OSM_TRANSPORT 20
- #define MAP_ID_OSM_ON_DISK 21
- #define MAP_ID_OSM_HUMANITARIAN 22
-diff -Naur viking-1.6.2.orig/src/osm.c viking-1.6.2/src/osm.c
---- viking-1.6.2.orig/src/osm.c 2015-11-10 22:01:35.000000000 +0100
-+++ viking-1.6.2/src/osm.c 2017-07-01 11:26:25.051880940 +0200
-@@ -89,21 +89,6 @@
- "license", "CC-BY-SA",
- "license-url", "http://www.openstreetmap.org/copyright",
- NULL));
-- VikMapSource *mapquest_type =
-- VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
-- "id", MAP_ID_MAPQUEST_OSM,
-- "name", "OSM-MapQuest",
-- "label", "OpenStreetMap (MapQuest)",
-- "hostname", "otile1.mqcdn.com",
-- "url", "/tiles/1.0.0/osm/%d/%d/%d.png",
-- "check-file-server-time", TRUE,
-- "use-etag", FALSE,
-- "zoom-min", 0,
-- "zoom-max", 19,
-- "copyright", "Tiles Courtesy of MapQuest © OpenStreetMap contributors",
-- "license", "MapQuest Specific",
-- "license-url", "http://developer.mapquest.com/web/info/terms-of-use",
-- NULL));
- VikMapSource *hot_type =
- VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
- "id", MAP_ID_OSM_HUMANITARIAN,
-@@ -152,7 +137,6 @@
- "is-osm-meta-tiles", TRUE,
- NULL));
-
-- maps_layer_register_map_source (mapquest_type);
- maps_layer_register_map_source (mapnik_type);
- maps_layer_register_map_source (cycle_type);
- maps_layer_register_map_source (transport_type);
-diff -Naur viking-1.6.2.orig/src/vikmapslayer.c viking-1.6.2/src/vikmapslayer.c
---- viking-1.6.2.orig/src/vikmapslayer.c 2015-12-21 12:44:57.000000000 +0100
-+++ viking-1.6.2/src/vikmapslayer.c 2017-07-01 11:25:52.947597509 +0200
-@@ -127,7 +127,7 @@
- { 0, 255, 3, 0 }, /* alpha */
- };
-
--static VikLayerParamData id_default ( void ) { return VIK_LPD_UINT ( MAP_ID_MAPQUEST_OSM ); }
-+static VikLayerParamData id_default ( void ) { return VIK_LPD_UINT ( MAP_ID_OSM_MAPNIK ); }
- static VikLayerParamData directory_default ( void )
- {
- VikLayerParamData data;
Deleted: viking-1.6.2-gpsd-3.18-fix.patch
===================================================================
--- viking-1.6.2-gpsd-3.18-fix.patch 2019-07-01 21:19:29 UTC (rev 487221)
+++ viking-1.6.2-gpsd-3.18-fix.patch 2019-07-01 21:19:40 UTC (rev 487222)
@@ -1,25 +0,0 @@
---- orig/vikgpslayer.c 2015-12-15 00:34:43.000000000 +0100
-+++ src/vikgpslayer.c 2018-10-09 20:32:19.001703665 +0200
-@@ -1681,2 +1681,4 @@
- if (gps_read(&vgl->vgpsd->gpsd) > -1) {
-+#elif GPSD_API_MAJOR_VERSION >= 7
-+ if (gps_read(&vgl->vgpsd->gpsd, NULL, 0) > -1) {
- // Reuse old function to perform operations on the new GPS data
-@@ -1713,2 +1715,12 @@
-
-+/**
-+ * rt_gpsd_try_connect:
-+ *
-+ * ATM Known to work up to at least GPSD_API_MAJOR_VERSION 7
-+ *
-+ * Support for the old/very old GPSD API versions is increasingly subject
-+ * to bitrot due to difficulty of creating/maintaining a test environment
-+ * of old software versions
-+ *
-+ */
- static gboolean rt_gpsd_try_connect(gpointer *data)
-@@ -1724,3 +1736,3 @@
- if (gps_open_r(vgl->gpsd_host, vgl->gpsd_port, /*(struct gps_data_t *)*/vgl->vgpsd) != 0) {
--#elif GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
-+#elif GPSD_API_MAJOR_VERSION >= 5
- vgl->vgpsd = g_malloc(sizeof(VglGpsd));
Deleted: viking.changelog
===================================================================
--- viking.changelog 2019-07-01 21:19:29 UTC (rev 487221)
+++ viking.changelog 2019-07-01 21:19:40 UTC (rev 487222)
@@ -1,52 +0,0 @@
-2018-10-09 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * viking 1.6.2-7 gpsd 3.18 rebuild
-
-2016-04-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * viking 1.6.2-3 pacman hooks rebuild
-
-2015-12-24 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * viking 1.6.2-1
-
-2015-11-25 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * viking 1.6.1-1
-
-2015-05-21 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * viking 1.6-3
- * gpsd 3.14 rebuild
-
-2015-04-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * viking 1.6-2
- * boost rebuild
-
-2015-03-31 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * viking 1.6-1
-
-2014-09-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * viking 1.5.1-1
-
-2014-02-04 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * viking 1.5-1
-
-2013-09-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * viking 1.4.2-1
-
-2013-05-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * viking 1.4.1-1
-
-2013-02-24 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * viking 1.4-1
-
-2012-10-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * viking 1.3.2.1-1
-
-2012-05-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * viking 1.3.0-1
-
-2011-11-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * viking 1.2.2-1
-
-2011-08-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * viking 1.2.1-1
-
-2011-06-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * viking 1.2-1
Copied: viking/repos/community-x86_64/viking.changelog (from rev 487221, viking/trunk/viking.changelog)
===================================================================
--- viking.changelog (rev 0)
+++ viking.changelog 2019-07-01 21:19:40 UTC (rev 487222)
@@ -0,0 +1,55 @@
+2019-07-01 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * viking 1.7-1
+
+2018-10-09 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * viking 1.6.2-7 gpsd 3.18 rebuild
+
+2016-04-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * viking 1.6.2-3 pacman hooks rebuild
+
+2015-12-24 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * viking 1.6.2-1
+
+2015-11-25 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * viking 1.6.1-1
+
+2015-05-21 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * viking 1.6-3
+ * gpsd 3.14 rebuild
+
+2015-04-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * viking 1.6-2
+ * boost rebuild
+
+2015-03-31 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * viking 1.6-1
+
+2014-09-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * viking 1.5.1-1
+
+2014-02-04 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * viking 1.5-1
+
+2013-09-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * viking 1.4.2-1
+
+2013-05-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * viking 1.4.1-1
+
+2013-02-24 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * viking 1.4-1
+
+2012-10-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * viking 1.3.2.1-1
+
+2012-05-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * viking 1.3.0-1
+
+2011-11-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * viking 1.2.2-1
+
+2011-08-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * viking 1.2.1-1
+
+2011-06-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * viking 1.2-1
More information about the arch-commits
mailing list