[libreoffice] fix build
David Tardon
dtardon at fedoraproject.org
Fri Jan 6 09:18:18 UTC 2012
commit c34d15ef1139a84cc6d1c54623e4c4523eb7154a
Author: David Tardon <dtardon at redhat.com>
Date: Fri Jan 6 10:18:10 2012 +0100
fix build
0001-gcc-trunk-avoid-confusion.patch | 26 ++++++++++++++++++++++++++
libreoffice.spec | 2 ++
2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/0001-gcc-trunk-avoid-confusion.patch b/0001-gcc-trunk-avoid-confusion.patch
new file mode 100644
index 0000000..7b59ee6
--- /dev/null
+++ b/0001-gcc-trunk-avoid-confusion.patch
@@ -0,0 +1,26 @@
+From eca998dc1dc874415794a27336d5db1679ef69b8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan at gmail.com>
+Date: Sat, 17 Dec 2011 13:29:50 +0100
+Subject: [PATCH] gcc-trunk: avoid confusion
+
+Signed-off-by: David Tardon <dtardon at redhat.com>
+---
+ svtools/source/graphic/graphic.hxx | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/svtools/source/graphic/graphic.hxx b/svtools/source/graphic/graphic.hxx
+index 7b4f5e0..a1efca0 100644
+--- a/svtools/source/graphic/graphic.hxx
++++ b/svtools/source/graphic/graphic.hxx
+@@ -58,7 +58,7 @@ public:
+ Graphic();
+ ~Graphic() throw();
+
+- using unographic::GraphicDescriptor::init;
++ using ::unographic::GraphicDescriptor::init;
+ void init( const ::Graphic& rGraphic ) throw();
+
+ static const ::Graphic* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
+--
+1.7.7.5
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 12f2cea..277ac84 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -112,6 +112,7 @@ Patch12: libreoffice-rhel6poppler.patch
%endif
Patch13: 0001-fix-syntactic-error.patch
Patch14: 0001-gcc-trunk-fix-error-unable-to-find-string-literal-op.patch
+Patch15: 0001-gcc-trunk-avoid-confusion.patch
# TODO: this in S390 only, so it can wait .-)
#Patch13: solenv.fix.mk.inheritance.patch
@@ -760,6 +761,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%endif
%patch13 -p1 -b .fix-syntactic-error.patch
%patch14 -p1 -b .gcc-trunk-fix-error-unable-to-find-string-literal-op.patch
+%patch15 -p1 -b .gcc-trunk-avoid-confusion.patch
#%patch13 -p1 -b .solenv.fix.mk.inheritance.patch
# TODO: check this
More information about the scm-commits
mailing list