[X2Go-Commits] [x2goclient] 01/01: Windows: Include all fonts in NSIS installer, make them optional, and install only "misc" by default. (Fixes: #108) Also make desktop shortcut optional.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit c0bc05f8e607afaa3aeb49af62eaf5d21e572519
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Mon Jul 7 23:06:07 2014 -0400

    Windows: Include all fonts in NSIS installer, make them optional, and install only "misc" by default. (Fixes: #108) Also make desktop shortcut optional.
---
 debian/changelog    |    9 ++++++-
 nsis/x2goclient.nsi |   72 ++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 76 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3148ef4..f4e8419 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -56,12 +56,19 @@ x2goclient (4.0.2.1-0x2go1) UNRELEASED; urgency=low
 
   [ Mike DePaulo ]
   * New upstream release (4.0.2.1):
+    - Windows: Install VcXsrv "misc" fonts by default, and make all 4 font
+      groups optional: misc, 75dpi, 100dpi and others (Fixes: #108)
+      Note: The fact that all the fonts are included makes the installer about
+      30MB larger. (See next comment, it would be even larger.)
+    - Windows: Reduce the new size of NSIS installer by several MB
+      by switching to lzma solid compression
+    - Windows: Make the desktop shortcut optional during install,
+      but still the default.
     - Windows: Prevent high PulseAudio CPU usage on Windows XP by lowering
       PulseAudio's CPU priority from "high" to "normal" on XP specifically.
       Also do so on Windows Server 2003 (R2) (Fixes #526)
     - Windows: Enable PulseAudio log when --debug is passed.
     - Windows: Fix compatibility with current PulseAudio master branch
-    - Windows: Reduce size of NSIS installer by switching to lzma solid compression
     - Windows: cygwin packages (inluding patched OpenSSH 6.6.1p1-3) updated from
       latest versions as of 2014-04-08 to latest versions as of 2014-06-09. This
       includes openssl 1.0.1h-1, which fixes the 6 CVEs announced on 2014-06-05.
diff --git a/nsis/x2goclient.nsi b/nsis/x2goclient.nsi
index bb6154b..7b976b3 100755
--- a/nsis/x2goclient.nsi
+++ b/nsis/x2goclient.nsi
@@ -5,6 +5,7 @@
 
 !include "MUI.nsh"
 !include "FileFunc.nsh"
+!include "Sections.nsh"
 !insertmacro Locate
 ;--------------------------------
 ;General
@@ -65,6 +66,7 @@ SectionEnd
 ;Pages
 
   !insertmacro MUI_PAGE_LICENSE "gpl.txt"
+  !insertmacro MUI_PAGE_COMPONENTS
   !insertmacro MUI_PAGE_DIRECTORY
   !define MUI_STARTMENUPAGE_DEFAULTFOLDER "X2Go Client for Windows"
   !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
@@ -95,7 +97,13 @@ SectionEnd
 
 ;--------------------------------
 ;Installer Sections
-Section "x2goclient" Section1
+
+;"Recommended" is the default because it is specified 1st.
+InstType "Recommended"
+InstType "Full"
+InstType "Minimal"
+
+Section "X2Go Client (required)" base
 
   SetShellVarContext all 
   SectionIn RO
@@ -103,7 +111,7 @@ Section "x2goclient" Section1
   SetOutPath "$INSTDIR"
   File /a "x2goclient\*.*"
   File /r "x2goclient\pulse"
-  File /r "x2goclient\VcXsrv"
+  File /r /x "fonts" "x2goclient\VcXsrv" 
   
   ;Store installation folder
   WriteRegStr HKLM "Software\x2goclient" "" $INSTDIR
@@ -115,7 +123,6 @@ Section "x2goclient" Section1
   CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
   CreateShortCut "$INSTDIR\X2Go Client.lnk" "$INSTDIR\x2goclient.exe"
   CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\X2Go Client.lnk" "$INSTDIR\x2goclient.exe"
-  CreateShortCut "$DESKTOP\X2Go Client.lnk" "$INSTDIR\x2goclient.exe"
 
   ;Cleanup previous icon names (prior to X2Go Client 4.0.1.2)
   Delete "$INSTDIR\X2goClient.lnk"
@@ -140,7 +147,64 @@ Section "x2goclient" Section1
   
 SectionEnd
 
-Section EstimatedSize
+;x2goclient bug 108 fix
+SectionGroup "Fonts"
+
+  ;Empirical testing shows that "misc" fixes compatibility for the majority
+  ;of applications with font compatibility programs.
+  ;So lets make "misc" be part of "recommended", and therefore the default.
+  ;
+  ;As of VcXsrv-xp 1.14.3.2
+  ;misc is 412 files at 6.80 MB (7.94 MB on disk)
+  Section "misc" fonts-misc
+    SectionIn 1 2
+    SetOutPath "$INSTDIR\VcXsrv\fonts\"
+    File "x2goclient\VcXsrv\fonts\fonts.conf"
+	File /r "x2goclient\VcXsrv\fonts\misc"
+  SectionEnd
+  
+  ;As of VcXsrv-xp 1.14.3.2
+  ;75dpi is 1,897 files at 10.7 MB (15.6 MB on disk)
+  Section "75dpi" fonts-75dpi
+    SectionIn 2
+    SetOutPath "$INSTDIR\VcXsrv\fonts\"
+    File "x2goclient\VcXsrv\fonts\fonts.conf"
+	File /r "x2goclient\VcXsrv\fonts\75dpi"
+  SectionEnd
+  
+  ;As of VcXsrv-xp 1.14.3.2
+  ;100dpi is 1,897 files at 12.3 MB (16.8 MB on disk)
+  Section "100dpi" fonts-100dpi
+    SectionIn 2
+    SetOutPath "$INSTDIR\VcXsrv\fonts\"
+    File "x2goclient\VcXsrv\fonts\fonts.conf"
+	File /r "x2goclient\VcXsrv\fonts\100dpi"
+  SectionEnd
+  
+  ;As of VcXsrv-xp 1.14.3.2
+  ;everything else is 466 files at 12.8MB (13.8 MB on disk)
+  Section "others" fonts-others
+    SectionIn 2
+    SetOutPath "$INSTDIR\VcXsrv\fonts\"
+    File "x2goclient\VcXsrv\fonts\fonts.conf"
+	File /r "x2goclient\VcXsrv\fonts\cyrillic"
+	File /r "x2goclient\VcXsrv\fonts\encodings"
+	File /r "x2goclient\VcXsrv\fonts\OTF"
+	File /r "x2goclient\VcXsrv\fonts\Speedo"
+	File /r "x2goclient\VcXsrv\fonts\terminus-font"
+	File /r "x2goclient\VcXsrv\fonts\TTF"
+	File /r "x2goclient\VcXsrv\fonts\Type1"
+  SectionEnd
+  
+SectionGroupEnd
+
+Section "Desktop Shortcut" desktopshortcut
+  SectionIn 1 2
+  CreateShortCut "$DESKTOP\X2Go Client.lnk" "$INSTDIR\x2goclient.exe"
+SectionEnd
+  
+Section -EstimatedSize
+  SectionIn RO
   ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
   IntFmt $0 "0x%08X" $0
   WriteRegDWORD HKLM ${UNINSTALL_REGKEY} "EstimatedSize" "$0"

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git