Bug 237733 - astro/gpsbabel: Update to latest 1.6.0
Summary: astro/gpsbabel: Update to latest 1.6.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Luca Pizzamiglio
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2019-05-03 15:11 UTC by Conrad Meyer
Modified: 2020-07-11 19:14 UTC (History)
3 users (show)

See Also:
bugzilla: maintainer-feedback? (dev2)
pizzamig: maintainer-feedback? (dev2)


Attachments
fix gpsbabel with Qt GUI (20.16 KB, patch)
2020-06-29 20:58 UTC, Loïc Bartoletti
no flags Details | Diff
Proposed patch (20.14 KB, patch)
2020-07-06 18:13 UTC, Oliver Heesakkers
dev2: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Conrad Meyer freebsd_committer freebsd_triage 2019-05-03 15:11:45 UTC
Upstream has released a new version yesterday:

https://www.gpsbabel.org/download.html

And Fedora has already got pending as an update:

https://bugzilla.redhat.com/show_bug.cgi?id=1705691

:-)
Comment 1 Conrad Meyer freebsd_committer freebsd_triage 2019-05-03 15:13:12 UTC
I don't know if there's any reason to create a new gpsbabel15 port or if the primary reason for the gpsbabel14 port was to avoid C++/Qt (which was done in 1.5, IIRC).  If the latter, maybe we can just drop gpsbabel14 now?  I don't have strong feelings about the older versions.
Comment 2 Oliver Heesakkers 2019-06-03 13:13:12 UTC
Thanks for notifying.

I'm running into some trouble with the GUI option again. Something to do with  MAKEFLAGS starting with "w " where w is not a valid (g)make target.

The non-GUI version builds OK, but I'll have to look closer on where that "w" comes from before I submit a patch.
Comment 3 Conrad Meyer freebsd_committer freebsd_triage 2019-07-12 20:08:02 UTC
Thanks Oliver.  Can you share your work-in-progress patch and maybe I can investigate a little?  I don't use the GUI myself but would be happy to look at the build a little bit to help get this updated.
Comment 4 Oliver Heesakkers 2019-07-12 20:32:56 UTC
Thanks for reminding me.

Most work so far has been establishing that all the patches have been included upstream.

Now it fails on not being able to build target "w", the w comes from $(MAKEFLAGS), but I have no idea how it got in there.

log:
https://heesakkers.info/poudriere/2019-07-12_22h16m54s/build.html

patch so far:
https://heesakkers.info/poudriere/2019-07-12_22h16m54s/gpsbabel-1.6.0.diff
Comment 5 Conrad Meyer freebsd_committer freebsd_triage 2019-07-16 00:54:21 UTC
It looks like maybe `environ` is ending up in `MAKEFLAGS`?  I'm confused:

cd gui ; qmake app.pro && gmake w -- _PKG_CHECKED=1 _PERL5_FROM_BIN=5.28.2 _OSRELEASE=13.0-CURRENT OSVERSION=1300031 OSREL=13.0 OPSYS=FreeBSD HAVE_COMPAT_IA32_KERN=YES\  CONFIG_DONE_GPSBABEL=1 CONFIGURE_MAX_CMD_LEN=262144 ARCH=amd64 .MAKE.LEVEL.ENV=MAKELEVEL
Comment 6 Loïc Bartoletti freebsd_committer freebsd_triage 2020-06-29 20:58:54 UTC
Created attachment 216048 [details]
fix gpsbabel with Qt GUI

Can you try this patch with GUI? It still needs to be polished (missing Qt include etc.) but should works.
Comment 7 Oliver Heesakkers 2020-07-05 17:45:06 UTC
Trying...
Thanks Loïc!

Note: I no longer use FreeBSD as a desktop, so any testing on my part will be limited. If it comes through Poudriere cleanly, I'm inclined to let the patch through as is.
Comment 8 Oliver Heesakkers 2020-07-06 18:13:28 UTC
Created attachment 216262 [details]
Proposed patch

Basically Loïcs patch.
Tested, builds and runs. Just added a patch on the gpsbabel.desktop file to accommodate for the new binary name.
Comment 9 Luca Pizzamiglio freebsd_committer freebsd_triage 2020-07-11 17:39:22 UTC
It doesn't build with the default value of GUI option [disabled].
Please fix the default build, at least
Comment 10 Luca Pizzamiglio freebsd_committer freebsd_triage 2020-07-11 19:07:52 UTC
I found the easy fix: I added qmake_build to USE_QT

I'm going to commit it with the fix
Comment 11 commit-hook freebsd_committer freebsd_triage 2020-07-11 19:13:21 UTC
A commit references this bug:

Author: pizzamig
Date: Sat Jul 11 19:13:01 UTC 2020
New revision: 542043
URL: https://svnweb.freebsd.org/changeset/ports/542043

Log:
  astro/gpsbabel: Update to latest 1.6.0

  Changes: https://www.gpsbabel.org/news/gpsbabel-1.6.0.html

  PR:		237733
  Submitted by:	Conrad Meyer <cem@freebsd.org>
  Approved by:	dev2@heesakkers.info (maintainer)
  Event: July 2020 Bugathon

Changes:
  head/astro/gpsbabel/Makefile
  head/astro/gpsbabel/distinfo
  head/astro/gpsbabel/files/patch-Makefile.in
  head/astro/gpsbabel/files/patch-bushnell.cc
  head/astro/gpsbabel/files/patch-garmin__device__xml.cc
  head/astro/gpsbabel/files/patch-gpx.cc
  head/astro/gpsbabel/files/patch-gui_gpsbabel.desktop
  head/astro/gpsbabel/files/patch-jeeps_gpslibusb.cc
  head/astro/gpsbabel/files/patch-lowranceusr.cc
  head/astro/gpsbabel/files/patch-magproto.cc
  head/astro/gpsbabel/files/patch-psitrex.cc
  head/astro/gpsbabel/files/patch-src_core_ziparchive.cc
  head/astro/gpsbabel/files/patch-src_core_ziparchive.h
  head/astro/gpsbabel/files/patch-tef_xml.cc
  head/astro/gpsbabel/files/patch-unicsv.cc
  head/astro/gpsbabel/pkg-plist
Comment 12 Luca Pizzamiglio freebsd_committer freebsd_triage 2020-07-11 19:14:58 UTC
Committed! Thanks to all involved.