[xqilla] fix FTBFS with GCC 4.7 (RHBZ #817274)
Haïkel Guémar
hguemar at fedoraproject.org
Sat Apr 28 17:09:18 UTC 2012
commit 4073beb0512608b026d24e39eba2aa9f692ae386
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date: Sat Apr 28 18:12:53 2012 +0200
fix FTBFS with GCC 4.7 (RHBZ #817274)
xqilla-2.2.4-gcc47.patch | 16 ++++++++++++++++
xqilla.spec | 8 +++++++-
2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/xqilla-2.2.4-gcc47.patch b/xqilla-2.2.4-gcc47.patch
new file mode 100644
index 0000000..6e5a555
--- /dev/null
+++ b/xqilla-2.2.4-gcc47.patch
@@ -0,0 +1,16 @@
+@@ -, +, @@
+ src/items/DatatypeFactoryTemplate.hpp | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+--- a/src/items/DatatypeFactoryTemplate.hpp
++++ a/src/items/DatatypeFactoryTemplate.hpp
+@@ -79,8 +79,8 @@ public:
+ AnyAtomicType::Ptr createInstance(const XMLCh* value,
+ const DynamicContext* context) const
+ {
+- return createInstanceNoCheck(DatatypeFactoryTemplate<TYPE>::getPrimitiveTypeURI(),
+- DatatypeFactoryTemplate<TYPE>::getPrimitiveTypeName(), value, context);
++ return this->createInstanceNoCheck(DatatypeFactoryTemplate<TYPE>::getPrimitiveTypeURI(),
++ DatatypeFactoryTemplate<TYPE>::getPrimitiveTypeName(), value, context);
+ }
+
+ bool checkInstance(const XMLCh* value,
diff --git a/xqilla.spec b/xqilla.spec
index c49af68..1f48578 100644
--- a/xqilla.spec
+++ b/xqilla.spec
@@ -1,6 +1,6 @@
Name: xqilla
Version: 2.2.4
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: XQuery and XPath 2.0 library, built on top of Xerces-C
Group: System Environment/Libraries
@@ -13,6 +13,8 @@ Source1: xqilla.1
Patch0: xqilla-2.2.4-gcc46.patch
# since header xqc.h is provided by xqc
Patch1: xqilla-2.2.4-use-system-xqc.h.patch
+# RHBZ #817274
+Patch2: xqilla-2.2.4-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: xerces-c-devel >= 3.0.1
@@ -50,6 +52,7 @@ simple-api and dom3-api documentation for XQilla.
%setup -qn XQilla-%{version}
%patch0 -p1 -b .gcc46
%patch1 -p1 -b .xqc
+%patch2 -p1 -b .gcc47
%build
# ensure that xqc.h is not used
@@ -97,6 +100,9 @@ rm -rf %{buildroot}
%changelog
+* Sat Apr 28 2012 Haïkel Guémar <hguemar at fedoraproject.org> - 2.2.4-5
+- fix FTBFS with GCC 4.7 (RHBZ #817274)
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.4-4
- Rebuilt for c++ ABI breakage
More information about the scm-commits
mailing list