[koffice] + libmso_buildfix patch
Rex Dieter
rdieter at fedoraproject.org
Sat Oct 2 17:57:48 UTC 2010
commit 1b66fd9c9d10693c73fdfc1193b741184a9837a2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sat Oct 2 13:03:19 2010 -0500
+ libmso_buildfix patch
.gitignore | 1 -
koffice-2.2.82-libmso_buildfix.patch | 21 +++++++++++++++++++++
koffice.spec | 10 ++++++++--
sources | 1 -
4 files changed, 29 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8ff1c90..e69de29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +0,0 @@
-/koffice-2.2.81.tar.bz2
diff --git a/koffice-2.2.82-libmso_buildfix.patch b/koffice-2.2.82-libmso_buildfix.patch
new file mode 100644
index 0000000..1341982
--- /dev/null
+++ b/koffice-2.2.82-libmso_buildfix.patch
@@ -0,0 +1,21 @@
+diff -up koffice-2.2.82/filters/libmso/ODrawToOdf.cpp.buildfix koffice-2.2.82/filters/libmso/ODrawToOdf.cpp
+--- koffice-2.2.82/filters/libmso/ODrawToOdf.cpp.buildfix 2010-10-01 07:03:06.000000000 -0500
++++ koffice-2.2.82/filters/libmso/ODrawToOdf.cpp 2010-10-02 12:54:18.913481804 -0500
+@@ -105,6 +105,8 @@ void ODrawToOdf::addGraphicStyleToDrawEl
+ const OfficeArtDggContainer* drawingGroup = 0;
+ const OfficeArtSpContainer* master = 0;
+
++ KoGenStyle style;
++
+ if (client) {
+ style = client->createGraphicStyle(o.clientTextbox.data(),
+ o.clientData.data(), out);
+@@ -120,7 +122,7 @@ void ODrawToOdf::addGraphicStyleToDrawEl
+ master = client->getMasterShapeContainer(spid);
+ }
+ }
+- KoGenStyle style;
++
+ const DrawStyle ds(*drawingGroup, master, &o);
+ defineGraphicProperties(style, ds, out.styles);
+
diff --git a/koffice.spec b/koffice.spec
index 16b5458..80a3648 100644
--- a/koffice.spec
+++ b/koffice.spec
@@ -20,8 +20,8 @@
Name: koffice
Epoch: 3
-Version: 2.2.81
-Release: 2%{?dist}
+Version: 2.2.82
+Release: 1%{?dist}
Summary: An integrated office suite
Group: Applications/Productivity
@@ -32,6 +32,7 @@ Source0: http://download.kde.org/stable/koffice-%{version}/koffice-%{vers
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
+Patch50: koffice-2.2.82-libmso_buildfix.patch
## upstream patches
@@ -492,6 +493,8 @@ Requires: libxml2-devel
%prep
%setup -q
+%patch50 -p1 -b .libmso_buildfix
+
## kdchart munging begin
pushd plugins/chartshape/kdchart
mv src kdchart
@@ -1203,6 +1206,9 @@ fi
%changelog
+* Sat Oct 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.2.82-1
+- koffice-2.2.82
+
* Thu Sep 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.2.81-2
- rebuild (poppler)
diff --git a/sources b/sources
index d87882d..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-cc06705b644552e3a87c2e5fc7eedb18 koffice-2.2.81.tar.bz2
More information about the scm-commits
mailing list