Attachment 217922 Details for Bug 248866 – Proposed patch

[patch] Proposed patch

gpsbabel-1.7.0.diff (text/plain), 4.53 KB, created by Oliver Heesakkers on 2020-09-13 01:22:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Heesakkers

Created: 2020-09-13 01:22:44 UTC

Size: 4.53 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 548301)
>+++ Makefile	(working copy)
>@@ -3,8 +3,7 @@
>
> PORTNAME=	gpsbabel
> DISTVERSIONPREFIX=	${PORTNAME}_
>-DISTVERSION=	1_6_0
>-PORTREVISION=	1
>+DISTVERSION=	1_7_0
> CATEGORIES=	astro geography
>
> MAINTAINER=	dev2@heesakkers.info
>@@ -20,7 +19,6 @@
>
> USE_GITHUB=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-zlib=system
>
> OPTIONS_DEFINE=	GUI
> OPTIONS_SUB=	yes
>@@ -36,7 +34,7 @@
> MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
>
> do-build:
>-	(cd ${WRKSRC}; ${CONFIGURE_ENV} ${CONFIGURE_CMD} --with-zlib-system; ${MAKE_ENV} ${GMAKE})
>+	(cd ${WRKSRC}; ${CONFIGURE_ENV} ${CONFIGURE_CMD}; ${MAKE_ENV} ${GMAKE})
> do-build-GUI-on:
> 	(cd ${WRKSRC}/gui; ${QMAKE} USE_GUI=qt5; ${LRELEASE} *.ts; ${GMAKE})
>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 548301)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1559490562
>-SHA256 (gpsbabel-gpsbabel-gpsbabel_1_6_0_GH0.tar.gz) = ad56796f725dcdb7f52d9a9509d4922f11198c382fe10fc2d6c9efa8159f2090
>-SIZE (gpsbabel-gpsbabel-gpsbabel_1_6_0_GH0.tar.gz) = 14098867
>+TIMESTAMP = 1599906857
>+SHA256 (gpsbabel-gpsbabel-gpsbabel_1_7_0_GH0.tar.gz) = 30b186631fb43db576b8177385ed5c31a5a15c02a6bc07bae1e0d7af9058a797
>+SIZE (gpsbabel-gpsbabel-gpsbabel_1_7_0_GH0.tar.gz) = 16718984
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(nonexistent)
>+++ files/patch-configure	(working copy)
>@@ -0,0 +1,28 @@
>+--- 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
>
>Property changes on: files/patch-configure
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-gui_gpsbabel.desktop
>===================================================================
>--- files/patch-gui_gpsbabel.desktop	(revision 548301)
>+++ files/patch-gui_gpsbabel.desktop	(nonexistent)
>@@ -1,10 +0,0 @@
>---- gui/gpsbabel.desktop.orig	2020-07-06 17:33:15 UTC
>-+++ gui/gpsbabel.desktop
>-@@ -4,6 +4,6 @@ Name=GPSBabel
>- Comment=Qt GUI interface for GPSBabel
>- GenericName=GPSBabel
>- Icon=gpsbabel
>--Exec=gpsbabelfe-bin
>-+Exec=gpsbabelfe
>- Terminal=false
>- Categories=Geography;Education;Utility;
>
>Property changes on: files/patch-gui_gpsbabel.desktop
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-jeeps_gpslibusb.cc
>===================================================================
>--- files/patch-jeeps_gpslibusb.cc	(nonexistent)
>+++ files/patch-jeeps_gpslibusb.cc	(working copy)
>@@ -0,0 +1,11 @@
>+--- jeeps/gpslibusb.cc.orig	2020-09-12 23:57:25 UTC
>++++ jeeps/gpslibusb.cc
>+@@ -32,7 +32,7 @@
>+ // We use our own libusb.
>+ #    include "mac/libusb/libusb.h"
>+ #  else
>+-#    include <libusb-1.0/libusb.h>
>++#    include <libusb.h>
>+ #  endif
>+ #include "../defs.h"
>+ #include "garminusb.h"
>
>Property changes on: files/patch-jeeps_gpslibusb.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>

Flags:

dev2: maintainer-approval+

Actions: View | Diff

Attachments on bug 248866: 217922