[ooo-build-commit] patches/dev300

Kohei Yoshida kohei at kemper.freedesktop.org
Wed Sep 30 14:13:22 PDT 2009 

 patches/dev300/apply                            |    9 +++++-
 patches/dev300/transogl-transitions-sd-m58.diff |   35 ++++++++++++++++++++++++
 patches/dev300/transogl-transitions-sd.diff     |    8 +++--
 3 files changed, 48 insertions(+), 4 deletions(-)

New commits:
commit b5edd3939760f2594d65c83260f2be5e0a98beea
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Sep 30 17:10:08 2009 -0400

    Adjusted patches for dev300-m60.
    
    * patches/dev300/apply: sfx2 pre and post process patches no
      longer apply.  Radek, please take a look.
    
    * patches/dev300/transogl-transitions-sd-m58.diff:
    * patches/dev300/transogl-transitions-sd.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index daf70d0..c0752ca 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2045,8 +2045,9 @@ vba-toolbar-menu-support-m57.diff
 
 vba-toolbar-menu-support.diff
 
-[ Features ]
+[ Features < dev300-m60 ]
 # Pre- and postprocessing capabilities for loading and saving.
+# FIXME: These patches no longer apply against dev300-m60.
 sfx2-pre-and-postprocess-during-save-load.diff, i#71939, florian
 sfx2-pre-and-postprocess-crash-fix.diff, n#270544, rodo
 
@@ -2231,7 +2232,13 @@ debian-dictionary.diff, rengelha
 # differences. --tml
 # transogl-transitions-slideshow.diff
 
+[ OpenGLTransitions >= dev300-m60 ]
 transogl-transitions-sd.diff
+
+[ OpenGLTransitions < dev300-m60 ]
+transogl-transitions-sd-m58.diff
+
+[ OpenGLTransitions ]
 transogl-transitions-officecfg.diff
 
 # FIXME: 2009-08-27: Parts of this might be upstream, but in a
diff --git a/patches/dev300/transogl-transitions-sd-m58.diff b/patches/dev300/transogl-transitions-sd-m58.diff
new file mode 100644
index 0000000..dea29d1
--- /dev/null
+++ b/patches/dev300/transogl-transitions-sd-m58.diff
@@ -0,0 +1,35 @@
+diff -ru sd-orig/prj/build.lst sd/prj/build.lst
+--- sd/prj/build.lst	2008-01-07 17:09:15.000000000 +0100
++++ sd/prj/build.lst	2008-01-07 21:03:56.000000000 +0100
+@@ -31,7 +31,7 @@
+ 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\grf					nmake	-	all	sd_grf sd_inc NULL
+-sd	sd\source\filter\xml					nmake	-	all	sd_xml 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
+ sd	sd\source\ui\animations					nmake	-	all sd_animations sd_inc NULL
+ sd	sd\source\ui\slideshow					nmake	-	all sd_slideshow sd_sdi sd_inc NULL
+@@ -42,4 +42,5 @@
+ 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_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_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
+--- /dev/null	2007-09-21 21:12:45.000000000 +0200
++++ sd/xml/makefile.mk	2008-01-07 17:19:14.000000000 +0100
+@@ -0,0 +1,13 @@
++PRJ=..
++PRJNAME=sd
++
++.INCLUDE :  settings.mk
++
++.IF "$(ENABLE_OPENGL)" != "TRUE"
++ at all:
++	@echo "Building without OpenGL Transitions..."
++	$(RM) transitions-ogl.xml
++.ELSE
++ at all:
++	$(GNUCOPY) transitions-ogl transitions-ogl.xml
++.ENDIF
diff --git a/patches/dev300/transogl-transitions-sd.diff b/patches/dev300/transogl-transitions-sd.diff
index dea29d1..afa2c2c 100644
--- a/patches/dev300/transogl-transitions-sd.diff
+++ b/patches/dev300/transogl-transitions-sd.diff
@@ -10,13 +10,15 @@ diff -ru sd-orig/prj/build.lst sd/prj/build.lst
  sd	sd\source\filter\html					nmake	-	all	sd_html sd_inc NULL
  sd	sd\source\ui\animations					nmake	-	all sd_animations sd_inc NULL
  sd	sd\source\ui\slideshow					nmake	-	all sd_slideshow sd_sdi sd_inc NULL
-@@ -42,4 +42,5 @@
+@@ -42,5 +42,6 @@
  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_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_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\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_filt sd_func sd_grf sd_unid sd_view sd_filter 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\xml									nmake	-	all	sd_xml NULL
+
 --- /dev/null	2007-09-21 21:12:45.000000000 +0200
 +++ sd/xml/makefile.mk	2008-01-07 17:19:14.000000000 +0100
 @@ -0,0 +1,13 @@

More information about the ooo-build-commit mailing list