[BACK]Return to patch-src_misc_configuration.cxx CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / ham / fldigi / patches
File: [cvs.NetBSD.org] / pkgsrc / ham / fldigi / patches / patch-src_misc_configuration.cxx (download)

Revision 1.3, Sun Apr 26 03:04:59 2015 UTC (7 years, 2 months ago) by mef
Branch: MAIN
CVS Tags: pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2
Changes since 1.2: +13 -4 lines 

(pkgsrc)
  - Drop patches, upstream seems to fix the problems.
  - (flxmlrpc is not supported yet, to be added later)
(upstream)
  - Update 3.22.07 to 3.22.08
-------------------------
=Version 3.22.08=

2015-04-23  David Freese  <iam_w1hkj@w1hkj.com>

        2bda963: Analysis
        967e7c5: rx/tx queues
        b5aa6a3: flxmlrpc

2015-04-16  Dave Freese  <w1hkj@bellsouth.net>

        28839d7: call focus

2015-04-14  David Freese  <iam_w1hkj@w1hkj.com>

        a4d4faa: 599 update
        41beca0: US units
        91ab73f: olivia cxx
        a45006d: fldigi-shell
        ee19668: Write log
        8d4f0ef: Config dialog

$NetBSD: patch-src_misc_configuration.cxx,v 1.3 2015/04/26 03:04:59 mef Exp $

For DragonFly build to fix following problem:
misc/configuration.cxx: In member function 'void configuration::testCommPorts()':
misc/configuration.cxx:934:2: error: 'glob_t' was not declared in this scope
misc/configuration.cxx:934:9: error: expected ';' before 'gbuf'
gmake[3]: *** [fldigi-configuration.o] Error 1

--- src/misc/configuration.cxx.orig	2015-04-18 22:26:19.000000000 +0900
+++ src/misc/configuration.cxx	2015-04-26 11:26:35.000000000 +0900
@@ -863,7 +863,7 @@
 		"/dev/ttyACM%u",
 		"/dev/usb/ttyACM%u",
 		"/opt/vttyS%u"
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 		"/dev/tty%2.2u"
 #elif defined(__CYGWIN__)
 		"/dev/ttyS%u"
@@ -877,7 +877,7 @@
 
 #if defined(__WOE32__)
 #  define TTY_MAX 255
-#elif defined(__OpenBSD__) || defined(__NetBSD__)
+#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 #  define TTY_MAX 4
 #else
 #  define TTY_MAX 8