[ooo-build-commit] 2 commits - patches/dev300

Petr Mladek pmladek at kemper.freedesktop.org
Sun Dec 20 08:40:48 PST 2009


 patches/dev300/apply                                 |   11 ++++-------
 patches/dev300/build-fix-linux.diff                  |   13 -------------
 patches/dev300/layout-disabled-layout-build-fix.diff |   18 ++++++++++++++++++
 patches/dev300/transogl-transitions-sd.diff          |    8 ++++----
 4 files changed, 26 insertions(+), 24 deletions(-)

New commits:
commit 142dc30b1171f93dac0b0af00671d3a62119a703
Author: Petr Mladek <pmladek at suse.cz>
Date:   Sun Dec 20 15:53:51 2009 +0100

    Fix build with OGL transitions a better way
    
    * patches/dev300/transogl-transitions-sd.diff: rename transitions-ogl.xml
      instead of remove when OGL stansions are disabled
    * patches/dev300/build-fix-linux.diff: bin obsolete
    * patches/dev300/apply: update for the above changes

diff --git a/patches/dev300/apply b/patches/dev300/apply
index e19e83a..d0b518a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -23,7 +23,7 @@ Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
 LinuxCommon : Common, Defaults, TangoIcons, FontConfigTemporaryHacks, \
 	      FedoraLinuxOnlyFixes, LinuxOnly, SystemBits, \
 	      msaccess, OpenGLTransitions, \
-	      Fpickers, Mono, AddressBooks, QuickStarter, KDE4, BuildFixLinux
+	      Fpickers, Mono, AddressBooks, QuickStarter, KDE4
 MacOSXCommon : Common, Defaults, TangoIcons, SystemBits
 Win32Common : Common, Defaults, TangoIcons, \
 	      Win32Only, NotDebian, BuildFixWin32
@@ -3195,12 +3195,6 @@ cws-mysqlnative-20090916.diff
 # Needs a libmysqlcppconn-stlport.so etc built with STLport
 #debian-mysqlc-build-against-stlport-hack.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
diff --git a/patches/dev300/build-fix-linux.diff b/patches/dev300/build-fix-linux.diff
deleted file mode 100644
index 46c5905..0000000
--- a/patches/dev300/build-fix-linux.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git sd/prj/build.lst sd/prj/build.lst
-index 52734f4..ef69a6a 100644
---- sd/prj/build.lst
-+++ sd/prj/build.lst
-@@ -41,6 +40,5 @@ 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\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_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 sd_text sd_annotations sd_uiannotations 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 sd_text sd_annotations sd_uiannotations NULL
-
diff --git a/patches/dev300/transogl-transitions-sd.diff b/patches/dev300/transogl-transitions-sd.diff
index 4242762..ed6f36f 100644
--- a/patches/dev300/transogl-transitions-sd.diff
+++ b/patches/dev300/transogl-transitions-sd.diff
@@ -19,8 +19,8 @@ diff -ru sd-orig/prj/build.lst sd/prj/build.lst
 +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 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
+--- /dev/null	2009-02-23 18:06:18.000000000 +0000
++++ sd/xml/makefile.mk	2009-12-20 13:51:43.000000000 +0000
 @@ -0,0 +1,13 @@
 +PRJ=..
 +PRJNAME=sd
@@ -30,8 +30,8 @@ diff -ru sd-orig/prj/build.lst sd/prj/build.lst
 +.IF "$(ENABLE_OPENGL)" != "TRUE"
 + at all:
 +	@echo "Building without OpenGL Transitions..."
-+	$(RM) transitions-ogl.xml
++	@test -f transitions-ogl.xml && mv transitions-ogl.xml transitions-ogl || true
 +.ELSE
 + at all:
-+	$(GNUCOPY) transitions-ogl transitions-ogl.xml
++	@test ! -f transitions-ogl.xml && mv transitions-ogl transitions-ogl.xml || true
 +.ENDIF
commit f714091da3b695915d86bc48fb79d06c22325fef
Author: Petr Mladek <pmladek at suse.cz>
Date:   Sun Dec 20 15:35:30 2009 +0100

    Fix build with --diable-layout
    
    * patches/dev300/layout-disabled-layout-build-fix.diff:
    * patches/dev300/apply: hack to fix build with --diable-layout; FIXME: is there
      a better solution?

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c99ddd7..e19e83a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2393,6 +2393,9 @@ layout-listbox-minsize.diff, n#557230, thorsten
 layout-move-copy-fixed-height.diff, n#559438, thorsten
 # the input field for the number of the sheet was too small
 layout-sc-insert-sheet-no.diff, n#559445, pmladek
+# FIXME: temporary hack to build with layout disabled
+# is there a better fix?
+layout-disabled-layout-build-fix.diff, pmladek
 
 [ FrameworkFeature ]
 SectionOwner => kohei
diff --git a/patches/dev300/layout-disabled-layout-build-fix.diff b/patches/dev300/layout-disabled-layout-build-fix.diff
new file mode 100644
index 0000000..49fbc49
--- /dev/null
+++ b/patches/dev300/layout-disabled-layout-build-fix.diff
@@ -0,0 +1,18 @@
+--- sfx2/inc/sfx2/layout.hxx.old	2009-12-20 13:35:29.000000000 +0000
++++ sfx2/inc/sfx2/layout.hxx	2009-12-20 13:02:22.000000000 +0000
+@@ -63,6 +63,7 @@ public:
+ };
+ #endif
+ 
++#if ENABLE_LAYOUT
+ class SFX2_DLLPUBLIC SfxTabPage
+     : public ::SfxTabPage
+     , public InPlug
+@@ -75,6 +76,7 @@ public:
+     Size GetOptimalSize (WindowSizeType eType) const;
+     void FreeResource ();
+ };
++#endif
+ } // end namespace layout
+ 
+ #endif /* _SFX2_LAYOUT_HXX */


More information about the ooo-build-commit mailing list