[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Apr 5 07:22:41 PDT 2011
patches/dev300/apply | 4
patches/dev300/novell-win32-msi-patchability.diff | 136 ----------------------
2 files changed, 140 deletions(-)
New commits:
commit 7db70694080b15341ac1556430190aa9f37cfd51
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Apr 5 17:19:38 2011 +0300
Kill novell-win32-msi-patchability.diff
It has been commented out since LibreOffice began its journey, and I
think we have given up on MSI patching. And even if we would try MSI
patching again, I doubt this patch would be relevant.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index fb201b6..3b85abb 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1185,10 +1185,6 @@ sled10-splash.diff, i#123456, pmladek
[ SUSE112 ]
xulrunner-1.9.1.diff, ccheney
-[ NovellLikeOnlyWin32 ]
-# Drop this for now
-# novell-win32-msi-patchability.diff, tml
-
[ MacOSXOnly ]
SectionOwner => thorsten
sfx2-global-scope-fix.diff, thorsten
diff --git a/patches/dev300/novell-win32-msi-patchability.diff b/patches/dev300/novell-win32-msi-patchability.diff
deleted file mode 100644
index c9e5424..0000000
--- a/patches/dev300/novell-win32-msi-patchability.diff
+++ /dev/null
@@ -1,136 +0,0 @@
---- instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
-+++ instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
-@@ -1,6 +1,7 @@
- el = "{FC4188CE-C087-4109-A904-0687A76ACEDA}"
- nl = "{1C7DD608-C8AC-4B5B-81BE-E4ED3753541D}"
- fr = "{D334E645-4240-467E-9049-8EDA0DF62DD8}"
-+fr-CA = "{1779C34A-84B1-4D43-B745-067E82A62052}"
- es = "{28F03675-F28C-460D-8C2E-800EA7A551A0}"
- fi = "{5FE3A584-4297-4199-BF98-2BD36628B6C7}"
- hu = "{91F443E7-DE34-46FC-B02E-F5628399603C}"
-@@ -13,12 +13,83 @@
- et = "{0A773C83-9633-4EAD-BE4F-C015568870BD}"
- ja = "{DAF0244B-3B71-4EC8-8246-C58401AE5E01}"
- ko = "{AAFFA871-4921-4D14-9767-E302020DD8BE}"
-+km = "{6E84D360-B0B6-405E-8134-5737FCAE19C2}"
-+cy = "{1B4EE7DB-FA7F-42AC-8695-58A5D358452E}"
- zh-CN = "{5B52E76A-647C-4F18-BC52-6293FDE98C5D}"
- zh-TW = "{03293AD0-38E2-4399-BE6E-EC696138E39A}"
- tr = "{5F926003-A07A-4812-A6AD-6C466C053F53}"
- hi = "{264BD610-28F9-42C0-AFBF-60870763B038}"
-+hi-IN = "{2ECD0724-FA4C-4C23-93C2-5801E04B9A00}"
-+pa-IN = "{490D7BE1-66E2-4FF0-ADBF-560F90066CA9}"
-+ta-IN = "{4C52426D-EF4A-449F-B05A-C2B0EFE5C359}"
-+ta = "{68B6D35D-2C65-4995-B899-287F8EEBD0FF}"
-+as-IN = "{1C234926-2FE1-4223-BB9C-86FB9ACFDC67}"
- ar = "{76854B27-9B89-4C7D-AB32-69E1F60CDA6F}"
-+ar-SA = "{6171B484-B0C4-403C-A1CA-50B4879DF076}"
- he = "{10C228EF-576B-466C-B863-955EC6A9340C}"
-+af = "{538C837C-7A6B-4CC4-9FD8-FB99B459B5FD}"
-+sq = "{848F9F66-A02C-4E12-85F2-D13DC02F0942}"
-+hy = "{43705B68-3DBD-4013-BE81-EB1D454E851A}"
-+eu = "{CD145A56-9FA5-4FD6-8BF3-80551AC7076B}"
-+be-BY = "{96527E6D-7840-4175-8BE8-93DA3706E6F1}"
-+bn = "{90B27463-E51E-48BB-B21F-D81E0F738FBE}"
-+bn-BD = "{6F47AED5-49DE-4D3D-8804-88C33FD41918}"
-+bn-IN = "{52649A81-A02C-4E44-A1E1-846FD635D60D}"
-+bg = "{E72472AF-C781-4F90-BC90-3621D3051416}"
-+is = "{ED539F5E-63F4-4366-B88C-4B78A1D85102}"
-+id = "{F1837E2E-6E6D-41E0-AFB4-519D666E05B1}"
-+lo = "{9572F7D7-FD00-443F-B77F-F49ABE718488}"
-+lv = "{D6D3626E-DAA7-4735-9B06-BCD3EB39542B}"
-+lt = "{4BB4B6E7-DD02-4A82-9F10-5D0D305CBE22}"
-+mt = "{A4686668-EC2F-49C8-ADED-B6BDA2FCFD78}"
-+mr = "{9ABBA360-AACA-4F22-AC20-42F1803B163E}"
-+rm = "{B41046A6-CEF6-45FF-A8D7-5CDCE4C2E500}"
-+ro = "{09ABF8A7-2A8B-4067-813E-A59F39BF199D}"
-+rw = "{E9B6A2E1-DF76-48BA-9A97-398F3CE2EA34}"
-+sa = "{E6D25E8C-3594-4EC2-8F26-5E07AEEAD305}"
-+sr-SP = "{9359B34C-4153-4D06-B3E3-B66215383E92}"
-+tn = "{0B48531D-0704-49F8-81AA-49088E27663B}"
-+hr = "{7509D7E9-6302-427E-88C0-42E4D81EC389}"
-+fa = "{4667356A-537B-4A30-BF99-C1A11EC6093A}"
-+fo = "{372E1C06-9EDE-470E-A154-2C94B1214FF5}"
-+sl = "{B1B6F2FF-5074-4D8B-B6E7-758C097E89F3}"
-+sb = "{23635FCA-F0EF-47F8-97D8-E7D65B834235}"
-+st = "{9E74E8F6-615E-4B02-8808-041A43D3B6A8}"
-+sw = "{EDD3461D-E7FE-4752-BEC8-8161FCA04619}"
-+sw-TZ = "{F139048C-2DE1-4889-BF47-B91B5D41E938}"
-+ta = "{9B6976A0-B9F1-462C-9B34-482D685EF006}"
-+tt = "{A5A0A068-3B2F-49B4-8EED-415FF06C4AB0}"
-+ts = "{9DC49678-1C01-487A-A2CA-2A2B8716610B}"
-+uk = "{22DCDF5F-8D27-42D7-945C-EB1F190E38B1}"
-+ur = "{1DA1B844-1807-43B5-A122-453FF57EE820}"
-+vi = "{084244C8-1887-4BC3-8E85-7DAD99D698D4}"
-+xh = "{6528B6C0-DD9F-4CB4-AE2D-A14DF74DDE7C}"
-+ns = "{80D26526-29C5-4795-8DBE-DFB8F7CCB1E5}"
-+yi = "{D340AAF8-8572-4874-A064-9D45DDB871C4}"
-+zu = "{ED5667CD-9B2A-401E-8ECA-9560CC475C41}"
-+gu-IN = "{EB5113B8-2AA8-4CE4-B02A-72E33D2E5143}"
-+gu = "{280B3D0B-36AD-462A-9C04-3686F183554D}"
-+br = "{84D7B232-2196-4CD0-A36F-949B7DB83AF2}"
-+ne = "{740B3E9E-7590-4E96-8497-3E231BAFFB7E}"
-+sh-YU = "{1EECD5C1-31E2-4C18-A57E-4FE79FDBE826}"
-+sr-CS = "{A7EA8FF4-A2CC-409F-8260-403442365FA8}"
-+nr = "{171E9D9F-58F0-49E0-84E4-E76352C2FF0F}"
-+ss = "{5E084FCA-3032-4833-B414-2E6777ECCFE9}"
-+st = "{895F4477-4E71-4158-93DC-14CB4114CC9A}"
-+ve = "{44411748-2FC8-4D70-BF25-AB6ABDE69D3A}"
-+ga = "{499D9641-2B98-4D59-974C-09199761F62C}"
-+mk = "{DBA9A11D-F600-42AD-8D99-06061102A517}"
-+te-IN = "{A340DAB6-ACD6-48BB-9F35-B7D087EA7625}"
-+ml-IN = "{741168B7-19D4-41D7-9A96-DF725DA44904}"
-+mr-IN = "{C60698D5-76E9-4AA4-92DE-89E38129E06E}"
-+ur-IN = "{1DEDD828-FA9B-4B86-8F00-3E90157B76D7}"
-+or-IN = "{0238EEF6-23ED-4065-989D-C95F1C8DCBEE}"
-+ku = "{490A29B0-D3F8-4C3F-B6D7-7BF5A791A746}"
-+tg = "{996FB6B4-5532-415F-9622-73E7C867F42D}"
-+ti-ER = "{E4FE8DE0-D5DB-4CA8-8BBD-2771822EFC6A}"
-+gl = "{B4E79B50-ADE3-49EE-AB75-D0B4AD676B3F}"
-+kn = "{08708716-FFC8-4717-AD92-9B60F4761119}"
-+ms = "{459A2CDA-7915-41FB-8965-7CF19A02F186}"
- multiwestern = "{D53F8583-419E-440E-AC00-40E9AB31EEBF}"
- multiasia = "{C0D08A10-A266-46DC-8EF4-BE0E5928129D}"
-
-@@ -63,6 +63,7 @@
- fa = "{12D1FE4A-95E1-4BED-B377-2E8EA93B2461}"
- fi = "{481B0FE0-8313-442E-8A53-7C5139ADA3DC}"
- fr = "{B0FDE9B8-D066-4FB2-885D-615A6D58E02F}"
-+fr-CA = "{5D4EA72D-E97F-4135-8BEC-ECA8E5A4DA30}"
- ga = "{39B343FE-EC1F-451E-930A-47D85E96DE67}"
- gd = "{DE408221-68E9-418D-9B20-10BE458268F2}"
- gl = "{38616841-D0DB-4768-B9B8-27D61A91FB47}"
-@@ -149,3 +149,13 @@
- zu = "{924D7527-25C6-4B95-95C7-7B68DABEC93E}"
- multiwestern = "{385A1970-0257-4C57-9383-DD2D668B23CE}"
- multiasia = "{74543111-6ABF-4A12-AC11-D315E2939D2A}"
-+sq = "{E9B56A18-156C-4936-9CFB-146CA7174B41}"
-+hy = "{681C6683-8D75-4284-AE77-DCF3C6E870DE}"
-+id = "{70886F70-BFB7-4E45-A05D-3294A91FEB3E}"
-+mt = "{B07B5F49-C4B6-4A9E-A46F-5565E64C4CC0}"
-+rm = "{A608FC91-CFD9-44E7-9813-22777911489A}"
-+ro = "{6CD33E91-55A4-4A9F-8A27-0069DF389BDC}"
-+fo = "{92F1FA59-3A7D-482D-823A-1A2734FEFB59}"
-+sb = "{5B574AAD-B8B2-4683-A806-BF92D80F914D}"
-+tt = "{88D194B3-C099-4D80-AD3D-7A26E082D3C8}"
-+yi = "{382C63FC-2CC9-4C7D-877B-AA779CEA0479}"
---- solenv/bin/modules/installer/windows/msp.pm
-+++ solenv/bin/modules/installer/windows/msp.pm
-@@ -285,8 +285,15 @@
- my $windowspatchlevel = 0;
- if ( $allvariables->{'MSPPATCHLEVEL'} ) { $windowspatchlevel = $allvariables->{'MSPPATCHLEVEL'}; }
- $databasename = $databasename . "_servicepack_" . $windowspatchlevel;
-- my $languagestring = create_langstring($languagesarrayref);
-- $databasename = $databasename . $languagestring;
-+ # Upstream just loves deep folder structures with lots of
-+ # redundancy.
-+ # Don't make the name too long. We already have the frigging
-+ # language string (or, a hash of it, in case it is long)
-+ # in the folder name, no need to repeat it in this file name.
-+ # And when actually providing the resulting .msp file to
-+ # customers, it will be given a better name anyway.
-+ # my $languagestring = create_langstring($languagesarrayref);
-+ # $databasename = $databasename . $languagestring;
- }
- else
- {
More information about the Libreoffice-commits
mailing list