[ooo-build-commit] patches/dev300

Tor Lillqvist tml at kemper.freedesktop.org
Thu Sep 10 08:41:19 PDT 2009


 patches/dev300/apply                |   18 +++++++++++++++---
 patches/dev300/build-fix-linux.diff |   19 +++++++++++++++++++
 patches/dev300/build-fix-win32.diff |   16 ++++++++++++++++
 patches/dev300/build-fix.diff       |   19 -------------------
 4 files changed, 50 insertions(+), 22 deletions(-)

New commits:
commit fcafdd163966d94540d272bc6315ec068dbffd7c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Sep 10 18:37:07 2009 +0300

    Split out platform-specific part of build-fix.diff
    
    * patches/dev300/build-fix.diff: Move out the patch to sd/prj/build.lst.
    
    * patches/dev300/build-fix-linux.diff
    * patches/dev300/build-fix-win32.diff: New files. Move the patch to
      sd/prj/build.lst into these as it needs to be different on Linux and
      Windows.
    
    * patches/dev300/apply: Add sets BuildFixLinux and BuildFixWin32, add
      build-fix-linux.diff and build-fix-win32.diff to them, use
      in the obvious way.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3db2c40..6da25d1 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -24,10 +24,10 @@ Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
 LinuxCommon : Common, Defaults, TangoIcons, FontConfigTemporaryHacks, \
 	      FedoraLinuxOnlyFixes, LinuxOnly, SystemBits, \
 	      msaccess, OpenGLTransitions, \
-	      Fpickers, Mono, AddressBooks, QuickStarter, KDE4
+	      Fpickers, Mono, AddressBooks, QuickStarter, KDE4, BuildFixLinux
 MacOSXCommon : Common, Defaults, TangoIcons, SystemBits
 Win32Common : Common, Defaults, TangoIcons, \
-	      Win32Only, NotDebian
+	      Win32Only, NotDebian, BuildFixWin32
 # Experimental sections
 Experimental: VBAUntested, ArkOnlyExperimental, \
 	      UnUsedButNotYetRemovedFromGit, WebDAVUpstream, \
@@ -3374,7 +3374,19 @@ cws-mysqlnative-20090828.diff
 debian-mysqlc-build-against-stlport-hack.diff
 
 [ BuildFix ]
-#FIXME 2009-09-10: various hacks to get the build to build, should be removed
+# FIXME: 2009-09-10: various hacks to get the build to build, should be removed
 # the changes in this patch should be integrated into existing patches or
 # the underlying problem these patches avoid should be fixex --noelp
 build-fix.diff
+
+[ BuildFixLinux ]
+# FIXME: 2009-09-10: various hacks to get the build to build, should be removed
+# the changes in this patch should be integrated into existing patches or
+# the underlying problem these patches avoid should be fixex --noelp
+build-fix-linux.diff
+
+[ BuildFixWin32 ]
+# FIXME: 2009-09-10: various hacks to get the build to build, should be removed
+# the changes in this patch should be integrated into existing patches or
+# the underlying problem these patches avoid should be fixex --noelp
+build-fix-win32.diff
diff --git a/patches/dev300/build-fix-linux.diff b/patches/dev300/build-fix-linux.diff
new file mode 100644
index 0000000..36bfe82
--- /dev/null
+++ b/patches/dev300/build-fix-linux.diff
@@ -0,0 +1,19 @@
+diff --git sd/prj/build.lst sd/prj/build.lst
+index 52734f4..ef69a6a 100644
+--- sd/prj/build.lst
++++ sd/prj/build.lst
+@@ -30,7 +30,6 @@ sd	sd\source\filter\ppt					nmake	-	all	sd_ppt sd_inc NULL
+ sd	sd\source\filter						nmake	-	all	sd_filt sd_sdi sd_ppt sd_inc NULL
+ sd	sd\source\filter\cgm					nmake	-	all	sd_cgm sd_inc NULL
+ sd	sd\source\filter\eppt					nmake	-	all	sd_eppt sd_inc NULL
+-sd	sd\source\filter\pptx					nmake	-	all	sd_pptx sd_inc NULL
+ sd	sd\source\filter\grf					nmake	-	all	sd_grf sd_inc NULL
+ sd	sd\source\filter\xml					nmake	-	all	sd_filter_xml sd_inc NULL
+ sd	sd\source\filter\html					nmake	-	all	sd_html sd_inc NULL
+@@ -41,5 +40,4 @@ sd	sd\source\ui\framework\configuration	nmake	-	all sd_framework_configuration s
+ sd	sd\source\ui\framework\module       	nmake	-	all sd_framework_module sd_inc NULL
+ 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\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_filter_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 NULL
+-sd	sd\xml									nmake	-	all	sd_xml 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_filter_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 NULL
diff --git a/patches/dev300/build-fix-win32.diff b/patches/dev300/build-fix-win32.diff
new file mode 100644
index 0000000..1383875
--- /dev/null
+++ b/patches/dev300/build-fix-win32.diff
@@ -0,0 +1,16 @@
+--- sd/prj/build.lst
++++ sd/prj/build.lst
+@@ -30,7 +30,6 @@
+ sd	sd\source\filter						nmake	-	all	sd_filt sd_sdi sd_ppt sd_inc NULL
+ sd	sd\source\filter\cgm					nmake	-	all	sd_cgm sd_inc NULL
+ sd	sd\source\filter\eppt					nmake	-	all	sd_eppt sd_inc NULL
+-sd	sd\source\filter\pptx					nmake	-	all	sd_pptx sd_inc NULL
+ 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
+@@ -41,4 +40,4 @@
+ sd	sd\source\ui\framework\module       	nmake	-	all sd_framework_module sd_inc NULL
+ 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\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 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 NULL
diff --git a/patches/dev300/build-fix.diff b/patches/dev300/build-fix.diff
index 7086a05..c90403d 100644
--- a/patches/dev300/build-fix.diff
+++ b/patches/dev300/build-fix.diff
@@ -104,25 +104,6 @@ index a4a78b7..a82585c 100644
                  if (!aName)
                      aName = pDim->GetName();
              }
-diff --git sd/prj/build.lst sd/prj/build.lst
-index 52734f4..ef69a6a 100644
---- sd/prj/build.lst
-+++ sd/prj/build.lst
-@@ -30,7 +30,6 @@ sd	sd\source\filter\ppt					nmake	-	all	sd_ppt sd_inc NULL
- sd	sd\source\filter						nmake	-	all	sd_filt sd_sdi sd_ppt sd_inc NULL
- sd	sd\source\filter\cgm					nmake	-	all	sd_cgm sd_inc NULL
- sd	sd\source\filter\eppt					nmake	-	all	sd_eppt sd_inc NULL
--sd	sd\source\filter\pptx					nmake	-	all	sd_pptx sd_inc NULL
- sd	sd\source\filter\grf					nmake	-	all	sd_grf sd_inc NULL
- sd	sd\source\filter\xml					nmake	-	all	sd_filter_xml sd_inc NULL
- sd	sd\source\filter\html					nmake	-	all	sd_html sd_inc NULL
-@@ -41,5 +40,4 @@ sd	sd\source\ui\framework\configuration	nmake	-	all sd_framework_configuration s
- sd	sd\source\ui\framework\module       	nmake	-	all sd_framework_module sd_inc NULL
- 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\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_filter_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 NULL
--sd	sd\xml									nmake	-	all	sd_xml 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_filter_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 NULL
 diff --git sd/source/ui/inc/res_bmp.hrc sd/source/ui/inc/res_bmp.hrc
 index ec8bb6b..89841d7 100644
 --- sd/source/ui/inc/res_bmp.hrc


More information about the ooo-build-commit mailing list