From 41c8cc01ed237ed906208d5dca5d28d6ad548942 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Mon, 24 Feb 2020 13:33:26 +0100
Subject: [PATCH] Revert "Unify component GUIDs across languages"

This reverts commit f8f20f3667d0c5d2844f2a926146ab1714d2d1ed.

Due to Active Setup StubPath bug in already deployed MSI packages we can
fix automatically using minor update only, we cannot change the
component GUIDs just yet.

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 MSI/ZRCola/Main/Makefile          | Bin 294368 -> 294968 bytes
 Updater                           |   2 +-
 ZRCola/MSIBuild/Makefile          |   7 +++++--
 lib/libZRColaUI/MSIBuild/Makefile |   7 +++++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile
index 38c4f354e11a2464d180408853346ff609f1170b..baa024a7f5e7faaa8b58f51f2a3561def83e2107 100644
GIT binary patch
delta 525
zcmZWlyGjH>5G-{B7ZyP|l{?u$Ffduzz1wHFk6F-Axm5iC1Mv}=2nMFYz)fsuc19X%
z;D7i9MrJ0~%<6I|O+$BePgm8vf2}-UuTDSv`pywc&KWLognf+F;$Umsb#QQn5h4sx
zqDIa-fR73pqhu8!MNHgB!MY&oqd~&`fOrJSxwLqu?gtMuJg@70b-LO6!&P#-=G&4N
zYNp|;*qghNWpBC6)bJMwt&*HO5s{2|h!MH8I^1y8N6*!PoHeM!9kHe_9I@@3<AkOU
zuxm|soi$xhenT-ve9qIp6;ZJ>LL^CyxZHk8^CKkWn}mBI=MCpETGQQS^=rCAELXzK
zl>3Iu$oE-Evb3fXYtmR95|NyyjGT2$!wDm`U!MLq-O=brDc<ypE0%92-tEMjW6m=d
Ko+h5yJN^c!SYPD;

delta 224
zcmdndAoSq3;D#@f(`(#VBqr~Wk($2FjYUAcn!$*{fWei)5=fdeSTHy;=rR~Hm@pVJ
zI0IQGKv6da7Y5zQ6Q#5zb%E+EfY=QvZUK}rVlV}=fI26ym!3X(pR5qbNWRI3#3UyF
zlM|Uf!5wTq$W&*rDNaBe41lH@0QsgsHpqMnh)q!Q9f9^607Z;}Dx83{3s9dKgEP?l
g?I7d$rq^h*h%_6>w;RYa0x=U1GjBJLXW>W$0O0E{Z2$lO

diff --git a/Updater b/Updater
index 349c42f..278cce1 160000
--- a/Updater
+++ b/Updater
@@ -1 +1 @@
-Subproject commit 349c42fe5797baae2161402eeca4bdd4c1108142
+Subproject commit 278cce1b4c17c8da9e615bae986bc9fe6eb670b3
diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile
index bdf2e28..4a48632 100644
--- a/ZRCola/MSIBuild/Makefile
+++ b/ZRCola/MSIBuild/Makefile
@@ -102,8 +102,11 @@ Component	ComponentId	Directory_	Attributes	Condition	KeyPath
 s$(MSIBUILD_LENGTH_ID)	S38	s$(MSIBUILD_LENGTH_ID)	i2	S255	S$(MSIBUILD_LENGTH_ID)
 Component	Component
 compZRCola.exe.$(PLAT)	{6DB513F9-BC90-4CE7-821$(MSIBUILD_PLAT_GUID)-AA50BF31F34E}	ZRCOLABINDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.exe.$(PLAT)
-!IF "$(LANG)" != "en_US"
-compZRCola.mo.$(LANG)	{4F59C403-D6DE-4B3F-$(MSIBUILD_LANG_GUID)-1190DB941EB3}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.$(LANG)
+!IF "$(LANG)" == "ru_RU"
+compZRCola.mo.ru_RU	{DEA5D11C-2B0E-4B85-ACE3-D76334866F50}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.ru_RU
+!ENDIF
+!IF "$(LANG)" == "sl_SI"
+compZRCola.mo.sl_SI	{7FF95C71-D8DE-4D2B-A26D-FEB5A1F54D63}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.sl_SI
 !ENDIF
 <<NOKEEP
 
diff --git a/lib/libZRColaUI/MSIBuild/Makefile b/lib/libZRColaUI/MSIBuild/Makefile
index 26aa6b4..ee75267 100644
--- a/lib/libZRColaUI/MSIBuild/Makefile
+++ b/lib/libZRColaUI/MSIBuild/Makefile
@@ -39,8 +39,11 @@ All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt"
 Component	ComponentId	Directory_	Attributes	Condition	KeyPath
 s$(MSIBUILD_LENGTH_ID)	S38	s$(MSIBUILD_LENGTH_ID)	i2	S255	S$(MSIBUILD_LENGTH_ID)
 Component	Component
-!IF "$(LANG)" != "en_US"
-complibZRColaUI.mo.$(LANG)	{1CEF160E-B56C-4636-$(MSIBUILD_LANG_GUID)-D6BAEB0A6EFD}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filelibZRColaUI.mo.$(LANG)
+!IF "$(LANG)" == "ru_RU"
+complibZRColaUI.mo.ru_RU	{2099A205-5D5E-4AD9-BD31-EECC87FEAB47}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filelibZRColaUI.mo.ru_RU
+!ENDIF
+!IF "$(LANG)" == "sl_SI"
+complibZRColaUI.mo.sl_SI	{EAE1C699-8415-4FC6-9EC7-FE74AFC432A9}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filelibZRColaUI.mo.sl_SI
 !ENDIF
 <<NOKEEP