[ooo-build-commit] .: 3 commits - patches/dev300

Fridrich Strba fridrich at kemper.freedesktop.org
Wed Mar 3 09:50:36 PST 2010 

 patches/dev300/apply                                    |   22 ++---
 patches/dev300/premium-splitted-language-packages.diff  |   10 +-
 patches/dev300/scp2_makefile_extensions.diff            |   12 +-
 patches/dev300/slideshow-effect-rewind-sdext.diff       |   67 ++--------------
 patches/dev300/solven-extensions-noarch-identifier.diff |    8 -
 5 files changed, 37 insertions(+), 82 deletions(-)

New commits:
commit a19e36c558774c0418cd922c4765f2d19cb7bca4
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Wed Mar 3 18:49:18 2010 +0100

    Let us try to put the common sections before the special ones.
    
    * patches/dev300/apply:
    * patches/dev300/slideshow-effect-rewind-sdext.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 78bcdfa..d299697 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -400,6 +400,17 @@ pdfimport-no-license.diff
 build-java-target-extensions.diff, i#93115, pmladek
 sdext-minimizer-docked.diff, thorsten
 
+[ Fixes < ooo320-m8 ]
+# gtk quickstarter crashes on disable/exit
+sfx2-qstart-nocrash.diff, i#101245, michael
+
+[ Fixes ]
+# Fix from Andre, allows to step back one animation effect
+slideshow-effect-rewind.diff, i#48179, thorsten
+
+# correctly set table row height during ppt import
+svx-ppt-tablerow-height-fix.diff, n#483951, i#100275, thorsten
+
 [ NovellOnlyExtensionFixes ]
 # allow build with ant-1.6
 # IMPORTANT: the second part of the patch is build-ant-1.6.diff
@@ -3114,17 +3125,6 @@ slideshow-mute-sound.diff, thorsten
 # unresolved Base64 Java classes
 base64.diff, i#100620, hmth
 
-[ Fixes < ooo320-m8 ]
-# gtk quickstarter crashes on disable/exit
-sfx2-qstart-nocrash.diff, i#101245, michael
-
-[ Fixes ]
-# Fix from Andre, allows to step back one animation effect
-slideshow-effect-rewind.diff, i#48179, thorsten
-
-# correctly set table row height during ppt import
-svx-ppt-tablerow-height-fix.diff, n#483951, i#100275, thorsten
-
 [ ExtensionFixes ]
 # Fix from Andre, allows to step back one animation effect
 slideshow-effect-rewind-sdext.diff, i#48179, thorsten
diff --git a/patches/dev300/slideshow-effect-rewind-sdext.diff b/patches/dev300/slideshow-effect-rewind-sdext.diff
index 11c1cb9..2f5f62b 100644
--- a/patches/dev300/slideshow-effect-rewind-sdext.diff
+++ b/patches/dev300/slideshow-effect-rewind-sdext.diff
@@ -58,7 +58,7 @@
 --- sdext/source/presenter/description.xml.old	2010-03-03 18:22:50.000000000 +0100
 +++ sdext/source/presenter/description.xml	2010-03-03 18:23:48.000000000 +0100
 @@ -8,10 +8,10 @@
-   <identifier value="com.sun.PresenterScreen" />
+   <identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" />
  
    <dependencies>
 -    <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
commit e346a719135a096dd4156ed6d2715acc0875d651
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Wed Mar 3 18:25:49 2010 +0100

    Defuzzing GoOoLinux distribution
    
    * patches/dev300/slideshow-effect-rewind-sdext.diff:
    * patches/dev300/solven-extensions-noarch-identifier.diff:

diff --git a/patches/dev300/slideshow-effect-rewind-sdext.diff b/patches/dev300/slideshow-effect-rewind-sdext.diff
index 507ef49..11c1cb9 100644
--- a/patches/dev300/slideshow-effect-rewind-sdext.diff
+++ b/patches/dev300/slideshow-effect-rewind-sdext.diff
@@ -1,45 +1,6 @@
-Updated slideshow effect rewind feature from CWS slideshow1
-
-From: Thorsten Behrens <thb at openoffice.org>
-
-
----
-
- offapi/com/sun/star/presentation/XSlideShow.idl    |   37 ++
- .../sun/star/presentation/XSlideShowController.idl |    8 
- .../sun/star/presentation/XSlideShowListener.idl   |    6 
- sd/source/ui/slideshow/slideshowimpl.cxx           |  120 +++++-
- sd/source/ui/slideshow/slideshowimpl.hxx           |    8 
- sdext/source/presenter/PresenterController.cxx     |   11 -
- .../presenter/PresenterCurrentSlideObserver.cxx    |    4 
- .../presenter/PresenterCurrentSlideObserver.hxx    |    2 
- sdext/source/presenter/description.xml             |    4 
- .../source/engine/animationnodes/basenode.hxx      |    6 
- .../animationnodes/sequentialtimecontainer.cxx     |    6 
- slideshow/source/engine/effectrewinder.cxx         |  432 ++++++++++++++++++++
- slideshow/source/engine/effectrewinder.hxx         |  185 +++++++++
- slideshow/source/engine/eventmultiplexer.cxx       |   10 
- slideshow/source/engine/eventqueue.cxx             |   47 ++
- slideshow/source/engine/makefile.mk                |    1 
- slideshow/source/engine/screenupdater.cxx          |   83 ++++
- slideshow/source/engine/shapes/drawshape.cxx       |    6 
- slideshow/source/engine/slide/layermanager.cxx     |  105 ++---
- slideshow/source/engine/slide/layermanager.hxx     |   35 --
- slideshow/source/engine/slideshowimpl.cxx          |  270 ++++++++++---
- slideshow/source/engine/usereventqueue.cxx         |   54 ++-
- slideshow/source/inc/eventqueue.hxx                |    8 
- slideshow/source/inc/screenupdater.hxx             |   21 +
- slideshow/source/inc/usereventqueue.hxx            |   18 +
- 25 files changed, 1303 insertions(+), 184 deletions(-)
- create mode 100644 slideshow/source/engine/effectrewinder.cxx
- create mode 100644 slideshow/source/engine/effectrewinder.hxx
-
-
-diff --git sdext/source/presenter/PresenterController.cxx sdext/source/presenter/PresenterController.cxx
-index 9c54364..975b116 100644
---- sdext/source/presenter/PresenterController.cxx
-+++ sdext/source/presenter/PresenterController.cxx
-@@ -1002,14 +1002,23 @@ void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent)
+--- sdext/source/presenter/PresenterController.cxx.old	2010-01-12 11:14:53.000000000 +0100
++++ sdext/source/presenter/PresenterController.cxx	2010-03-03 18:23:48.000000000 +0100
+@@ -1002,14 +1002,23 @@ void SAL_CALL PresenterController::keyRe
              }
              break;
  
@@ -65,11 +26,9 @@ index 9c54364..975b116 100644
              }
              break;
  
-diff --git sdext/source/presenter/PresenterCurrentSlideObserver.cxx sdext/source/presenter/PresenterCurrentSlideObserver.cxx
-index 8f587c5..87abc55 100644
---- sdext/source/presenter/PresenterCurrentSlideObserver.cxx
-+++ sdext/source/presenter/PresenterCurrentSlideObserver.cxx
-@@ -109,13 +109,13 @@ void SAL_CALL PresenterCurrentSlideObserver::resumed (void)
+--- sdext/source/presenter/PresenterCurrentSlideObserver.cxx.old	2009-10-07 15:07:29.000000000 +0200
++++ sdext/source/presenter/PresenterCurrentSlideObserver.cxx	2010-03-03 18:23:48.000000000 +0100
+@@ -109,13 +109,13 @@ void SAL_CALL PresenterCurrentSlideObser
  {
  }
  
@@ -85,10 +44,8 @@ index 8f587c5..87abc55 100644
          if (mxSlideShowController->getNextSlideIndex() < 0)
              if( mpPresenterController.is() )
                  mpPresenterController->UpdateCurrentSlide(+1);
-diff --git sdext/source/presenter/PresenterCurrentSlideObserver.hxx sdext/source/presenter/PresenterCurrentSlideObserver.hxx
-index 8775c50..8608b52 100644
---- sdext/source/presenter/PresenterCurrentSlideObserver.hxx
-+++ sdext/source/presenter/PresenterCurrentSlideObserver.hxx
+--- sdext/source/presenter/PresenterCurrentSlideObserver.hxx.old	2009-10-07 15:07:29.000000000 +0200
++++ sdext/source/presenter/PresenterCurrentSlideObserver.hxx	2010-03-03 18:23:48.000000000 +0100
 @@ -76,7 +76,7 @@ public:
      virtual void SAL_CALL slideTransitionStarted(  ) throw (::com::sun::star::uno::RuntimeException);
      virtual void SAL_CALL slideTransitionEnded(  ) throw (::com::sun::star::uno::RuntimeException);
@@ -97,13 +54,11 @@ index 8775c50..8608b52 100644
 +    virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (::com::sun::star::uno::RuntimeException);
      virtual void SAL_CALL hyperLinkClicked( const ::rtl::OUString& hyperLink ) throw (::com::sun::star::uno::RuntimeException);
  
- 	// XAnimationListener
-diff --git sdext/source/presenter/description.xml sdext/source/presenter/description.xml
-index c00b8f0..35e2acc 100644
---- sdext/source/presenter/description.xml
-+++ sdext/source/presenter/description.xml
+     // XAnimationListener
+--- sdext/source/presenter/description.xml.old	2010-03-03 18:22:50.000000000 +0100
++++ sdext/source/presenter/description.xml	2010-03-03 18:23:48.000000000 +0100
 @@ -8,10 +8,10 @@
-   <identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" />
+   <identifier value="com.sun.PresenterScreen" />
  
    <dependencies>
 -    <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
diff --git a/patches/dev300/solven-extensions-noarch-identifier.diff b/patches/dev300/solven-extensions-noarch-identifier.diff
index 0123e67..a2399b0 100644
--- a/patches/dev300/solven-extensions-noarch-identifier.diff
+++ b/patches/dev300/solven-extensions-noarch-identifier.diff
@@ -1,11 +1,11 @@
---- solenv/inc/extension_post.mk.old	2008-09-26 16:11:11.000000000 +0200
-+++ solenv/inc/extension_post.mk	2008-09-26 18:25:04.000000000 +0200
-@@ -101,7 +101,7 @@ $(COMPONENT_LIBRARIES) : $(DLLDEST)$/$$(
+--- solenv/inc/extension_post.mk.old	2010-03-03 18:22:46.000000000 +0100
++++ solenv/inc/extension_post.mk	2010-03-03 18:22:49.000000000 +0100
+@@ -120,7 +120,7 @@ $(COMPONENT_LIBRARIES) : $(DLLDEST)/$$(@
  .ENDIF 			# "$(OS)$(CPU)"=="WNTI"
  .ENDIF			# "$(COMPONENT_LIBRARIES)"!=""
  
 -IMPLEMENTATION_IDENTIFIER*="com.sun.star.$(EXTENSIONNAME)-$(PLATFORMID)"
 +IMPLEMENTATION_IDENTIFIER*="com.sun.star.$(EXTENSIONNAME)"
  
- .INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
+ .INCLUDE .IGNORE : $(MISC)/$(TARGET)_lang_track.mk
  .IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
commit 69b0715540eda66f8c1375846b248fc787e409fe
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Wed Mar 3 18:14:47 2010 +0100

    Defuzzing NovellWin32 distribution
    
    * patches/dev300/premium-splitted-language-packages.diff:
    * patches/dev300/scp2_makefile_extensions.diff:

diff --git a/patches/dev300/premium-splitted-language-packages.diff b/patches/dev300/premium-splitted-language-packages.diff
index db5df9f..e69c898 100644
--- a/patches/dev300/premium-splitted-language-packages.diff
+++ b/patches/dev300/premium-splitted-language-packages.diff
@@ -1,8 +1,8 @@
---- setup_native/source/packinfo/packinfo_office_lang.txt.orig	2008-03-25 00:11:06.000000000 +0100
-+++ setup_native/source/packinfo/packinfo_office_lang.txt	2008-03-23 15:36:45.000000000 +0100
-@@ -75,3 +75,91 @@
- description = "Language help module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
- destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+--- setup_native/source/packinfo/packinfo_office_lang.txt.old	2009-10-07 15:07:24.000000000 +0200
++++ setup_native/source/packinfo/packinfo_office_lang.txt	2010-03-03 18:13:36.000000000 +0100
+@@ -207,3 +207,91 @@ destpath = "/opt"
+ packageversion = "%OOOPACKAGEVERSION"
+ pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate"
  End
 +
 +Start
diff --git a/patches/dev300/scp2_makefile_extensions.diff b/patches/dev300/scp2_makefile_extensions.diff
index 9a6ccbc..b605d20 100644
--- a/patches/dev300/scp2_makefile_extensions.diff
+++ b/patches/dev300/scp2_makefile_extensions.diff
@@ -1,6 +1,6 @@
---- scp2/util/makefile.mk.orig	2008-03-19 07:37:00.000000000 +0100
-+++ scp2/util/makefile.mk	2008-03-19 10:24:18.000000000 +0100
-@@ -81,6 +81,9 @@
+--- scp2/util/makefile.mk.old	2009-10-08 16:17:46.000000000 +0200
++++ scp2/util/makefile.mk	2010-03-03 18:13:36.000000000 +0100
+@@ -77,6 +77,9 @@ SCP1FILES  = installation_ooo.par
               module_systemint.par          \
               module_graphicfilter.par      \
               file_graphicfilter.par        \
@@ -9,8 +9,8 @@
 +             file_extensions.par           \
               module_testtool.par           \
               file_testtool.par             \
-              file_lingu.par                \
-@@ -222,6 +224,9 @@
+              module_xsltfilter.par         \
+@@ -235,6 +238,9 @@ SCP2FILES  = installation_ooo.par
               module_systemint.par          \
               module_graphicfilter.par      \
               file_graphicfilter.par        \
@@ -19,4 +19,4 @@
 +             file_extensions.par           \
               module_testtool.par           \
               file_testtool.par             \
-              file_lingu.par                \
+              module_xsltfilter.par         \

More information about the ooo-build-commit mailing list