[ooo-build-commit] .: 2 commits - patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Mon Sep 27 12:59:58 PDT 2010
patches/dev300/apply | 69 ++++++++++----------
patches/dev300/libxmlsec-olderlibxml2patch-fix.diff | 13 +++
2 files changed, 49 insertions(+), 33 deletions(-)
New commits:
commit 23bcd8367ef06bbe366dfb2dc5337a62f04de2c6
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Mon Sep 27 21:57:01 2010 +0200
Fix some trailing whitespaces
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 26d0218..0c2679d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -39,9 +39,9 @@ DebianLooseSections: DebianBaseNoHelpContent
# Optional sections
Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes
# optional section for ConvertTextToNumber extension
-CT2N : CT2NBits
+CT2N : CT2NBits
# optional section for NLPSolver extension
-NLPSolver : NLPSolverBits
+NLPSolver : NLPSolverBits
# special fragmented build patch distro
Piece : PieceBits
#Localize
@@ -526,7 +526,7 @@ calc-xlsx-import-default-cellstyle.diff, n#558577, kohei
# The work to increase Calc's row size limit, and any work associated with it.
SectionOwner => kohei
-# don't show progress bar during row height adjustment if the row count is
+# don't show progress bar during row height adjustment if the row count is
# less than 1000.
calc-perf-rowheight-no-progress-bar.diff, n#514156, kohei
@@ -572,7 +572,7 @@ scroll-accel-vcl.diff, n#375909, i#71362, kohei
# reduce mininum password length from 5 to 1.
min-password-length-sfx2.diff, i#85453, kohei
-min-password-length-helpcontent2.diff, i#112772, timar
+min-password-length-helpcontent2.diff, i#112772, timar
# allow users to change current document password.
document-password-change-sfx2.diff, kohei
@@ -736,7 +736,7 @@ build-allow-system-cppunit-1.12.0.diff, pmladek
ucb-neon-0.24.diff, pmladek
# don't break dmake with environment variables containing space in the name
-# [which is a broken setup, but apparently most apps don't break with that ;-)]
+# [which is a broken setup, but apparently most apps don't break with that ;-)]
dmake-space-in-envvar-name.diff, i#101786, jholesov
# find gsicheck in the solver
@@ -1125,12 +1125,12 @@ vba-container-controls.diff
oox-projectname-oobuild-specifix.diff
# fix problem with inserting imported modules with oox
oox-insert-module-bug.diff
-# tweak oox filter to handle any passed generated code names
+# tweak oox filter to handle any passed generated code names
# there is a strange scenario with one cust doc where a code module is missing
vba-oox-autocodename.diff, n#507768
# tweak oox filter to handle strange scenario where there might be some
# missing codenmames in excel
-vba-oox-olenameoverride.diff, n#359933, n#403974
+vba-oox-olenameoverride.diff, n#359933, n#403974
# fix strange ranges seperator regression problem
fix-name-range-separator.diff, n#597351
# remove dependency of vbahelper on oox ( added by container_controls.diff )
@@ -1162,10 +1162,10 @@ vba-fix-logical-precedence-order.diff
vba-fix-implicit-indexaccess.diff
[ VBAUntested ]
SectionOwner => noelpwer
-# KEEP - unfinished autotext stuff
-vba-transient-imported-autotext.diff
+# KEEP - unfinished autotext stuff
+vba-transient-imported-autotext.diff
# not sure if this is useful, keep for reference
-save-doc-withembedded-doc-with-vba-crash.diff
+save-doc-withembedded-doc-with-vba-crash.diff
# doesn't work
vba-basic-null.diff i#85349, jjiao
vba-support-stoc-typeprovider-xexactname.diff, #no-upstream
@@ -1364,7 +1364,7 @@ vba-servicemacros-rework.diff
#vba-word-executable-option.diff, Fong
vba-interior-object-fix.diff, n#459479, Fong
-range-defaultmethod-i98476.diff, i#98476
+range-defaultmethod-i98476.diff, i#98476
vba-excel-iserror-fix.diff, n#469762
# filter to read custom toolbars ( and other customization data ) from writer
@@ -1375,7 +1375,7 @@ vba-templateobject.diff
vba-vpagebreak-object.diff, hanbo
vba-combobox-listindex-fix.diff, n#476891, Fong
-vba-fix-copysheet-toend.diff, n#478187
+vba-fix-copysheet-toend.diff, n#478187
vba-improve-toolbarapi-macro-search.diff
# fix core when there is an error in the doc close vba
# event handler ( bit of a hack )
@@ -1390,7 +1390,7 @@ vba-toolbar-menufilter-core-fix.diff
word-read-builtinmenubar-filter.diff
# allow private/public modifier for DECLARE
vba-fix-private-declare.diff
-# import customization and macros from global templates ( if defined ) when
+# import customization and macros from global templates ( if defined ) when
# opening word documents
vba-import-globaltemplate-customizations.diff
# fix problem with syntax like 'If LCase(str1) = str2 <> 0 Then'
@@ -1412,7 +1412,7 @@ vba-fix-IsEmpty-api-object.diff, n#494990
# fix crash when attempting to use geometry attributes of
# control on sheet/document
vba-fix-control-shape-geom-fix.diff, n#500006
-#
+#
basic-public-dim-fix.diff, n#488590, i#100659
vba-fix-optionalparam-assigment.diff, n#494667
vba-reset-screenupdateing.diff, n#494964
@@ -1426,7 +1426,7 @@ fix-read-disabled-toolbarimport.diff
# would be nice to be able to move it nearer the other word patch
# but it won't apply there
vba-word-support-part2.diff
-# tweak custom toolbar import slightly to
+# tweak custom toolbar import slightly to
# import dropdowns not associated with builtin menu additions
vba-only-import-std-menutoolbar.diff
# sometimes the resize event cores the office
@@ -1443,13 +1443,13 @@ vba-testclient-fix-project.diff
#fix checkbox access via vba api
vba-fix-checkbox-ole-access.diff, n#507400
# fix vbadocumentbase::getPath & vbadocumentbase::getFullName
-vba-fix-path-fullname.diff, n#507745
+vba-fix-path-fullname.diff, n#507745
# fix setting control default value ( when accessed from sheet )
-fix-sheet-control-valueset.diff, n#507748
+fix-sheet-control-valueset.diff, n#507748
# fix auto calculation of shift direction for delete ( where none specified )
vba-fix-range-delete-shift.diff, n#508101
# allow worksheet to be passed as ( before or after ) param
-vba-fix-worksheet-add-before-param-object.diff, n#507760
+vba-fix-worksheet-add-before-param-object.diff, n#507760
# active newly added worksheet
vba-fix-worksheet-add-activate.diff, n#507758
# add Application.Quit api
@@ -1464,7 +1464,7 @@ vba-fix-missing-codename.diff, n#507768
vba-zoom-per-sheet.diff
# fall back to doc context for active sheet if it fails
vba-fallback-to-calling-doc-context.diff
-# when selecting full range view is not scrolled back
+# when selecting full range view is not scrolled back
vba-cursor-pos-for-selected-maxrange.diff
# fix combox binding data import in userform
vba-combobox-rowsource-fix.diff, Fong
@@ -1486,13 +1486,13 @@ vba-dim-as-contants-fix.diff, n#521820, Fong
vba-commandbar-toolbar-fix.diff, Fong
# fix for set involving an automation object ( in vba mode )
vba-automation-set-fix.diff, n#507501, iz#103859
-# various improvements, handle tooltip, handle seperators, fix bug where
-# toolbar control isn't displayed if the macro isn't resolved,
+# various improvements, handle tooltip, handle seperators, fix bug where
+# toolbar control isn't displayed if the macro isn't resolved,
# added classes for excel toolbar import ( disabled )
tool-menu-bar-improvements.diff
# fix for the issue in Styles.Add in Calc
vba-styles-add-fix.diff, Fong
-vba-financial-functions.diff, n#525633, n#525635, n#525642, n#525647,
+vba-financial-functions.diff, n#525633, n#525635, n#525642, n#525647,
vba-typename-fix.diff, n#525649
# disable untill master is updated
# associated with vba-automation-set-fix.diff above, this patch
@@ -1509,8 +1509,8 @@ vba-toolbar-menu-support.diff
vba-reenable-rowsourcefixes.diff, bnc#540960
cws-vbasupportdev300-wae.diff
vba-control-api-vis-fix.diff, bnc#542132
-vba-fix-isempty.diff, bnc#541749
-vba-fix-wsfunction-booleanparam.diff, bnc#541735
+vba-fix-isempty.diff, bnc#541749
+vba-fix-wsfunction-booleanparam.diff, bnc#541735
vba-fix-errobj-errnum.diff, bcn#541755
vba-basic-not-fix.diff, i#105321, Fong
@@ -1531,10 +1531,10 @@ fix-vba-late-docevent-crash.diff, n#558907
vba-import-and-use-localrangenames.diff
-eventhelper-closecrash-fix.diff, n#438606, i#106270
+eventhelper-closecrash-fix.diff, n#438606, i#106270
# make sure no vba libraries are loaded ( if not filtering )
-vba-dont-load-for-odf.diff
-vba-fix-listboxhang-n560355.diff, n#560355
+vba-dont-load-for-odf.diff
+vba-fix-listboxhang-n560355.diff, n#560355
vba-fireevents-from-apichange.diff, n#561639, n#539220
vba-macro-properties.diff, n#566030
vba-word-executable-option.diff, Fong #disabled
@@ -2343,7 +2343,7 @@ pptx-fix-connector-crash.diff, n#499129, thorsten
[ OOXMLExportDevel ]
# this is shared binary/ooxml filter
-# doesn't include
+# doesn't include
# xlsx-export-row-limit-fix.diff, n#504623, kohei
# Snapshot of the xlsx export filter at the time of creation of ooxml03
@@ -2471,10 +2471,10 @@ experimental_ooapi.diff, flr
[ CalcExperimental ]
# It's empty but please don't remove this section.
SectionOwner => kohei
-
+
# when reading csv file, don't read multiple physical lines for one logical
-# line even if matching quotes are on separate lines.
-stream-read-csv-always-single-line.diff, n#523517, kohei
+# line even if matching quotes are on separate lines.
+stream-read-csv-always-single-line.diff, n#523517, kohei
[ AutoLayout ]
@@ -2908,10 +2908,10 @@ calc-xls-import-cell-border.diff, n#636691, kohei
[ FSFhuOnly ]
SectionOwner => timar
-fsfhu-instset.diff
+fsfhu-instset.diff
fsfhu-splash.diff
fsfhu-vendor-win32.diff
-fsfhu-win32-installer-branding.diff
+fsfhu-win32-installer-branding.diff
# Make CaptionOrderNumberingFirst true for Hungarian
captionnumbering-hu.diff, i#110273, timar
win32-gw-send-mail.diff, i#34264, n#418407, tml
commit a48a567333af52ad7d3590de6113a32de5badeef
Author: Jonas Finnemann Jensen <jopsen at gmail.com>
Date: Sat Sep 25 16:01:44 2010 +0200
Fix in patch that fixes older libxml2 versions
libxmlsec/xmlsec1-olderlibxml2.patch fixes a missing enum in older
versions of libxml2. However, the #if LIBXML_VERSION < ... that
enables the patch had the wrong version number. This is fixed so OO.o
compiles with libxml2 2.7.4 and 2.7.5 again.
(These where the only affected version numbers).
diff --git a/patches/dev300/apply b/patches/dev300/apply
index af9fb43..26d0218 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -351,6 +351,9 @@ sfx2-check-existing-template-dirs.diff, i#100518, pmladek
# FIXME: temporarily disabled as this causes a race condition in calc's cell format dialog.
#vcl-kerning-fix.diff, n#464436, i#26519, cbosdo
+#Fix version number bug in patch for old libxml2
+libxmlsec-olderlibxml2patch-fix.diff, jopsen
+
[ LinuxOnly ]
# fix that allows OOo to work with a standard (unpatched) libjpeg,
jpegc.c.diff, i#80674, n#272574, flr
diff --git a/patches/dev300/libxmlsec-olderlibxml2patch-fix.diff b/patches/dev300/libxmlsec-olderlibxml2patch-fix.diff
new file mode 100644
index 0000000..0fdeefb
--- /dev/null
+++ b/patches/dev300/libxmlsec-olderlibxml2patch-fix.diff
@@ -0,0 +1,13 @@
+diff --git libxmlsec/xmlsec1-olderlibxml2.patch libxmlsec/xmlsec1-olderlibxml2.patch
+index b5f3d57..f2bd85f 100644
+--- libxmlsec/xmlsec1-olderlibxml2.patch
++++ libxmlsec/xmlsec1-olderlibxml2.patch
+@@ -4,7 +4,7 @@
+ return(0);
+ }
+
+-+#if !defined(LIBXML_VERSION) || LIBXML_VERSION < 20706
+++#if !defined(LIBXML_VERSION) || LIBXML_VERSION < 20704
+ +/*
+ + * xmlC14NMode:
+ + *
More information about the ooo-build-commit
mailing list