pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
flnews: Updated to 0.16
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By: micha
Date: Mon Jan 21 11:06:57 2019 +0100
Changeset: 75dabb2e9c312aff73f14bfdf77039b1e8f9e85d
Modified Files:
Makefile
Added Files:
flnews/COMMIT_MSG
flnews/DESCR
flnews/Makefile
flnews/PLIST
flnews/TODO
flnews/distinfo
flnews/files/CONFIG
flnews/options.mk
flnews/patches/patch-mkconfig
flnews/patches/patch-src_bsd.c
flnews/patches/patch-src_doc_templates_header.tex
Log Message:
flnews: Updated to 0.16
Backported patches from 0.17 branch:
--------------------------------------------------------------------------------
Bugfix: Configuration test result for inttypes.h presence is used,
reintroduce the test
Bugfix: BSD version of ntohl() for old systems now working again
Modified LaTeX documentation to work with recent doxygen
--------------------------------------------------------------------------------
Changelog:
--------------------------------------------------------------------------------
V0.16 Bugfix: Supersede now preserves Followup-To header field
Bugfix: The code that generates the attribute "reply to own article"
now checks the Message-IDs too (to avoid errors if the parent
article is missing in the hierarchy)
Bugfix: Header parser and MIME parser fixed to correctly handle
MIME entity delimiters (for boundary strings that contain spaces)
Bugfix: Removed Unicode range U+E0020 ... U+E007E from rejected
control characters (deprecated since Unicode 5.1, reintroduced for
different purpose since Unicode 9.0) (Reported by Marcel Logen)
TLS: Protocol version TLSv1.3 according to RFC8446 is now supported
(requires at least OpenSSL 1.1.1)
CORE module now supports multiple article hierarchies
Unicode database updated to version 11.0.0
IBM852 to UTF-8 converter added
If the OS doesn't report IPv6 as available, usage can now be forced
with the option 'CFG_FORCE_IP6'
Support for reproducible builds added (option 'CFG_REPRODUCIBLE')
Some checks for system header files removed to speed up configuration
(Build fails in any case if they are missing)
Documentation updated
--------------------------------------------------------------------------------
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=75dabb2e9c312aff73f14bfdf77039b1e8f9e85d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 +
flnews/COMMIT_MSG | 33 +++++
flnews/DESCR | 17 +++
flnews/Makefile | 85 +++++++++++
flnews/PLIST | 5 +
flnews/TODO | 13 ++
flnews/distinfo | 9 ++
flnews/files/CONFIG | 165 ++++++++++++++++++++++
flnews/options.mk | 44 ++++++
flnews/patches/patch-mkconfig | 16 +++
flnews/patches/patch-src_bsd.c | 24 ++++
flnews/patches/patch-src_doc_templates_header.tex | 24 ++++
12 files changed, 436 insertions(+)
diffs:
diff --git a/Makefile b/Makefile
index 83c4922ba7..6bc257274f 100644
--- a/Makefile
+++ b/Makefile
@@ -806,6 +806,7 @@ SUBDIR+= flim
SUBDIR+= flimp
SUBDIR+= flimsel
SUBDIR+= flite2
+SUBDIR+= flnews
SUBDIR+= flnews-devel
SUBDIR+= flpsed
SUBDIR+= fltk14-devel
diff --git a/flnews/COMMIT_MSG b/flnews/COMMIT_MSG
new file mode 100644
index 0000000000..48e18acea3
--- /dev/null
+++ b/flnews/COMMIT_MSG
@@ -0,0 +1,33 @@
+flnews: Updated to 0.16
+
+Backported patches from 0.17 branch:
+--------------------------------------------------------------------------------
+ Bugfix: Configuration test result for inttypes.h presence is used,
+ reintroduce the test
+ Bugfix: BSD version of ntohl() for old systems now working again
+ Modified LaTeX documentation to work with recent doxygen
+--------------------------------------------------------------------------------
+
+Changelog:
+--------------------------------------------------------------------------------
+V0.16 Bugfix: Supersede now preserves Followup-To header field
+ Bugfix: The code that generates the attribute "reply to own article"
+ now checks the Message-IDs too (to avoid errors if the parent
+ article is missing in the hierarchy)
+ Bugfix: Header parser and MIME parser fixed to correctly handle
+ MIME entity delimiters (for boundary strings that contain spaces)
+ Bugfix: Removed Unicode range U+E0020 ... U+E007E from rejected
+ control characters (deprecated since Unicode 5.1, reintroduced for
+ different purpose since Unicode 9.0) (Reported by Marcel Logen)
+ TLS: Protocol version TLSv1.3 according to RFC8446 is now supported
+ (requires at least OpenSSL 1.1.1)
+ CORE module now supports multiple article hierarchies
+ Unicode database updated to version 11.0.0
+ IBM852 to UTF-8 converter added
+ If the OS doesn't report IPv6 as available, usage can now be forced
+ with the option 'CFG_FORCE_IP6'
+ Support for reproducible builds added (option 'CFG_REPRODUCIBLE')
+ Some checks for system header files removed to speed up configuration
+ (Build fails in any case if they are missing)
+ Documentation updated
+--------------------------------------------------------------------------------
diff --git a/flnews/DESCR b/flnews/DESCR
new file mode 100644
index 0000000000..a1ab58b53f
--- /dev/null
+++ b/flnews/DESCR
@@ -0,0 +1,17 @@
+flnews is a client with graphical user interface to read USENET newsgroups.
+It is intended for POSIX compliant operating systems running the X window
+system.
+
+The main development goals are (in order of importance):
+- No bloat
+- Support for old workstations
+- Standard compliance
+- Be conservative in what you do, be liberal in what you accept from others
+- Compatibility with other newsreaders
+- Usable X display redirection via network (or ssh tunnel)
+- Warn users about things that are not forbidden but considered "bad practice"
+
+Features that are currently not implemented (or not usable yet):
+- UUCP
+- Multiple servers
+- Offline mode (for network connection via dialup line)
diff --git a/flnews/Makefile b/flnews/Makefile
new file mode 100644
index 0000000000..dd59bbbb81
--- /dev/null
+++ b/flnews/Makefile
@@ -0,0 +1,85 @@
+# $NetBSD$
+
+FLNEWS_VERSION= 0.16
+
+DISTNAME= flnews-${FLNEWS_VERSION}
+CATEGORIES= news
+MASTER_SITES= http://micha.freeshell.org/flnews/src/
+MASTER_SITES+= http://www.ybtra.de/flnews-mirror/src/
+MASTER_SITES+= http://www.southcity.de/flnews/src/
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= michael.baeuerle%gmx.net@localhost
+HOMEPAGE= http://micha.freeshell.org/flnews/
+COMMENT= Fast and lightweight USENET newsreader with GUI
+LICENSE= modified-bsd AND 2-clause-bsd AND unicode
+
+USE_LANGUAGES= c c++
+
+TEST_TARGET= test
+
+# Bug report contact address used for GUI
+FLNEWS_MAINTAINER= ${MAINTAINER}
+
+.include "options.mk"
+
+post-extract:
+ ${CP} ${FILESDIR}/CONFIG ${WRKSRC}
+
+# Prepare CONFIG file
+SUBST_CLASSES+= edit-config
+SUBST_STAGE.edit-config= pre-configure
+SUBST_MESSAGE.edit-config= Preparing CONFIG file ...
+SUBST_FILES.edit-config= CONFIG
+SUBST_SED.edit-config= -e 's,@VERSION@,${FLNEWS_VERSION},g'
+SUBST_SED.edit-config+= -e 's,@PREFIX@,${PREFIX},g'
+SUBST_SED.edit-config+= -e 's,@MAINT@,${FLNEWS_MAINTAINER},g'
+SUBST_SED.edit-config+= -e 's,@IP6@,${FLNEWS_OPT_DISABLE_IP6},g'
+SUBST_SED.edit-config+= -e 's,@NLS@,${FLNEWS_OPT_DISABLE_NLS},g'
+SUBST_SED.edit-config+= -e 's,@XDBE@,${FLNEWS_OPT_DISABLE_XDBE},g'
+SUBST_SED.edit-config+= -e 's,@MAN_PATH@,${PREFIX}/${PKGMANDIR},g'
+# NetBSD reports X/Open XSI extension as not available using the POSIX
+# sysconf(_SC_XOPEN_VERSION) call, but has a sufficient implementation
+# => Force using it
+.if ${OPSYS} == "NetBSD"
+SUBST_SED.edit-config+= -e 's,@FORCE_XSI@,1,g'
+.else
+SUBST_SED.edit-config+= -e 's,@FORCE_XSI@,0,g'
+.endif
+# NetBSD reports IPv6 as not available using the POSIX sysconf(_SC_IPV6)
+# call, but has a sufficient implementation
+# => Force using it if inet6 option of pkgsrc package is selected
+.if ${OPSYS} == "NetBSD" && ${FLNEWS_OPT_DISABLE_IP6} == 0
+SUBST_SED.edit-config+= -e 's,@FORCE_IP6@,1,g'
+.else
+SUBST_SED.edit-config+= -e 's,@FORCE_IP6@,0,g'
+.endif
+# Old SunPro compilers cannot create dependencies with the "-M" option
+# => Use makedepend instead for all SunPro compilers
+.if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER:Msunpro}
+SUBST_SED.edit-config+= -e 's,@DEP_MD@,,g'
+SUBST_SED.edit-config+= -e 's,@DEP_COMP@,\#,g'
+.else
+SUBST_SED.edit-config+= -e 's,@DEP_MD@,\#,g'
+SUBST_SED.edit-config+= -e 's,@DEP_COMP@,,g'
+.endif
+
+do-configure:
+ cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} config
+
+.if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER:Msunpro}
+BUILD_DEPENDS+= makedepend-[0-9]*:../../devel/makedepend
+.endif
+
+BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.3
+.include "../../devel/zlib/buildlink3.mk"
+# OpenSSL 1.1 API is required for signature algorithm negotiation
+# OpenSSL 1.1 API is required for TLSv1.2 FFDHE group check
+# At least OpenSSL 1.1.1 is required for TLSv1.3
+BUILDLINK_API_DEPENDS.openssl+= openssl>=1.0.0
+.include "../../security/openssl/buildlink3.mk"
+# FLTK must be compiled with multithreading support
+# FLTK version 1.4 is supported (should be compiled with pango support)
+.include "../../x11/fltk13/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/flnews/PLIST b/flnews/PLIST
new file mode 100644
index 0000000000..922112bfe0
--- /dev/null
+++ b/flnews/PLIST
@@ -0,0 +1,5 @@
+@comment $NetBSD$
+bin/flnews
+man/man1/flnews.1
+share/flnews/license.txt
+${PLIST.nls}lib/flnews/nls/de_DE.cat
diff --git a/flnews/TODO b/flnews/TODO
new file mode 100644
index 0000000000..bebe3614e4
--- /dev/null
+++ b/flnews/TODO
@@ -0,0 +1,13 @@
+[X] Create reproducible build
+[X] Include mk/pthread.buildlink3.mk (similar to FLTK)
+[X] Force POSIX.1 IP6 on NetBSD (if inet6 option is selected)
+ Reason: Autodetect via POSIX sysconf(_SC_IPV6) doesn't work on NetBSD
+[X] Suggest option inet6
+[X] Add help message for NLS (supported locale codesets)
+[X] Suggest option nls?
+ Yes => Even without NLS the FILTER module limits supported locale codesets
+[X] Execute "make config" part of build in the pkgsrc configure phase
+[X] Check handling of CPPFLAGS
+[X] Import final flnews 0.16 release
+[X] Backport patches from 0.17pre1
+[X] Switch back to FLTK version from pkgsrc current
diff --git a/flnews/distinfo b/flnews/distinfo
new file mode 100644
index 0000000000..4f1fbb1985
--- /dev/null
+++ b/flnews/distinfo
@@ -0,0 +1,9 @@
+$NetBSD$
+
+SHA1 (flnews-0.16.tar.bz2) = efa5ab06d18fe4993551c623aca3a6e61b8ec20e
+RMD160 (flnews-0.16.tar.bz2) = 25ace0387584fa253c065aeeeb946ffc4773c9b7
+SHA512 (flnews-0.16.tar.bz2) = d68615b38d4e4770ea3e404082943ac8efbc8aa6b0075ae437a5806e330e7f2ae987c00c321857b926bfe0007f59e329f1bd38b69e017b1495cd8fedbf316e5c
+Size (flnews-0.16.tar.bz2) = 1068677 bytes
+SHA1 (patch-mkconfig) = 3121cec3b8f01e71989de3f7d2092f71b6f737ba
+SHA1 (patch-src_bsd.c) = 0298c6e17d2e5f7498b6f15546a089f5a44ea70c
+SHA1 (patch-src_doc_templates_header.tex) = f9de1452f48c5e120ca6e9b96ee51f3dbfe99f86
diff --git a/flnews/files/CONFIG b/flnews/files/CONFIG
new file mode 100644
index 0000000000..1bf195f5fd
--- /dev/null
+++ b/flnews/files/CONFIG
@@ -0,0 +1,165 @@
+#
+# Config file for pkgsrc
+# ======================
+#
+# This file is intended to customize the program. Any changes made to this file
+# don't create a modified version of the program in terms of the license.
+#
+# This file will be parsed by a POSIX shell. Therefore all lines starting with
+# the character '#' are comments and ignored.
+
+
+# User configuration
+# ==============================================================================
+# Installation prefix (must be an absolute path without trailing slash)
+# The environment variable 'PREFIX' will override this entry if present!
+# The environment variable 'DESTDIR' will be prepended to this entry if present!
+CFG_PREFIX="@PREFIX@"
+
+# Disable IPv6
+# Set this to 1 to disable the usage of IPv6 and POSIX.1g API even if system
+# report IPv6 option (IP6) as available
+CFG_IP6_DISABLE=@IP6@
+
+# Disable compression
+# Set this to 1 if NNTP COMPRESS extension should never be used, even if the
+# required libraries (currently libz) are installed and usable.
+# Otherwise the compression negotiation can be enabled and disabled in the GUI
+# (disabled by default)
+CFG_CMPR_DISABLE=0
+
+# Disable X11 double buffering
+# DB is slow. On fast machines this can be set to 0 to reduce flicker in the GUI
+CFG_DB_DISABLE=@XDBE@
+
+# Disable National Language Support (NLS)
+# Set this to 1 to disable NLS even if system report it as available.
+CFG_NLS_DISABLE=@NLS@
+
+# The TLS module can do some simple checks and generate warnings if it thinks
+# that underlaying libraries contain known security vulnerabilities
+# Set this to 1 if you don't want to get such warnings
+CFG_TLS_WARNING_DISABLE=1
+# ==============================================================================
+
+
+# Force usage of REQUIRED facilities that system reports as not available
+# ==============================================================================
+# Force usage of POSIX.1b realtime extension, timers (TMR) option even if system
+# reports TMR option as not available
+# Set this to 1 if your system report no sufficient TMR option, but you want to
+# try anyway
+CFG_FORCE_TMR=1
+
+# Force usage of POSIX.1c thread (THR) extension even if system reports THR
+# extension as not available
+# Set this to 1 if your system report no sufficient THR extension, but you want
+# to try anyway
+CFG_FORCE_THR=1
+
+# Force usage of POSIX.2a user portability (UP) utilities even if system reports
+# UP extension as not available
+# Set this to 1 if your system report no sufficient UP extension, but you want
+# to try anyway
+CFG_FORCE_UP=1
+# ==============================================================================
+
+
+# Force usage of OPTIONAL facilities that system reports as not available
+# ==============================================================================
+# Force usage of X/Open System Interface (XSI) even if system reports XSI
+# extension as not available or too old (at least SUSv2 is required)
+# Set this to 1 if your system report no sufficient XSI extension, but you want
+# to try anyway
+CFG_FORCE_XSI=@FORCE_XSI@
+
+# Force usage of IPv6 option (IP6) even if system reports it as not available
+# Set this to 1 if your system report no IP6 option, but you want to try anyway
+# (at least POSIX.1-2001 is required)
+CFG_FORCE_IP6=@FORCE_IP6@
+# ==============================================================================
+
+
+# Dependency creation (try the defaults if in doubt)
+# ==============================================================================
+# Commands to create dependencies
+# If the compilers preprocessor don't support '-M' use makedepend like this:
+@DEP_MD@CFG_CC_DEP_COMMAND='makedepend -f- -- $(CFLAGS) -- $$file'
+@DEP_MD@CFG_CXX_DEP_COMMAND='makedepend -f- -- $(CXXFLAGS) $(FLTK_CXXFLAGS) -- $$file'
+@DEP_COMP@CFG_CC_DEP_COMMAND='$(CC) $(CFLAGS) -M $$file'
+@DEP_COMP@CFG_CXX_DEP_COMMAND='$(CXX) $(CXXFLAGS) $(FLTK_CXXFLAGS) -M $$file'
+# ==============================================================================
+
+
+# Utilities (modify only if the versions of your system are too old or broken)
+# ==============================================================================
+# POSIX.2 compliant standard utilities
+UTIL_AWK="awk"
+UTIL_CAT="cat"
+UTIL_CHMOD="chmod"
+UTIL_DATE="date"
+UTIL_GREP="grep"
+UTIL_HEAD="head"
+UTIL_MKDIR="mkdir"
+UTIL_PWD="pwd"
+UTIL_RM="rm"
+UTIL_SED="sed"
+UTIL_SH="sh"
+UTIL_SLEEP="sleep"
+UTIL_TOUCH="touch"
+UTIL_STRIP="strip"
+UTIL_TR="tr"
+UTIL_UNAME="uname"
+# ==============================================================================
+# List of all tools in this section
+CFG_UTILS="$UTIL_AWK $UTIL_CAT $UTIL_CHMOD $UTIL_DATE $UTIL_GREP $UTIL_HEAD \
+ $UTIL_MKDIR $UTIL_PWD $UTIL_RM $UTIL_SED $UTIL_SH $UTIL_SLEEP \
+ $UTIL_TOUCH $UTIL_STRIP $UTIL_TR $UTIL_UNAME"
+
+
+# This is for the package maintainer (do not change as user)
+CFG_PREFIX=${PREFIX:-$CFG_PREFIX}
+# ==============================================================================
+# Program name (printable characters from POSIX portable character set only)
+CFG_NAME="flnews"
+
+# Version (printable characters from POSIX portable character set only)
+# Must start with major number followed by '.'
+CFG_VERSION="@VERSION@"
+
+# If a modified version should be redistributed, set this to '1' if you want to
+# keep the original program name. This will automatically insert the prominent
+# modification notice that is required by the license.
+# Alternatively you can set this to '0' and change the program name with the
+# variable "CFG_NAME" above.
+CFG_MODIFIED=0
+
+# Contact information of package maintainer
+# If a modified version should be redistributed, the following maintainer
+# contact information must be replaced. Read "src/LICENSE" file for details.
+CFG_MAINTAINER="mailto:@MAINT@";
+
+# Installation path for man page
+# (must be an absolute path without trailing slash)
+# The FHS defines "/usr[/local]/share/man". The location "/usr/local/man" is
+# explicitly marked deprecated.
+CFG_MAN_PATH="@MAN_PATH@/man1"
+
+# Installation path for license file
+# (must be an absolute path without trailing slash)
+CFG_LICENSE_PATH="$CFG_PREFIX/share/$CFG_NAME"
+
+# Installation path for National Language Support (NLS) catalogs
+# (must be an absolute path without trailing slash)
+# The FHS defines "/usr[/local]/share/nls" for NLS catalogs but the whole
+# hierarchy below "share" is dedicated to files that are portable between
+# architectures - what our catalogs are not!
+CFG_NLS_PATH="$CFG_PREFIX/lib/$CFG_NAME/nls"
+
+# If you require reproducible builds for a binary package of a distribution,
+# set this to '1'.
+CFG_REPRODUCIBLE=1
+# ==============================================================================
+
+
+# EOF
diff --git a/flnews/options.mk b/flnews/options.mk
new file mode 100644
index 0000000000..0600f9e236
--- /dev/null
+++ b/flnews/options.mk
@@ -0,0 +1,44 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.flnews
+PKG_SUPPORTED_OPTIONS= inet6 nls xdbe xdg-utils
+PKG_SUGGESTED_OPTIONS= inet6 nls xdbe xdg-utils
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
+
+# POSIX.1c-1996 Threads (THR) extension is required
+PTHREAD_OPTS+= require
+
+# inet6: Optional support for Internet Protocol Version 6 (IPv6)
+# Requires an OS with POSIX.1-2001 API and IP6 option
+.if !empty(PKG_OPTIONS:Minet6)
+FLNEWS_OPT_DISABLE_IP6= 0
+.else
+FLNEWS_OPT_DISABLE_IP6= 1
+.endif
+
+# nls: Optional support for National Language Support (NLS)
+# Requires an OS with X/Open XSI extension API (SUSv2) and the gencat utility
+# Note: Only locales with UTF-8, ISO-8859-1 or US-ASCII codeset are supported!
+PLIST_VARS+= nls
+.if !empty(PKG_OPTIONS:Mnls)
+PLIST.nls= yes
+FLNEWS_OPT_DISABLE_NLS= 0
+.else
+FLNEWS_OPT_DISABLE_NLS= 1
+.endif
+
+# xdbe: Optional support for X11 Double Buffer Extension (XDBE)
+# This option should be disabled for slow machines
+.if !empty(PKG_OPTIONS:Mxdbe)
+FLNEWS_OPT_DISABLE_XDBE= 0
+.else
+FLNEWS_OPT_DISABLE_XDBE= 1
+.endif
+
+# xdg-utils: Create dependency for xdg-utils (Portland project)
+# xdg-utils are used for WWW-Browser and eMail redirection
+.if !empty(PKG_OPTIONS:Mxdg-utils)
+DEPENDS+= xdg-utils>=1.1:../../misc/xdg-utils
+.endif
diff --git a/flnews/patches/patch-mkconfig b/flnews/patches/patch-mkconfig
new file mode 100644
index 0000000000..e5c58f0193
--- /dev/null
+++ b/flnews/patches/patch-mkconfig
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Test results for inttypes.h and sys/select.h are required.
+
+--- mkconfig.orig 2018-11-06 09:02:42.000000000 +0000
++++ mkconfig
+@@ -78,7 +78,9 @@ CFG_LOG="config.log"
+ # Attention: No spaces are allowed in the names!
+ CFG_C_HEADERS="\
+ sys/types.h \
++ inttypes.h \
+ regex.h \
++ sys/select.h \
+ openssl/ssl.h \
+ "
+
diff --git a/flnews/patches/patch-src_bsd.c b/flnews/patches/patch-src_bsd.c
new file mode 100644
index 0000000000..5b1d7c36af
--- /dev/null
+++ b/flnews/patches/patch-src_bsd.c
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Fixed typo. Only relevant for very old systems without inttypes.h header file.
+
+--- src/bsd.c.orig 2017-11-08 12:11:18.000000000 +0000
++++ src/bsd.c
+@@ -2,7 +2,7 @@
+ /*! \file
+ * \brief This is a wrapper to map BSD functionality of OS into POSIX subsystem
+ *
+- * Copyright (c) 2012-2015 by the developers. See the LICENSE file for details.
++ * Copyright (c) 2012-2019 by the developers. See the LICENSE file for details.
+ *
+ * BSD functions not defined in POSIX.1-1990 or XSI extension should be called
+ * from here.
+@@ -108,7 +108,7 @@ unsigned short int posix_ntohs(unsigned
+ #if CFG_HDR_INTTYPES_H
+ uint32_t posix_ntohl(uint32_t net32)
+ #else
+-unsigned long int posix_ntohs(unsigned long int net32)
++unsigned long int posix_ntohl(unsigned long int net32)
+ #endif /* CFG_HDR_INTTYPES_H */
+ {
+ return(ntohl(net32));
diff --git a/flnews/patches/patch-src_doc_templates_header.tex b/flnews/patches/patch-src_doc_templates_header.tex
new file mode 100644
index 0000000000..f7303b904e
--- /dev/null
+++ b/flnews/patches/patch-src_doc_templates_header.tex
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Documentation build fix for doxygen 1.8.15.
+
+--- src/doc/templates/header.tex.orig 2015-11-09 15:55:42.000000000 +0000
++++ src/doc/templates/header.tex
+@@ -1,13 +1,15 @@
+ % ==============================================================================
+ % LaTeX header
+
+-\documentclass[a4paper]{article}
++% Declare "export" here. If this is done with adjbox, it gives this error:
++% "Option clash for package adjustbox."
++\documentclass[export,a4paper]{article}
+ \usepackage{a4wide}
+ \usepackage{fixltx2e}
+ \usepackage{fancyhdr}
+ \usepackage{calc}
+ \usepackage{doxygen}
+-\usepackage[export]{adjustbox} % Also loads graphicx
++\usepackage{adjustbox} % Also loads graphicx
+ \usepackage{graphicx}
+ \usepackage[utf8]{inputenc}
+ \usepackage{makeidx}
Home |
Main Index |
Thread Index |
Old Index