packages: libreoffice/libreoffice.spec, libreoffice/libreoffice-impress-don...

[baggins]

Author: baggins                      Date: Tue Feb 15 19:32:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- BR cppunit-devel
- for unknown reasons install fails for me when it can't find QT stuff
- hack impress to return to presentation editor after exit from autoplay of .pps file

---- Files affected:
packages/libreoffice:
   libreoffice.spec (1.882 -> 1.883) , libreoffice-impress-dont-exit-after-pps-autoplay.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libreoffice/libreoffice.spec
diff -u packages/libreoffice/libreoffice.spec:1.882 packages/libreoffice/libreoffice.spec:1.883
--- packages/libreoffice/libreoffice.spec:1.882	Sat Feb  5 00:36:51 2011
+++ packages/libreoffice/libreoffice.spec	Tue Feb 15 20:31:56 2011
@@ -155,6 +155,7 @@
 # https://bugs.freedesktop.org/show_bug.cgi?id=31871
 Patch100:	%{name}-hotfix-with-lang-all.patch
 Patch101:	%{name}-hotfix-kde4.patch
+Patch102:	%{name}-impress-dont-exit-after-pps-autoplay.patch
 URL:		http://www.documentfoundation.org/
 BuildRequires:	/usr/bin/getopt
 BuildRequires:	GConf2-devel
@@ -170,6 +171,7 @@
 BuildRequires:	boost-devel >= 1.35.0
 BuildRequires:	cairo-devel >= 1.2.0
 %{?with_ccache:BuildRequires:	ccache}
+BuildRequires:	cppunit-devel >= 1.12.0
 BuildRequires:	cups-devel
 BuildRequires:	curl-devel >= 7.9.8
 %{?with_system_db:BuildRequires:	db-cxx-devel}
@@ -2566,6 +2568,7 @@
 
 ln -s %{PATCH100} patches/hotfixes/%{basename:%{PATCH100}}.diff
 ln -s %{PATCH101} patches/hotfixes/%{basename:%{PATCH101}}.diff
+ln -s %{PATCH102} patches/hotfixes/%{basename:%{PATCH102}}.diff
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
@@ -2827,6 +2830,9 @@
 	# limit to single process installation, it's safe at least
 	%{__sed} -i -e 's#^BUILD_NCPUS=.*#BUILD_NCPUS=1#g' bin/setup
 
+	export QTINC="%{_includedir}/qt"
+	export QTLIB="%{_libdir}"
+	export QT4DIR="%{_libdir}/qt4"
 	export DESTDIR=$RPM_BUILD_ROOT
 	export TMP="%{tmpdir}"
 	export TMPDIR="%{tmpdir}"
@@ -4313,6 +4319,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.883  2011/02/15 19:31:56  baggins
+- BR cppunit-devel
+- for unknown reasons install fails for me when it can't find QT stuff
+- hack impress to return to presentation editor after exit from autoplay of .pps file
+
 Revision 1.882  2011/02/04 23:36:51  sparky
 - %description <name> for correct %package
 

================================================================
Index: packages/libreoffice/libreoffice-impress-dont-exit-after-pps-autoplay.patch
diff -u /dev/null packages/libreoffice/libreoffice-impress-dont-exit-after-pps-autoplay.patch:1.1
--- /dev/null	Tue Feb 15 20:32:02 2011
+++ packages/libreoffice/libreoffice-impress-dont-exit-after-pps-autoplay.patch	Tue Feb 15 20:31:56 2011
@@ -0,0 +1,26 @@
+--- libreoffice-build-3.3.0.2/build/libreoffice-3.3.0.2/sd/source/ui/slideshow/slideshow.cxx.orig	2010-11-11 16:20:26.000000000 +0100
++++ libreoffice-build-3.3.0.2/build/libreoffice-3.3.0.2/sd/source/ui/slideshow/slideshow.cxx	2011-02-14 14:50:45.877089981 +0100
+@@ -781,23 +781,6 @@
+                 if( pViewShell->GetDoc()->IsStartWithPresentation() )
+                 {
+                     pViewShell->GetDoc()->SetStartWithPresentation( false );
+-
+-                    Reference<frame::XDispatchProvider> xProvider(pViewShell->GetViewShellBase().GetController()->getFrame(),
+-                                                                  UNO_QUERY);
+-                    if( xProvider.is() )
+-                    {
+-                        util::URL aURL;
+-                        aURL.Complete = ::rtl::OUString::createFromAscii(".uno:CloseFrame");
+-
+-                        uno::Reference< frame::XDispatch > xDispatch(
+-                            xProvider->queryDispatch(
+-                                aURL, ::rtl::OUString(), 0));
+-                        if( xDispatch.is() )
+-                        {
+-                            xDispatch->dispatch(aURL,
+-                                                uno::Sequence< beans::PropertyValue >());
+-                        }
+-                    }
+                 }
+             }
+         }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libreoffice/libreoffice.spec?r1=1.882&r2=1.883&f=u