drop rhel6 limits patch

f41
Caolán McNamara 11 years ago
parent 447b26a022
commit eb0642b865

@ -1,13 +0,0 @@
--- a/basic/source/classes/propacc.cxx 2013-02-11 12:23:01.571839617 +0000
+++ b/basic/source/classes/propacc.cxx 2013-02-11 12:23:04.808850284 +0000
@@ -21,8 +21,9 @@
#include "propacc.hxx"
#include <basic/sbstar.hxx>
-#include <sbunoobj.hxx>
#include <basic/sbuno.hxx>
+#include <sbunoobj.hxx>
+#include <limits.h>
using com::sun::star::uno::Reference;
using namespace com::sun::star;

@ -258,10 +258,9 @@ Patch6: libreoffice-installfix.patch
Patch7: libreoffice-rhel6gcj.patch
Patch8: libreoffice-rhel6poppler.patch
Patch9: libreoffice-rhel6langs.patch
Patch10: libreoffice-rhel6limits.patch
Patch11: libreoffice-rhel6glib.patch
Patch10: libreoffice-rhel6glib.patch
%endif
Patch12: 0001-Related-rhbz-1032774-bodge-around-reported-NULL-valu.patch
Patch11: 0001-Related-rhbz-1032774-bodge-around-reported-NULL-valu.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@ -993,10 +992,9 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch7 -p1 -b .rhel6gcj.patch
%patch8 -p1 -b .rhel6poppler.patch
%patch9 -p1 -b .rhel6langs.patch
%patch10 -p1 -b .rhel6limits.patch
%patch11 -p1 -b .rhel6glib.patch
%patch10 -p1 -b .rhel6glib.patch
%endif
%patch12 -p1 -b .rhbz-1032774-bodge-around-reported-NULL-valu.patch
%patch11 -p1 -b .rhbz-1032774-bodge-around-reported-NULL-valu.patch
# TODO: check this
# these are horribly incomplete--empty translations and copied english

Loading…
Cancel
Save