[stardict/f15] add patch from Jiri Skala to fix gcc46 build failure (#704248)
Karsten Hopp
karsten at fedoraproject.org
Thu May 19 09:53:37 UTC 2011
commit 7194bb305429d7326f7b1aecf92796dac5c71f6c
Author: Karsten Hopp <karsten at redhat.com>
Date: Thu May 19 11:52:48 2011 +0200
add patch from Jiri Skala to fix gcc46 build failure (#704248)
stardict-3.0.1-gcc46.patch | 11 +++++++++++
stardict.spec | 7 ++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/stardict-3.0.1-gcc46.patch b/stardict-3.0.1-gcc46.patch
new file mode 100644
index 0000000..265f253
--- /dev/null
+++ b/stardict-3.0.1-gcc46.patch
@@ -0,0 +1,11 @@
+diff -up stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/scene.hpp.gcc46 stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/scene.hpp
+--- stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/scene.hpp.gcc46 2011-05-19 11:50:58.000000000 +0200
++++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/scene.hpp 2011-05-19 11:51:19.000000000 +0200
+@@ -9,6 +9,7 @@
+ #include "partic.hpp"
+ #include "spring.hpp"
+
++#include <cstddef>
+ #include <vector>
+ using namespace std;
+
diff --git a/stardict.spec b/stardict.spec
index 44c6ecc..96e3ae9 100644
--- a/stardict.spec
+++ b/stardict.spec
@@ -4,7 +4,7 @@
Name: %{name}
Summary: A powerful dictionary platform written in GTK+2
Version: %{version}
-Release: 23%{?dist}
+Release: 23.1%{?dist}
Group: Applications/System
License: GPLv3
URL: http://stardict.sourceforge.net
@@ -16,6 +16,7 @@ Patch2: stardict-3.0.1-10.gucharmap.patch
Patch3: stardict-3.0.1-13.bz441209.patch
Patch4: stardict-3.0.1.gcc44.patch
Patch5: stardict-3.0.1-20.security.patch
+Patch6: stardict-3.0.1-gcc46.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: enchant, espeak, gucharmap >= 2.22.1, libbonobo >= 2.2.0, libgnome >= 2.2.0, libgnomeui >= 2.2.0, libsigc++20 >= 2.0.17
@@ -46,6 +47,7 @@ It has powerful features such as "Glob-style pattern matching,"
%patch3 -p1 -b .4-bz441209
%patch4 -b .5-gcc44
%patch5 -p1 -b .6-netdict
+%patch6 -p1 -b .7.gcc46ct
# Remove unneeded sigc++ header files to make it sure
# that we are using system-wide libsigc++
@@ -112,6 +114,9 @@ if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
%changelog
+* Thu May 19 2011 Karsten Hopp <karsten at redhat.com> 3.0.1-23.1
+- add patch from Jiri Skala to fix gcc46 build failure (#704248)
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list