rpms/openoffice.org/devel openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch, NONE, 1.1.2.1 openoffice.org.spec, 1.1440.2.27, 1.1440.2.28

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17761

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org.spec 
Added Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch 
Log Message:
sync

openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch:

--- NEW FILE openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch ---
Index: source/awt/vclxwindow.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/vclxwindow.cxx,v
retrieving revision 1.85
diff -u -r1.85 vclxwindow.cxx
--- openoffice.org.orig/toolkit/source/awt/vclxwindow.cxx	29 Jan 2008 15:05:41 -0000	1.85
+++ openoffice.org/toolkit/source/awt/vclxwindow.cxx	19 Mar 2008 12:48:55 -0000
@@ -289,7 +289,7 @@
 #else
 #if !defined( SYNCHRON_NOTIFICATION )
     EventArray                          maEvents;
-    sal_Int32                           mnEventId;
+    ULONG                               mnEventId;
 #endif
 #endif
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.27
retrieving revision 1.1440.2.28
diff -u -r1.1440.2.27 -r1.1440.2.28
--- openoffice.org.spec	16 Mar 2008 20:20:59 -0000	1.1440.2.27
+++ openoffice.org.spec	19 Mar 2008 13:03:27 -0000	1.1440.2.28
@@ -138,6 +138,7 @@
 Patch65: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
 Patch66: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
 Patch67: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
+Patch68: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
 
 %define instdir %{_libdir}/openoffice.org
 %define OFFICEUPD 300
@@ -1103,6 +1104,7 @@
 %patch65 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
 %patch66 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
 %patch67 -p1 -b .ooo86924.sfx2.iconchanges.patch
+%patch68 -p1 -b .ooo87204.toolkit.64bitevent.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2932,6 +2934,12 @@
 - add workspace.cmcfixes43.patch
 - add the report-builder
 
+* Wed Mar 19 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.2
+- add openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
+
+* Sun Mar 16 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.1
+- yet another release candidate
+
 * Thu Mar 13 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-11.1
 - next release candidate
 - Resolves: rhbz#429632 add openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
@@ -2943,6 +2951,13 @@
 - drop integrated openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
 - Resolves: rhbz#436518 add openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
 
+* Sun Mar 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-10.1
+- next release candidate
+- rhbz#293791 Restore draw back to the menus and revert to upstream app names
+- drop integrated openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
+- Resolves: rhbz#436518 add openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+
+>>>>>>> 1.1452
 * Thu Mar 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-9.1
 - next release candidate