Attachment #217922 for bug #248866

View | Details | Raw Unified | Return to bug 248866
Collapse All | Expand All

Lines 3-10 Link Here

(-)Makefile (-4 / +2 lines)
3	PORTNAME= gpsbabel	3	PORTNAME= gpsbabel
4	DISTVERSIONPREFIX= ${PORTNAME}_	4	DISTVERSIONPREFIX= ${PORTNAME}_
5	DISTVERSION= 1_6_0	5	DISTVERSION= 1_7_0
6	PORTREVISION= 1
7	CATEGORIES= astro geography	6	CATEGORIES= astro geography
8	MAINTAINER= dev2@heesakkers.info	7	MAINTAINER= dev2@heesakkers.info
Lines 20-26 Link Here
20	USE_GITHUB= yes	19	USE_GITHUB= yes
21	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
22	CONFIGURE_ARGS= --with-zlib=system
23	OPTIONS_DEFINE= GUI	21	OPTIONS_DEFINE= GUI
24	OPTIONS_SUB= yes	22	OPTIONS_SUB= yes
Lines 36-42 Link Here
36	MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"	34	MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
37	do-build:	35	do-build:
38	(cd ${WRKSRC}; ${CONFIGURE_ENV} ${CONFIGURE_CMD} --with-zlib-system; ${MAKE_ENV} ${GMAKE})	36	(cd ${WRKSRC}; ${CONFIGURE_ENV} ${CONFIGURE_CMD}; ${MAKE_ENV} ${GMAKE})
39	do-build-GUI-on:	37	do-build-GUI-on:
40	(cd ${WRKSRC}/gui; ${QMAKE} USE_GUI=qt5; ${LRELEASE} *.ts; ${GMAKE})	38	(cd ${WRKSRC}/gui; ${QMAKE} USE_GUI=qt5; ${LRELEASE} *.ts; ${GMAKE})

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1559490562	1	TIMESTAMP = 1599906857
2	SHA256 (gpsbabel-gpsbabel-gpsbabel_1_6_0_GH0.tar.gz) = ad56796f725dcdb7f52d9a9509d4922f11198c382fe10fc2d6c9efa8159f2090	2	SHA256 (gpsbabel-gpsbabel-gpsbabel_1_7_0_GH0.tar.gz) = 30b186631fb43db576b8177385ed5c31a5a15c02a6bc07bae1e0d7af9058a797
3	SIZE (gpsbabel-gpsbabel-gpsbabel_1_6_0_GH0.tar.gz) = 14098867	3	SIZE (gpsbabel-gpsbabel-gpsbabel_1_7_0_GH0.tar.gz) = 16718984




--- configure.orig	2020-09-12 23:44:42 UTC
+++ configure
@@ -6278,13 +6278,13 @@ fi
 else

     # Die if libusb-1.0 not found. This prevents link failures later.
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb_init in -lusb-1.0" >&5
-$as_echo_n "checking for libusb_init in -lusb-1.0... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb_init in -lusb" >&5
+$as_echo_n "checking for libusb_init in -lusb... " >&6; }
 if ${ac_cv_lib_usb_1_0_libusb_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lusb-1.0  $LIBS"
+LIBS="-lusb  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */

@@ -6319,7 +6319,7 @@ if test "x$ac_cv_lib_usb_1_0_libusb_init" = xyes; then
 #define HAVE_LIBUSB_1_0 1
 _ACEOF

-  LIBS="-lusb-1.0 $LIBS"
+  LIBS="-lusb $LIBS"

 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

Lines 1-10 Link Here

(-)files/patch-gui_gpsbabel.desktop (-10 lines)
1	--- gui/gpsbabel.desktop.orig 2020-07-06 17:33:15 UTC
2	+++ gui/gpsbabel.desktop
3	@@ -4,6 +4,6 @@ Name=GPSBabel
4	Comment=Qt GUI interface for GPSBabel
5	GenericName=GPSBabel
6	Icon=gpsbabel
7	-Exec=gpsbabelfe-bin
8	+Exec=gpsbabelfe
9	Terminal=false
10	Categories=Geography;Education;Utility;

Line 0 Link Here

(-)files/patch-jeeps_gpslibusb.cc (+11 lines)
	1	--- jeeps/gpslibusb.cc.orig 2020-09-12 23:57:25 UTC
	2	+++ jeeps/gpslibusb.cc
	3	@@ -32,7 +32,7 @@
	4	// We use our own libusb.
	5	# include "mac/libusb/libusb.h"
	6	# else
	7	-# include <libusb-1.0/libusb.h>
	8	+# include <libusb.h>
	9	# endif
	10	#include "../defs.h"
	11	#include "garminusb.h"

Return to bug 248866

Line 0 Link Here

(-)files/patch-configure (+28 lines)
	1	--- configure.orig 2020-09-12 23:44:42 UTC
	2	+++ configure
	3	@@ -6278,13 +6278,13 @@ fi
	4	else
	5
	6	# Die if libusb-1.0 not found. This prevents link failures later.
	7	- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb_init in -lusb-1.0" >&5
	8	-$as_echo_n "checking for libusb_init in -lusb-1.0... " >&6; }
	9	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb_init in -lusb" >&5
	10	+$as_echo_n "checking for libusb_init in -lusb... " >&6; }
	11	if ${ac_cv_lib_usb_1_0_libusb_init+:} false; then :
	12	$as_echo_n "(cached) " >&6
	13	else
	14	ac_check_lib_save_LIBS=$LIBS
	15	-LIBS="-lusb-1.0 $LIBS"
	16	+LIBS="-lusb $LIBS"
	17	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	18	/* end confdefs.h. */
	19
	20	@@ -6319,7 +6319,7 @@ if test "x$ac_cv_lib_usb_1_0_libusb_init" = xyes; then
	21	#define HAVE_LIBUSB_1_0 1
	22	_ACEOF
	23
	24	- LIBS="-lusb-1.0 $LIBS"
	25	+ LIBS="-lusb $LIBS"
	26
	27	else
	28	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5