the Fink project is an effort to port
popular Unix programs to Mac OS X
Package: gpsdrive
Version: 2.09
Revision: 1016
Description: GPS-based navigation tool
DescDetail: <<
GpsDrive is a car (bike, ship, plane) navigation system. GpsDrive
displays your position provided from your NMEA capable GPS receiver on
a zoomable map, the map file is autoselected depending of the position
and prefered scale. Speech output is supported if the "festival"
software is running. The maps are autoselected for best resolution
depending of your position and can be downloaded from Internet. All
Garmin GPS reveiver with a serial output should be usable, also other
GPS receiver which supports NMEA protocol.
For optional MySQL support, install 'mysql-shlibs'.
Garmin is disabled in this Fink package at this time.
<<
DescUsage: <<
'man gpsdrive' to get started.
You may have to adjust the /dev path for communication with Garmin.
There are reports that mouse buttons do not work correctly. The
following was posted to the gpsdrive mailing list:
From: Eduo
Date: Sun, 15 Jun 2003 02:03:40 -0500 (CDT)
Subject: Re: mac OS X: no right click
On Sat, 14 Jun 2003, Stephen Proulx wrote:
>
> Since there's been a string of messages about compiling, I thought I'd
> see if any of the mac users have the same problem as me with using
> gpsdrive.
>
> I've compiled it for OS X 10.2 and can run it under Macintosh's X11
> server, but using Option+click and Command+click does nothing.
I had this problem and haven't been able to fix it, but I have found that
with a two-button mouse you can actually duplicate the right and left
button behaviours in a strange way: you have to click both buttons first
the mouse clicking the one you want and without relasing clicking the
second one, thus:
left-click-hold, right click-release: left click
right-click-hold, left click-release: right click
<<
DescPort: <<
Have to move doc files by hand (./configure putting doc files in
--datadir along with pix (DATADIR gets hard-coded; prog looks for
DATADIR/gpsdrive/filename.ext). Should doc files go in DATADIR/doc?
At run-time, gpsdrive checks if the MySQL client library is available,
and enables MySql support if so (mysql version 3/libversion 10).
Besides patching in the Fink mysql lib path, we patch out any mysql
lib paths that are not libversion-specific, just to be safe. Also
scrap the dist mysql headers and patch to get from standard locations.
Need a way (--with-mysql-client= ?) to pass non-standard mysql lib
(path and filename (but could guess default filenames if passed a
path?>). Maybe --with-mysql-headers= path to dir of .h so could use
matching headers to installed lib to over-ride the dist -Imysql?
ccache disabled due to occasional gpsd.c problems (thanks to Ben Hines
for the way to disable it).
The patch -module is needed to cause libtool to instruct the linker to
build g_module_open()able .so files (cf. -bundle giving .dylib). Has
anybody gotten a configure.ac or .m4 fragment to automatically set
these flags correctly on all platforms?
Module linking is broken by default. The problem seems to be that the
libtool that is created doesn't construct the correct linker flags in
response to -module. The libtool created using ltmain.sh from libtool
1.5 (fink's libtool14) gets it right, so copy that one and regenerate
configure.
Modules are segregated within lib/%n.
--with-debug may allow some optimization flags to leak through.
Garmin disabled (lots of prototyping non-portability...should just
use sys/types.h for everyone, etc., but haven't fixed it yet).
If MySQL dlopen succeeds by dlsym fails (i.e., dlsym _ omitted),
segfault during startup (EXC_BAD_ACCESS/KERN_INVALID_ADDRESS in
gtk_box_pack_start in _start (crt.c:267) in start) (during or just
after splash-screen; before main window is created.
freetype2 + dlcompat deps removed for 10.3.
Often the Quit button causes a segfault.
If the main window is dragged so that the penguin icon is entirely
off-screen, get lots of:
(gpsdrive:6483): Gdk-CRITICAL **: file gdkmain-x11.c: line 648 (gdk_error_trap_pop): assertion `gdk_error_traps != NULL' failed
Fixed some weirdness relating to crypt. Was using the presence of
crypt.h to indicate availability of crypt(). Now check for the
function itself (possibly in libcrypt).
Removed duplicate dlsym and crypt blocks from configure.ac.
Renamed nlist[] since libm has a symbol with the same name.
Original port and maintenance until 2.09-11 on OS X 10.3 by Daniel Macks
<<
Homepage: http://www.kraftvoll.at/software/index.shtml
License: GPL
Maintainer: None
Depends: <<
atk1-shlibs (>= 1.20.0-1),
glib2-shlibs (>= 2.14.0-1),
gtk+2 (>= 2.12.0-1),
pango1-xft2-ft219-shlibs (>= 1.18.4-4),
pcre-shlibs (>= 3-1),
x11
<<
BuildDepends: <<
atk1 (>= 1.20.0-1),
cairo (>= 1.6-1),
expat1,
autoconf (>= 2.60-1),
automake1.7,
fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.5-1),
glib2-dev (>= 2.14.0-1),
glitz,
gtk+2-dev (>= 2.12.0-1),
libgettext3-dev,
libiconv-dev,
libpng3,
libtool14,
mysql-dev (>= 3.23.58-1023),
pango1-xft2-ft219-dev (>= 1.18.4-4),
pcre (>= 3-1),
pcre-bin (>= 3-1),
pixman (>= 0.10.0-1),
pkgconfig (>= 0.21-1),
x11-dev,
xft2-dev
<<
# automake<1.7 barfs on configure.ac
# mysql-shlibs is libmysqlclient.10.dylib
Suggests: mysql-shlibs (>= 3.23.58-1023)
# Garmin is C++
#GCC: 4.0
Source: mirror:custom:%n-%v.tar.gz
Source-MD5: eaa52cb220f3d10312a1046dd47126bb
CustomMirror: <<
eur-DE: http://gpsdrive.flugfunk.de/
eur-US: http://www.gpsdrive.oc512.us/
nam-US: http://gpsdrive.teachlinux.com/
Primary: http://www.gpsdrive.cc/
<<
PatchFile: %n.patch
PatchFile-MD5: 078081992a1fb3e87e94c5c6497b856f
# PatchScript may need to
# cp %p/share/automake-1.7/compile
# before autoreconf
# PatchScript needs to
# autoreconf -f
# after patches to .ac/.am files or replacement of the support scripts
# (and if so BuildDepends on autoconf/automake)
PatchScript: <<
%{default_script}
perl -pi.bak -e 's|\@PREFIX\@|%p|' src/gpsdrive.c
#perl -pi.bak -e 's|ient.10.dylib|ient.12.dylib|g' src/gpsdrive.c
#perl -pi.bak -e 's|\(mod1, "|\(mod1, "_|g' src/gpsdrive.c
rm -rf src/mysql
cp %p/share/libtool/ltmain.sh .
autoreconf -f
perl -pi.bak -e 's/-version-info 2:0:0/-module -avoid-version/' src/Makefile.in
<<
SetCPPFLAGS: -I/usr/X11R6/include -Wall
SetMACOSX_DEPLOYMENT_TARGET: 10.3
ConfigureParams: --mandir='${prefix}/share/man' --libdir='${prefix}/lib/%n' --disable-garmin --disable-dependency-tracking PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH" FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
CompileScript: <<
#!/bin/sh -ex
export CCACHE_DISABLE=1
export CC=/usr/bin/gcc
./configure %c
make
<<
# InstallScript should do
# rm %i/lib/%n/*.a %i/lib/%n/*.la
# when plugins are enabled
InstallScript: <<
make prefix=%i install
rm %i/lib/%n/*.a %i/lib/%n/*.la
install -d -m 755 %i/share/doc/%n
mv %i/share/%n/[A-Zcw]* %i/share/doc/%n
<<
diff -Nurd -x*~ gpsdrive-2.08pre12.orig/configure.ac gpsdrive-2.08pre12/configure.ac
--- gpsdrive-2.08pre12.orig/configure.ac Fri Feb 6 18:02:49 2004
+++ gpsdrive-2.08pre12/configure.ac Wed Feb 18 02:40:22 2004
@@ -163,10 +163,11 @@
AC_CHECK_HEADERS(sys/types.h sys/termios.h termio.h termios.h sys/stat.h fcntl.h stdio.h unistd.h netdb.h X11/X.h linux/inet.h sys/ioctl.h)
dnl ************************
-dnl crypt.h and libcrypt
+dnl friends.c wonders about crypt()
dnl ************************
AC_CHECK_HEADERS(crypt.h)
-AC_CHECK_LIB(crypt,crypt)
+AC_SEARCH_LIBS(crypt,crypt)
+AC_CHECK_FUNCS(crypt)
dnl ************************
dnl check dynamic loading flags
@@ -261,30 +262,9 @@
dnl ************************
-dnl crypt.h and libcrypt
-dnl ************************
-AC_CHECK_HEADERS(crypt.h)
-AC_CHECK_LIB(crypt,crypt)
-
-dnl ************************
dnl GNU getopt
dnl ************************
AC_CHECK_DECLS(getopt)
-
-dnl ************************
-dnl check dynamic loading flags
-dnl ************************
-AC_LTDL_DLLIB
-AC_LTDL_DLSYM_USCORE
-# putting this here gets the option enabled, but program segfaults
-# putting a non-conditional CFLAGS="$CFLAGS -Ddlsym..." early in
-# configure.ac works correctly, but putting the two AC_ and the
-# conditional CFLAGS= does not.
-#if test x"$libltdl_cv_need_uscore" = xyes; then
-# AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore')
-#fi
-
-CFLAGS="$CFLAGS -Imysql"
CFLAGS="$CFLAGS $OPT_CFLAGS"
CXXFLAGS="$CXXFLAGS $OPT_CFLAGS"
diff -Nurd -x*~ gpsdrive-2.08pre12.orig/src/Makefile.am gpsdrive-2.08pre12/src/Makefile.am
--- gpsdrive-2.08pre12.orig/src/Makefile.am Fri Feb 6 18:01:22 2004
+++ gpsdrive-2.08pre12/src/Makefile.am Wed Feb 18 02:40:22 2004
@@ -2,8 +2,6 @@
# DEFS=@DEFS@ -I. -I$(srcdir) -I.. -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" -DLIBDIR=\"${libdir}\" -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" ${NOGARMIN} ${NOPLUGINS} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
-includedir = mysql
-
if DISABLEGARMIN
PRG1=
else
diff -Nurd -x*~ gpsdrive-2.08pre12.orig/src/friends.c gpsdrive-2.08pre12/src/friends.c
--- gpsdrive-2.08pre12.orig/src/friends.c Sun Feb 8 11:35:10 2004
+++ gpsdrive-2.08pre12/src/friends.c Wed Feb 18 02:57:49 2004
@@ -435,7 +435,7 @@
g_snprintf (buf2, sizeof (buf2), "$1$%08lx$", r);
key = "havenocrypt";
-#ifdef HAVE_CRYPT_H
+#ifdef HAVE_CRYPT
key = crypt ("fritz", buf2);
g_strlcpy (friendsidstring, (key + 12), sizeof (friendsidstring));
#else
@@ -443,7 +443,7 @@
g_snprintf (friendsidstring, sizeof (friendsidstring), "nocrypt%015ld",
labs (r));
#endif
- printf ("\nKey: %s,id: %s %d bytes, time: %ld\n", key,
+ printf ("\nKey: %s,id: %s %ld bytes, time: %ld\n", key,
friendsidstring, strlen (friendsidstring), ti);
needtosave = 1;
}
diff -Nurd -x*~ gpsdrive-2.08pre12.orig/src/friendsd.c gpsdrive-2.08pre12/src/friendsd.c
--- gpsdrive-2.08pre12.orig/src/friendsd.c Sun Feb 8 12:16:25 2004
+++ gpsdrive-2.08pre12/src/friendsd.c Wed Feb 18 03:16:06 2004
@@ -446,7 +446,7 @@
g_snprintf (friendsidstring, sizeof (friendsidstring), "nocrypt%015ld",
labs (r));
#endif
- printf ("\nKey: %s,id: %s %d bytes, time: %ld\n", key,
+ printf ("\nKey: %s,id: %s %ld bytes, time: %ld\n", key,
friendsidstring, strlen (friendsidstring), ti);
g_strlcpy (serverid, friendsidstring, sizeof (serverid));
diff -Nurd -x*~ gpsdrive-2.08pre12.orig/src/gpsdrive.c gpsdrive-2.08pre12/src/gpsdrive.c
--- gpsdrive-2.08pre12.orig/src/gpsdrive.c Sun Feb 8 12:16:25 2004
+++ gpsdrive-2.08pre12/src/gpsdrive.c Wed Feb 18 02:40:22 2004
@@ -1994,7 +1994,7 @@
"1000000", "1500000", "2000000", "3000000", "5000000", "7500000",
"10000000", "15000000", "20000000", "30000000", "50000000", "75000000"
};
-gint nlist[] = { 1000, 1500, 2000, 3000, 5000, 7500,
+gint scalelist[] = { 1000, 1500, 2000, 3000, 5000, 7500,
10000, 15000, 20000, 30000, 50000, 75000,
100000, 150000, 200000, 300000, 500000, 750000,
1000000, 1500000, 2000000, 3000000, 5000000, 7500000,
@@ -3161,7 +3161,7 @@
g_print ("\n!!bigp:%d, e: %d!!", bigp, e);
g_strlcat (big, buffer, MAXBIG);
if (mydebug)
- g_print (", strlen big:%d", strlen (big));
+ g_print (", strlen big:%ld", strlen (big));
bigp += e;
bigpGSA = bigpRME = bigpGSV = bigpGGA = bigp;
@@ -8815,7 +8815,7 @@
scaler_cb (GtkAdjustment * adj, gdouble * datum)
{
gchar s2[100];
- scalewanted = nlist[(gint) rint (adj->value)];
+ scalewanted = scalelist[(gint) rint (adj->value)];
g_snprintf (s2, sizeof (s2), "1:%d", scalewanted);
gtk_label_set_text (GTK_LABEL (l8), s2);
if (debug)
diff -Nurd -x*~ gpsdrive-2.08pre12.orig/src/gpsdrive.h gpsdrive-2.08pre12/src/gpsdrive.h
--- gpsdrive-2.08pre12.orig/src/gpsdrive.h Fri Feb 6 09:55:54 2004
+++ gpsdrive-2.08pre12/src/gpsdrive.h Wed Feb 18 02:40:22 2004
@@ -79,7 +79,7 @@
#include
#include
#include "gtk/gtk.h"
-#include "mysql.h"
+#include
#include "gpsproto.h"
/* adapt this section for the size of your screen */
diff -Nurd -x*~ gpsdrive-2.08pre12.orig/src/gpssql.c gpsdrive-2.08pre12/src/gpssql.c
--- gpsdrive-2.08pre12.orig/src/gpssql.c Sun Feb 8 12:16:25 2004
+++ gpsdrive-2.08pre12/src/gpssql.c Wed Feb 18 02:40:22 2004
@@ -181,7 +181,7 @@
******************************************************************/
-#include "mysql.h"
+#include
Package: gpsdrive
Version: 2.09
Revision: 1016
Description: GPS-based navigation tool
DescDetail: <<
GpsDrive is a car (bike, ship, plane) navigation system. GpsDrive
displays your position provided from your NMEA capable GPS receiver on
a zoomable map, the map file is autoselected depending of the position
and prefered scale. Speech output is supported if the "festival"
software is running. The maps are autoselected for best resolution
depending of your position and can be downloaded from Internet. All
Garmin GPS reveiver with a serial output should be usable, also other
GPS receiver which supports NMEA protocol.
For optional MySQL support, install 'mysql-shlibs'.
Garmin is disabled in this Fink package at this time.
<<
DescUsage: <<
'man gpsdrive' to get started.
You may have to adjust the /dev path for communication with Garmin.
There are reports that mouse buttons do not work correctly. The
following was posted to the gpsdrive mailing list:
From: Eduo
Date: Sun, 15 Jun 2003 02:03:40 -0500 (CDT)
Subject: Re: mac OS X: no right click
On Sat, 14 Jun 2003, Stephen Proulx wrote:
>
> Since there's been a string of messages about compiling, I thought I'd
> see if any of the mac users have the same problem as me with using
> gpsdrive.
>
> I've compiled it for OS X 10.2 and can run it under Macintosh's X11
> server, but using Option+click and Command+click does nothing.
I had this problem and haven't been able to fix it, but I have found that
with a two-button mouse you can actually duplicate the right and left
button behaviours in a strange way: you have to click both buttons first
the mouse clicking the one you want and without relasing clicking the
second one, thus:
left-click-hold, right click-release: left click
right-click-hold, left click-release: right click
<<
DescPort: <<
Have to move doc files by hand (./configure putting doc files in
--datadir along with pix (DATADIR gets hard-coded; prog looks for
DATADIR/gpsdrive/filename.ext). Should doc files go in DATADIR/doc?
At run-time, gpsdrive checks if the MySQL client library is available,
and enables MySql support if so (mysql version 3/libversion 10).
Besides patching in the Fink mysql lib path, we patch out any mysql
lib paths that are not libversion-specific, just to be safe. Also
scrap the dist mysql headers and patch to get from standard locations.
Need a way (--with-mysql-client= ?) to pass non-standard mysql lib
(path and filename (but could guess default filenames if passed a
path?>). Maybe --with-mysql-headers= path to dir of .h so could use
matching headers to installed lib to over-ride the dist -Imysql?
ccache disabled due to occasional gpsd.c problems (thanks to Ben Hines
for the way to disable it).
The patch -module is needed to cause libtool to instruct the linker to
build g_module_open()able .so files (cf. -bundle giving .dylib). Has
anybody gotten a configure.ac or .m4 fragment to automatically set
these flags correctly on all platforms?
Module linking is broken by default. The problem seems to be that the
libtool that is created doesn't construct the correct linker flags in
response to -module. The libtool created using ltmain.sh from libtool
1.5 (fink's libtool14) gets it right, so copy that one and regenerate
configure.
Modules are segregated within lib/%n.
--with-debug may allow some optimization flags to leak through.
Garmin disabled (lots of prototyping non-portability...should just
use sys/types.h for everyone, etc., but haven't fixed it yet).
If MySQL dlopen succeeds by dlsym fails (i.e., dlsym _ omitted),
segfault during startup (EXC_BAD_ACCESS/KERN_INVALID_ADDRESS in
gtk_box_pack_start in _start (crt.c:267) in start) (during or just
after splash-screen; before main window is created.
freetype2 + dlcompat deps removed for 10.3.
Often the Quit button causes a segfault.
If the main window is dragged so that the penguin icon is entirely
off-screen, get lots of:
(gpsdrive:6483): Gdk-CRITICAL **: file gdkmain-x11.c: line 648 (gdk_error_trap_pop): assertion `gdk_error_traps != NULL' failed
Fixed some weirdness relating to crypt. Was using the presence of
crypt.h to indicate availability of crypt(). Now check for the
function itself (possibly in libcrypt).
Removed duplicate dlsym and crypt blocks from configure.ac.
Renamed nlist[] since libm has a symbol with the same name.
Original port and maintenance until 2.09-11 on OS X 10.3 by Daniel Macks
<<
Homepage: http://www.kraftvoll.at/software/index.shtml
License: GPL
Maintainer: None
Depends: <<
atk1-shlibs (>= 1.20.0-1),
glib2-shlibs (>= 2.14.0-1),
gtk+2 (>= 2.12.0-1),
pango1-xft2-ft219-shlibs (>= 1.18.4-4),
pcre-shlibs (>= 3-1),
x11
<<
BuildDepends: <<
atk1 (>= 1.20.0-1),
cairo (>= 1.6-1),
expat1,
autoconf (>= 2.60-1),
automake1.7,
fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.5-1),
glib2-dev (>= 2.14.0-1),
glitz,
gtk+2-dev (>= 2.12.0-1),
libgettext3-dev,
libiconv-dev,
libpng3,
libtool14,
mysql-dev (>= 3.23.58-1023),
pango1-xft2-ft219-dev (>= 1.18.4-4),
pcre (>= 3-1),
pcre-bin (>= 3-1),
pixman (>= 0.10.0-1),
pkgconfig (>= 0.21-1),
x11-dev,
xft2-dev
<<
# automake<1.7 barfs on configure.ac
# mysql-shlibs is libmysqlclient.10.dylib
Suggests: mysql-shlibs (>= 3.23.58-1023)
# Garmin is C++
#GCC: 4.0
Source: mirror:custom:%n-%v.tar.gz
Source-MD5: eaa52cb220f3d10312a1046dd47126bb
CustomMirror: <<
eur-DE: http://gpsdrive.flugfunk.de/
eur-US: http://www.gpsdrive.oc512.us/
nam-US: http://gpsdrive.teachlinux.com/
Primary: http://www.gpsdrive.cc/
<<
PatchFile: %n.patch
PatchFile-MD5: 078081992a1fb3e87e94c5c6497b856f
# PatchScript may need to
# cp %p/share/automake-1.7/compile
# before autoreconf
# PatchScript needs to
# autoreconf -f
# after patches to .ac/.am files or replacement of the support scripts
# (and if so BuildDepends on autoconf/automake)
PatchScript: <<
%{default_script}
perl -pi.bak -e 's|\@PREFIX\@|%p|' src/gpsdrive.c
#perl -pi.bak -e 's|ient.10.dylib|ient.12.dylib|g' src/gpsdrive.c
#perl -pi.bak -e 's|\(mod1, "|\(mod1, "_|g' src/gpsdrive.c
rm -rf src/mysql
cp %p/share/libtool/ltmain.sh .
autoreconf -f
perl -pi.bak -e 's/-version-info 2:0:0/-module -avoid-version/' src/Makefile.in
<<
SetCPPFLAGS: -I/usr/X11R6/include -Wall
SetMACOSX_DEPLOYMENT_TARGET: 10.3
ConfigureParams: --mandir='${prefix}/share/man' --libdir='${prefix}/lib/%n' --disable-garmin --disable-dependency-tracking PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH" FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
CompileScript: <<
#!/bin/sh -ex
export CCACHE_DISABLE=1
export CC=/usr/bin/gcc
./configure %c
make
<<
# InstallScript should do
# rm %i/lib/%n/*.a %i/lib/%n/*.la
# when plugins are enabled
InstallScript: <<
make prefix=%i install
rm %i/lib/%n/*.a %i/lib/%n/*.la
install -d -m 755 %i/share/doc/%n
mv %i/share/%n/[A-Zcw]* %i/share/doc/%n
<<
diff -Nurd -x*~ gpsdrive-2.08pre12.orig/configure.ac gpsdrive-2.08pre12/configure.ac
--- gpsdrive-2.08pre12.orig/configure.ac Fri Feb 6 18:02:49 2004
+++ gpsdrive-2.08pre12/configure.ac Wed Feb 18 02:40:22 2004
@@ -163,10 +163,11 @@
AC_CHECK_HEADERS(sys/types.h sys/termios.h termio.h termios.h sys/stat.h fcntl.h stdio.h unistd.h netdb.h X11/X.h linux/inet.h sys/ioctl.h)
dnl ************************
-dnl crypt.h and libcrypt
+dnl friends.c wonders about crypt()
dnl ************************
AC_CHECK_HEADERS(crypt.h)
-AC_CHECK_LIB(crypt,crypt)
+AC_SEARCH_LIBS(crypt,crypt)
+AC_CHECK_FUNCS(crypt)
dnl ************************
dnl check dynamic loading flags
@@ -261,30 +262,9 @@
dnl ************************
-dnl crypt.h and libcrypt
-dnl ************************
-AC_CHECK_HEADERS(crypt.h)
-AC_CHECK_LIB(crypt,crypt)
-
-dnl ************************
dnl GNU getopt
dnl ************************
AC_CHECK_DECLS(getopt)
-
-dnl ************************
-dnl check dynamic loading flags
-dnl ************************
-AC_LTDL_DLLIB
-AC_LTDL_DLSYM_USCORE
-# putting this here gets the option enabled, but program segfaults
-# putting a non-conditional CFLAGS="$CFLAGS -Ddlsym..." early in
-# configure.ac works correctly, but putting the two AC_ and the
-# conditional CFLAGS= does not.
-#if test x"$libltdl_cv_need_uscore" = xyes; then
-# AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore')
-#fi
-
-CFLAGS="$CFLAGS -Imysql"
CFLAGS="$CFLAGS $OPT_CFLAGS"
CXXFLAGS="$CXXFLAGS $OPT_CFLAGS"
diff -Nurd -x*~ gpsdrive-2.08pre12.orig/src/Makefile.am gpsdrive-2.08pre12/src/Makefile.am
--- gpsdrive-2.08pre12.orig/src/Makefile.am Fri Feb 6 18:01:22 2004
+++ gpsdrive-2.08pre12/src/Makefile.am Wed Feb 18 02:40:22 2004
@@ -2,8 +2,6 @@
# DEFS=@DEFS@ -I. -I$(srcdir) -I.. -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" -DLIBDIR=\"${libdir}\" -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" ${NOGARMIN} ${NOPLUGINS} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
-includedir = mysql
-
if DISABLEGARMIN
PRG1=
else
diff -Nurd -x*~ gpsdrive-2.08pre12.orig/src/friends.c gpsdrive-2.08pre12/src/friends.c
--- gpsdrive-2.08pre12.orig/src/friends.c Sun Feb 8 11:35:10 2004
+++ gpsdrive-2.08pre12/src/friends.c Wed Feb 18 02:57:49 2004
@@ -435,7 +435,7 @@
g_snprintf (buf2, sizeof (buf2), "$1$%08lx$", r);
key = "havenocrypt";
-#ifdef HAVE_CRYPT_H
+#ifdef HAVE_CRYPT
key = crypt ("fritz", buf2);
g_strlcpy (friendsidstring, (key + 12), sizeof (friendsidstring));
#else
@@ -443,7 +443,7 @@
g_snprintf (friendsidstring, sizeof (friendsidstring), "nocrypt%015ld",
labs (r));
#endif
- printf ("\nKey: %s,id: %s %d bytes, time: %ld\n", key,
+ printf ("\nKey: %s,id: %s %ld bytes, time: %ld\n", key,
friendsidstring, strlen (friendsidstring), ti);
needtosave = 1;
}
diff -Nurd -x*~ gpsdrive-2.08pre12.orig/src/friendsd.c gpsdrive-2.08pre12/src/friendsd.c
--- gpsdrive-2.08pre12.orig/src/friendsd.c Sun Feb 8 12:16:25 2004
+++ gpsdrive-2.08pre12/src/friendsd.c Wed Feb 18 03:16:06 2004
@@ -446,7 +446,7 @@
g_snprintf (friendsidstring, sizeof (friendsidstring), "nocrypt%015ld",
labs (r));
#endif
- printf ("\nKey: %s,id: %s %d bytes, time: %ld\n", key,
+ printf ("\nKey: %s,id: %s %ld bytes, time: %ld\n", key,
friendsidstring, strlen (friendsidstring), ti);
g_strlcpy (serverid, friendsidstring, sizeof (serverid));
diff -Nurd -x*~ gpsdrive-2.08pre12.orig/src/gpsdrive.c gpsdrive-2.08pre12/src/gpsdrive.c
--- gpsdrive-2.08pre12.orig/src/gpsdrive.c Sun Feb 8 12:16:25 2004
+++ gpsdrive-2.08pre12/src/gpsdrive.c Wed Feb 18 02:40:22 2004
@@ -1994,7 +1994,7 @@
"1000000", "1500000", "2000000", "3000000", "5000000", "7500000",
"10000000", "15000000", "20000000", "30000000", "50000000", "75000000"
};
-gint nlist[] = { 1000, 1500, 2000, 3000, 5000, 7500,
+gint scalelist[] = { 1000, 1500, 2000, 3000, 5000, 7500,
10000, 15000, 20000, 30000, 50000, 75000,
100000, 150000, 200000, 300000, 500000, 750000,
1000000, 1500000, 2000000, 3000000, 5000000, 7500000,
@@ -3161,7 +3161,7 @@
g_print ("\n!!bigp:%d, e: %d!!", bigp, e);
g_strlcat (big, buffer, MAXBIG);
if (mydebug)
- g_print (", strlen big:%d", strlen (big));
+ g_print (", strlen big:%ld", strlen (big));
bigp += e;
bigpGSA = bigpRME = bigpGSV = bigpGGA = bigp;
@@ -8815,7 +8815,7 @@
scaler_cb (GtkAdjustment * adj, gdouble * datum)
{
gchar s2[100];
- scalewanted = nlist[(gint) rint (adj->value)];
+ scalewanted = scalelist[(gint) rint (adj->value)];
g_snprintf (s2, sizeof (s2), "1:%d", scalewanted);
gtk_label_set_text (GTK_LABEL (l8), s2);
if (debug)
diff -Nurd -x*~ gpsdrive-2.08pre12.orig/src/gpsdrive.h gpsdrive-2.08pre12/src/gpsdrive.h
--- gpsdrive-2.08pre12.orig/src/gpsdrive.h Fri Feb 6 09:55:54 2004
+++ gpsdrive-2.08pre12/src/gpsdrive.h Wed Feb 18 02:40:22 2004
@@ -79,7 +79,7 @@
#include
#include
#include "gtk/gtk.h"
-#include "mysql.h"
+#include
#include "gpsproto.h"
/* adapt this section for the size of your screen */
diff -Nurd -x*~ gpsdrive-2.08pre12.orig/src/gpssql.c gpsdrive-2.08pre12/src/gpssql.c
--- gpsdrive-2.08pre12.orig/src/gpssql.c Sun Feb 8 12:16:25 2004
+++ gpsdrive-2.08pre12/src/gpssql.c Wed Feb 18 02:40:22 2004
@@ -181,7 +181,7 @@
******************************************************************/
-#include "mysql.h"
+#include