[ooo-build-commit] .: 2 commits - patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Wed Jul 21 05:13:37 PDT 2010
patches/dev300/apply | 7 +--
patches/dev300/build-ant-1.6-swext.diff | 4 +-
patches/dev300/go-oo-splash.diff | 14 +++----
patches/dev300/ooo64508.vcl.honourfontconfighinting-gtk-2.8.diff | 18 ----------
patches/dev300/ooxml-sc-docpropsimp.diff | 8 ++--
patches/dev300/ooxml-sc-paneexport.diff | 2 -
patches/dev300/sdext-noarch-identifier.diff | 2 -
7 files changed, 17 insertions(+), 38 deletions(-)
New commits:
commit fc27ee531d2f82de88b1dd2bafe933bb5d95e23d
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Jul 21 14:13:03 2010 +0200
Making patch.apply work with GoOoLinux distro
* patches/dev300/build-ant-1.6-swext.diff:
* patches/dev300/go-oo-splash.diff:
* patches/dev300/ooxml-sc-docpropsimp.diff:
* patches/dev300/ooxml-sc-paneexport.diff:
* patches/dev300/sdext-noarch-identifier.diff:
diff --git a/patches/dev300/build-ant-1.6-swext.diff b/patches/dev300/build-ant-1.6-swext.diff
index 7c231c3..9f877c5 100644
--- a/patches/dev300/build-ant-1.6-swext.diff
+++ b/patches/dev300/build-ant-1.6-swext.diff
@@ -12,6 +12,6 @@
+ <fileset file="${commons-httpclient-jar}" casesensitive="yes"/>
+ <fileset file="${commons-lang-jar}" casesensitive="yes"/>
+ <fileset file="${commons-logging-jar}" casesensitive="yes"/>
- <zipfileset file="${solar.bin}/xslt/export/wiki/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
- <zipfileset file="${solar.bin}/xslt/export/wiki/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/>
+ <zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
+ <zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/>
<zipfileset dir="${solar.bin}/xslt/export/xsltml" casesensitive="yes" prefix="filter/math"/>
diff --git a/patches/dev300/go-oo-splash.diff b/patches/dev300/go-oo-splash.diff
index 58205b8..77aa6f0 100644
--- a/patches/dev300/go-oo-splash.diff
+++ b/patches/dev300/go-oo-splash.diff
@@ -1,17 +1,17 @@
--- instsetoo_native/util/openoffice.lst.old 2010-03-03 17:50:21.000000000 +0100
+++ instsetoo_native/util/openoffice.lst 2010-03-03 17:50:36.000000000 +0100
@@ -25,10 +25,10 @@ Globals
- POOLPRODUCT 1
- REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
+ POOLPRODUCT 1
+ REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
-- PROGRESSBARCOLOR 4,68,155
-- PROGRESSSIZE 412,7
-- PROGRESSPOSITION 14,230
-- PROGRESSFRAMECOLOR 58,159,232
+- PROGRESSBARCOLOR 14,133,205
+- PROGRESSSIZE 320,7
+- PROGRESSPOSITION 185,206
+- PROGRESSFRAMECOLOR 207,208,211
+ PROGRESSBARCOLOR 186,189,182
+ PROGRESSSIZE 186,5
+ PROGRESSPOSITION 126,183
+ PROGRESSFRAMECOLOR 255,255,255
NATIVEPROGRESS true
REGISTRYLAYERNAME Layers
- SERVICEPACK 1
+ SERVICEPACK 1
diff --git a/patches/dev300/ooxml-sc-docpropsimp.diff b/patches/dev300/ooxml-sc-docpropsimp.diff
index 8433ef3..eecddc9 100644
--- a/patches/dev300/ooxml-sc-docpropsimp.diff
+++ b/patches/dev300/ooxml-sc-docpropsimp.diff
@@ -11,9 +11,9 @@
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
--- oox/source/core/xmlfilterbase.cxx 2010-05-11 19:14:26.000000000 +0530
+++ oox/source/core/xmlfilterbase.cxx 2010-07-14 13:40:30.000000000 +0530
-@@ -88,6 +88,22 @@ using ::sax_fastparser::FastSerializerHe
+@@ -80,6 +80,22 @@ using ::sax_fastparser::FastSerializerHe
+ using ::sax_fastparser::FastSerializerHelper;
using ::sax_fastparser::FSHelperPtr;
- using namespace ::com::sun::star;
+
+#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
@@ -55,8 +55,8 @@
+
+// ============================================================================
- namespace
- {
+ XmlFilterBase::XmlFilterBase( const Reference< XMultiServiceFactory >& rxGlobalFactory ) :
+ FilterBase( rxGlobalFactory ),
@@ -187,6 +219,25 @@ XmlFilterBase::~XmlFilterBase()
// ----------------------------------------------------------------------------
diff --git a/patches/dev300/ooxml-sc-paneexport.diff b/patches/dev300/ooxml-sc-paneexport.diff
index e85710f..85bbc0d 100644
--- a/patches/dev300/ooxml-sc-paneexport.diff
+++ b/patches/dev300/ooxml-sc-paneexport.diff
@@ -9,7 +9,6 @@
#include <oox/core/tokens.hxx>
@@ -1146,6 +1148,10 @@ bool XclExpXmlStream::exportDocument() t
- {
pShell->SetError( nError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
}
#endif
@@ -19,3 +18,4 @@
+
OUString const workbook = CREATE_OUSTRING( "xl/workbook.xml" );
PushStream( CreateOutputStream( workbook, workbook,
+ Reference <XOutputStream>(),
diff --git a/patches/dev300/sdext-noarch-identifier.diff b/patches/dev300/sdext-noarch-identifier.diff
index e047ff9..f3ac357 100644
--- a/patches/dev300/sdext-noarch-identifier.diff
+++ b/patches/dev300/sdext-noarch-identifier.diff
@@ -19,7 +19,7 @@
+ <identifier value="com.sun.PresenterScreen" />
<dependencies>
- <OpenOffice.org-minimal-version value="3.1" dep:name="OpenOffice.org 3.2"/>
+ <OpenOffice.org-minimal-version value="3.2" dep:name="OpenOffice.org 3.2"/>
--- sdext/source/pdfimport/pdfisettings.pmk.old 2010-02-02 12:49:41.000000000 +0100
+++ sdext/source/pdfimport/pdfisettings.pmk 2010-03-09 14:05:36.000000000 +0100
@@ -29,4 +29,4 @@
commit d5568b53d469a458044ec5faf323b5dfc7980509
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Jul 21 14:12:23 2010 +0200
Remove the GTK28 section since the code itself caters for this case
* patches/dev300/apply:
* patches/dev300/ooo64508.vcl.honourfontconfighinting-gtk-2.8.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0f6c45a..c5b0868 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -71,7 +71,7 @@ SUSE-9.1 : NovellBase
SUSE-9.2 : NovellBase
SUSE-9.3 : NovellBase
SUSE-10.0 : NovellBase
-SUSE-10.1 : NovellBase, BerkeleyDB43, EMFPlus, Java14, BrokenSystemNSS, GTK28, SUSE101
+SUSE-10.1 : NovellBase, BerkeleyDB43, EMFPlus, Java14, BrokenSystemNSS, SUSE101
SUSE-10.2 : NovellBase, BerkeleyDB43, EMFPlus, Java14, OpenGLTransitionsMesa703
SUSE-10.3 : NovellBase, BerkeleyDB43, EMFPlus, Java14, GCC41
SUSE-11.0 : NovellBase, BerkeleyDB43, EMFPlus, CairoFonts, PostgreSQL
@@ -142,7 +142,7 @@ Pardus2008: PardusOnly, LinuxCommon, NotDebian
# Solaris
Solaris: NovellBase, UnstableExtensions
# Universal Upstream-like packages
-GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, IntegrateExtensions, GoOoSplash, GTK28
+GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, IntegrateExtensions, GoOoSplash
# OxygenOffice Professional
OxygenOfficeLinuxCommon : Common, EMFPlus, FontConfigTemporaryHacks, \
LinuxOnly, SystemBits, Lockdown, \
@@ -2223,9 +2223,6 @@ unxlngi6-notune.diff, doko
[ UbuntuL10nOnly ]
human-icons-i18n.diff, mklose
-[ GTK28 ]
-ooo64508.vcl.honourfontconfighinting-gtk-2.8.diff
-
[ FedoraCommonFixes ]
ooo67658.sfx2.reloadcrash.diff
diff --git a/patches/dev300/ooo64508.vcl.honourfontconfighinting-gtk-2.8.diff b/patches/dev300/ooo64508.vcl.honourfontconfighinting-gtk-2.8.diff
deleted file mode 100644
index a77a8f3..0000000
--- a/patches/dev300/ooo64508.vcl.honourfontconfighinting-gtk-2.8.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx.old 2009-10-29 15:25:08.000000000 +0100
-+++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 2009-10-29 15:24:44.000000000 +0100
-@@ -3449,10 +3449,11 @@ void GtkSalGraphics::updateSettings( All
- // FIXME: need some way of fetching toolbar icon size.
- // aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_SMALL );
-
-- const cairo_font_options_t *pNewOptions = 0;
-- if (GdkScreen* pScreen = gdk_display_get_screen( gdk_display_get_default(), m_nScreen ))
-- pNewOptions = gdk_screen_get_font_options(pScreen);
-- aStyleSet.SetCairoFontOptions( pNewOptions );
-+// FIXME: gdk_screen_get_font_options is not supported by gdk2-2.8 on SLED10
-+// const cairo_font_options_t *pNewOptions = 0;
-+// if (GdkScreen* pScreen = gdk_display_get_screen( gdk_display_get_default(), m_nScreen ))
-+// pNewOptions = gdk_screen_get_font_options(pScreen);
-+// aStyleSet.SetCairoFontOptions( pNewOptions );
-
- // finally update the collected settings
- rSettings.SetStyleSettings( aStyleSet );
More information about the ooo-build-commit
mailing list