rpms/openoffice.org/devel openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch, NONE, 1.1 openoffice.org.spec, 1.1451, 1.1452
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Mar 19 13:00:48 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11607
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
Log Message:
add openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
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.1451
retrieving revision 1.1452
diff -u -r1.1451 -r1.1452
--- openoffice.org.spec 16 Mar 2008 20:49:25 -0000 1.1451
+++ openoffice.org.spec 19 Mar 2008 13:00:02 -0000 1.1452
@@ -1,6 +1,6 @@
%define oootag OOH680
%define ooomilestone 12
-%define rh_rpm_release 1
+%define rh_rpm_release 2
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -146,6 +146,7 @@
Patch73: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
Patch74: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
Patch75: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
+Patch76: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
%define instdir %{_libdir}/openoffice.org
@@ -1106,6 +1107,7 @@
%patch73 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
%patch74 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
%patch75 -p1 -b .ooo86924.sfx2.iconchanges.patch
+%patch76 -p1 -b .ooo87204.toolkit.64bitevent.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2876,6 +2878,9 @@
%changelog
+* 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
More information about the fedora-extras-commits
mailing list