rpms/openoffice.org/devel workspace.gcc44.patch, NONE, 1.1 openoffice.org.spec, 1.1777, 1.1778
Caolan McNamara
caolanm at fedoraproject.org
Tue Feb 3 16:52:11 UTC 2009
- Previous message: rpms/gai/devel gai-0.5.10-gnome-panel-2.25.patch,NONE,1.1
- Next message: rpms/tex-musixtex/F-9 import.log, NONE, 1.1 tex-musixtex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9639
Modified Files:
openoffice.org.spec
Added Files:
workspace.gcc44.patch
Log Message:
add workspace.gcc44.patch for gcc44
workspace.gcc44.patch:
--- NEW FILE workspace.gcc44.patch ---
Index: cppu/inc/uno/lbnames.h
===================================================================
--- cppu/inc/uno/lbnames.h (.../tags/DEV300_m36) (revision 267338)
+++ cppu/inc/uno/lbnames.h (.../cws/gcc44) (revision 267338)
@@ -65,12 +65,12 @@
#error "Tested gcc 2 versions are 2.91 and 2.95. Patch uno/lbnames.h to try your gcc 2 version."
#elif (__GNUC__ == 3 && __GNUC_MINOR__ <= 4)
#define __CPPU_ENV gcc3
-#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 3)
+#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 4)
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
#error "Tested gcc 3 version is <= 3.4. Patch uno/lbnames.h to try your gcc 3 version."
#else
-#error "Supported gcc majors are 2 , 3 and 4 <= 4.3. Unsupported gcc major version."
+#error "Supported gcc majors are 2 , 3 and 4 <= 4.4. Unsupported gcc major version."
#endif /* defined (__GNUC__) */
#endif /* defined (_MSC_VER) */
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1777
retrieving revision 1.1778
diff -u -r1.1777 -r1.1778
--- openoffice.org.spec 3 Feb 2009 15:09:08 -0000 1.1777
+++ openoffice.org.spec 3 Feb 2009 16:51:41 -0000 1.1778
@@ -136,6 +136,7 @@
Patch65: workspace.cmcfixes54.patch
Patch66: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
Patch67: openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
+Patch68: workspace.gcc44.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1424,6 +1425,7 @@
%patch65 -p1 -b .workspace.cmcfixes54.patch
%patch66 -p1 -b .gccXXXXX.solenv.javaregistration.patch
%patch67 -p1 -b .ooo98649.svtools.missingUI.patch
+%patch68 -p1 -b .workspace.gcc44.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3835,9 +3837,10 @@
unopkg list --shared > /dev/null 2>&1 || :
%changelog
-* Thu Feb 03 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.6
+* Tue Feb 03 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.6
- Resolves: rhbz#483223 openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
-- mythes-pt
+- add mythes-pt depend to pt langpack
+- add workspace.gcc44.patch for gcc44
* Sat Jan 24 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.5
- cjkunifonts-uming -> cjkuni-uming-fonts
- Previous message: rpms/gai/devel gai-0.5.10-gnome-panel-2.25.patch,NONE,1.1
- Next message: rpms/tex-musixtex/F-9 import.log, NONE, 1.1 tex-musixtex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list