[pan: 11/16] Update documentation

[Dominique Dumont <ddumont src gnome org>]

commit c2f84e09ce01b09fd15aedf1f04b051174f99de4
Author: Thomas Tanner <thosrtanner googlemail com>
Date:   Fri Apr 15 18:56:35 2022 +0100

    Update documentation

 README.mingw64_msys2 | 30 +++++++++++++++++---------
 wininstall.py        | 60 +++++++++++++++++++++++++---------------------------
 2 files changed, 49 insertions(+), 41 deletions(-)
---
diff --git a/README.mingw64_msys2 b/README.mingw64_msys2
index e6b471e..15e5d5b 100644
--- a/README.mingw64_msys2
+++ b/README.mingw64_msys2
@@ -17,10 +17,10 @@ $ pacman -S mingw-w64-x86_64-gtkspell
 For gtk3 builds,
 $ pacman -S mingw-w64-x86_64-gtkspell3
 
-# You also need some dictionaries to spell check against!
+You also need some dictionaries to spell check against!
 $ pacman -S mingw-w64-x86_64-hunspell-en
 
-# and this (possibly optional, but...)
+and this (possibly optional, but...)
 $ pacman -S mingw-w64-x86_64-iso-codes (possibly: /mingw64/share/xml, /mingw64/share/locale)
 
 Then you can create an msys2 x64 window and run
@@ -31,18 +31,26 @@ or
 
 `autogen --with-gtk2`
 
-NOTE: enchant is somewhat broken under mingw64 and cannot find the appropriate libraries as it appears to 
expect to find at least 'lib/enchant=2' in the the same directory as the executable. You might want to create 
a soft link or copy.
+Personally I think the gtk2 version looks a *lot* better
+
+NOTE: enchant is somewhat broken under mingw64 and cannot find the appropriate libraries as it appears to 
expect to find at least 'lib/enchant-2' in the the same directory as the executable. You might want to create 
a soft link or copy. If you run wininstall, it copies the appropriate directories to the same place as the 
executable, and works fine. Go figure.
 
 Haven't tried these yet:
 
---with-yelp-tools for user manual
---with-gmime-crypto for cryptography
---enable-libnotify for notifications
---enable-gkr for gnome keyring
+1. --with-dbus
 
-and `make`.
+2. libnotify: autogen with --enable-libnotify
+$ pacman -S mingw-w64-x86_64-libnotify
 
-Personally I think the gtk2 version looks a *lot* better
+3. --enable-manual for user manual
+
+4. --enable-gkr for gnome keyring (gtk2 and 3 different for this)
+
+5. --with-gnutls
+
+5. --with-webkit
+
+and `make`.
 
 If you want a windows theme in gtk3, run
 ```
@@ -54,9 +62,11 @@ gtk-theme-name=win32
 
 If you want other themes, you can install them in share/themes in the target directory.
 
+Issues:
+1. bold state on group doesn't get cleared when you do 'mark all as read'
+
 To add:
 
-- [[http://www.galago-project.org/news/index.php][libnotify]] 0.4.1 or higher for notifications
 
 - [[https://developer.gnome.org/libsecret/][libsecret]] 0.16 or higher and 
[[https://developer.gnome.org/gcr/][gcr]] 3.20 or higher for password storage
 
diff --git a/wininstall.py b/wininstall.py
index 5647991..e6f3a57 100644
--- a/wininstall.py
+++ b/wininstall.py
@@ -67,15 +67,17 @@ def copy_tree(*, target_dir: str, tree: str):
 
 def read_configure():
     dbus = False
-    have_gkr = False
     gmime_crypto = False
-    gnu_tls = False
-    gtk_version = 2
     spellcheck = False
-    popups = False
+    gtk_version = 2
+# webkit?
+    tls_support = False
+    popup_notifications = False
+    password_storage = False
+# yelp-tools ?
     manual = False
 
-    # Check these
+    # These are in the order output by configure
     with open("config.h") as config:
         for line in config.readlines():
             line = line.rstrip()
@@ -85,34 +87,31 @@ def read_configure():
                 continue
             if words[1] == 'HAVE_DBUS':
                 dbus = True # better to say multiple pans?
-            elif words[1] == 'HAVE_GKR': # What is this? gnome keyring?
-                have_gkr = True # What effect?
             elif words[1] == 'HAVE_GMIME_CRYPTO':
-                gmime_crypto = True # What effect?
-            elif words[1] == 'HAVE_GNUTLS':
-                gnu_tls = True # What effect?
-            elif words[1] == 'HAVE_GTK':
-                gtk_version = 3
+                gmime_crypto = True
             elif words[1] == 'HAVE_GTKSPELL':
                 spellcheck = True
+            elif words[1] == 'HAVE_GTK':
+                gtk_version = 3
+            # webkit?
+            elif words[1] == 'HAVE_GNUTLS':
+                tls_support = True
             elif words[1] == 'HAVE_LIBNOTIFY':
-                popups = True
+                popup_notifications = True
+            elif words[1] == 'HAVE_GKR':
+                password_storage = True
             elif words[1] == 'HAVE_MANUAL':
                 manual = True
 
-#        With WebKitGTK:         no Which param?
-#        With password storage: which param?
-#        With yelp-tools:        yes doubt it affects distro
-#        With user manual:       no can we do anything anyway?
-
     return {
         "dbus": dbus,
-        "have_gkr": have_gkr,
         "gmime_crypto": gmime_crypto,
-        "gnu_tls": gnu_tls,
-        "gtk_version": gtk_version,
         "spellcheck": spellcheck,
-        "popups": popups,
+        "gtk_version": gtk_version,
+        # webkit?
+        "tls_support": tls_support,
+        "popup_notifications": popup_notifications,
+        "password_storage": password_storage,
         "manual": manual
     }
 
@@ -146,6 +145,7 @@ def main():
     dlls = copy_executable(executable, target_dir)
 
     copy_tree(target_dir=target_dir, tree="lib/gdk-pixbuf-2.0")
+    # + share/locale/en_GB/LC_MESSAGES/gdk-pixbuf.mo?
 
     # Deal with magically autoloaded stuff
     #------------------------------------------------------------------------
@@ -159,6 +159,7 @@ def main():
     # ------------ gtk2
     if config["gtk_version"] == 2:
         copy_tree(target_dir=target_dir, tree="lib/gtk-2.0/2.10.0/engines")
+        # + share/locale/en_GB/LC_MESSAGES/gtk20*?
 
     # None of these appear to be necessary so why do we have them?
     # However, the release pan version has very slightly nicer fonts, so need
@@ -167,12 +168,6 @@ def main():
     # add etc/gtk-2.0
     # add etc/pango
 
-    # for enchant:
-    # share/xml/iso-codes (seems a bit optional)
-    # locale
-
-    # what about contents of 'po' directory?
-
     # ------------ gtk3
     #if config["gtk_version"] == 3:
 
@@ -202,13 +197,16 @@ def main():
         # Maybe we should extract the pacman file directly?
         # tar -xvf /var/cache/pacman/pkg/mingw-w64-x86_64-iso-codes-4.9.0-3-any.pkg.tar.zst
         #   -C <target_dir> --strip-components 1
-        # note that there are a bunch of other .mo files like gtk20.mo, .....
-        # in share/locale
 
     #------------------------------------------------------------------------
 
+    # Possibly copy the whole of /mingw64share/locale?
+    # May be worth while installing the packages installed to build this with the tar
+    # command above?
+
     # Now we copy all the pan <lang>.gmo files in the po directory to the right place in
-    # <target>/locale/<dir>/LC_MESSAGES/pan.mo. This may or may not be correct for windows
+    # <target>/locale/<dir>/LC_MESSAGES/pan.mo. This may or may not be correct for windows,
+    # as the existing install appears to set up registry keys.
     locale_dir = os.path.join(target_dir, 'share', 'locale')
     for gmo in glob.glob("po/*.gmo"):
         name = os.path.basename(gmo)