[ooo-build-commit] .: patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Thu May 20 00:35:07 PDT 2010
patches/dev300/apply | 14 -
patches/dev300/novell-win32-drop-win9x.diff | 4
patches/dev300/novell-win32-installer-branding.diff | 8
patches/dev300/novell-win32-msi-patchability.diff | 135 ----------
patches/dev300/pptx-filter-as-a-separate-lib-sd-build-lst-without-transogl.diff | 4
patches/dev300/win32-multi-lang-installer.diff | 20 -
patches/dev300/win32-no-seterror-when-debugging.diff | 4
patches/dev300/win32-no-uninstall-survey.diff | 3
patches/dev300/win32-prebuilt-writingaids-zip.diff | 13
patches/dev300/win32-restore-associations.diff | 14 -
10 files changed, 59 insertions(+), 160 deletions(-)
New commits:
commit 72a25ab4a055cd1d3cf5aec627cfe120113bfb34
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu May 20 10:34:24 2010 +0300
Make patches apply for a Windows build
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 66ca715..cf70290 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1296,7 +1296,9 @@ odf-flatxml-import-export.diff
[ Win32Only ]
# search <ooo-home>/share/template/common for language independent templates
# will not push it upstream because it will be replaced by upcomming kendy's work
-office-cfg-common-template-dir.diff, pmladek
+
+# FIXME dev300-m77: doesn't apply at all
+# office-cfg-common-template-dir.diff, pmladek
[ MacOSXOnly ]
# search <ooo-home>/share/template/common for language independent templates
@@ -2219,7 +2221,9 @@ kde4-kab.diff
# fallback to any installed icon theme
# show only the installed icon themes in Tools/Options.../OpenOffice.org/View
# upstreamed in m68
-optional-icon-themes-without-oxygen.diff, i#105062, bnc#529404, pmladek
+
+# FIEMX dev300-m77: doesn't apply at all
+# optional-icon-themes-without-oxygen.diff, i#105062, bnc#529404, pmladek
# search also /usr/share for icons
# it is a temporary hack; we should do more clean FHS compliant installation
@@ -3290,11 +3294,13 @@ boost-1.39-extra-header.diff, kohei
boost-deliver-ptr-container.diff, kohei
[ Win32Only ]
-win32-boost-crack.diff
+# FIXME dev300-m77: Doesn't apply, maybe not needed
+# win32-boost-crack.diff
win32-pdfimport-use-temporary-file.diff, n#569319, fridrich
-win32-avoid-uac.diff, i#111232, tml
+# FIXME dev300-m77: I think upstream now works around UAC using slightly different code
+# win32-avoid-uac.diff, i#111232, tml
[ NovellOnly ]
# remove Macro Recorder from UI since it is borked by design
diff --git a/patches/dev300/novell-win32-drop-win9x.diff b/patches/dev300/novell-win32-drop-win9x.diff
index e296fa0..b442ce0 100644
--- a/patches/dev300/novell-win32-drop-win9x.diff
+++ b/patches/dev300/novell-win32-drop-win9x.diff
@@ -172,8 +172,8 @@
+ if test -x ./external/msi/instmsiw.exe; then
AC_MSG_RESULT([found])
else
-- MSIAPATH=`/bin/find "$COMPATH/../.." -iname instmsia.exe | head -n 1`
- MSIWPATH=`/bin/find "$COMPATH/../.." -iname instmsiw.exe | head -n 1`
+- MSIAPATH=`/bin/find "$COMPATH/.." -iname instmsia.exe | head -n 1`
+ MSIWPATH=`/bin/find "$COMPATH/.." -iname instmsiw.exe | head -n 1`
- if test -n "$MSIAPATH" -a -n "$MSIWPATH"; then
- cp "$MSIAPATH" ./external/msi/ && chmod +x ./external/msi/instmsia.exe && MSIACOPY="OK"
+ if test -n "$MSIWPATH"; then
diff --git a/patches/dev300/novell-win32-installer-branding.diff b/patches/dev300/novell-win32-installer-branding.diff
index 935226f..e076b1a 100644
--- a/patches/dev300/novell-win32-installer-branding.diff
+++ b/patches/dev300/novell-win32-installer-branding.diff
@@ -35,7 +35,7 @@
+++ instsetoo_native/util/openoffice.lst
@@ -29,9 +29,9 @@
USE_FILEVERSION 1
- LIBRARYVERSION 9.2.1
+ LIBRARYVERSION 9.3.0
PATCHCODEFILE ooo_patchcodes.txt
- DOWNLOADBANNER ooobanner.bmp
- DOWNLOADBITMAP ooobitmap.bmp
@@ -47,7 +47,7 @@
STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
STARTCENTER_INFO_URL http://www.go-oo.org
@@ -76,9 +76,9 @@
- LIBRARYVERSION 9.2.1
+ LIBRARYVERSION 9.3.0
PATCHCODEFILE ooo_patchcodes.txt
JAVAPRODUCT 1
- DOWNLOADBANNER ooobanner.bmp
@@ -60,7 +60,7 @@
STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
STARTCENTER_INFO_URL http://www.go-oo.org
@@ -122,9 +122,9 @@
- LIBRARYVERSION 9.2.1
+ LIBRARYVERSION 9.3.0
PATCHCODEFILE ooodev_patchcodes.txt
CODEFILENAME codes_ooodev.txt
- DOWNLOADBANNER ooobanner.bmp
@@ -71,7 +71,7 @@
+ DOWNLOADSETUPICO ooosetup_nld.ico
LOCALUSERDIR $ORIGIN/..
RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
@@ -150,9 +150,9 @@
PCPFILENAME ure.pcp
POOLPRODUCT 0
diff --git a/patches/dev300/novell-win32-msi-patchability.diff b/patches/dev300/novell-win32-msi-patchability.diff
index ac6345d..c9e5424 100644
--- a/patches/dev300/novell-win32-msi-patchability.diff
+++ b/patches/dev300/novell-win32-msi-patchability.diff
@@ -1,12 +1,6 @@
--- instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
+++ instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
-@@ -1,10 +1,13 @@
- [PRODUCTCODE]
- en-US = "{302DAE3A-2CD6-46DF-A25B-ED0B59FBA771}"
-+bs = "{9DF5D8E3-239F-4672-8CBB-64F35914D8FC}"
- pt = "{FC10CE94-41C6-43AE-AC97-4F4AE45B1BCC}"
-+pt-PT = "{B4191495-6B61-4C9E-8E64-BD6B10E7F784}"
- ru = "{C0C43007-C203-4722-916E-7A4E915E4F8D}"
+@@ -1,6 +1,7 @@
el = "{FC4188CE-C087-4109-A904-0687A76ACEDA}"
nl = "{1C7DD608-C8AC-4B5B-81BE-E4ED3753541D}"
fr = "{D334E645-4240-467E-9049-8EDA0DF62DD8}"
@@ -14,20 +8,7 @@
es = "{28F03675-F28C-460D-8C2E-800EA7A551A0}"
fi = "{5FE3A584-4297-4199-BF98-2BD36628B6C7}"
hu = "{91F443E7-DE34-46FC-B02E-F5628399603C}"
-@@ -13,55 +13,210 @@
- cs = "{7C4C496A-2087-4AE3-8620-84FFD736F2BF}"
- sk = "{73D7DA04-45CD-494E-9B78-1EFDFDBF5600}"
- en-GB = "{80F13A63-A0C3-4C6D-A0B3-28F106730674}"
-+en-ZA = "{36488CF6-0AA7-4106-8ED5-573C15307DDD}"
- da = "{387DC3B5-4CF9-48A2-8292-3BB725BF654A}"
- sv = "{72B0A3D4-B9E4-454C-9A45-52D2DC433A58}"
-+nb = "{8372057C-007A-4C31-9E63-F62553829587}"
-+nn = "{A144BF58-9C8B-44B7-82D4-33A8EA2B5EF1}"
- no = "{8FDD7F7B-104C-4CB6-B7BD-F67FCF42F3CD}"
- pl = "{7CA9656A-7DB4-48EB-8E18-456256C05E92}"
- de = "{300FFDA6-0C64-406D-B09B-CB5C91ABEBBA}"
- pt-BR = "{E49BD84D-625C-4BEB-AE0E-349D0DD6FFB7}"
- th = "{B0E54B09-14B1-4440-BCB8-E036CCD332DF}"
+@@ -13,12 +13,83 @@
et = "{0A773C83-9633-4EAD-BE4F-C015568870BD}"
ja = "{DAF0244B-3B71-4EC8-8246-C58401AE5E01}"
ko = "{AAFFA871-4921-4D14-9767-E302020DD8BE}"
@@ -88,7 +69,6 @@
+gu-IN = "{EB5113B8-2AA8-4CE4-B02A-72E33D2E5143}"
+gu = "{280B3D0B-36AD-462A-9C04-3686F183554D}"
+br = "{84D7B232-2196-4CD0-A36F-949B7DB83AF2}"
-+or = "{12E38217-141E-484E-A6C9-47C5850B4903}"
+ne = "{740B3E9E-7590-4E96-8497-3E231BAFFB7E}"
+sh-YU = "{1EECD5C1-31E2-4C18-A57E-4FE79FDBE826}"
+sr-CS = "{A7EA8FF4-A2CC-409F-8260-403442365FA8}"
@@ -109,122 +89,31 @@
+gl = "{B4E79B50-ADE3-49EE-AB75-D0B4AD676B3F}"
+kn = "{08708716-FFC8-4717-AD92-9B60F4761119}"
+ms = "{459A2CDA-7915-41FB-8965-7CF19A02F186}"
-+tg = "{707373D8-F32A-4A02-AA04-9D726F90AB41}"
multiwestern = "{D53F8583-419E-440E-AC00-40E9AB31EEBF}"
multiasia = "{C0D08A10-A266-46DC-8EF4-BE0E5928129D}"
- [UPGRADECODE]
- en-US = "{8B909084-2220-49AC-A421-142180519088}"
-+bs = "{997C6313-8DFC-42F5-BA83-7433C46FD10C}"
- pt = "{CBFA6A61-D310-4A90-8F49-C7BE2735D58D}"
-+pt-PT = "{C66D6B75-5808-44E2-AF7A-4023E3847300}"
- ru = "{DF67ADAA-4755-4184-9E32-1020F40DDA81}"
- el = "{39772F91-1D37-4866-BBA4-900AB53590B0}"
- nl = "{7D14314D-DAF7-4A97-A6EE-97C475080A73}"
+@@ -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}"
- es = "{01588DD5-C6C5-4C9D-A1BD-1A63E779DA1A}"
- fi = "{481B0FE0-8313-442E-8A53-7C5139ADA3DC}"
- hu = "{5981EE94-6763-40AD-A8A0-EEB01CCA153C}"
- ca = "{8EEC9A45-3BD3-431F-81D0-394F41185BD9}"
- it = "{50087605-A504-441B-B514-67F13A284C10}"
- cs = "{DBA607B3-0805-4A18-A45D-769C70D90AB7}"
- sk = "{19B49960-B58C-48A7-9761-F0B325E00C31}"
- en-GB = "{E60BC5AC-2513-40AF-A41B-64118A287662}"
-+en-ZA = "{7BE3ACA1-3791-47A8-96D6-E284D82B07BC}"
- da = "{4E7025EF-909F-4609-97BA-304684C4833D}"
- sv = "{5E751B0D-FE96-4D0E-BAC1-5E7501294940}"
-+nb = "{A9DAD90A-13F9-40DB-BAF7-039D0192CCBE}"
-+nn = "{BF0595DA-9F14-4DEA-A56A-1E5E20641AF3}"
- no = "{00C1656C-6386-42ED-BE8C-5D6C553EF125}"
- pl = "{9C92258E-9A41-4A03-AA5C-FD8EF15189BA}"
- de = "{481E648E-D8AD-478A-A3F6-68FC563FFD8F}"
- pt-BR = "{7364F154-089D-400B-B275-751AAB9A6122}"
- th = "{1F9BC074-55AA-496A-9EC5-05E65CF64AE6}"
- et = "{34FBD5D3-3F88-4C91-8B9B-A10AE833250F}"
- ja = "{74F683CC-8356-4BF7-9098-B85AAB7C1A0C}"
- ko = "{1D068BF9-FBCF-4A3B-B9A4-4B2DD3DE8CFB}"
-+km = "{D395C065-A13B-4AD1-A283-978E03D56422}"
-+cy = "{7417DE83-77C8-41D0-A6DB-D8440BA14BC5}"
- zh-CN = "{5B45DC72-0755-4EC2-BB12-65A1FEADDDE7}"
- zh-TW = "{08B2CED3-CFB5-491F-ADC4-FD0CD2366C60}"
- tr = "{46AB3EE6-FD98-460D-AE0B-6AE68ED6204D}"
- hi = "{2C70F320-6771-42D6-B3F5-97678C822B20}"
-+hi-IN = "{4F098A99-D6A2-4286-9442-9871404D4A46}"
-+pa-IN = "{0FDD36BA-D1EE-4F8E-AD8B-BD55459EC790}"
-+ta-IN = "{F9817B26-6ED7-452A-8AB8-91341BF1D103}"
-+ta = "{130152CC-41E4-4780-8559-21C40587EAFB}"
-+as-IN = "{F93D27C8-4A21-4569-AF35-7EC77B70B402}"
- ar = "{DF297699-3040-48E0-B0E6-B54385D76018}"
-+ar-SA = "{6C5D341D-96E3-44FF-961F-9FD50D66AB57}"
- he = "{13484272-CE60-4867-B494-D56F9049B95A}"
-+af = "{FF27D70C-0C5B-4E4E-8883-8F375CA9C468}"
+ 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}"
-+eu = "{F7141DC1-1538-4FF9-919A-FE1FF0E89503}"
-+be-BY = "{CDC2F130-3E02-430F-A5B5-05067BC9336F}"
-+bn = "{0B5D5885-3192-48D9-8C8D-706E0DB403DF}"
-+bn-BD = "{0535AF67-E56A-4ED8-8A1E-578E549D30AD}"
-+bn-IN = "{6F0D3ACA-DCE7-4E0A-87E2-CBD0F8A5B33B}"
-+bg = "{50E0988D-23C4-44CA-B66A-A4E427A7F038}"
-+is = "{6DD324DE-DFA9-41B8-BADF-D037AD3B7A88}"
+id = "{70886F70-BFB7-4E45-A05D-3294A91FEB3E}"
-+lo = "{588DACBD-89FA-45EC-B3B5-ACE2759664CC}"
-+lv = "{09F6F2FC-F7A3-4C56-B4B6-A1D1483BAF55}"
-+lt = "{001E86DD-C817-4076-981B-D35253B6910B}"
+mt = "{B07B5F49-C4B6-4A9E-A46F-5565E64C4CC0}"
-+mr = "{F2EFAC72-0CFD-4121-A995-1062E6CE4CA0}"
+rm = "{A608FC91-CFD9-44E7-9813-22777911489A}"
+ro = "{6CD33E91-55A4-4A9F-8A27-0069DF389BDC}"
-+rw = "{0C88E37B-36CB-4DE0-8332-6A294E342B28}"
-+sa = "{6BA9DC90-6F8E-407A-982D-E01A4FF72443}"
-+sr-SP = "{4FBE4F81-E634-4A58-9B23-598706996376}"
-+tn = "{38219093-AB4D-4060-9456-EFB10DADC897}"
-+hr = "{E96AE6FB-521A-44A8-AA91-8A7EE15D704B}"
-+fa = "{F09DEEB5-1185-4DF2-B9C0-0C295858F966}"
+fo = "{92F1FA59-3A7D-482D-823A-1A2734FEFB59}"
-+sl = "{6B1F1226-EBC6-4FED-AD37-E01DA6C5089A}"
+sb = "{5B574AAD-B8B2-4683-A806-BF92D80F914D}"
-+st = "{10D5A692-629B-41AB-A74C-2D8E93A8B99A}"
-+sw = "{50A48005-42C8-44D8-A12E-936D539E4AB0}"
-+sw-TZ = "{53C0207E-0AE7-489F-8B56-DC09E873D3CD}"
-+ta = "{538254E7-DCA7-4CD9-8CCE-3E09CD29C508}"
+tt = "{88D194B3-C099-4D80-AD3D-7A26E082D3C8}"
-+ts = "{C2A6002F-C719-4E82-BDAD-74313D50442F}"
-+uk = "{71F2B27E-DAD2-4B21-9488-8571B7E8C81F}"
-+ur = "{A97E507B-875E-465C-933F-A33755EE8898}"
-+vi = "{EE359E05-9385-4E70-B63A-39045A7C1285}"
-+xh = "{BDBDB347-A3BC-42AB-A315-3AAEF9A533BA}"
-+ns = "{875DF331-64DC-4CF1-B835-4D0A7D3D9BB4}"
+yi = "{382C63FC-2CC9-4C7D-877B-AA779CEA0479}"
-+zu = "{AAD0E34A-99D5-4C5F-AC7A-5180377E9A60}"
-+gu-IN = "{6AD46A4D-CE47-4C88-83CE-C1F475A2E4A3}"
-+gu = "{27983EB1-C0D6-43A4-BD3E-E6B6CECAE8D6}"
-+br = "{6FE542FD-D054-4F33-BC9C-76E9426240C8}"
-+or = "{76B5E11A-3741-46FC-BD84-4673C770755A}"
-+ne = "{2AC2E0AD-44DB-482B-B57C-D33B312C556D}"
-+sh-YU = "{2C15F81E-ABDC-4036-9C1A-4B1D5F9D2A1B}"
-+sr-CS = "{CF7835AD-75B4-4EB2-B0DE-F9E38AB720ED}"
-+nr = "{01FC6CDA-80A7-421A-96A7-126DC9416B4C}"
-+ss = "{C826B91A-C667-4960-89F1-FDFBC0470FA7}"
-+st = "{430448C7-5E21-43A9-87FF-8123C5D31DF7}"
-+ve = "{09D0356B-C800-474A-ACFD-A4F3B8C1A20D}"
-+ga = "{7605EA0F-8D6C-41DB-8D78-6919C7B07809}"
-+mk = "{FF8AC100-490B-4F21-AEEC-51A830D0FF00}"
-+te-IN = "{06A44CB4-8BC0-4526-BB93-DB0BE5BF3D57}"
-+ml-IN = "{6306670C-8496-43BD-80D8-6840A1B93594}"
-+mr-IN = "{89A9DFB9-17C7-4C59-AF7F-620165DE19DD}"
-+ur-IN = "{AF887C48-DB5D-4146-9D60-C20BA348D057}"
-+or-IN = "{DE221F90-27CB-497C-AE61-F158527C5265}"
-+ku = "{325DC0A7-E6CD-40E7-BC9C-EE7D90F0D3DE}"
-+tg = "{8E7D7847-D4E3-4709-80EB-345B9F314E98}"
-+ti-ER = "{B09DCB13-DBB8-4F6C-8CE5-AE153B8A6699}"
-+gl = "{2856F4CC-18CC-492C-AA5B-52C90F2431F1}"
-+kn = "{0EF96046-D3E4-4ECA-A691-951A90838ACF}"
-+ms = "{0590E9C9-8F5D-446B-883F-7C52963D788B}"
-+tg = "{C5C00559-A17F-4ED2-B475-82D94A5BB1B4}"
- multiwestern = "{385A1970-0257-4C57-9383-DD2D668B23CE}"
- multiasia = "{74543111-6ABF-4A12-AC11-D315E2939D2A}"
--- solenv/bin/modules/installer/windows/msp.pm
+++ solenv/bin/modules/installer/windows/msp.pm
@@ -285,8 +285,15 @@
diff --git a/patches/dev300/pptx-filter-as-a-separate-lib-sd-build-lst-without-transogl.diff b/patches/dev300/pptx-filter-as-a-separate-lib-sd-build-lst-without-transogl.diff
index 3af06f7..3bbb106 100644
--- a/patches/dev300/pptx-filter-as-a-separate-lib-sd-build-lst-without-transogl.diff
+++ b/patches/dev300/pptx-filter-as-a-separate-lib-sd-build-lst-without-transogl.diff
@@ -8,10 +8,10 @@
sd sd\source\filter\grf nmake - all sd_grf sd_inc NULL
sd sd\source\filter\xml nmake - all sd_xml sd_inc NULL
sd sd\source\filter\html nmake - all sd_html sd_inc NULL
-@@ -43,4 +44,4 @@
+@@ -43,5 +44,5 @@
sd sd\source\ui\framework\factories nmake - all sd_framework_factories sd_inc NULL
sd sd\source\ui\framework\tools nmake - all sd_framework_tools sd_inc NULL
sd sd\source\ui\annotations nmake - all sd_uiannotations sd_inc NULL
-sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL
+sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_pptx sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL
-
+ sd sd\qa\unoapi nmake - all sd_qa_unoapi NULL
diff --git a/patches/dev300/win32-multi-lang-installer.diff b/patches/dev300/win32-multi-lang-installer.diff
index 028be0f..35e0bf6 100644
--- a/patches/dev300/win32-multi-lang-installer.diff
+++ b/patches/dev300/win32-multi-lang-installer.diff
@@ -505,20 +505,20 @@
--- instsetoo_native/util/makefile.mk
+++ instsetoo_native/util/makefile.mk
@@ -234,7 +234,7 @@
- openoffice_% :
- .ENDIF # "$(PKGFORMAT)"!=""
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
-- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ .ENDIF # "$(MAKETARGETS)"!=""
+ openoffice_%{$(PKGFORMAT:^".") .archive} :
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
- .IF "$(PKGFORMAT)"!=""
$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
+ openofficewithjre_%{$(PKGFORMAT:^".")} :
@@ -251,7 +251,7 @@
- openofficedev_% :
- .ENDIF # "$(PKGFORMAT)"!=""
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
-- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
+ openofficedev_%{$(PKGFORMAT:^".")} :
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
- .IF "$(PKGFORMAT)"!=""
$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
+ ooolanguagepack_%{$(PKGFORMAT:^".")} :
diff --git a/patches/dev300/win32-no-seterror-when-debugging.diff b/patches/dev300/win32-no-seterror-when-debugging.diff
index 801c082..bc7f682 100644
--- a/patches/dev300/win32-no-seterror-when-debugging.diff
+++ b/patches/dev300/win32-no-seterror-when-debugging.diff
@@ -11,8 +11,8 @@
/* initialize global mutex */
g_Mutex = osl_createMutex();
---- sal/osl/w32/module.c
-+++ sal/osl/w32/module.c
+--- sal/osl/w32/module.cxx
++++ sal/osl/w32/module.cxx
@@ -48,7 +48,9 @@
oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMode )
{
diff --git a/patches/dev300/win32-no-uninstall-survey.diff b/patches/dev300/win32-no-uninstall-survey.diff
index d8a0358..ca7fcd2 100644
--- a/patches/dev300/win32-no-uninstall-survey.diff
+++ b/patches/dev300/win32-no-uninstall-survey.diff
@@ -1,6 +1,6 @@
--- scp2/source/ooo/windowscustomaction_ooo.scp
+++ scp2/source/ooo/windowscustomaction_ooo.scp
-@@ -511,11 +511,3 @@
+@@ -511,15 +511,6 @@
Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end");
End
@@ -12,4 +12,7 @@
- Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and Not UPGRADINGPRODUCTCODE", "end");
-End
--
\ No newline at end of file
+-
+ WindowsCustomAction gid_Customaction_LookForRegisteredExtensions
+ Name = "LookForRegisteredExtensions";
+ Typ = "65";
diff --git a/patches/dev300/win32-prebuilt-writingaids-zip.diff b/patches/dev300/win32-prebuilt-writingaids-zip.diff
index 9fec910..8472aa2 100644
--- a/patches/dev300/win32-prebuilt-writingaids-zip.diff
+++ b/patches/dev300/win32-prebuilt-writingaids-zip.diff
@@ -1,8 +1,8 @@
--- dictionaries/prj/build.lst
+++ dictionaries/prj/build.lst
-@@ -1,34 +1,3 @@
--di dictionaries : readlicense_oo soltools NULL
--di dictionaries usr1 - all di_mkout NULL
+@@ -1,37 +1,3 @@
+-di dictionaries : soltools NULL
+-di dictionaries usr1 - all di_mkout NULL
-di dictionaries\af_ZA nmake - all di_af_ZA NULL
-di dictionaries\ca nmake - all di_ca NULL
-di dictionaries\cs_CZ nmake - all di_cs_CZ NULL
@@ -10,7 +10,11 @@
-di dictionaries\de_AT nmake - all di_de_AT NULL
-di dictionaries\de_CH nmake - all di_de_CH NULL
-di dictionaries\de_DE nmake - all di_de_DE di_de_AT di_de_CH NULL
--di dictionaries\en nmake - all di_en NULL
+-di dictionaries\en_US nmake - all di_en_US NULL
+-di dictionaries\en_ZA nmake - all di_en_ZA NULL
+-di dictionaries\en_AU nmake - all di_en_AU NULL
+-di dictionaries\en_CA nmake - all di_en_CA NULL
+-di dictionaries\en_GB nmake - all di_en_GB di_en_US di_en_ZA di_en_ZA di_en_AU NULL
-di dictionaries\es_ES nmake - all di_es_ES NULL
-di dictionaries\et_EE nmake - all di_et_EE NULL
-di dictionaries\fr_FR nmake - all di_fr_FR NULL
@@ -18,7 +22,6 @@
-di dictionaries\he_IL nmake - all di_he_IL NULL
-di dictionaries\hu_HU nmake - all di_hu_HU NULL
-di dictionaries\it_IT nmake - all di_it_IT NULL
--di dictionaries\ku_TR nmake - all di_ku_TR NULL
-di dictionaries\lt_LT nmake - all di_lt_LT NULL
-di dictionaries\ne_NP nmake - all di_ne_NP NULL
-di dictionaries\nl_NL nmake - all di_nl_NL NULL
diff --git a/patches/dev300/win32-restore-associations.diff b/patches/dev300/win32-restore-associations.diff
index 54502a5..cc08673 100644
--- a/patches/dev300/win32-restore-associations.diff
+++ b/patches/dev300/win32-restore-associations.diff
@@ -2,7 +2,7 @@
+++ scp2/source/ooo/windowscustomaction_ooo.scp
@@ -56,6 +56,15 @@
Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "CostFinalize");
+ Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And _IsSetupTypeMin<>\"Custom\"", "CostFinalize");
End
+
+WindowsCustomAction gid_Customaction_Restoreregallmsdocdll
@@ -96,10 +96,10 @@
+
BOOL bRegister = bRegisterAll || CheckExtensionInRegistry( g_Extensions[nIndex] );
if ( bRegister )
- {
+ registerForExtension( handle, nIndex, true );
@@ -290,6 +346,10 @@
- //----------------------------------------------------------
- //----------------------------------------------------------
+ }
+
//----------------------------------------------------------
+//
+// This is the (slightly misleadinly named) entry point for the
@@ -107,7 +107,7 @@
+//
extern "C" UINT __stdcall FindRegisteredExtensions( MSIHANDLE handle )
{
- bool bRegisterAll = IsSetMsiProp( handle, "REGISTER_ALL_MSO_TYPES" );
+ if ( IsSetMsiProp( handle, "FILETYPEDIALOGUSED" ) )
@@ -309,7 +369,12 @@
return ERROR_SUCCESS;
}
@@ -201,6 +201,8 @@
+}
--- setup_native/source/win32/customactions/reg4allmsdoc/exports.dxp
+++ setup_native/source/win32/customactions/reg4allmsdoc/exports.dxp
-@@ -1 +1,2 @@
+@@ -1,3 +1,4 @@
FindRegisteredExtensions
+ LookForRegisteredExtensions
+ RegisterSomeExtensions
+RestoreRegAllMSDoc
More information about the ooo-build-commit
mailing list