[gimp/gimp-2-10] Installer: proper fix for libthai
- From: Jernej Simončič <jernejs src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-10] Installer: proper fix for libthai
- Date: Fri, 9 Nov 2018 23:46:10 +0000 (UTC)
commit 3fd5b50f948f9217400d6a11599f0f7eb7e8b9ed
Author: Jernej Simončič <jernej|s-gitstuff eternallybored org>
Date: Sat Nov 10 00:45:43 2018 +0100
Installer: proper fix for libthai
build/windows/installer/gimp3264.iss | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/build/windows/installer/gimp3264.iss b/build/windows/installer/gimp3264.iss
index b0d6b92b6a..e14e18b526 100755
--- a/build/windows/installer/gimp3264.iss
+++ b/build/windows/installer/gimp3264.iss
@@ -110,6 +110,7 @@ DisableProgramGroupPage=yes
DisableWelcomePage=no
DisableDirPage=auto
AlwaysShowDirOnReadyPage=yes
+ChangesEnvironment=yes
#if Defined(DEVEL) && DEVEL != ""
DefaultDirName={pf}\GIMP {#MAJOR}.{#MINOR}
@@ -248,6 +249,7 @@ Source: "{#DEPS_DIR32}\share\themes\*"; DestDir: "{app}\share\themes"; Component
Source: "{#DEPS_DIR32}\share\xml\*"; DestDir: "{app}\share\xml"; Components: deps32 or deps64; Flags:
recursesubdirs restartreplace uninsrestartdelete ignoreversion
Source: "{#DEPS_DIR32}\share\poppler\*.*"; DestDir: "{app}\share\poppler"; Components: deps32 or deps64;
Flags: recursesubdirs restartreplace uninsrestartdelete ignoreversion
+Source: "{#DEPS_DIR32}\share\libthai\*"; DestDir: "{app}\share\libthai"; Components: deps32 or deps64;
Flags: recursesubdirs restartreplace uninsrestartdelete ignoreversion
Source: "{#DEPS_DIR32}\share\locale\*"; DestDir: "{app}\share\locale"; Components: loc; Flags:
recursesubdirs restartreplace uninsrestartdelete ignoreversion
Source: "{#GIMP_DIR32}\share\locale\*"; DestDir: "{app}\share\locale"; Components: loc; Flags:
recursesubdirs restartreplace uninsrestartdelete ignoreversion
@@ -549,13 +551,12 @@ Type: files; Name: "{commondesktop}\GIMP 2.lnk"
;get previous GIMP icon name from uninstall name in Registry
Type: files; Name:
"{commonprograms}\{reg:HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GIMP-2_is1,DisplayName|GIMP
2}.lnk"; Check:
CheckRegValueExists('SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GIMP-2_is1','DisplayName')
Type: files; Name:
"{commondesktop}\{reg:HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GIMP-2_is1,DisplayName|GIMP
2}.lnk"; Check:
CheckRegValueExists('SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GIMP-2_is1','DisplayName')
-;temporary: thai locale causes a crash on Windows 7 (https://p.0au.de/4cd14fde/)
-Type: filesandordirs; Name: "{app}\share\locale\th\*"
-Type: dirifempty; Name: "{app}\share\locale\th"
[Registry]
;fix broken toolbox icons
Root: HKLM; Subkey: "Software\Classes\.svg"; ValueType: string; ValueName: "Content Type"; ValueData:
"image/svg+xml"; Flags: noerror createvalueifdoesntexist
+;libthai crashes without this
+Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: string;
ValueName: "LIBTHAI_DICTDIR"; ValueData: "{app}\share\libthai"; Flags: createvalueifdoesntexist
preservestringtype uninsdeletevalue
[UninstallDelete]
Type: files; Name: "{app}\uninst\uninst.inf"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]