diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 5ba451e..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -gpsdrive-2.10-20100508.tar.gz -openstreetmap-map-icons-minimal.tar.gz -gpsdrive-2.11.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/gpsdrive-2.10-fix-dso-linking.patch b/gpsdrive-2.10-fix-dso-linking.patch deleted file mode 100644 index ec56d3c..0000000 --- a/gpsdrive-2.10-fix-dso-linking.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- gpsdrive-2.10-20100508/src/CMakeLists.txt.old 2010-05-10 01:17:03.000000000 +0100 -+++ gpsdrive-2.10-20100508/src/CMakeLists.txt 2010-05-10 01:18:26.000000000 +0100 -@@ -28,7 +28,7 @@ if (WITH_POSTGIS) - endif (WITH_POSTGIS) - - if (WITH_MAPNIK) -- find_package(Boost COMPONENTS filesystem REQUIRED) -+ find_package(Boost COMPONENTS filesystem system thread REQUIRED) - find_package(Mapnik REQUIRED) - add_definitions(-DMAPNIK) - endif (WITH_MAPNIK) -@@ -176,7 +176,7 @@ if (WITH_MAPNIK) - ) - set(GPSDRIVE_LINK_LIBRARIES - ${GPSDRIVE_LINK_LIBRARIES} -- ${Boost_FILESYSTEM_LIBRARY} -+ ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} - ${MAPNIK_LIBRARIES} - ) - endif (WITH_MAPNIK) diff --git a/gpsdrive-2.10-newgps.patch b/gpsdrive-2.10-newgps.patch deleted file mode 100644 index a74e768..0000000 --- a/gpsdrive-2.10-newgps.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Nur gpsdrive-2.10-20100508.sav/cmake/Modules/FindBoost.cmake gpsdrive-2.10-20100508/cmake/Modules/FindBoost.cmake ---- gpsdrive-2.10-20100508.sav/cmake/Modules/FindBoost.cmake 2010-05-08 20:56:16.000000000 -0600 -+++ gpsdrive-2.10-20100508/cmake/Modules/FindBoost.cmake 2010-05-09 14:28:05.000000000 -0600 -@@ -78,7 +78,7 @@ - - # MESSAGE(STATUS "Finding Boost libraries.... ") - --SET( _boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS} "1.33" "1.33.0" "1.33.1" "1.34" "1.34.0" "1.34.1" ) -+SET( _boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS} "1.33" "1.33.0" "1.33.1" "1.34" "1.34.0" "1.34.1" "1.41.0") - - ############################################ - # -diff -Nur gpsdrive-2.10-20100508.sav/cmake/Modules/FindGTK2.cmake gpsdrive-2.10-20100508/cmake/Modules/FindGTK2.cmake ---- gpsdrive-2.10-20100508.sav/cmake/Modules/FindGTK2.cmake 2010-05-08 20:56:16.000000000 -0600 -+++ gpsdrive-2.10-20100508/cmake/Modules/FindGTK2.cmake 2010-05-09 13:35:59.000000000 -0600 -@@ -228,6 +228,30 @@ - /opt/gnome/lib - ) - -+ FIND_LIBRARY(GTK2_PANGO_LIBRARY -+ NAMES -+ pango-1.0 -+ PATHS -+ ${_GDK2_LIBDIR} -+ /usr/lib -+ /usr/local/lib -+ /usr/openwin/lib -+ /usr/X11R6/lib -+ /opt/gnome/lib -+ ) -+ -+ FIND_LIBRARY(GTK2_GDK_PIXBUF_LIBRARY -+ NAMES -+ gdk_pixbuf-2.0 -+ PATHS -+ ${_GDK2_LIBDIR} -+ /usr/lib -+ /usr/local/lib -+ /usr/openwin/lib -+ /usr/X11R6/lib -+ /opt/gnome/lib -+ ) -+ - FIND_LIBRARY(GTK2_GMODULE_LIBRARY - NAMES - gmodule-2.0 -@@ -312,6 +336,9 @@ - SET(GTK2_LIBRARIES - ${GTK2_GTK_LIBRARY} - ${GTK2_GDK_LIBRARY} -+ ${GTK2_GDK_PIXBUF_LIBRARY} -+ ${GTK2_GOBJECT_LIBRARY} -+ ${GTK2_PANGO_LIBRARY} - ${GTK2_GLIB_LIBRARY} - ) - #${GTK2_GOBJECT_LIBRARY}) -diff -Nur gpsdrive-2.10-20100508.sav/DefineOptions.cmake gpsdrive-2.10-20100508/DefineOptions.cmake ---- gpsdrive-2.10-20100508.sav/DefineOptions.cmake 2010-05-08 20:57:14.000000000 -0600 -+++ gpsdrive-2.10-20100508/DefineOptions.cmake 2010-05-09 12:10:51.000000000 -0600 -@@ -10,5 +10,5 @@ - option(WITH_KISMET "Build with kismet support" ON) - option(DEBUG "Build with debug -D support" ON) - option(WITH_NAVIGATION "Build with routing support" OFF) --option(LIBGPS_OLD "Build with old libgps version (<2.90)" ON) -+option(LIBGPS_OLD "Build with old libgps version (<2.90)" OFF) - diff --git a/gpsdrive-2.10pre7-fedora.patch b/gpsdrive-2.10pre7-fedora.patch deleted file mode 100644 index 8d3f48a..0000000 --- a/gpsdrive-2.10pre7-fedora.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Nur gpsdrive-2.10pre7.orig/scripts/osm/perl_lib/CMakeLists.txt gpsdrive-2.10pre7/scripts/osm/perl_lib/CMakeLists.txt ---- gpsdrive-2.10pre7.orig/scripts/osm/perl_lib/CMakeLists.txt 2009-06-14 07:57:25.000000000 -0600 -+++ gpsdrive-2.10pre7/scripts/osm/perl_lib/CMakeLists.txt 2009-06-17 11:13:56.000000000 -0600 -@@ -16,7 +16,7 @@ - foreach(perl_module ${perl_modules}) - file(RELATIVE_PATH relative_module_path ${CMAKE_CURRENT_SOURCE_DIR} ${perl_module}) - get_filename_component(relative_module_path ${relative_module_path} PATH) -- install(FILES ${perl_module} DESTINATION ${PERL_SITELIB}/${relative_module_path}) -+ install(FILES ${perl_module} DESTINATION ${PERL_VENDORLIB}/${relative_module_path}) - #message("DEBUG: install ${perl_module} to ${PERL_SITELIB}/${relative_module_path}") - endforeach(perl_module ${perl_modules}) - endif (perl_modules) -diff -Nur gpsdrive-2.10pre7.orig/scripts/osm/perl_lib/Geo/Gpsdrive/getstreet.pm gpsdrive-2.10pre7/scripts/osm/perl_lib/Geo/Gpsdrive/getstreet.pm ---- gpsdrive-2.10pre7.orig/scripts/osm/perl_lib/Geo/Gpsdrive/getstreet.pm 2009-06-14 07:57:25.000000000 -0600 -+++ gpsdrive-2.10pre7/scripts/osm/perl_lib/Geo/Gpsdrive/getstreet.pm 2009-06-21 19:41:12.000000000 -0600 -@@ -2,7 +2,7 @@ - #noch nicht alle variablen angepasst - use LWP::UserAgent; - use WWW::Mechanize; --use Text::Query; -+#use Text::Query; - use Getopt::Long; #maybe not needed any more - use Pod::Usage; - use DBI; -diff -Nur gpsdrive-2.10pre7.orig/scripts/osm/perl_lib/Geo/OSM/Upload.pm gpsdrive-2.10pre7/scripts/osm/perl_lib/Geo/OSM/Upload.pm ---- gpsdrive-2.10pre7.orig/scripts/osm/perl_lib/Geo/OSM/Upload.pm 2009-06-14 07:57:25.000000000 -0600 -+++ gpsdrive-2.10pre7/scripts/osm/perl_lib/Geo/OSM/Upload.pm 2009-06-21 19:40:48.000000000 -0600 -@@ -4,7 +4,7 @@ - use warnings; - - --use WWW::Curl::easy; -+use WWW::Curl::Easy; - - sub new(){bless{}}; - -diff -Nur gpsdrive-2.10pre7.orig/src/gpsdrive_config.c gpsdrive-2.10pre7/src/gpsdrive_config.c ---- gpsdrive-2.10pre7.orig/src/gpsdrive_config.c 2009-06-14 07:57:25.000000000 -0600 -+++ gpsdrive-2.10pre7/src/gpsdrive_config.c 2009-06-22 22:22:10.000000000 -0600 -@@ -889,7 +889,7 @@ config_init () - g_snprintf(local_config.mapnik_input_path, sizeof(local_config.mapnik_input_path), - "%s", "/usr/lib/mapnik/0.7/input/"); - g_snprintf(local_config.mapnik_font_path, sizeof(local_config.mapnik_font_path), -- "%s", "/usr/share/fonts/truetype/ttf-dejavu/"); -+ "%s", "/usr/share/fonts/dejavu/"); - - /* kismet default values */ - g_strlcpy(local_config.kismet_servername, "127.0.0.1", sizeof(local_config.kismet_servername)); diff --git a/gpsdrive-2.10pre7-usepc.patch b/gpsdrive-2.10pre7-usepc.patch deleted file mode 100644 index 18914d9..0000000 --- a/gpsdrive-2.10pre7-usepc.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -Nru gpsdrive-2.10pre7.orig/cmake/Modules/FindMapnik.cmake gpsdrive-2.10pre7/cmake/Modules/FindMapnik.cmake ---- gpsdrive-2.10pre7.orig/cmake/Modules/FindMapnik.cmake 2009-09-11 13:30:56.000000000 +0100 -+++ gpsdrive-2.10pre7/cmake/Modules/FindMapnik.cmake 2009-09-11 13:33:36.000000000 +0100 -@@ -13,62 +13,4 @@ - # For details see the accompanying COPYING-CMAKE-SCRIPTS file. - # - -- --if (MAPNIK_LIBRARIES AND MAPNIK_INCLUDE_DIRS) -- # in cache already -- set(MAPNIK_FOUND TRUE) --else (MAPNIK_LIBRARIES AND MAPNIK_INCLUDE_DIRS) -- find_path(MAPNIK_INCLUDE_DIR -- NAMES -- mapnik/config.hpp -- PATHS -- /usr/include -- /usr/local/include -- /opt/local/include -- /sw/include -- ) -- -- find_library(MAPNIK_LIBRARY -- NAMES -- mapnik -- PATHS -- /usr/lib -- /usr/local/lib -- /opt/local/lib -- /sw/lib -- ) -- -- if (MAPNIK_LIBRARY) -- set(MAPNIK_FOUND TRUE) -- endif (MAPNIK_LIBRARY) -- -- set(MAPNIK_INCLUDE_DIRS -- ${MAPNIK_INCLUDE_DIR} -- ) -- -- if (MAPNIK_FOUND) -- set(MAPNIK_LIBRARIES -- ${MAPNIK_LIBRARIES} -- ${MAPNIK_LIBRARY} -- ) -- endif (MAPNIK_FOUND) -- -- if (MAPNIK_INCLUDE_DIRS AND MAPNIK_LIBRARIES) -- set(MAPNIK_FOUND TRUE) -- endif (MAPNIK_INCLUDE_DIRS AND MAPNIK_LIBRARIES) -- -- if (MAPNIK_FOUND) -- if (NOT Mapnik_FIND_QUIETLY) -- message(STATUS "Found Mapnik: ${MAPNIK_LIBRARIES}") -- endif (NOT Mapnik_FIND_QUIETLY) -- else (MAPNIK_FOUND) -- if (Mapnik_FIND_REQUIRED) -- message(FATAL_ERROR "Could not find Mapnik") -- endif (Mapnik_FIND_REQUIRED) -- endif (MAPNIK_FOUND) -- -- # show the MAPNIK_INCLUDE_DIRS and MAPNIK_LIBRARIES variables only in the advanced view -- mark_as_advanced(MAPNIK_INCLUDE_DIRS MAPNIK_LIBRARIES) -- --endif (MAPNIK_LIBRARIES AND MAPNIK_INCLUDE_DIRS) -- -+pkg_check_modules (MAPNIK REQUIRED mapnik) diff --git a/gpsdrive-2.11-add-gdk-pixbuf2.patch b/gpsdrive-2.11-add-gdk-pixbuf2.patch deleted file mode 100644 index 6f4befd..0000000 --- a/gpsdrive-2.11-add-gdk-pixbuf2.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- gpsdrive-2.11/cmake/Modules/FindGTK2.cmake.gdk-pixbuf2 2010-07-28 18:21:37.000000000 +0100 -+++ gpsdrive-2.11/cmake/Modules/FindGTK2.cmake 2010-07-28 18:23:09.000000000 +0100 -@@ -192,6 +192,20 @@ - ) - #MESSAGE(STATUS "DEBUG: GTK2_ATK_INCLUDE_PATH = ${GTK2_ATK_INCLUDE_PATH}") - -+ if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) -+ pkgconfig(gdk-pixbuf-2.0 _GDKPIXBUF2_INCLUDEDIR _GDKPIXBUF2inkDir _GDKPIXBUF2_LDFLAGS _GDKPIXBUF2_CFLAGS) -+ else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) -+ if (PKG_CONFIG_FOUND) -+ pkg_check_modules(_GDKPIXBUF2 gdk-pixbuf-2.0) -+ endif (PKG_CONFIG_FOUND) -+ endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) -+ -+ FIND_PATH(GTK2_GDKPIXBUF2_INCLUDE_PATH gdk-pixbuf/gdk-pixbuf.h -+ ${_GDKPIXBUF2_INCLUDEDIR} /usr/include/gdk-pixbuf-2.0 /usr/include/gtk-2.0 -+ ) -+ -+ #MESSAGE(STATUS "DEBUG:GTK2_GDKPIXBUF2_INCLUDE_PATH = ${GTK2_GDKPIXBUF2_INCLUDE_PATH}") -+ - FIND_LIBRARY(GTK2_GTKGL_LIBRARY - NAMES - gtkgl -@@ -329,6 +343,7 @@ - ${GTK2_GLIB_INCLUDE_PATH} - ${GTK2_PANGO_INCLUDE_PATH} - ${GTK2_GDKCONFIG_INCLUDE_PATH} -+ ${GTK2_GDKPIXBUF2_INCLUDE_PATH} - ${GTK2_ATK_INCLUDE_PATH} - ${GTK2_CAIRO_INCLUDE_PATH} - ) diff --git a/gpsdrive-2.11-fix-lm-dso.patch b/gpsdrive-2.11-fix-lm-dso.patch deleted file mode 100644 index 862fa2a..0000000 --- a/gpsdrive-2.11-fix-lm-dso.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gpsdrive-2.11/src/CMakeLists.txt.lm-dso 2012-03-12 11:33:12.347973812 +0000 -+++ gpsdrive-2.11/src/CMakeLists.txt 2012-03-12 11:33:37.834147334 +0000 -@@ -101,6 +101,7 @@ set(GPSDRIVE_LINK_LIBRARIES - ${SQLITE3_LIBRARIES} - ${CURL_LIBRARIES} - ${GPS_LIBRARIES} -+ m - ) - - set(gpsdrive_SRCS diff --git a/gpsdrive-2.11-freetype-cmake.patch b/gpsdrive-2.11-freetype-cmake.patch deleted file mode 100644 index 7e15440..0000000 --- a/gpsdrive-2.11-freetype-cmake.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -up ./cmake/Modules/FindFreetype2.cmake.freetype-cmake ./cmake/Modules/FindFreetype2.cmake ---- ./cmake/Modules/FindFreetype2.cmake.freetype-cmake 2010-06-24 21:53:32.000000000 +0200 -+++ ./cmake/Modules/FindFreetype2.cmake 2014-06-12 13:11:59.599880608 +0200 -@@ -1,89 +0,0 @@ --# - Try to find Freetype2 --# Once done this will define --# --# FREETYPE2_FOUND - system has Freetype2 --# FREETYPE2_INCLUDE_DIRS - the Freetype2 include directory --# FREETYPE2_LIBRARIES - Link these to use Freetype2 --# FREETYPE2_DEFINITIONS - Compiler switches required for using Freetype2 --# --# Copyright (c) 2008 Andreas Schneider --# --# Redistribution and use is allowed according to the terms of the New --# BSD license. --# For details see the accompanying COPYING-CMAKE-SCRIPTS file. --# -- -- --if (FREETYPE2_LIBRARIES AND FREETYPE2_INCLUDE_DIRS) -- # in cache already -- set(FREETYPE2_FOUND TRUE) --else (FREETYPE2_LIBRARIES AND FREETYPE2_INCLUDE_DIRS) -- # use pkg-config to get the directories and then use these values -- # in the FIND_PATH() and FIND_LIBRARY() calls -- if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) -- include(UsePkgConfig) -- pkgconfig(freetype2 _FREETYPE2_INCLUDEDIR _FREETYPE2_LIBDIR _FREETYPE2_LDFLAGS _FREETYPE2_CFLAGS) -- else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) -- find_package(PkgConfig) -- if (PKG_CONFIG_FOUND) -- pkg_check_modules(_FREETYPE2 freetype2) -- endif (PKG_CONFIG_FOUND) -- endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) -- find_path(FREETYPE2_INCLUDE_DIR -- NAMES -- freetype/freetype.h -- PATHS -- ${_FREETYPE2_INCLUDEDIR} -- /usr/include -- /usr/local/include -- /opt/local/include -- /sw/include -- PATH_SUFFIXES -- freetype2 -- ) -- -- find_library(FREETYPE_LIBRARY -- NAMES -- freetype -- PATHS -- ${_FREETYPE2_LIBDIR} -- /usr/lib -- /usr/local/lib -- /opt/local/lib -- /sw/lib -- ) -- -- if (FREETYPE_LIBRARY) -- set(FREETYPE_FOUND TRUE) -- endif (FREETYPE_LIBRARY) -- -- set(FREETYPE2_INCLUDE_DIRS -- ${FREETYPE2_INCLUDE_DIR} -- ) -- -- if (FREETYPE_FOUND) -- set(FREETYPE2_LIBRARIES -- ${FREETYPE2_LIBRARIES} -- ${FREETYPE_LIBRARY} -- ) -- endif (FREETYPE_FOUND) -- -- if (FREETYPE2_INCLUDE_DIRS AND FREETYPE2_LIBRARIES) -- set(FREETYPE2_FOUND TRUE) -- endif (FREETYPE2_INCLUDE_DIRS AND FREETYPE2_LIBRARIES) -- -- if (FREETYPE2_FOUND) -- if (NOT Freetype2_FIND_QUIETLY) -- message(STATUS "Found Freetype2: ${FREETYPE2_LIBRARIES}") -- endif (NOT Freetype2_FIND_QUIETLY) -- else (FREETYPE2_FOUND) -- if (Freetype2_FIND_REQUIRED) -- message(FATAL_ERROR "Could not find Freetype2") -- endif (Freetype2_FIND_REQUIRED) -- endif (FREETYPE2_FOUND) -- -- # show the FREETYPE2_INCLUDE_DIRS and FREETYPE2_LIBRARIES variables only in the advanced view -- mark_as_advanced(FREETYPE2_INCLUDE_DIRS FREETYPE2_LIBRARIES) -- --endif (FREETYPE2_LIBRARIES AND FREETYPE2_INCLUDE_DIRS) -- -diff -up ./src/CMakeLists.txt.freetype-cmake ./src/CMakeLists.txt diff --git a/gpsdrive-2.11-gpsd-2.96.patch b/gpsdrive-2.11-gpsd-2.96.patch deleted file mode 100644 index ec56667..0000000 --- a/gpsdrive-2.11-gpsd-2.96.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -up gpsdrive-2.11/src/gps_handler.c.gpsd296 gpsdrive-2.11/src/gps_handler.c ---- gpsdrive-2.11/src/gps_handler.c.gpsd296 2010-06-24 15:53:32.000000000 -0400 -+++ gpsdrive-2.11/src/gps_handler.c 2011-08-23 10:43:17.293314786 -0400 -@@ -265,6 +265,33 @@ g_print ("--- connecting signal to gps\n - - static gint gps_timeout_source = 0; - static struct gps_data_t *gpsdata; -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+static struct gps_data_t gpsdata_buf; -+static gpointer gpsdata_hook = NULL; -+ -+int gps_poll(/*@out@*/struct gps_data_t *gpsdata) -+/* for backwards compatibility */ -+{ -+ int status = gps_read(gpsdata, NULL, 0); -+ -+ if (status > 0) -+ status = 0; -+ -+ if ((gpsdata_hook != NULL) && (gpsdata->set & PACKET_SET)) -+ { -+ ((void (*)())gpsdata_hook)(gpsdata, NULL, 0); -+ } -+ return status; -+} -+ -+static void gps_set_raw_hook(struct gps_data_t *g, gpointer cb) -+{ -+ // gps_set_raw_hook() was removed from gpsd-2.96 Instead, clients will simply be -+ // able to look at the packet buffer directly. (Of course, this is only -+ // recommended when the PACKET_SET flag is up.) (Done in 2.96~dev.) -+ gpsdata_hook = cb; -+} -+#endif - - /* SYMBOLS USED IN LIBGPS: - * -@@ -394,7 +421,6 @@ gps_hook_cb (struct gps_data_t *data, gc - #endif - } - -- - gboolean - gps_query_data_cb (gpointer data) - { -@@ -410,7 +436,11 @@ gps_query_data_cb (gpointer data) - */ - gps_query (gpsdata, "oys\n"); - #else -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+ if (gps_waiting(gpsdata, 2000000)) -+#else - if (gps_waiting(gpsdata)) -+#endif - { - gps_poll (gpsdata); - } -@@ -447,7 +477,16 @@ gpsd_connect (gboolean reconnect) - } - - /* try to open connection */ -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+ if (!gps_open (local_config.gpsd_server, local_config.gpsd_port, &gpsdata_buf)) -+ { -+ gpsdata = &gpsdata_buf; -+ } else { -+ gpsdata = NULL; -+ } -+#else - gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port); -+#endif - if (!gpsdata) - { - g_print ("Can't connect to gps daemon on %s:%s, disabling GPS support!\n", diff --git a/gpsdrive-2.11-libgps6.patch b/gpsdrive-2.11-libgps6.patch deleted file mode 100644 index 2fbf298..0000000 --- a/gpsdrive-2.11-libgps6.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gpsdrive-2.11.orig/src/gps_handler.c 2015-03-18 19:32:52.740956266 +0100 -+++ gpsdrive-2.11/src/gps_handler.c 2015-03-19 03:46:53.978763761 +0100 -@@ -405,11 +405,19 @@ - for (i=0;isatellites_visible;i++) - #endif - { -+#if (GPSD_API_MAJOR_VERSION >= 6) -+ gps_sats[i].used = data->skyview[i].used; -+ gps_sats[i].prn = data->skyview[i].PRN; -+ gps_sats[i].elevation = data->skyview[i].elevation; -+ gps_sats[i].azimuth = data->skyview[i].azimuth; -+ gps_sats[i].snr = data->skyview[i].ss; -+#else - gps_sats[i].used = data->used[i]; - gps_sats[i].prn = data->PRN[i]; - gps_sats[i].elevation = data->elevation[i]; - gps_sats[i].azimuth = data->azimuth[i]; - gps_sats[i].snr = data->ss[i]; -+#endif - } - } - diff --git a/gpsdrive-2.11-remove-Switch.patch b/gpsdrive-2.11-remove-Switch.patch deleted file mode 100644 index 9dcb156..0000000 --- a/gpsdrive-2.11-remove-Switch.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur gpsdrive-2.11.orig/scripts/gpsfetchmap.pl gpsdrive-2.11/scripts/gpsfetchmap.pl ---- gpsdrive-2.11.orig/scripts/gpsfetchmap.pl 2010-06-24 13:53:32.000000000 -0600 -+++ gpsdrive-2.11/scripts/gpsfetchmap.pl 2011-07-31 10:27:26.889347649 -0600 -@@ -70,7 +70,6 @@ - use File::Path; - use File::Copy; - use IO::File; --use Switch; - use POSIX qw(ceil floor); - use Image::Magick; - diff --git a/gpsdrive-2.11-set-boostfilesystemversion.patch b/gpsdrive-2.11-set-boostfilesystemversion.patch deleted file mode 100644 index a3b3d55..0000000 --- a/gpsdrive-2.11-set-boostfilesystemversion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gpsdrive-2.11/src/CMakeLists.txt.old 2011-02-17 09:49:21.000000000 +0000 -+++ gpsdrive-2.11/src/CMakeLists.txt 2011-02-17 09:49:35.000000000 +0000 -@@ -31,6 +31,7 @@ if (WITH_MAPNIK) - find_package(Boost COMPONENTS filesystem system thread REQUIRED) - find_package(Mapnik REQUIRED) - add_definitions(-DMAPNIK) -+ add_definitions(-DBOOST_FILESYSTEM_VERSION=2) - endif (WITH_MAPNIK) - - if (WITH_SPEECH) diff --git a/gpsdrive-speechd.patch b/gpsdrive-speechd.patch deleted file mode 100644 index fa14c8a..0000000 --- a/gpsdrive-speechd.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- gpsdrive-2.11/cmake/Modules/FindSpeechd.cmake.orig 2013-08-19 22:25:36.921359302 +0100 -+++ gpsdrive-2.11/cmake/Modules/FindSpeechd.cmake 2013-08-19 22:26:55.491330632 +0100 -@@ -23,6 +23,7 @@ - libspeechd.h - PATHS - /usr/include -+ /usr/include/speech-dispatcher - /usr/local/include - /opt/local/include - /sw/include ---- gpsdrive-2.11/src/speech.c.orig 2013-08-19 22:25:48.751505499 +0100 -+++ gpsdrive-2.11/src/speech.c 2013-08-19 22:26:22.910927769 +0100 -@@ -62,7 +62,7 @@ - - - --#include -+#include - #include "speech.h" - - diff --git a/gpsdrive.spec b/gpsdrive.spec deleted file mode 100644 index 8d62ff5..0000000 --- a/gpsdrive.spec +++ /dev/null @@ -1,353 +0,0 @@ -Summary: A GPS based navigation tool -Name: gpsdrive -Version: 2.11 -Release: 54%{?dist} -License: GPLv2+ -URL: http://www.gpsdrive.de/index.shtml - -Source0: http://www.gpsdrive.de/packages/%{name}-%{version}.tar.gz -Source1: http://downloads.sourceforge.net/sourceforge/gpsdrive/openstreetmap-map-icons-minimal.tar.gz - -Patch1: gpsdrive-2.10pre7-fedora.patch -Patch2: gpsdrive-2.10pre7-usepc.patch -Patch3: gpsdrive-2.10-newgps.patch -Patch4: gpsdrive-2.10-fix-dso-linking.patch -Patch5: gpsdrive-2.11-add-gdk-pixbuf2.patch -Patch6: gpsdrive-2.11-set-boostfilesystemversion.patch -Patch7: gpsdrive-2.11-remove-Switch.patch -Patch8: gpsdrive-2.11-gpsd-2.96.patch -Patch9: gpsdrive-2.11-fix-lm-dso.patch -Patch10: gpsdrive-speechd.patch -Patch11: gpsdrive-2.11-freetype-cmake.patch -Patch12: gpsdrive-2.11-libgps6.patch - -BuildRequires: gcc-c++ -BuildRequires: gcc -BuildRequires: gtk2-devel >= 2.0.6 -BuildRequires: gettext intltool -BuildRequires: desktop-file-utils -BuildRequires: pcre-devel -BuildRequires: autoconf m4 -BuildRequires: cmake -BuildRequires: libxml2-devel -BuildRequires: boost-devel -BuildRequires: sqlite-devel -BuildRequires: libicu-devel -BuildRequires: libtool-ltdl-devel -BuildRequires: perl-devel -BuildRequires: perl-generators -BuildRequires: libcurl-devel -BuildRequires: gpsd-devel -BuildRequires: speech-dispatcher-devel -BuildRequires: libpq-devel - -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: gpsd - -Provides: perl(Geo::OSM::EntitiesV3) = %{version} -Provides: perl(Geo::OSM::OsmReaderV5) = %{version} -Provides: perl(Geo::OSM::EntitiesV5) = %{version} -Provides: perl(Geo::OSM::OsmReaderV3) = %{version} - -%description -Gpsdrive is a map-based navigation system. -It displays your position on a zoomable map -provided from a NMEA-capable GPS receiver. The maps are autoselected -for the best resolution, depending of your position, and the displayed -image can be zoomed. Maps can be downloaded from the Internet with one -mouse click. The program provides information about speed, direction, -bearing, arrival time, actual position, and target position. -Speech output is also available. MySQL is supported. - -%prep -%setup -q -%setup -q -a 1 -T -D - -%patch1 -p1 -%patch2 -p1 -b .usepc -%patch3 -p1 -b .newgps -%patch4 -p1 -b .fix-dso-linking -%patch5 -p1 -b .gdk-pixbuf2 -%patch6 -p1 -b .boostfilesystemver -%patch7 -p1 -b .removeswitch -%patch8 -p1 -b .gpsd296 -%patch9 -p1 -b .lm-dso -%patch10 -p1 -b .gpsdrive -%patch11 -p1 -b .freetype-cmake -%patch12 -p1 - -%build -mkdir build -export Boost_LIBRARYDIR=%{_libdir} -cd build -%cmake -DWITH_MAPNIK=OFF \ - .. -make VERBOSE=1 %{?_smp_mflags} - -%install -cd build -make install DESTDIR=$RPM_BUILD_ROOT - -cd .. -mkdir -p $RPM_BUILD_ROOT/usr/share/icons/map-icons/ -cp -a usr/share/icons/map-icons/* $RPM_BUILD_ROOT/usr/share/icons/map-icons/ - -desktop-file-validate \ - ${RPM_BUILD_ROOT}%{_datadir}/applications/gpsdrive.desktop - -%find_lang %{name} - -%ldconfig_scriptlets - -%files -f %{name}.lang -%doc ABOUT-NLS AUTHORS ChangeLog COPYING README Documentation/* -%{_bindir}/friendsd -%{_bindir}/gdal_slice.sh -%{_bindir}/geocache2way.pl -%{_bindir}/gpsd-connect-bluetooth.sh -%{_bindir}/gpsreplay.pl -%{_bindir}/geoinfo.pl -%{_bindir}/gpsd_nmea.sh -%{_bindir}/gpsdrive -%{_bindir}/gpsdrive-update-mapnik-poitypes.pl -%{_bindir}/gpsdrive_mapnik_gentiles.* -%{_bindir}/gpsfetchmap.pl -%{_bindir}/gpspoint2gpsdrive.pl -%{_bindir}/nasaconv.sh -%{_datadir}/applications/%{name}.desktop -%{_datadir}/%{name} -%{_datadir}/icons/map-icons -%{_datadir}/icons/%{name}.png -%{_mandir}/*/man1/* -%{_mandir}/man1/* -%{perl_vendorlib}/* - -%changelog -* Wed Jan 29 2020 Fedora Release Engineering - 2.11-54 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 2.11-53 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Jul 03 2019 Björn Esser - 2.11-52 -- Rebuild (gpsd) - -* Sat Jun 01 2019 Jitka Plesnikova - 2.11-51 -- Perl 5.30 rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 2.11-50 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 14 2019 Björn Esser - 2.11-49 -- Rebuilt for libcrypt.so.2 (#1666033) - -* Sat Jan 05 2019 Björn Esser - 2.11-48 -- Update gpsdrive-2.11-gpsd-2.96.patch for API change in gpsd 3.18.1 - -* Fri Jul 13 2018 Fedora Release Engineering - 2.11-47 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Jun 29 2018 Jitka Plesnikova - 2.11-46 -- Perl 5.28 rebuild - -* Tue Feb 20 2018 Nils Philippsen - 2.11-45 -- require gcc for building - -* Wed Feb 07 2018 Fedora Release Engineering - 2.11-44 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Jan 20 2018 Björn Esser - 2.11-43 -- Rebuilt for switch to libxcrypt - -* Wed Aug 02 2017 Fedora Release Engineering - 2.11-42 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.11-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jul 03 2017 Jonathan Wakely - 2.11-40 -- Rebuilt for Boost 1.64 - -* Sun Jun 04 2017 Jitka Plesnikova - 2.11-39 -- Perl 5.26 rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.11-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 27 2017 Jonathan Wakely - 2.11-37 -- Rebuilt for Boost 1.63 - -* Fri Jan 27 2017 Jonathan Wakely - 2.11-36 -- Rebuilt for Boost 1.63 - -* Tue May 17 2016 Jitka Plesnikova - 2.11-35 -- Perl 5.24 rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 2.11-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 15 2016 Jonathan Wakely - 2.11-33 -- Rebuilt for Boost 1.60 - -* Thu Aug 27 2015 Jonathan Wakely - 2.11-32 -- Rebuilt for Boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 2.11-31 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 2.11-30 -- rebuild for Boost 1.58 - -* Wed Jun 17 2015 Fedora Release Engineering - 2.11-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Jun 06 2015 Jitka Plesnikova - 2.11-28 -- Perl 5.22 rebuild - -* Sat Apr 04 2015 Ralf Corsépius - 2.11-27 -- Reflect libgps API-changes (FTFBS RHBZ #1202688). - Add gpsdrive-2.11-libgps6.patch. - -* Mon Jan 26 2015 Petr Machata - 2.11-26 -- Rebuild for boost 1.57.0 - -* Thu Aug 28 2014 Jitka Plesnikova - 2.11-25 -- Perl 5.20 rebuild - -* Sat Aug 16 2014 Fedora Release Engineering - 2.11-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Thu Jun 12 2014 Nils Philippsen - 2.11-23 -- use system copy of FindFreetype.cmake (#1106719, patch by Hamish Bowman) - -* Sat Jun 07 2014 Fedora Release Engineering - 2.11-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 23 2014 Petr Machata - 2.11-22 -- Rebuild for boost 1.55.0 - -* Thu Jan 16 2014 Adam Williamson - 2.11-21 -- rebuild for new libgps - -* Mon Aug 19 2013 Peter Robinson 2.11-20 -- Fix FTBFS (speechd) -- Cleanup spec and fix dates - -* Fri Aug 16 2013 Nils Philippsen - 2.11-19 -- don't require unused (compat-)libgda-devel for building (#991891) - -* Sat Aug 03 2013 Fedora Release Engineering - 2.11-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 30 2013 Petr Machata - 2.11-17 -- Rebuild for boost 1.54.0 - -* Wed Jul 17 2013 Petr Pisar - 2.11-16 -- Perl 5.18 rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 2.11-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Nov 19 2012 Nils Philippsen - 2.11-14 -- update sourceforge download URL - -* Thu Jul 19 2012 Fedora Release Engineering - 2.11-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jun 08 2012 Petr Pisar - 2.11-12 -- Perl 5.16 rebuild - -* Tue Feb 21 2012 Hicham HAOUARI - 2.11-11 -- Disable mapnik library support since its API changed -- Add patch from debian 107-fix-disable-mapnik.patch - to workaround a known bug when disabling mapnik -- Remove %%clean section - -* Tue Aug 23 2011 Tom Callaway - 2.11-10 -- fix build against gpsd 2.96+ - -* Sun Jul 31 2011 Kevin Fenzi - 2.11-9 -- Add patch to remove bogus dep on perl(Switch). - -* Fri Jul 29 2011 Kevin Fenzi - 2.11-8 -- Rebuild again for new boost - -* Thu Jul 21 2011 Kevin Fenzi - 2.11-7 -- Rebuild for new boost. - -* Fri Jun 17 2011 Marcela Mašláňová - 2.11-6 -- Perl mass rebuild - -* Fri Jun 10 2011 Marcela Mašláňová - 2.11-5 -- Perl 5.14 mass rebuild - -* Sun Apr 17 2011 Kalev Lember - 2.11-4 -- Rebuilt for boost 1.46.1 soname bump - -* Thu Feb 17 2011 Hicham HAOUARI - 2.11-3 -- Set BOOST_FILESYSTEM_VERSION to 2 (gpsdrive-2.11-set-boostfilesystemversion.patch) - -* Tue Feb 08 2011 Fedora Release Engineering - 2.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jul 28 2010 Hicham HAOUARI - 2.11-1 -- Update to 2.11 -- Add patch to add gdk-pixbuf2 to include path (gpsdrive-2.11-add-gdk-pixbuf2.patch) - -* Tue Jun 01 2010 Marcela Maslanova - 2.10-0.9.20100508svn -- Mass rebuild with perl-5.12.0 - -* Mon May 10 2010 Hicham HAOUARI - 2.10-0.8.20100508svn -- Fix dso linking issue - -* Sat May 08 2010 Kevin Fenzi - 2.1.0-0.6.20100508svn -- Update to svn version. - -* Fri Jan 22 2010 Rahul Sundaram - 2.1.0-0.5.pre7 -- Rebuild for Boost soname bump - -* Sat Sep 12 2009 Tom "spot" Callaway - 2.1.0-0.4.pre7 -- use caolanm's fix (now that mapnik is properly fixed), use pkgconfig to figure out mapnik cflags/libs - -* Sat Sep 12 2009 Tom "spot" Callaway - 2.1.0-0.3.pre7 -- mapnik needs libagg to work - -* Fri Jul 24 2009 Fedora Release Engineering - 2.10-0.2.pre7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Jun 16 2009 Kevin Fenzi - 2.10-0.1.pre7 -- update to 2.10pre7 - -* Sun Jun 07 2009 Kevin Fenzi - 2.10-0.1.20090607svn -- update to 2.10-20090607svn - -* Tue Feb 24 2009 Fedora Release Engineering - 2.09-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 02 2009 Kevin Fenzi - 2.09-7 -- fix for CVE-2008-4959 - bug 470241 -- fix for CVE-2008-5380 - bug 475478 -- fix for CVE-2008-5703 - bug 481702 - -* Tue Apr 08 2008 Kevin Fenzi - 2.09-6 -- Add patch for gpsd arguments - bug 438615 -- Add patch for mysql - bug 441179 - -* Sun Feb 10 2008 Kevin Fenzi - 2.09-5 -- Rebuild for gcc43 - -* Tue Aug 21 2007 Kevin Fenzi - 2.09-4 -- Update License tag. - -* Mon May 21 2007 Kevin Fenzi - 2.09-3 -- Do not ship useless INSTALL file. -- Fix incorrect greek translation. - -* Tue May 15 2007 Kevin Fenzi - 2.09-2 -- Update for current guidelines - -* Tue Apr 12 2005 Ignacio Vazquez-Abrams 2.09-1.iva.1 -- Added gtk2-devel to BR - -* Sat Jan 8 2005 Ignacio Vazquez-Abrams 0:2.09-1.iva.0 -- Retooled spec file for standards diff --git a/sources b/sources deleted file mode 100644 index ac7e1ff..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -6eeeca8e5c647115bea836d1f8fb6e0c gpsdrive-2.11.tar.gz -f369ecdbb73d4ff5ae10da6fd2ee5f5e openstreetmap-map-icons-minimal.tar.gz