Yet another Qt5WebEngine rampage update diff. Update gpsbabel to 1.10.
Notable port changes:
- Switch to Qt6/Cmake
- Cleanup makefile
- Drop gui/serial_unix.cc it's handled by x11/qt6/qtserialport
Lightly tested on amd64. OK?
Cheers Rafael
diff --git a/geo/gpsbabel/Makefile b/geo/gpsbabel/Makefile
index 1ebd4d55e18..a25d6750263 100644
--- a/geo/gpsbabel/Makefile
+++ b/geo/gpsbabel/Makefile
@@ -1,19 +1,19 @@
USE_WXNEEDED= Yes
+PKG_ARCH-tk= *
+
COMMENT-main= GPS waypoint, track, and route conversion tool
COMMENT-tk= Tk front-end to gpsbabel
COMMENT-qt= Qt front-end to gpsbabel
-VERSION= 1.6.0.1
+VERSION= 1.10.0
GH_ACCOUNT= gpsbabel
GH_PROJECT= gpsbabel
-GH_TAGNAME= gpsbabel_1_6_0.1
+GH_TAGNAME= gpsbabel_1_10_0
DISTNAME= gpsbabel-${VERSION}
PKGNAME-main= gpsbabel-${VERSION}
PKGNAME-tk= gpsbabel-tk-${VERSION}
PKGNAME-qt= gpsbabel-qt-${VERSION}
-REVISION-main= 3
-REVISION-qt= 3
CATEGORIES= geo
HOMEPAGE= https://www.gpsbabel.org/
@@ -21,55 +21,52 @@ HOMEPAGE= https://www.gpsbabel.org/
# GPLv2
PERMIT_PACKAGE= Yes
-COMPILER = base-clang ports-gcc base-gcc
+WANTLIB-main += ${COMPILER_LIBCXX} Qt6Core Qt6Core5Compat c m shp usb-1.0
+
+WANTLIB-qt += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Network Qt6OpenGL
+WANTLIB-qt += Qt6Positioning Qt6PrintSupport Qt6Qml Qt6QmlMeta Qt6QmlModels
+WANTLIB-qt += Qt6QmlWorkerScript Qt6Quick Qt6SerialPort Qt6WebChannel
+WANTLIB-qt += Qt6WebEngineCore Qt6WebEngineWidgets Qt6Widgets Qt6Xml
+WANTLIB-qt += c m shp
-AUTOCONF_VERSION= 2.69
-CONFIGURE_STYLE= autoconf qmake
-USE_GMAKE= yes
-CONFIGURE_ARGS+= --with-zlib=system
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lshp" \
- WEB=${WRKSRC}
+WANTLIB-tk =
MULTI_PACKAGES= -main -tk -qt
-MODULES= devel/qmake x11/tk x11/qt5
-MODQMAKE_PROJECTS = gui/app.pro
+MODULES= devel/cmake \
+ x11/tk \
+ x11/qt6
-# /usr/local/bin/gpsbabel (from the -main subpackage) is linked against Qt5Core
-LIB_DEPENDS-main= ${MODGCC4_CPPLIBDEP} \
- x11/qt5/qtbase \
- devel/libusb-compat \
- devel/shapelib
+# gpsbabel (from the -main subpackage) is linked against Qt6Core
+LIB_DEPENDS-main= devel/libusb1 \
+ devel/shapelib \
+ x11/qt6/qt5compat \
+ x11/qt6/qtbase
-cWANTLIB = c m pthread
-WANTLIB-main += Qt5Core shp>=1 usb z ${cWANTLIB} ${COMPILER_LIBCXX}
-WANTLIB-tk =
-WANTLIB-qt += ${COMPILER_LIBCXX} ${cWANTLIB} GL Qt5Core Qt5Gui Qt5Network
-WANTLIB-qt += Qt5Positioning Qt5PrintSupport Qt5Qml Qt5Quick Qt5WebChannel
-WANTLIB-qt += Qt5WebEngineCore Qt5WebEngineWidgets Qt5Widgets Qt5Xml
Qt5QmlModels
+LIB_DEPENDS-tk= ${MODTK_RUN_DEPENDS}
+RUN_DEPENDS-tk= geo/gpsbabel \
+LIB_DEPENDS-qt= devel/shapelib \
+ x11/qt6/qtwebengine
-LIB_DEPENDS-tk=
-LIB_DEPENDS-qt= ${MODGCC4_CPPLIBDEP} \
- x11/qt5/qtwebengine
-PKG_ARCH-tk= *
-RUN_DEPENDS-tk= geo/gpsbabel \
- ${MODTK_RUN_DEPENDS}
RUN_DEPENDS-qt= geo/gpsbabel \
devel/desktop-file-utils
+CONFIGURE_ARGS+= -DGPSBABEL_ENABLE_PCH=OFF
+
+CONFIGURE_ENV+= CWEB=${WRKSRC}
+
+CXXFLAGS += -I${LOCALBASE}/include
+MODCMAKE_LDFLAGS= -L${LOCALBASE}/lib -lshp
+
pre-configure:
${SUBST_CMD} ${WRKSRC}/guibabel
@perl -pi -e 's/gpsbabelfe-bin/guibabel-qt/' \
${WRKSRC}/gui/gpsbabel.desktop
-post-build:
- ${MODQMAKE_build}
-
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/gpsbabel ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKBUILD}/gui/objects/gpsbabelfe \
+ ${INSTALL_PROGRAM} ${WRKBUILD}/gui/GPSBabelFE/gpsbabelfe \
${PREFIX}/bin/guibabel-qt
${INSTALL_SCRIPT} ${WRKSRC}/guibabel ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gpsbabel
diff --git a/geo/gpsbabel/distinfo b/geo/gpsbabel/distinfo
index 668daf8f9bd..09ee88c47e6 100644
--- a/geo/gpsbabel/distinfo
+++ b/geo/gpsbabel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gpsbabel-1.6.0.1.tar.gz) = /vHVYr3ylrasXqG8ChxG+YnVU1Ro4arfEwNdU4PHTso=
-SIZE (gpsbabel-1.6.0.1.tar.gz) = 14099101
+SHA256 (gpsbabel-1.10.0.tar.gz) = qJdW+5iKVPXF83FBOEW5rstmYopZTNg71SnA8YOCyWg=
+SIZE (gpsbabel-1.10.0.tar.gz) = 14885291
diff --git a/geo/gpsbabel/patches/patch-Makefile_in
b/geo/gpsbabel/patches/patch-Makefile_in
deleted file mode 100644
index 2c677789103..00000000000
--- a/geo/gpsbabel/patches/patch-Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: Makefile.in
---- Makefile.in.orig
-+++ Makefile.in
-@@ -236,7 +236,6 @@ dep:
- $(WEB)/htmldoc-$(DOCVERSION)/index.html: FORCE
- mkdir -p $(WEB)/htmldoc-$(DOCVERSION)
- perl xmldoc/makedoc
-- xmlwf xmldoc/readme.xml #check for well-formedness
- xmllint --noout --valid xmldoc/readme.xml #validate
- xsltproc --load-trace \
- --stringparam base.dir "$(WEB)/htmldoc-$(DOCVERSION)/" \
-@@ -293,7 +292,7 @@ changes.html: FORCE
- wget -O $(WEB)/changes.html http://www.gpsbabel.org/changes.html ||
exit 1
- rm -f $(WEB)/changes.html.1 > /dev/null
-
--doc: gpsbabel $(WEB)/htmldoc-$(DOCVERSION)/index.html gpsbabel.pdf #
readme.txt
-+doc: gpsbabel $(WEB)/htmldoc-$(DOCVERSION)/index.html # readme.txt
-
- FORCE:
-
diff --git a/geo/gpsbabel/patches/patch-gbser_posix_cc
b/geo/gpsbabel/patches/patch-gbser_posix_cc
index 4ae7ec3338a..120c7b501c7 100644
--- a/geo/gpsbabel/patches/patch-gbser_posix_cc
+++ b/geo/gpsbabel/patches/patch-gbser_posix_cc
@@ -7,6 +7,6 @@ Index: gbser_posix.cc
return h;
- } else if (h->fd = open(port_name, O_RDWR | O_NOCTTY), h->fd == -1) {
+ } else if (h->fd = open(port_name, O_RDWR | O_NOCTTY | O_NDELAY), h->fd ==
-1) {
- warning("Failed to open port (%s)\n", strerror(errno));
+ gbWarning("Failed to open port (%s)\n", strerror(errno));
goto failed;
}
diff --git a/geo/gpsbabel/patches/patch-gui_serial_unix_cc
b/geo/gpsbabel/patches/patch-gui_serial_unix_cc
deleted file mode 100644
index 8eb6a2021bc..00000000000
--- a/geo/gpsbabel/patches/patch-gui_serial_unix_cc
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: gui/serial_unix.cc
---- gui/serial_unix.cc.orig
-+++ gui/serial_unix.cc
-@@ -84,12 +84,12 @@ static QStringList dynamicDevices()
-
-
- static const char* deviceNames[] = {
-- "/dev/ttyS0",
-- "/dev/ttyS1",
-- "/dev/ttyS2",
-- "/dev/ttyS3",
-- "/dev/ttyUSB0",
-- "/dev/rfcomm0",
-+ "/dev/cua00",
-+ "/dev/cua01",
-+ "/dev/cua02",
-+ "/dev/cua03",
-+ "/dev/cuaU0",
-+ "/dev/cuaU1",
- nullptr
- };
-
diff --git a/geo/gpsbabel/patches/patch-tools_mkcapabilities_in
b/geo/gpsbabel/patches/patch-tools_mkcapabilities_in
deleted file mode 100644
index 4a138831a0b..00000000000
--- a/geo/gpsbabel/patches/patch-tools_mkcapabilities_in
+++ /dev/null
@@ -1,7 +0,0 @@
---- tools/mkcapabilities.in.orig Mon Nov 6 22:44:57 2006
-+++ tools/mkcapabilities.in Mon Nov 6 22:46:05 2006
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- #
- # mkcapabilities.in is used to create mkcapabilities.
- #
diff --git a/geo/gpsbabel/pkg/PLIST-main b/geo/gpsbabel/pkg/PLIST-main
index e21c99e13fc..2e097068d28 100644
--- a/geo/gpsbabel/pkg/PLIST-main
+++ b/geo/gpsbabel/pkg/PLIST-main
@@ -4,6 +4,4 @@
share/doc/gpsbabel/
share/doc/gpsbabel/README.contrib
share/doc/gpsbabel/README.igc
-share/doc/gpsbabel/README.mapconverter
share/doc/gpsbabel/README.md
-share/doc/gpsbabel/README.xmapwpt
