Hello community, here is the log from the commit of package libreoffice-bootstrap for openSUSE:Factory checked in at Wed Mar 2 13:53:48 CET 2011.
-------- --- libreoffice-bootstrap/libreoffice-bootstrap.changes 2011-02-17 14:21:30.000000000 +0100 +++ libreoffice-bootstrap/libreoffice-bootstrap.changes 2011-02-23 16:06:39.000000000 +0100 @@ -1,0 +2,28 @@ +Wed Feb 23 14:08:35 CET 2011 - [email protected] + +- libreoffice-3.3.1.2 == 3.3.1-rc2 == final + +------------------------------------------------------------------- +Wed Feb 23 14:02:28 CET 2011 - [email protected] + +- libreoffice-build-slideshow-media-playback-bug.diff: fix audio/video playback + in presentation (deb#612940, bnc#651250) +- vcl-input-methods-in-qt4.diff: non-working input methods in KDE4 (bnc#665112) + +------------------------------------------------------------------- +Tue Feb 22 17:42:08 CET 2011 - [email protected] + +- sd-blank-first-slide.diff: fixed occasional blank first slide (fdo#34533) + +------------------------------------------------------------------- +Mon Feb 21 14:23:59 CET 2011 - [email protected] + +- canvas-cairo-edge-count-calculation.diff: fixed cairo canvas edge count + calculation (bnc#647959) + +------------------------------------------------------------------- +Fri Feb 18 19:21:03 CET 2011 - [email protected] + +- defuzzed piece-packimages.diff to apply cleanly on all distros + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- canvas-cairo-edge-count-calculation.diff libreoffice-build-slideshow-media-playback-bug.diff piece-packimages.diff sd-blank-first-slide.diff vcl-input-methods-in-qt4.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.erSZds/_old 2011-03-02 13:52:46.000000000 +0100 +++ /var/tmp/diff_new_pack.erSZds/_new 2011-03-02 13:52:46.000000000 +0100 @@ -189,7 +189,7 @@ License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Group: Productivity/Office/Suite Version: 3.3.1.2 -Release: 1 +Release: 2 AutoReqProv: on # we use the tool "free" to detect the available memory and reduce the parallelism is needed # too high parallelism caused troubles in the Build Service @@ -214,6 +214,8 @@ Patch0: libreoffice-build-3.2.99.2-extensions-hack.diff Patch1: libreoffice-build-3.3.1.1-setup-native.diff Patch2: libreoffice-build-3.3.1.1-enable-kde4-support.diff +# fix audio/video playback in presentation (deb#612940, bnc#651250) +Patch3: libreoffice-build-slideshow-media-playback-bug.diff # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) Patch500: ooo-build-3.1.99.2-xulrunner-1.9.1.diff # FIXME: fix the python UNO components registration on SLED10 @@ -226,11 +228,18 @@ Patch903: officecfg-help-in-usr-share.diff # FIXME: temporary disable mono-loader build until the dependency on comphelper is removed Patch904: cli_ure-disable-mono-loader.diff +# FIXME: defuzzed diff +Patch905: piece-packimages.diff +# occasional blank first slide in presentation (fdo#34533) +Patch906: sd-blank-first-slide.diff +# non-working input methods in KDE4 (bnc#665112) +Patch907: vcl-input-methods-in-qt4.diff # FIXME: fix EMP+ import (bnc#650049) Patch960: svtools-enable-emfplus.diff Patch961: vcl-use-canvas-bool.diff Patch962: drawinglayer-metadata-decomposition.diff Patch963: canvas-polygon-access-out-of-range.diff +Patch964: canvas-cairo-edge-count-calculation.diff # # patches against the upstream sources, must be -p0 # Patch1000: bug-123456-fix-foo.diff # example @@ -254,6 +263,7 @@ %patch0 %patch1 %patch2 +%patch3 install -m 644 %{S:1} %{S:30} src/ %if 0%{?suse_version} == 01010 install -m 644 %{S:150} src/ @@ -273,11 +283,15 @@ cp %{P:902} patches/hotfixes cp %{P:903} patches/hotfixes cp %{P:904} patches/hotfixes +cp %{P:905} patches/hotfixes +cp %{P:906} patches/hotfixes +cp %{P:907} patches/hotfixes # EMF+ stuff cp %{P:960} patches/hotfixes cp %{P:961} patches/hotfixes cp %{P:962} patches/hotfixes cp %{P:963} patches/hotfixes +cp %{P:964} patches/hotfixes %endif %build ++++++ canvas-cairo-edge-count-calculation.diff ++++++ commit faf02acc88bc4d7ead617e8e4999ac717bbce31b Author: Radek Doulik <[email protected]> Date: Thu Feb 17 15:55:19 2011 +0100 fix cairo canvas edge count calculation (cherry picked from commit abb5233c0b9b584407b4696f5db2c330ca45b632) Signed-off-by: Thorsten Behrens <[email protected]> diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index bb5f6be..29cf38e 100644 --- canvas/source/cairo/cairo_canvashelper.cxx +++ canvas/source/cairo/cairo_canvashelper.cxx @@ -1065,7 +1065,7 @@ namespace cairocanvas if(nPointCount) { - const sal_uInt32 nEdgeCount(aCandidate.isClosed() ? nPointCount + 1: nPointCount); + const sal_uInt32 nEdgeCount(aCandidate.isClosed() ? nPointCount: nPointCount - 1); basegfx::B2DPolygon aEdge; aEdge.append(aCandidate.getB2DPoint(0)); aEdge.append(basegfx::B2DPoint(0.0, 0.0)); ++++++ libreoffice-build-slideshow-media-playback-bug.diff ++++++ >From 99f78609e2b81169e1ed4aa9ffa31aeadeb4ca52 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens <[email protected]> Date: Wed, 23 Feb 2011 07:44:17 +0100 Subject: [PATCH] Temp fix for slideshow media playback bug. Fixes deb#612940 and n#651250 by disabling the impress media embedding patches. Those don't pass on proper temporary file system urls to avmedia, during slideshow. --- patches/dev300/apply | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/dev300/apply b/patches/dev300/apply index c60565e..4df4ea2 100644 --- patches/dev300/apply +++ patches/dev300/apply @@ -2279,8 +2279,8 @@ transogl-crossplatform.diff, ericb [ Features ] # embed generic media files inside odf docs, plus various related # sound fixes from rodo -impressmedia-features.diff, i#83753, n#515553, thorsten -slideshow-sound.diff, n#515553, rodo +#impressmedia-features.diff, i#83753, n#515553, thorsten +#slideshow-sound.diff, n#515553, rodo [ Fixes ] vcl-gtk-process-events-on-exit.diff, rodo -- 1.6.4.2 ++++++ piece-packimages.diff ++++++ --- packimages/pack/makefile.mk.old 2010-11-11 16:35:27.000000000 +0100 +++ packimages/pack/makefile.mk 2011-02-18 19:17:04.000000000 +0100 @@ -34,18 +34,19 @@ TARGET=packimages RSCCUSTOMIMG*=$(PRJ) .INCLUDE: target.mk +IMGSRC=$(SOLARVER) IMAGES := $(COMMONBIN)$/images.zip SORTED_LIST=$(RES)$/img$/sorted.lst # Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially # (Tango fallbacks to Industrial for the missing icons) CUSTOM_IMAGE_SETS=hicontrast crystal oxygen tango classic CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i) -CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango -CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial +CUSTOM_PREFERRED_FALLBACK_1*=-c $(IMGSRC)$/ooo_custom_images$/tango +CUSTOM_PREFERRED_FALLBACK_2*=-c $(IMGSRC)$/ooo_custom_images$/industrial -CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz -OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz -CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz +CRYSTAL_TARBALL=$(IMGSRC)$/external_images$/ooo_crystal_images-1.tar.gz +OXYGEN_TARBALL=$(IMGSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz +CLASSIC_TARBALL=$(IMGSRC)$/ooo_custom_images$/classic/classic_images.tar.gz ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip @@ -58,14 +59,14 @@ $(SORTED_LIST) : image-sort.lst $(RES)$/img$/commandimagelist.ilst .PHONY : $(SORTED_LIST) @@-$(MKDIR) $(RES)$/img #+-$(RM) $@ $@.$(INPATH) - $(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(SOLARSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH) + $(FIND) $(IMGSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(IMGSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH) $(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@ $(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst - $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@ + $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@ images_% : $(RES)$/img$/commandimagelist.ilst - $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/[email protected] + $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(IMGSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/[email protected] # make sure to have one to keep packing happy $(COMMONBIN)$/images_brand.zip: @@ -73,7 +74,7 @@ $(COMMONBIN)$/images_brand.zip: # generate the HiContrast icon set $(MISC)$/hicontrast.flag .PHONY : - $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(SOLARSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@ + $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(IMGSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@ # unpack the Crystal icon set $(MISC)$/crystal.flag : $(CRYSTAL_TARBALL) ++++++ sd-blank-first-slide.diff ++++++ commit 89fe9346a5292ddb1ac19ba734034b61e4b628b2 Author: Michael Meeks <[email protected]> Date: Tue Feb 22 11:23:46 2011 +0000 fix fdo#34533 - occasional blank first slide in presentation diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 2000ae0..fa293b2 100644 --- sd/source/ui/slideshow/slideshowviewimpl.cxx +++ sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -500,7 +500,17 @@ void SlideShowView::updateimpl( ::osl::ClearableMutexGuard& rGuard, SlideshowImp if( pSlideShow ) { ::rtl::Reference< SlideshowImpl > aSLGuard( pSlideShow ); - rGuard.clear(); + + if( mbFirstPaint ) + { + mbFirstPaint = false; + SlideshowImpl* pSlideShow = mpSlideShow; + rGuard.clear(); + if( pSlideShow ) + pSlideShow->onFirstPaint(); + } else + rGuard.clear(); + pSlideShow->startUpdateTimer(); } } ++++++ vcl-input-methods-in-qt4.diff ++++++ --- vcl/unx/kde4/KDESalDisplay.cxx.old 2010-11-11 16:22:48.000000000 +0100 +++ vcl/unx/kde4/KDESalDisplay.cxx 2011-02-22 19:37:17.000000000 +0100 @@ -41,6 +41,7 @@ SalKDEDisplay::SalKDEDisplay( Display* p { assert( selfptr == NULL ); selfptr = this; + xim_protocol = XInternAtom( pDisp_, "_XIM_PROTOCOL", False ); } SalKDEDisplay::~SalKDEDisplay() @@ -65,7 +66,32 @@ void SalKDEDisplay::Yield() XEvent event; XNextEvent( pDisp_, &event ); + if( checkDirectInputEvent( &event )) + return; qApp->x11ProcessEvent( &event ); } +// HACK: When using Qt event loop, input methods (japanese, etc.) will get broken because +// of XFilterEvent() getting called twice, once by Qt, once by LO (bnc#665112). +// This function is therefore called before any XEvent is passed to Qt event handling +// and if it is a keyboard event and no Qt widget is the active window (i.e. we are +// processing events for some LO window), then feed the event only to LO directly and skip Qt +// completely. Skipped events are KeyPress, KeyRelease and also _XIM_PROTOCOL client message +// (seems to be necessary too, hopefully there are not other internal XIM messages that +// would need this handling). +bool SalKDEDisplay::checkDirectInputEvent( XEvent* ev ) +{ + if( ev->xany.type == XLIB_KeyPress || ev->xany.type == KeyRelease + || ( ev->xany.type == ClientMessage && ev->xclient.message_type == xim_protocol )) + { + if( qApp->activeWindow() == NULL ) + { + Dispatch(ev); + return true; + } + } + return false; +} + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ --- vcl/unx/kde4/KDESalDisplay.hxx.old 2010-11-11 16:22:48.000000000 +0100 +++ vcl/unx/kde4/KDESalDisplay.hxx 2011-02-22 19:37:17.000000000 +0100 @@ -41,7 +41,9 @@ class SalKDEDisplay : public SalX11Displ inline void EventGuardRelease() { osl_releaseMutex( hEventGuard_ ); } // virtual long Dispatch( XEvent *event ); virtual void Yield(); + bool checkDirectInputEvent( XEvent* ev ); private: + Atom xim_protocol; static SalKDEDisplay* selfptr; }; --- vcl/unx/kde4/KDEXLib.cxx.old 2010-12-14 17:02:02.000000000 +0100 +++ vcl/unx/kde4/KDEXLib.cxx 2011-02-22 19:37:17.000000000 +0100 @@ -205,8 +205,19 @@ static GPollFunc old_gpoll = NULL; static gint gpoll_wrapper( GPollFD*, guint, gint ); #endif +static bool ( *old_qt_event_filter )( void* ); +static bool qt_event_filter( void* m ) +{ + if( old_qt_event_filter != NULL && old_qt_event_filter( m )) + return true; + if( SalKDEDisplay::self() && SalKDEDisplay::self()->checkDirectInputEvent( static_cast< XEvent* >( m ))) + return true; + return false; +} + void KDEXLib::setupEventLoop() { + old_qt_event_filter = QAbstractEventDispatcher::instance()->setEventFilter( qt_event_filter ); #ifdef GLIB_EVENT_LOOP_SUPPORT // Glib is simple, it has g_main_context_set_poll_func() for wrapping the sleep call. // The catch is that Qt has a bug that allows triggering timers even when they should ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
