Bump version and update build instructions to note CUPS dependency.

michaelrsweet · Feb 11, 2024 · d592299 · d592299
1 parent eb3e99f
commit d592299
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 24 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -5,7 +5,7 @@ To compile HTMLDOC you'll need C and C++ compilers (clang and gcc are fine)
 along with the following libraries:
 
 - FLTK 1.1.x or higher for GUI support
-- GNU TLS for HTTPS support (except on macOS and Windows)
+- CUPS 2.2 or higher for HTTP/HTTPS support
 - libjpeg (7 or higher) or libjpeg-turbo for JPEG support
 - libpng 1.6 or higher for PNG support
 - zlib 1.1 or higher
@@ -63,13 +63,13 @@ Ubuntu and Debian Notes
 You should install the following packages:
 
     sudo apt-get install build-essential autoconf libfltk1.3-dev \
-        libgnutls28-dev libjpeg-dev libpng-dev pkg-config zlib1g-dev
+        libcups2-dev libjpeg-dev libpng-dev pkg-config zlib1g-dev
 
 
 CentOS, Fedora, and RHEL Notes
 ------------------------------
 
 Install the following packages to get full functionality:
 
-    sudo yum install autoconf fltk-devel gnutls-devel libjpeg-devel \
+    sudo dnf install autoconf fltk-devel cups-devel libjpeg-devel \
     	libpng-devel pkgconfig zlib-devel
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ servers.  However, it does not support many things in "the modern web", such as:
   output (which is not well supported by CSS)
 
 - Encryption: HTMLDOC currently supports the older (and very insecure) PDF 1.4
-  (128-bit RC4) encryption.  I have looked at supporting AES (256-bit)
+  (128-bit RC4) encryption.  I have looked at supporting AES (128/256-bit)
   encryption, however it is not widely supported and there are incompatible
   changes in PDF 2.0, so it is unlikely to be added to HTMLDOC.
 
@@ -118,7 +118,7 @@ of Ghostscript, among other things).
 Legal Stuff
 -----------
 
-HTMLDOC is copyright © 1997-2023 by Michael R Sweet.  This program is free
+HTMLDOC is copyright © 1997-2024 by Michael R Sweet.  This program is free
 software.  Distribution and use rights are outlined in the file "COPYING".
 
 HTMLDOC includes code to encrypt PDF document files using the RC4 algorithm

diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for HTMLDOC 1.9.17.
+# Generated by GNU Autoconf 2.71 for HTMLDOC 1.9.18.
 #
 # Report bugs to <https://github.com/michaelrsweet/htmldoc/issues>.
 #
@@ -610,8 +610,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='HTMLDOC'
 PACKAGE_TARNAME='htmldoc'
-PACKAGE_VERSION='1.9.17'
-PACKAGE_STRING='HTMLDOC 1.9.17'
+PACKAGE_VERSION='1.9.18'
+PACKAGE_STRING='HTMLDOC 1.9.18'
 PACKAGE_BUGREPORT='https://github.com/michaelrsweet/htmldoc/issues'
 PACKAGE_URL='https://www.msweet.org/htmldoc'
 
@@ -1293,7 +1293,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures HTMLDOC 1.9.17 to adapt to many kinds of systems.
+\`configure' configures HTMLDOC 1.9.18 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1359,7 +1359,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HTMLDOC 1.9.17:";;
+     short | recursive ) echo "Configuration of HTMLDOC 1.9.18:";;
    esac
   cat <<\_ACEOF
 
@@ -1458,7 +1458,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-HTMLDOC configure 1.9.17
+HTMLDOC configure 1.9.18
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1753,7 +1753,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HTMLDOC $as_me 1.9.17, which was
+It was created by HTMLDOC $as_me 1.9.18, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -2728,7 +2728,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 
-SVERSION="1.9.17"
+SVERSION="1.9.18"
 
 printf "%s\n" "#define SVERSION \"$SVERSION\"" >>confdefs.h
 
@@ -6209,7 +6209,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by HTMLDOC $as_me 1.9.17, which was
+This file was extended by HTMLDOC $as_me 1.9.18, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6274,7 +6274,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-HTMLDOC config.status 1.9.17
+HTMLDOC config.status 1.9.18
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
@@ -1,7 +1,7 @@
 dnl
 dnl Configuration script for HTMLDOC, an HTML document processing program.
 dnl
-dnl Copyright © 2011-2023 by Michael R Sweet.
+dnl Copyright © 2011-2024 by Michael R Sweet.
 dnl Copyright © 1997-2010 by Easy Software Products.
 dnl
 dnl This program is free software.  Distribution and use rights are outlined in
@@ -21,7 +21,7 @@ dnl We need at least autoconf 2.69 for the AS_HELP_STRING macro...
 AC_PREREQ([2.69])
 
 
-AC_INIT([HTMLDOC], [1.9.17], [https://github.com/michaelrsweet/htmldoc/issues], [htmldoc], [https://www.msweet.org/htmldoc])
+AC_INIT([HTMLDOC], [1.9.18], [https://github.com/michaelrsweet/htmldoc/issues], [htmldoc], [https://www.msweet.org/htmldoc])
 AC_CONFIG_HEADERS([config.h])
 
 

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: htmldoc
-base: core20
-version: 1.9.17
+base: core22
+version: "1.9.18"
 summary: HTML and Markdown conversion utility
 description: |
   HTMLDOC is a program that reads HTML and Markdown source files or web pages

diff --git a/vcnet/config.h b/vcnet/config.h
@@ -1,7 +1,7 @@
 /*
  * Visual Studio configuration file for HTMLDOC.
  *
- * Copyright © 2011-2023 by Michael R Sweet.
+ * Copyright © 2011-2024 by Michael R Sweet.
  * Copyright © 1997-2010 by Easy Software Products.  All rights reserved.
  *
  * This program is free software.  Distribution and use rights are outlined in
@@ -93,7 +93,7 @@ typedef __int64 ssize_t;
  * What is the version number for this software?
  */
 
-#define SVERSION	"1.9.17"
+#define SVERSION	"1.9.18"
 
 
 /*

diff --git a/vcnet/htmldoc-installer.aip b/vcnet/htmldoc-installer.aip
@@ -19,7 +19,7 @@
     <ROW Property="ProductCode" Value="1033:{20C49885-ABD0-4F20-B13A-3ED4D0888BF8} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="HTMLDOC"/>
-    <ROW Property="ProductVersion" Value="1.9.17.0" Options="32"/>
+    <ROW Property="ProductVersion" Value="1.9.18.0" Options="32"/>
     <ROW Property="REBOOT" MultiBuildValue="DefaultBuild:ReallySuppress"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{4016A37E-404B-4785-B768-D4FF161DE6E9}"/>

diff --git a/xcode/config.h b/xcode/config.h
@@ -1,7 +1,7 @@
 /*
  * Xcode configuration file for HTMLDOC.
  *
- * Copyright © 2011-2023 by Michael R Sweet.
+ * Copyright © 2011-2024 by Michael R Sweet.
  * Copyright © 1997-2010 by Easy Software Products.  All rights reserved.
  *
  * This program is free software.  Distribution and use rights are outlined in
@@ -12,7 +12,7 @@
  * What is the version number for this software?
  */
 
-#define SVERSION "1.9.17"
+#define SVERSION "1.9.18"
 
 
 /*