From d172f38d4d2976d20c9596e9a7eb59b521283cf7 Mon Sep 17 00:00:00 2001
From: Bill Kendrick <nbs@sonic.net>
Date: Fri, 10 Apr 2020 19:05:52 -0700
Subject: [PATCH] Win32 build (& doc) tweaks

TOYAMA Shin-ichi noticed that when building for Win32 under mingw/msys,
an #include of "librsvg-cairo.h" was also necessary.

He also bumped the version # in win32/resources.rc
(and I put his credit in there).

I updated docs/RELEASE.txt to mention that .rc file also needing
updated when preparing a new release.
---
 docs/CHANGES.txt         |  5 ++++-
 docs/RELEASE.txt         |  3 ++-
 docs/en/README.txt       |  2 +-
 docs/en/html/README.html |  2 +-
 src/manpage/tuxpaint.1   |  4 ++--
 src/tuxpaint.c           |  5 ++++-
 win32/resources.rc       | 12 ++++++------
 7 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 405419ea7..e3dab3147 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -8,7 +8,7 @@ http://www.tuxpaint.org/
 
 $Id$
 
-2020.April.1 (0.9.24)
+2020.April.10 (0.9.24)
   * New tools
     ---------
     * Fill
@@ -35,6 +35,9 @@ $Id$
       and made sure some warnings and errors were going to
       STDERR, rather than STDOUT.
 
+    * Updates to build for Windows (using mingw/msys)
+      TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
+
   * Other Improvements
     ------------------
     * Added ability to move color palette options to the end of
diff --git a/docs/RELEASE.txt b/docs/RELEASE.txt
index f4ec34219..0da1f6661 100644
--- a/docs/RELEASE.txt
+++ b/docs/RELEASE.txt
@@ -7,8 +7,9 @@ cutting a release (tagging in the source code repository, and running
  * Makefile
 
  * Build description files:
-   * tuxpaint.spec (RPM package)
+   * tuxpaint.spec (Linux RPM package)
    * macos/Info.plist (macOS build)
+   * win32/resources.rc (Windows mingw/msys build)
 
  * Documentation
    (For HTML variants, be sure to run "make" in "docs/", to
diff --git a/docs/en/README.txt b/docs/en/README.txt
index 5e9038382..8d1204558 100644
--- a/docs/en/README.txt
+++ b/docs/en/README.txt
@@ -6,7 +6,7 @@
           Copyright 2002-2020 by various contributors; see AUTHORS.txt
                             http://www.tuxpaint.org/
 
-                         June 14, 2002 - April 1, 2020
+                         June 14, 2002 - April 10, 2020
 
      ----------------------------------------------------------------------
 
diff --git a/docs/en/html/README.html b/docs/en/html/README.html
index a1d2c1099..b09d64c77 100644
--- a/docs/en/html/README.html
+++ b/docs/en/html/README.html
@@ -22,7 +22,7 @@ version
 
 <p>June 14, 2002 -
 
-					April 1, 2020</p>
+					April 10, 2020</p>
 
 </center>
 
diff --git a/src/manpage/tuxpaint.1 b/src/manpage/tuxpaint.1
index 6a25a976b..01bb92acd 100644
--- a/src/manpage/tuxpaint.1
+++ b/src/manpage/tuxpaint.1
@@ -1,5 +1,5 @@
-.\" tuxpaint.1 - 2020.03.28
-.TH TUXPAINT 1 "28 March 2020" "0.9.24" "Tux Paint"
+.\" tuxpaint.1 - 2020.04.10
+.TH TUXPAINT 1 "10 April 2020" "0.9.24" "Tux Paint"
 .SH NAME
 tuxpaint -- "Tux Paint", a drawing program for young children.
 
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index d6f950845..9e9e96a0c 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -22,7 +22,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   (See COPYING.txt)
 
-  June 14, 2002 - April 2, 2020
+  June 14, 2002 - April 10, 2020
 */
 
 
@@ -457,6 +457,9 @@ static void mtw(wchar_t * wtok, char *tok)
 #else
 
 #include <librsvg/rsvg.h>
+#ifdef WIN32
+#include <librsvg/rsvg-cairo.h>
+#endif
 
 #if !defined(RSVG_H) || !defined(RSVG_CAIRO_H)
 #error "---------------------------------------------------"
diff --git a/win32/resources.rc b/win32/resources.rc
index 077655e41..2579cc0f8 100644
--- a/win32/resources.rc
+++ b/win32/resources.rc
@@ -26,8 +26,8 @@ IDI_ICON1               ICON    DISCARDABLE     "data/images/icon-win32.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,23,0
- PRODUCTVERSION 0,9,23,0
+ FILEVERSION 0,9,24,0
+ PRODUCTVERSION 0,9,24,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x21L
@@ -45,15 +45,15 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "New Breed Software\0"
             VALUE "FileDescription", "Tux Paint - Interactive Paint Program.\0"
-            VALUE "FileVersion", "0.9.23\0"
+            VALUE "FileVersion", "0.9.24\0"
             VALUE "InternalName", "Tux Paint\0"
-            VALUE "LegalCopyright", "Copyright (C) 2008 by Bill Kendrick\0"
+            VALUE "LegalCopyright", "Copyright (C) 2008-2020 by Bill Kendrick, et al\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "TuxPaint.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Tux Paint\0"
-            VALUE "ProductVersion", "0.9.23\0"
-            VALUE "SpecialBuild", "win32 build by John Popplewell\0"
+            VALUE "ProductVersion", "0.9.24\0"
+            VALUE "SpecialBuild", "win32 build by TOYAMA Shin-ichi\0"
         END
     END
     BLOCK "VarFileInfo"