logo

etc_portage

Unnamed repository; edit this file 'description' to name the repository. git clone https://hacktivis.me/git/etc_portage.git

innoextract-1.7_inno_5.6.2_0001.patch (2226B)

    

  1. From 5cf1cb3ba07eba8d32b4bb961ba80401ea8248e7 Mon Sep 17 00:00:00 2001
  2. From: Daniel Scharrer <daniel@constexpr.org>
  3. Date: Sat, 8 Sep 2018 03:24:54 +0200
  4. Subject: [PATCH] Add preliminary Inno Setup 5.6.2 support
  6. ---
  7.  CHANGELOG            |  1 +
  8.  src/setup/header.cpp | 13 +++++++++++--
  9.  src/setup/header.hpp |  2 ++
  10.  3 files changed, 14 insertions(+), 2 deletions(-)
  12. diff --git a/src/setup/header.cpp b/src/setup/header.cpp
  13. index 1484181..844b2e9 100644
  14. --- a/src/setup/header.cpp
  15. +++ b/src/setup/header.cpp
  16. @@ -236,6 +236,13 @@ void header::load(std::istream & is, const version & version) {
  17.  	} else {
  18.  		setup_mutex.clear();
  19.  	}
  20. +	if(version >= INNO_VERSION(5, 6, 1)) {
  21. +		is >> util::encoded_string(changes_environment, version.codepage());
  22. +		is >> util::encoded_string(changes_associations, version.codepage());
  23. +	} else {
  24. +		changes_environment.clear();
  25. +		changes_associations.clear();
  26. +	}
  27.  	if(version >= INNO_VERSION(5, 2, 5)) {
  28.  		is >> util::ansi_string(license_text);
  29.  		is >> util::ansi_string(info_before);
  30. @@ -498,7 +505,9 @@ void header::load(std::istream & is, const version & version) {
  31.  		if(version < INNO_VERSION(1, 3, 21)) {
  32.  			flagreader.add(OverwriteUninstRegEntries);
  33.  		}
  34. -		flagreader.add(ChangesAssociations);
  35. +		if(version < INNO_VERSION(5, 6, 1)) {
  36. +			flagreader.add(ChangesAssociations);
  37. +		}
  38.  	}
  39.  	if(version >= INNO_VERSION(1, 3, 21)) {
  40.  		if(version < INNO_VERSION(5, 3, 8)) {
  41. @@ -562,7 +571,7 @@ void header::load(std::istream & is, const version & version) {
  42.  	if(version >= INNO_VERSION(4, 2, 2)) {
  43.  		flagreader.add(EncryptionUsed);
  44.  	}
  45. -	if(version >= INNO_VERSION(5, 0, 4)) {
  46. +	if(version >= INNO_VERSION(5, 0, 4) && version < INNO_VERSION(5, 6, 1)) {
  47.  		flagreader.add(ChangesEnvironment);
  48.  	}
  49.  	if(version >= INNO_VERSION(5, 1, 7) && !version.unicode) {
  50. diff --git a/src/setup/header.hpp b/src/setup/header.hpp
  51. index a21dba0..8975e2f 100644
  52. --- a/src/setup/header.hpp
  53. +++ b/src/setup/header.hpp
  54. @@ -154,6 +154,8 @@ struct header {
  55.  	std::string uninstallable;
  56.  	std::string close_applications_filter;
  57.  	std::string setup_mutex;
  58. +	std::string changes_environment;
  59. +	std::string changes_associations;
  60.  	std::string license_text;
  61.  	std::string info_before;
  62.  	std::string info_after;