rpms/openoffice.org/devel .cvsignore, 1.150.2.2, 1.150.2.3 openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.7, 1.7.2.1 openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch, 1.1.2.1, 1.1.2.2 openoffice.org.spec, 1.1440.2.15, 1.1440.2.16 sources, 1.273.2.1, 1.273.2.2 workspace.unifysound01.patch, 1.11, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Mar 12 16:41:52 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24749
Modified Files:
Tag: openoffice_org-2_4_0-9_1_999_fc9
.cvsignore openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
openoffice.org.spec sources
Removed Files:
Tag: openoffice_org-2_4_0-9_1_999_fc9
workspace.unifysound01.patch
Log Message:
m2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.150.2.2
retrieving revision 1.150.2.3
diff -u -r1.150.2.2 -r1.150.2.3
--- .cvsignore 9 Mar 2008 18:12:22 -0000 1.150.2.2
+++ .cvsignore 12 Mar 2008 16:40:53 -0000 1.150.2.3
@@ -4,4 +4,4 @@
Tigert-templates.tar.gz
unowinreg.dll
bengali.sdf
-DEV300_m1.tar.bz2
+DEV300_m2.tar.bz2
openoffice.org-2.2.0.ooo68717.gstreamer.video.patch:
Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 5 Feb 2008 16:25:54 -0000 1.7
+++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 12 Mar 2008 16:40:53 -0000 1.7.2.1
@@ -324,97 +324,9 @@
gid_File_Lib_BaseGfx,
gid_File_Lib_Sysdtrans,
gid_File_Lib_Sw,
-diff -rup sd-orig/source/ui/animations/CustomAnimationDialog.cxx sd/source/ui/animations/CustomAnimationDialog.cxx
---- sd-orig/source/ui/animations/CustomAnimationDialog.cxx 2006-08-17 15:48:52.000000000 +0200
-+++ sd/source/ui/animations/CustomAnimationDialog.cxx 2006-08-17 15:50:37.000000000 +0200
-@@ -1943,6 +1943,9 @@
- // TODO(Q3): This breaks encapsulation. Either export
- // these strings from avmedia, or provide an XManager
- // factory there
-+#ifdef GSTREAMER
-+# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
-+#else
- #ifdef WNT
- # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
- #elif defined QUARTZ
-@@ -1950,6 +1953,7 @@
- #else
- # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
- #endif
-+#endif
-
- void CustomAnimationEffectTabPage::onSoundPreview()
- {
-diff -rup sd-orig/source/ui/slideshow/slideshowimpl.cxx sd/source/ui/slideshow/slideshowimpl.cxx
---- sd-orig/source/ui/slideshow/slideshowimpl.cxx 2006-08-17 15:48:52.000000000 +0200
-+++ sd/source/ui/slideshow/slideshowimpl.cxx 2006-08-17 15:54:35.000000000 +0200
-@@ -121,6 +121,9 @@
- // TODO(Q3): This breaks encapsulation. Either export
- // these strings from avmedia, or provide an XManager
- // factory there
-+#ifdef GSTREAMER
-+# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
-+#else
- #ifdef WNT
- # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
- #elif defined QUARTZ
-@@ -128,6 +131,7 @@
- #else
- # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
- #endif
-+#endif
-
- using ::com::sun::star::uno::UNO_QUERY;
- using ::com::sun::star::uno::UNO_QUERY_THROW;
-diff -rup slideshow-orig/source/engine/soundplayer.cxx slideshow/source/engine/soundplayer.cxx
---- slideshow-orig/source/engine/soundplayer.cxx 2006-08-17 16:15:39.000000000 +0200
-+++ slideshow/source/engine/soundplayer.cxx 2006-08-17 16:17:17.000000000 +0200
-@@ -58,6 +58,9 @@
- // TODO(Q3): This breaks encapsulation. Either export
- // these strings from avmedia, or provide an XManager
- // factory there
-+#ifdef GSTREAMER
-+# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
-+#else
- #ifdef WNT
- # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
- #elif defined QUARTZ
-@@ -65,6 +68,7 @@
- #else
- # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
- #endif
-+#endif
-
-
- namespace slideshow
diff -rup slideshow-orig/source/engine/viewmediashape.cxx slideshow/source/engine/viewmediashape.cxx
--- slideshow-orig/source/engine/shapes/viewmediashape.cxx 2006-08-17 16:15:39.000000000 +0200
+++ slideshow/source/engine/shapes/viewmediashape.cxx 2006-08-17 17:26:09.000000000 +0200
-@@ -75,6 +75,16 @@
- #include "mediashape.hxx"
- #include "tools.hxx"
-
-+#ifdef GSTREAMER
-+#ifndef _SV_SYSDATA_HXX
-+#include <vcl/sysdata.hxx>
-+#endif
-+
-+// TODO(Q3): This breaks encapsulation. Either export
-+// these strings from avmedia, or provide an XManager
-+// factory there
-+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
-+#else
- #ifdef WNT
- #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
- #elif defined QUARTZ
-@@ -82,6 +92,7 @@
- #else
- #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
- #endif
-+#endif
-
- using namespace ::com::sun::star;
-
@@ -159,7 +170,11 @@
mxPlayerWindow.clear();
}
@@ -3289,3 +3201,88 @@
}
public String getLanguageString(String MSID) {
+diff -ru /usr/src/redhat/BUILD/OOF680_m18/avmedia/source/gstreamer/gstplayer.cxx source/gstreamer/gstplayer.cxx
+--- avmedia.orig/source/gstreamer/gstplayer.cxx 2007-08-07 19:50:02.000000000 +0100
++++ avmedia/source/gstreamer/gstplayer.cxx 2007-08-07 17:14:52.000000000 +0100
+@@ -67,6 +67,7 @@
+ mpPlaybin( NULL ),
+ mbFakeVideo (sal_False ),
+ mnUnmutedVolume( 0 ),
++ mbPlayPending ( false ),
+ mbMuted( false ),
+ mbLooping( false ),
+ mbInitialized( false ),
+@@ -140,6 +141,7 @@
+ case GST_MESSAGE_EOS:
+ //DBG( "EOS, reset state to NULL" );
+ gst_element_set_state( mpPlaybin, GST_STATE_READY );
++ mbPlayPending = false;
+ break;
+ case GST_MESSAGE_STATE_CHANGED:
+ if( message->src == GST_OBJECT( mpPlaybin ) ) {
+@@ -151,6 +153,9 @@
+ pendingstate == GST_STATE_VOID_PENDING &&
+ mpXOverlay )
+ gst_x_overlay_expose( mpXOverlay );
++
++ if (mbPlayPending)
++ mbPlayPending = ((newstate == GST_STATE_READY) || (newstate == GST_STATE_PAUSED));
+ }
+ default:
+ break;
+@@ -250,6 +255,7 @@
+
+ if( mpPlaybin != NULL ) {
+ gst_element_set_state( mpPlaybin, GST_STATE_NULL );
++ mbPlayPending = false;
+ g_object_unref( mpPlaybin );
+ }
+
+@@ -281,6 +287,7 @@
+ preparePlaybin( rURL, true );
+
+ gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
++ mbPlayPending = false;
+
+ bRet = true;
+ }
+@@ -305,6 +312,7 @@
+ if( mbInitialized && NULL != mpPlaybin )
+ {
+ gst_element_set_state( mpPlaybin, GST_STATE_PLAYING );
++ mbPlayPending = true;
+ }
+ }
+
+@@ -317,6 +325,7 @@
+ if( mpPlaybin )
+ gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
+
++ mbPlayPending = false;
+ DBG( "stop %p", mpPlaybin );
+ }
+
+@@ -325,10 +334,10 @@
+ sal_Bool SAL_CALL Player::isPlaying()
+ throw (uno::RuntimeException)
+ {
+- bool bRet = false;
++ bool bRet = mbPlayPending;
+
+ // return whether the pipeline is in PLAYING STATE or not
+- if( mbInitialized && mpPlaybin )
++ if( !mbPlayPending && mbInitialized && mpPlaybin )
+ {
+ bRet = GST_STATE_PLAYING == GST_STATE( mpPlaybin );
+ }
+diff -ru /usr/src/redhat/BUILD/OOF680_m18/avmedia/source/gstreamer/gstplayer.hxx source/gstreamer/gstplayer.hxx
+--- avmedia.orig/source/gstreamer/gstplayer.hxx 2007-08-07 19:50:02.000000000 +0100
++++ avmedia/source/gstreamer/gstplayer.hxx 2007-08-07 10:30:45.000000000 +0100
+@@ -101,6 +101,7 @@
+ sal_Bool mbFakeVideo;
+
+ gdouble mnUnmutedVolume;
++ sal_Bool mbPlayPending;
+ sal_Bool mbMuted;
+ sal_Bool mbLooping;
+ sal_Bool mbInitialized;
openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch:
Index: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 6 Mar 2008 19:06:15 -0000 1.1.2.1
+++ openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 12 Mar 2008 16:40:53 -0000 1.1.2.2
@@ -17,7 +17,7 @@
+ set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
+ fi
+ echo $@ | grep -q env:UNO_JAVA_JFW_INSTALL_DATA
-+ if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ];
++ if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ]; then
+ set -- $@ '-env:UNO_JAVA_JFW_INSTALL_DATA=$$ORIGIN/../share/config/javasettingsunopkginstall.xml'
+ fi
+ echo $@ | grep -q env:UserInstallation
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.15
retrieving revision 1.1440.2.16
diff -u -r1.1440.2.15 -r1.1440.2.16
--- openoffice.org.spec 11 Mar 2008 13:28:15 -0000 1.1440.2.15
+++ openoffice.org.spec 12 Mar 2008 16:40:53 -0000 1.1440.2.16
@@ -1,5 +1,5 @@
%define oootag DEV300
-%define ooomilestone 1
+%define ooomilestone 2
%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
@@ -116,31 +116,30 @@
Patch43: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
Patch44: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
Patch45: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch46: workspace.unifysound01.patch
-Patch47: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch48: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
-Patch49: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch50: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
-Patch51: openoffice.org-2.3.1.ooo81307.sw.word2.patch
-Patch52: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch53: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
-Patch54: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
-Patch55: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
-Patch56: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-Patch57: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch58: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch59: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch60: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch61: workspace.cairotext01.patch
-Patch62: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
-Patch63: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch64: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch65: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch66: workspace.cmcfixes43.patch
-Patch67: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
-Patch68: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
-Patch69: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
-Patch70: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
+Patch46: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch47: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
+Patch48: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch49: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
+Patch50: openoffice.org-2.3.1.ooo81307.sw.word2.patch
+Patch51: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch52: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
+Patch53: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+Patch54: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
+Patch55: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+Patch56: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch57: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch58: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch59: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch60: workspace.cairotext01.patch
+Patch61: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
+Patch62: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch63: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch64: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch65: workspace.cmcfixes43.patch
+Patch66: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
+Patch67: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+Patch68: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
+Patch69: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
%define instdir %{_libdir}/openoffice.org
%define OFFICEUPD 300
@@ -1074,31 +1073,30 @@
%patch43 -p1 -b .ooo79481.sw.rowordcount.patch
%patch44 -p1 -b .ooo80257.sd.textonlystyle.patch
tar xzf %{PATCH45}
-%patch46 -p1 -b .workspace.unifysound01.patch
-%patch47 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch48 -p1 -b .ooo81321.cppu.silencewarnings.patch
-%patch49 -p1 -b .ooo76649.httpencoding.patc
-%patch50 -p1 -b .ooo82966.svx.missing3d.patch
-%patch51 -p1 -b .ooo81307.sw.word2.patch
-%patch52 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch53 -p1 -b .ooo84676.ucb.davprotocol.patch
-%patch54 -p1 -b .ooo84621.sw.insertexcel.patch
-%patch55 -p1 -b .ooo85054.stlport.noorigs.patch
-%patch56 -p1 -b .ooo85097.desktop.pagein.patch
-%patch57 -p1
-%patch58 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch59 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch60 -p1 -b .ooo85448.emptyrpath.patch
-%patch61 -p1 -b .workspace.cairotext01.patch
-%patch62 -p1 -b .ooo85854.sw.graphicsaveas.patch
-%patch63 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch64 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch65 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch66 -p1 -b .workspace.cmcfixes43.patch
-%patch67 -p1 -b .ooo86588.sw.buildfix.patch
-%patch68 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
-%patch69 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
-%patch70 -p1 -b .ooo86924.sfx2.iconchanges.patch
+%patch46 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch47 -p1 -b .ooo81321.cppu.silencewarnings.patch
+%patch48 -p1 -b .ooo76649.httpencoding.patc
+%patch49 -p1 -b .ooo82966.svx.missing3d.patch
+%patch50 -p1 -b .ooo81307.sw.word2.patch
+%patch51 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch52 -p1 -b .ooo84676.ucb.davprotocol.patch
+%patch53 -p1 -b .ooo84621.sw.insertexcel.patch
+%patch54 -p1 -b .ooo85054.stlport.noorigs.patch
+%patch55 -p1 -b .ooo85097.desktop.pagein.patch
+%patch56 -p1
+%patch57 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch58 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch59 -p1 -b .ooo85448.emptyrpath.patch
+%patch60 -p1 -b .workspace.cairotext01.patch
+%patch61 -p1 -b .ooo85854.sw.graphicsaveas.patch
+%patch62 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch63 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch64 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch65 -p1 -b .workspace.cmcfixes43.patch
+%patch66 -p1 -b .ooo86588.sw.buildfix.patch
+%patch67 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
+%patch68 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
+%patch69 -p1 -b .ooo86924.sfx2.iconchanges.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1565,9 +1563,9 @@
chmod u+w *.desktop
for file in *.desktop; do
# rhbz#156067 don't version the icons
- sed -i -e s/$ICONPRODUCTVERSION//g $file
+ sed -i -e "s/$ICONPRODUCTVERSION//g" $file
# rhbz#156677 remove the version from Name=
- sed -i -e s/$LONGICONPRODUCTVERSION //g $file
+ sed -i -e "s/$LONGICONPRODUCTVERSION //g" $file
done
echo "StartupNotify=true" >> base.desktop
echo "TryExec=oobase" >> base.desktop
@@ -2868,7 +2866,7 @@
%{python_py_sitearch}/unohelper.py*
%changelog
-* Tue Mar 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.1.1
+* Wed Mar 12 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.2.1
- extend selinux bodge to ia64
- drop integrated workspace.notes2.patch
- drop integrated openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
@@ -2877,6 +2875,7 @@
- drop integrated openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
- drop integrated openoffice.org-2.4.0.ooo86123.ucb.newneon.patch
- drop subsumed openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch
+- drop integrated workspace.unifysound01.patch
- add workspace.cmcfixes43.patch
- add openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.273.2.1
retrieving revision 1.273.2.2
diff -u -r1.273.2.1 -r1.273.2.2
--- sources 7 Mar 2008 14:32:38 -0000 1.273.2.1
+++ sources 12 Mar 2008 16:40:53 -0000 1.273.2.2
@@ -4,4 +4,4 @@
e3a0b76dcd876f3d721ee7183729153d unowinreg.dll
f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz
0c0e868b34329d90a7c9a92f1704775c bengali.sdf
-46342c036e072477b43dcb25b743b88e DEV300_m1.tar.bz2
+5311182b27647f0de8b5ab86e72e75b4 DEV300_m2.tar.bz2
--- workspace.unifysound01.patch DELETED ---
More information about the fedora-extras-commits
mailing list