Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=3a3d2e7c311407a07a66579ecbbb8db021d2a2ed
commit 3a3d2e7c311407a07a66579ecbbb8db021d2a2ed Author: James Buren <[email protected]> Date: Thu Nov 29 06:56:01 2012 -0600 gpsdrive-2.11-3-x86_64 * remove package diff --git a/source/xapps-extra/gpsdrive/FrugalBuild b/source/xapps-extra/gpsdrive/FrugalBuild deleted file mode 100644 index 5376d86..0000000 --- a/source/xapps-extra/gpsdrive/FrugalBuild +++ /dev/null @@ -1,34 +0,0 @@ -# Compiling Time: 0.17 SBU -# Maintainer: bouleetbil <[email protected]> - -pkgname=gpsdrive -pkgver=2.11 -pkgrel=3 -pkgdesc="a car (bike, ship, plane) navigation system" -depends=('gtk+2>=2.16.5' 'curl' 'libgda' 'mapnik' 'speech-dispatcher' 'gpsd' 'dejavu-ttf') -makedepends=('boost' 'libboost') -options=('scriptlet' 'noversrc') -groups=('xapps-extra') -Finclude cmake sourceforge -archs=('i686' 'x86_64') -source=($source - ${source/$pkgname-$pkgver/openstreetmap-map-icons-minimal} \ - gdk-pixbuf.diff \ - gpsd-2.96.patch \ - gpsdrive-boostfilesystemversion.patch) -url="http://www.gpsdrive.de/"; -sha1sums=('9636116c219098fd00cc2500c4d2dd2676253a80' \ - 'd5315e25a9c8f7e5a6c90e21fe5f8d8d8d77d47f' \ - 'f2634985a24267918dd7903146618ffdb60ecd48' \ - '968057f9f72ddbea6935c023c6fc04599f6ec70e' \ - 'f595fc688c174ea6f5d3e0cb55bb6ff0887289d1') - -build() { - Fcd - Fsed "/usr/share/fonts/truetype/ttf-dejavu/" "/usr/share/fonts/X11/TTF/" src/gpsdrive_config.c - Fsed "/usr/share/fonts/truetype/ttf-dejavu/" "/usr/share/fonts/X11/TTF/" tests/gpsdriverc-in - #Copy map - Fmkdir usr/share/icons/map-icons/ - mv ../usr/share/icons/map-icons/* $Fdestdir/usr/share/icons/map-icons/ || Fdie - CMake_build -DLIBGPS_OLD=OFF -} diff --git a/source/xapps-extra/gpsdrive/gdk-pixbuf.diff b/source/xapps-extra/gpsdrive/gdk-pixbuf.diff deleted file mode 100644 index 6f4befd..0000000 --- a/source/xapps-extra/gpsdrive/gdk-pixbuf.diff +++ /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/source/xapps-extra/gpsdrive/gpsd-2.96.patch b/source/xapps-extra/gpsdrive/gpsd-2.96.patch deleted file mode 100644 index 00cca50..0000000 --- a/source/xapps-extra/gpsdrive/gpsd-2.96.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -wbBur gpsdrive-2.11/src/gps_handler.c gpsdrive-2.11.my/src/gps_handler.c ---- gpsdrive-2.11/src/gps_handler.c 2010-06-24 19:53:32.000000000 +0000 -+++ gpsdrive-2.11.my/src/gps_handler.c 2011-04-18 13:21:33.000000000 +0000 -@@ -264,7 +264,8 @@ - #define GPS_TIMER 500 - - static gint gps_timeout_source = 0; --static struct gps_data_t *gpsdata; -+static struct gps_data_t __gd; -+static struct gps_data_t *gpsdata = &__gd; - - /* SYMBOLS USED IN LIBGPS: - * -@@ -410,9 +411,10 @@ - */ - gps_query (gpsdata, "oys\n"); - #else -- if (gps_waiting(gpsdata)) -+ if (gps_waiting(gpsdata, 1000000)) - { -- gps_poll (gpsdata); -+ gps_read (gpsdata); -+ gps_hook_cb(gpsdata, NULL); - } - #endif - -@@ -447,7 +449,7 @@ - } - - /* try to open connection */ -- gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port); -+ gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port, gpsdata) ? NULL : &__gd; - if (!gpsdata) - { - g_print ("Can't connect to gps daemon on %s:%s, disabling GPS support!\n", -@@ -466,7 +468,7 @@ - gps_sats = g_new (gps_satellite_struct, MAXCHANNELS); - - /* set hook function to handle gps data */ -- gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb); -+// gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb); - - #ifndef LIBGPS_OLD - /* enable watch mode to get data stream from gpsd */ diff --git a/source/xapps-extra/gpsdrive/gpsdrive-boostfilesystemversion.patch b/source/xapps-extra/gpsdrive/gpsdrive-boostfilesystemversion.patch deleted file mode 100644 index a147485..0000000 --- a/source/xapps-extra/gpsdrive/gpsdrive-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) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
