rpms/openoffice.org/devel workspace.dtardon03.patch, NONE, 1.1 workspace.vcl114.patch, NONE, 1.1 openoffice.org.spec, 1.2297, 1.2298 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch, 1.4, NONE openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch, 1.1, NONE openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch, 1.8, NONE openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch, 1.3, NONE openoffice.org-3.3.0.ooo113259.vcl.xioerror.patch, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Wed Jul 21 07:54:35 UTC 2010
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19678
Modified Files:
openoffice.org.spec
Added Files:
workspace.dtardon03.patch workspace.vcl114.patch
Removed Files:
openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
openoffice.org-3.3.0.ooo113259.vcl.xioerror.patch
Log Message:
merge patches under upstream workspace umbrella name
workspace.dtardon03.patch:
docbook/sofftodocbookheadings.xsl | 9 ---
xslt/export/uof/odf2uof_text.xsl | 8 ---
xslt/odf2xhtml/export/xhtml/body.xsl | 88 +++++++++++++++++++++++++++--------
3 files changed, 72 insertions(+), 33 deletions(-)
--- NEW FILE workspace.dtardon03.patch ---
Index: filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
===================================================================
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl (revision 276736)
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl (working copy)
@@ -102,8 +102,8 @@
</xsl:when>
<xsl:otherwise>
<!-- As CSS writing-mode is not implemented by all browsers, a heuristic is done -->
- <xsl:variable name="writingMode" select="key('writingModeStyles', 'test')"/>
- <xsl:if test="contains($writingMode, 'rl')">
+ <xsl:variable name="writingModeTest" select="key('writingModeStyles', 'test')"/>
+ <xsl:if test="contains($writingModeTest, 'rl')">
<xsl:attribute name="dir">rtl</xsl:attribute>
</xsl:if>
</xsl:otherwise>
@@ -579,13 +579,13 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="$tabIndent='NaN'">
- <xsl:variable name="tabPosition">
+ <xsl:variable name="tabPositionTmp">
<xsl:call-template name="convert2cm">
<xsl:with-param name="value" select="$tabStops/style:tab-stop[last()]/@style:position"/>
</xsl:call-template>
</xsl:variable>
<!-- Heuristic: for every tab that is more than specified give a further 1 cm -->
- <xsl:value-of select="$parentMarginLeft + $tabPosition + count($tabStops/style:tab-stop) - $tabCount"/>
+ <xsl:value-of select="$parentMarginLeft + $tabPositionTmp + count($tabStops/style:tab-stop) - $tabCount"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$tabIndent"/>
diff -ru filter.orig/source/xslt/export/uof/odf2uof_text.xsl filter/source/xslt/export/uof/odf2uof_text.xsl
--- filter.orig/source/xslt/export/uof/odf2uof_text.xsl 2009-04-24 09:31:14.000000000 +0100
+++ filter/source/xslt/export/uof/odf2uof_text.xsl 2009-04-24 09:32:29.000000000 +0100
@@ -4029,13 +4029,7 @@
<xsl:element name="字:文本串">
<xsl:attribute name="uof:locID">t0109</xsl:attribute>
<xsl:attribute name="uof:attrList">标识符</xsl:attribute>
- <xsl:variable name="stt">
- <xsl:value-of select="./text:a"/>
- </xsl:variable>
- <xsl:variable name="end">
- <xsl:value-of select="."/>
- </xsl:variable>
- <xsl:value-of select="substring-after($end,$stt)"/>
+ <xsl:value-of select="$bijiao"/>
</xsl:element>
</xsl:if>
</字:句>
Index: filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
===================================================================
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl (revision 270524)
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl (working copy)
@@ -1767,6 +1767,11 @@
<xsl:param name="minLabelWidth"/>
<xsl:param name="listIndent" />
+ <!-- The text:list-header shall not be labeled. According to ODF specification (sect. 4.3.2):
+ "The <text:list-header> element represents a list header and is a special kind of list item. It
+ contains one or more paragraphs that are displayed before a list. The paragraphs are formatted
+ like list items but they do not have a preceding number or bullet." -->
+ <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
<xsl:variable name="listIndentNew">
<xsl:choose>
@@ -1785,13 +1790,15 @@
<xsl:variable name="itemNumberNew">
<xsl:if test="$listStyle/text:list-style/text:list-level-style-number">
<xsl:choose>
- <xsl:when test="$isEmptyList">
+ <xsl:when test="$isListHeader">0</xsl:when>
<!-- An empty list item (no text:h/text:p as child), will not count as item and does not increment the count. -->
<xsl:variable name="tempItemNumber">
<xsl:choose>
<!-- siblings will be incremented by one -->
<xsl:when test="$itemNumber">
- <xsl:value-of select="$itemNumber + 1"/>
+ <xsl:if test="not($isListHeader)">
+ <xsl:value-of select="$itemNumber + 1"/>
+ </xsl:if>
</xsl:when>
<!-- if a higher list level had content the numbering starts with 1 -->
<xsl:when test="$isListNumberingReset and $listLevel > 1">
@@ -1866,6 +1873,7 @@
<xsl:when test="$display">
<xsl:value-of select="$display"/>
</xsl:when>
+ <xsl:when test="$isListHeader">0</xsl:when>
<xsl:otherwise>1</xsl:otherwise>
</xsl:choose>
</xsl:with-param>
@@ -1876,9 +1884,10 @@
</xsl:variable>
<xsl:element name="li">
<xsl:choose>
- <xsl:when test="$isEmptyList">
+ <xsl:when test="$isEmptyList or $isListHeader">
<xsl:apply-templates>
<xsl:with-param name="globalData" select="$globalData"/>
+ <xsl:with-param name="isNextLevelNumberingReset" select="$isListHeader or $isNextLevelNumberingReset"/>
<xsl:with-param name="itemLabel" select="$itemLabelNew"/>
<xsl:with-param name="listLevel" select="$listLevel + 1"/>
<xsl:with-param name="listStyleName" select="$listStyleName"/>
@@ -1889,7 +1898,7 @@
<xsl:apply-templates mode="list-item-children" select="*[1]">
<xsl:with-param name="globalData" select="$globalData"/>
<xsl:with-param name="isEmptyList" select="$isEmptyList"/>
- <xsl:with-param name="isNextLevelNumberingReset" select="$isNextLevelNumberingReset"/>
+ <xsl:with-param name="isNextLevelNumberingReset" select="$isListHeader or $isNextLevelNumberingReset"/>
<!-- The new created label is given to the children -->
<xsl:with-param name="itemLabel" select="$itemLabelNew"/>
<xsl:with-param name="listLabelElement">
@@ -2088,7 +2097,7 @@
<!-- The Numbering start value (or offset from regular counteing) is used at the first item of offset,
- but have to be reused on following item/headers with no text:start-value -->
+ but have to be reused on following items with no text:start-value -->
<xsl:template name="getItemNumber">
<xsl:param name="listLevel"/>
<xsl:param name="listLevelStyle"/>
@@ -2122,6 +2131,8 @@
<!-- E.g.: If a list level 2 number is searched, a level 3 with content found with only a level 1 parent with content,
the level 3 gets a 'pseudoLevel' -->
<xsl:param name="pseudoLevel" select="0" />
+ <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
+ <xsl:variable name="isEmptyList" select="not(*[name() = 'text:h' or name() = 'text:p'])"/>
<!-- set the next of preceding list items. Starting from the current to the next previous text:list-item -->
<xsl:variable name="precedingListItemOfSameLevelAndStyle" select="$precedingListItemsOfSameLevelAndStyle[$precedingListItemsOfSameLevelAndStyleCount - $IteratorSameLevelAndStyle + 1]"/>
@@ -2155,7 +2166,7 @@
<xsl:when test="$currentListLevel < $listLevel">
<xsl:choose>
<!-- if it has content the counting is ended -->
- <xsl:when test="*[name() = 'text:h' or name() = 'text:p']">
+ <xsl:when test="not($isEmptyList or $isListHeader)">
<!-- 2DO: Perhaps the children still have to be processed -->
<xsl:value-of select="$itemNumber + $pseudoLevel"/>
</xsl:when>
@@ -2210,7 +2221,7 @@
<xsl:with-param name="pseudoLevel">
<xsl:choose>
<!-- empty list item does not count -->
- <xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
+ <xsl:when test="$isEmptyList or $isListHeader">
<xsl:value-of select="$pseudoLevel"/>
</xsl:when>
<xsl:otherwise>1</xsl:otherwise>
@@ -2243,11 +2254,14 @@
<xsl:param name="precedingListItemsOfSameStyleCount"/>
<xsl:param name="pseudoLevel" />
+ <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
+ <xsl:variable name="isEmptyList" select="not(*[name() = 'text:h' or name() = 'text:p'])"/>
+
<xsl:choose>
<xsl:when test="@text:start-value">
<xsl:choose>
- <xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
- <!-- empty list item does not count -->
+ <xsl:when test="$isEmptyList or $isListHeader">
+ <!-- empty list item does not count. neither does list header -->
<xsl:call-template name="countListItemTillStartValue">
<xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
<xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
@@ -2269,8 +2283,8 @@
</xsl:when>
<xsl:when test="$listLevelStyle/@text:start-value">
<xsl:choose>
- <xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
- <!-- empty list item does not count -->
+ <xsl:when test="$isEmptyList or $isListHeader">
+ <!-- empty list item does not count. neither does list header -->
<xsl:call-template name="countListItemTillStartValue">
<xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
<xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
@@ -2292,8 +2306,8 @@
</xsl:when>
<xsl:otherwise>
<xsl:choose>
- <xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
- <!-- empty list item does not count -->
+ <xsl:when test="$isEmptyList or $isListHeader">
+ <!-- empty list item does not count. neither does list header -->
<xsl:call-template name="countListItemTillStartValue">
<xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
<xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
Index: filter/source/docbook/sofftodocbookheadings.xsl
===================================================================
--- filter/source/docbook/sofftodocbookheadings.xsl (revision 270724)
+++ filter/source/docbook/sofftodocbookheadings.xsl (working copy)
@@ -73,11 +73,6 @@
match="text:h"
use="generate-id(preceding::text:h[@text:level < current()/@text:level][1])"/>
- <!-- All those headings have not the lowest outline level (mapped to section1), but come before the first heading mapped to section1 -->
- <xsl:key name="preludingHeadings"
- match="text:h"
- use="generate-id(following::text:h[@text:level = $section1_OutlineLevel][1])"/>
-
<!-- The key function "getHeadingsByOutline" returns all headings of a certain outline level -->
<xsl:key name="getHeadingsByOutline"
match="text:h"
@@ -175,7 +170,7 @@
<xsl:text disable-output-escaping="yes"><sect1></xsl:text>
<title></title>
<!-- create sections for all the first section1 preluding headings -->
- <xsl:for-each select="key('preludingHeadings', generate-id())">
+ <xsl:for-each select="key('getHeadingsByOutline', $section1_OutlineLevel)[1]/preceding::text:h">
<xsl:call-template name="make-section">
<xsl:with-param name="previousSectionLevel" select="$section1_OutlineLevel"/>
<xsl:with-param name="currentSectionLevel">
@@ -1186,4 +1181,4 @@
<xsl:with-param name="whitespaces" select="8"/>
</xsl:call-template>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
Index: filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
===================================================================
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl (revision 276736)
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl (working copy)
@@ -59,6 +59,13 @@
<xsl:key name="writingModeStyles" match="/*/office:styles/style:style/style:paragraph-properties/@style:writing-mode | /*/office:automatic-styles/style:style/style:paragraph-properties/@style:writing-mode" use="'test'"/>
<xsl:template name="create-body">
<xsl:param name="globalData"/>
+ <xsl:call-template name="create-body.collect-page-properties">
+ <xsl:with-param name="globalData" select="$globalData"/>
+ </xsl:call-template>
+ </xsl:template>
+
+ <xsl:template name="create-body.collect-page-properties">
+ <xsl:param name="globalData"/>
<!-- approximation to find the correct master page style (with page dimensions) -->
<xsl:variable name="masterPageNames">
@@ -75,10 +82,10 @@
<!-- Take the first of the masterpage list and get the according style:master-page element and find the @style:page-layout-name -->
<xsl:variable name="pageLayoutName" select="key('masterPageElements', substring-before($masterPageNames,';'))/@style:page-layout-name"/>
- <xsl:variable name="pageProperties">
+ <xsl:variable name="pagePropertiesRTF">
<xsl:choose>
<xsl:when test="not($pageLayoutName) or $pageLayoutName = ''">
- <xsl:copy-of select="$globalData/styles-file/*/office:automatic-styles/style:page-layout[1]/style:page-layout-properties"/>
+ <xsl:value-of select="$globalData/styles-file/*/office:automatic-styles/style:page-layout[1]/style:page-layout-properties"/>
</xsl:when>
<xsl:otherwise>
<!-- Find the according style:page-layout and store the properties in a variable -->
@@ -86,6 +93,35 @@
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
+ <xsl:choose>
+ <xsl:when test="function-available('common:node-set')">
+ <xsl:call-template name="create-body.create">
+ <xsl:with-param name="globalData" select="common:node-set($globalData)"/>
+ <xsl:with-param name="pageProperties" select="common:node-set($pagePropertiesRTF)"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="function-available('xalan:nodeset')">
+ <xsl:call-template name="create-body.create">
+ <xsl:with-param name="globalData" select="xalan:nodeset($globalData)"/>
+ <xsl:with-param name="pageProperties" select="xalan:nodeset($pagePropertiesRTF)"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="function-available('xt:node-set')">
+ <xsl:call-template name="create-body.create">
+ <xsl:with-param name="globalData" select="xt:node-set($globalData)"/>
+ <xsl:with-param name="pageProperties" select="xt:node-set($pagePropertiesRTF)"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:message terminate="yes">The required node-set function was not found!</xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template name="create-body.create">
+ <xsl:param name="globalData"/>
+ <xsl:param name="pageProperties"/>
+
<xsl:element name="body">
<!-- direction of text flow -->
<xsl:variable name="writingMode" select="$pageProperties/style:page-layout-properties/@style:writing-mode"/>
workspace.vcl114.patch:
gtkdata.cxx | 9 +++++++++
1 file changed, 9 insertions(+)
--- NEW FILE workspace.vcl114.patch ---
diff -ru vcl.orig/unx/gtk/app/gtkdata.cxx vcl/unx/gtk/app/gtkdata.cxx
--- vcl.orig/unx/gtk/app/gtkdata.cxx 2010-07-19 15:32:25.000000000 +0100
+++ vcl/unx/gtk/app/gtkdata.cxx 2010-07-19 15:43:33.000000000 +0100
@@ -519,6 +519,7 @@
GSource *m_pUserEvent;
oslMutex m_aDispatchMutex;
oslCondition m_aDispatchCondition;
+ XIOErrorHandler m_aOrigGTKXIOErrorHandler;
public:
static gboolean timeoutFn(gpointer data);
@@ -552,6 +553,7 @@
m_pUserEvent = NULL;
m_aDispatchCondition = osl_createCondition();
m_aDispatchMutex = osl_createMutex();
+ m_aOrigGTKXIOErrorHandler = NULL;
}
GtkXLib::~GtkXLib()
@@ -565,6 +567,9 @@
osl_setCondition( m_aDispatchCondition );
osl_destroyCondition( m_aDispatchCondition );
osl_destroyMutex( m_aDispatchMutex );
+
+ PopXErrorLevel();
+ XSetIOErrorHandler (m_aOrigGTKXIOErrorHandler);
}
void GtkXLib::Init()
@@ -626,6 +631,10 @@
// init gtk/gdk
gtk_init_check( &nParams, &pCmdLineAry );
+ //gtk_init_check sets XError/XIOError handlers, we want our own one
+ m_aOrigGTKXIOErrorHandler = XSetIOErrorHandler ( (XIOErrorHandler)X11SalData::XIOErrorHdl );
+ PushXErrorLevel( !!getenv( "SAL_IGNOREXERRORS" ) );
+
for (i = 0; i < nParams; i++ )
g_free( pCmdLineAry[i] );
delete [] pCmdLineAry;
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2297
retrieving revision 1.2298
diff -u -p -r1.2297 -r1.2298
--- openoffice.org.spec 20 Jul 2010 14:30:23 -0000 1.2297
+++ openoffice.org.spec 21 Jul 2010 07:54:34 -0000 1.2298
@@ -83,42 +83,39 @@ Patch5: openoffice.org-2.2.1.ooo7065.sw
Patch6: openoffice.org-2.3.0.ooo76649.httpencoding.patch
Patch7: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
Patch8: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch9: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+Patch9: workspace.dtardon03.patch
Patch10: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
Patch11: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
Patch12: ooo-build.ooo2497.filter.svg.patch
Patch13: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
Patch14: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
-Patch15: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-Patch16: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
-Patch17: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
-Patch18: workspace.impress195.patch
-Patch19: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
-Patch20: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
-Patch21: workspace.srb1.patch
-Patch22: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-Patch23: openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
-Patch24: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
-Patch25: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
-Patch26: openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
-Patch27: openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch
-Patch28: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
-Patch29: openoffice.org-3.3.0.ooo111699.svx.nullfield.patch
-Patch30: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
-Patch31: openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
-Patch32: workspace.writerfilter08.patch
-Patch33: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
-Patch34: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
-Patch35: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
-Patch36: workspace.vcl113.patch
-Patch37: workspace.tl81.patch
-Patch38: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
-Patch39: workspace.gtk3.patch
-Patch40: workspace.sb128.patch
-Patch41: workspace.cmcfixes77.patch
-Patch42: workspace.sb126.patch
-Patch43: openoffice.org-3.3.0.ooo113259.vcl.xioerror.patch
-Patch44: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
+Patch15: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+Patch16: workspace.impress195.patch
+Patch17: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
+Patch18: workspace.srb1.patch
+Patch19: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch20: openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
+Patch21: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
+Patch22: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
+Patch23: openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
+Patch24: openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch
+Patch25: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
+Patch26: openoffice.org-3.3.0.ooo111699.svx.nullfield.patch
+Patch27: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
+Patch28: openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
+Patch29: workspace.writerfilter08.patch
+Patch30: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
+Patch31: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
+Patch32: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
+Patch33: workspace.vcl113.patch
+Patch34: workspace.tl81.patch
+Patch35: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
+Patch36: workspace.gtk3.patch
+Patch37: workspace.sb128.patch
+Patch38: workspace.cmcfixes77.patch
+Patch39: workspace.sb126.patch
+Patch40: workspace.vcl114.patch
+Patch41: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -1615,42 +1612,39 @@ cp -p %{SOURCE5} external/unowinreg/unow
%patch6 -p0 -b .ooo76649.httpencoding.patch
%patch7 -p1 -b .ooo86080.unopkg.bodge.patch
%patch8 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch9 -p0 -b .ooo98137.filter.redeclared-variables.patch
+%patch9 -p0 -b .workspace.dtardon03.patch
%patch10 -p0 -b .gccXXXXX.solenv.javaregistration.patch
%patch11 -p1 -b .oooXXXXX.solenv.allowmissing.patch
%patch12 -p1 -b .ooo2497.filter.svg.patch
%patch13 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
%patch14 -p0 -b .ooo101274.opening-a-directory.patch
-%patch15 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
-%patch16 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
-%patch17 -p0 -b .ooo102061.sc.cellanchoring.patch
-%patch18 -p0 -b .workspace.impress195.patch
-%patch19 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
-%patch20 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
-%patch21 -p1 -b .workspace.srb1.patch
-%patch22 -p1 -b .ooo106502.svx.fixspelltimer.patch
-%patch23 -p1 -b .ooo108246.svx.hide-sql-group-when-inactive.patch
-%patch24 -p1 -b .ooo108637.sfx2.uisavedir.patch
-%patch25 -p1 -b .ooo108846.sfx2.qstartfixes.patch
-%patch26 -p1 -b .ooo95369.sw.sortedobjs.patch
-%patch27 -p1 -b .ooo74188.indiccursor.editeng.patch
-%patch28 -p0 -b .ooo110142.svx.safercolornames.patch
-%patch29 -p0 -b .ooo111699.svx.nullfield.patch
-%patch30 -p0 -b .ooo111758.sd.xerror.patch
-%patch31 -p1 -b .ooo111741.extras.malformed-xml-file.patch
-%patch32 -p0 -b .workspace.writerfilter08.patch
-%patch33 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
-%patch34 -p0 -b .ooo107490.cppu.lifecycle.patch
-%patch35 -p0 -b .ooo100686.wizards.types.not.mediatypes.patch
-%patch36 -p0 -b .workspace.vcl113.patch
-%patch37 -p0 -b .workspace.tl81.patch
-%patch38 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
-%patch39 -p0 -b .workspace.gtk3.patch
-%patch40 -p1 -b .workspace.sb128.patch
-%patch41 -p1 -b .workspace.cmcfixes77.patch
-%patch42 -p1 -b .workspace.sb126.patch
-%patch43 -p0 -b .openoffice.org-3.3.0.ooo113259.vcl.xioerror.patch
-%patch44 -p0 -b .openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
+%patch15 -p0 -b .ooo102061.sc.cellanchoring.patch
+%patch16 -p0 -b .workspace.impress195.patch
+%patch17 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
+%patch18 -p1 -b .workspace.srb1.patch
+%patch19 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch20 -p1 -b .ooo108246.svx.hide-sql-group-when-inactive.patch
+%patch21 -p1 -b .ooo108637.sfx2.uisavedir.patch
+%patch22 -p1 -b .ooo108846.sfx2.qstartfixes.patch
+%patch23 -p1 -b .ooo95369.sw.sortedobjs.patch
+%patch24 -p1 -b .ooo74188.indiccursor.editeng.patch
+%patch25 -p0 -b .ooo110142.svx.safercolornames.patch
+%patch26 -p0 -b .ooo111699.svx.nullfield.patch
+%patch27 -p0 -b .ooo111758.sd.xerror.patch
+%patch28 -p1 -b .ooo111741.extras.malformed-xml-file.patch
+%patch29 -p0 -b .workspace.writerfilter08.patch
+%patch30 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
+%patch31 -p0 -b .ooo107490.cppu.lifecycle.patch
+%patch32 -p0 -b .ooo100686.wizards.types.not.mediatypes.patch
+%patch33 -p0 -b .workspace.vcl113.patch
+%patch34 -p0 -b .workspace.tl81.patch
+%patch35 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
+%patch36 -p0 -b .workspace.gtk3.patch
+%patch37 -p1 -b .workspace.sb128.patch
+%patch38 -p1 -b .workspace.cmcfixes77.patch
+%patch39 -p1 -b .workspace.sb126.patch
+%patch40 -p0 -b .workspace.vcl114.patch
+%patch41 -p0 -b .openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1750,7 +1744,7 @@ if dmake broffice_pt-BR; then
break
else
echo - ---dump log start---
- cat ../unx*.pro/BrOffice/logging/pt-BR/log_*_pt-BR.log
+ cat ../unx*.pro/BrOffice/installed/logging/pt-BR/log_*_pt-BR.log
echo - ---dump log end---
ok=false
fi
@@ -1765,7 +1759,7 @@ if dmake openoffice_en-US; then
break
else
echo - ---dump log start---
- cat ../unx*.pro/OpenOffice/logging/en-US/log_*_en-US.log
+ cat ../unx*.pro/OpenOffice/installed/logging/en-US/log_*_en-US.log
echo - ---dump log end---
ok=false
fi
--- openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch DELETED ---
--- openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch DELETED ---
--- openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch DELETED ---
--- openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch DELETED ---
--- openoffice.org-3.3.0.ooo113259.vcl.xioerror.patch DELETED ---
More information about the scm-commits
mailing list