tags 672095 + patch pending
thanks
add patch and upload to delayed/5
diff -Nru serna-free-4.3.0.20110221/debian/changelog
serna-free-4.3.0.20110221/debian/changelog
--- serna-free-4.3.0.20110221/debian/changelog 2011-11-02 16:48:23.000000000
+0100
+++ serna-free-4.3.0.20110221/debian/changelog 2012-05-23 03:01:04.000000000
+0200
@@ -1,3 +1,10 @@
+serna-free (4.3.0.20110221-7.1) unstable; urgency=low
+
+ * Non maintainer upload
+ * Fix build failure with GCC 4.7.
+
+ -- Matthias Klose <d...@debian.org> Wed, 23 May 2012 00:50:41 +0000
+
serna-free (4.3.0.20110221-7) unstable; urgency=low
* Transition to dh_python2. Really Closes: #642567
diff -Nru serna-free-4.3.0.20110221/debian/patches/ftbfs-gcc-4.7.diff
serna-free-4.3.0.20110221/debian/patches/ftbfs-gcc-4.7.diff
--- serna-free-4.3.0.20110221/debian/patches/ftbfs-gcc-4.7.diff 1970-01-01
01:00:00.000000000 +0100
+++ serna-free-4.3.0.20110221/debian/patches/ftbfs-gcc-4.7.diff 2012-05-28
10:08:03.000000000 +0200
@@ -0,0 +1,148 @@
+Index:
serna-free-4.3.0.20110221/3rd/qtsingleapplication/2.6_1/_patches/patch-qtsingleapplication.pro
+===================================================================
+---
serna-free-4.3.0.20110221.orig/3rd/qtsingleapplication/2.6_1/_patches/patch-qtsingleapplication.pro
2011-01-31 18:35:13.000000000 +0100
++++
serna-free-4.3.0.20110221/3rd/qtsingleapplication/2.6_1/_patches/patch-qtsingleapplication.pro
2012-05-23 03:01:40.000000000 +0200
+@@ -15,3 +15,13 @@
+ +mac:CONFIG += x86 ppc
+ +
+ +include(src/qtsingleapplication.pri)
++--- ./src/qtlocalpeer.cpp.orig 2012-05-23 00:46:09.406041456 +0000
+++++ ./src/qtlocalpeer.cpp 2012-05-23 00:46:43.666040301 +0000
++@@ -58,6 +58,7 @@
++ #if defined(Q_OS_UNIX)
++ #include <time.h>
++ #endif
+++#include <unistd.h>
++
++ namespace QtLP_Private {
++ #include "qtlockedfile.cpp"
+Index: serna-free-4.3.0.20110221/sfworks/common/RefCntStorage.h
+===================================================================
+--- serna-free-4.3.0.20110221.orig/sfworks/common/RefCntStorage.h
2012-05-23 03:00:32.000000000 +0200
++++ serna-free-4.3.0.20110221/sfworks/common/RefCntStorage.h 2012-05-23
03:04:18.322068217 +0200
+@@ -46,6 +46,7 @@
+ #include <string>
+ #include <memory>
+ #include <cassert>
++#include <unistd.h>
+
+ #if defined(_MSC_VER)
+ # pragma warning (push)
+Index: serna-free-4.3.0.20110221/sfworks/common/PackedPtrSet.h
+===================================================================
+--- serna-free-4.3.0.20110221.orig/sfworks/common/PackedPtrSet.h
2011-01-31 18:35:13.000000000 +0100
++++ serna-free-4.3.0.20110221/sfworks/common/PackedPtrSet.h 2012-05-28
09:47:34.996374573 +0200
+@@ -36,6 +36,7 @@
+ #include "common/common_defs.h"
+ #include "common/common_types.h"
+ #include "common/asserts.h"
++#include <unistd.h>
+
+ COMMON_NS_BEGIN
+
+@@ -171,11 +172,11 @@
+ const T* const* constList() const { return PackedPointerSet<T>::list(); }
+ ~PackedPtrSet() { clear(); }
+
+- PackedPointerSet<T>::list;
+- PackedPointerSet<T>::isEnd;
+- PackedPointerSet<T>::isValid;
+- PackedPointerSet<T>::dump;
+- PackedPointerSet<T>::isNull;
++ using PackedPointerSet<T>::list;
++ using PackedPointerSet<T>::isEnd;
++ using PackedPointerSet<T>::isValid;
++ using PackedPointerSet<T>::dump;
++ using PackedPointerSet<T>::isNull;
+ };
+
+ COMMON_NS_END
+Index: serna-free-4.3.0.20110221/sfworks/common/SubAllocator.h
+===================================================================
+--- serna-free-4.3.0.20110221.orig/sfworks/common/SubAllocator.h
2012-05-23 03:00:32.000000000 +0200
++++ serna-free-4.3.0.20110221/sfworks/common/SubAllocator.h 2012-05-23
03:12:11.442076470 +0200
+@@ -176,7 +176,7 @@
+ void* allocate()
+ {
+ LockType lkg(*this);
+- registerAllocation(size());
++ this->registerAllocation(size());
+ if (0 != free_block_) {
+ uchar* r = free_block_;
+ free_block_ = puchar_ref(free_block_);
+@@ -207,7 +207,7 @@
+ void deallocate(void* p)
+ {
+ LockType lkg(*this);
+- registerDeallocation(p, size());
++ this->registerDeallocation(p, size());
+ puchar_ref(p) = free_block_;
+ free_block_ = reinterpret_cast<uchar*>(p);
+ }
+Index: serna-free-4.3.0.20110221/sfworks/common/AssocVector.h
+===================================================================
+--- serna-free-4.3.0.20110221.orig/sfworks/common/AssocVector.h
2011-01-31 18:35:13.000000000 +0100
++++ serna-free-4.3.0.20110221/sfworks/common/AssocVector.h 2012-05-23
03:24:41.002093350 +0200
+@@ -174,7 +174,7 @@
+ bool found(true);
+ iterator i(lower_bound(val.first));
+
+- if (i == end() || operator()(val.first, i->first)) {
++ if (i == end() || this->operator()(val.first, i->first)) {
+ i = Base::insert(i, val);
+ found = false;
+ }
+@@ -233,7 +233,7 @@
+ iterator find(const key_type& k)
+ {
+ iterator i(lower_bound(k));
+- if (i != end() && operator()(k, i->first))
++ if (i != end() && this->operator()(k, i->first))
+ i = end();
+ return i;
+ }
+@@ -241,7 +241,7 @@
+ const_iterator find(const key_type& k) const
+ {
+ const_iterator i(lower_bound(k));
+- if (i != end() && operator()(k, i->first))
++ if (i != end() && this->operator()(k, i->first))
+ i = end();
+ return i;
+ }
+Index: serna-free-4.3.0.20110221/sfworks/common/StringUtils.h
+===================================================================
+--- serna-free-4.3.0.20110221.orig/sfworks/common/StringUtils.h
2011-01-31 18:35:13.000000000 +0100
++++ serna-free-4.3.0.20110221/sfworks/common/StringUtils.h 2012-05-28
09:59:40.712390973 +0200
+@@ -365,6 +365,18 @@
+ return s.substr(sz - len, len);
+ }
+
++COMMON_EXPIMP int compare(const Char*, unsigned, const char*);
++COMMON_EXPIMP int compare(const Char*, unsigned, const Char*);
++
++COMMON_EXPIMP int compare(const char*, unsigned, const Char*);
++COMMON_EXPIMP int compare(const char*, unsigned, const char*);
++
++COMMON_EXPIMP int compare(const Char*, unsigned, const char*, unsigned);
++COMMON_EXPIMP int compare(const char*, unsigned, const Char*, unsigned);
++
++COMMON_EXPIMP int compare(const Char*, unsigned, const Char*, unsigned);
++COMMON_EXPIMP int compare(const char*, unsigned, const char*, unsigned);
++
+ template<typename E, class T, class A, class S, typename Ch> bool
+ starts_with(const flex_string<E, T, A, S>& s, const Ch* p)
+ {
+Index: serna-free-4.3.0.20110221/sfworks/xs/datatypes/FacetsContainer.h
+===================================================================
+--- serna-free-4.3.0.20110221.orig/sfworks/xs/datatypes/FacetsContainer.h
2011-01-31 18:35:13.000000000 +0100
++++ serna-free-4.3.0.20110221/sfworks/xs/datatypes/FacetsContainer.h
2012-05-28 10:08:00.000402256 +0200
+@@ -45,7 +45,7 @@
+ template <class T> class FacetsContainer : public
std::list<COMMON_NS::RefCntPtr<T> >
+ {
+ public:
+- void insert(T* obj) { push_back(obj); }
++ void insert(T* obj) { this->push_back(obj); }
+
+ };
+
diff -Nru serna-free-4.3.0.20110221/debian/patches/series
serna-free-4.3.0.20110221/debian/patches/series
--- serna-free-4.3.0.20110221/debian/patches/series 2011-11-02
16:46:37.000000000 +0100
+++ serna-free-4.3.0.20110221/debian/patches/series 2012-05-23
03:01:19.000000000 +0200
@@ -26,3 +26,4 @@
0026-Revert-patch-for-qscintilla.patch
0027-python-version-is-important-here.patch
0028-Use-bash-instead-of-sh.patch
+ftbfs-gcc-4.7.diff
diff -Nru serna-free-4.3.0.20110221/debian/rules
serna-free-4.3.0.20110221/debian/rules
--- serna-free-4.3.0.20110221/debian/rules 2011-11-02 16:47:32.000000000
+0100
+++ serna-free-4.3.0.20110221/debian/rules 2012-05-23 04:14:24.000000000
+0200
@@ -1,4 +1,5 @@
#!/usr/bin/make -f
+
%:
dh $@ --with python2
