diff -Nru mediatomb-0.12.1/debian/changelog mediatomb-0.12.1/debian/changelog --- mediatomb-0.12.1/debian/changelog 2011-11-24 07:55:08.000000000 +0000 +++ mediatomb-0.12.1/debian/changelog 2012-10-05 09:04:35.000000000 +0000 @@ -1,3 +1,9 @@ +mediatomb (0.12.1-0ubuntu5) quantal; urgency=low + + * import gcc_4.{6,7}_support.patch from debian + + -- Julian Taylor Fri, 05 Oct 2012 11:04:25 +0200 + mediatomb (0.12.1-0ubuntu4) precise; urgency=low * Rebuild for libmysqlclient transition diff -Nru mediatomb-0.12.1/debian/patches/gcc_4.6_support.patch mediatomb-0.12.1/debian/patches/gcc_4.6_support.patch --- mediatomb-0.12.1/debian/patches/gcc_4.6_support.patch 1970-01-01 00:00:00.000000000 +0000 +++ mediatomb-0.12.1/debian/patches/gcc_4.6_support.patch 2012-10-05 08:56:29.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Fix a FTBFS when using gcc-4.6 +Origin: other, http://pkgs.fedoraproject.org/gitweb/?p=mediatomb.git;a=commitdiff;h=ff59631d +Bug-Debian: http://bugs.debian.org/624921 +Forwarded: http://sourceforge.net/tracker/?func=detail&aid=3173314&group_id=129766&atid=715782 +Last-Update: 2012-03-03 + +--- a/src/zmm/object.h ++++ b/src/zmm/object.h +@@ -32,6 +32,7 @@ + #ifndef __ZMM_OBJECT_H__ + #define __ZMM_OBJECT_H__ + ++#include "stddef.h" //for size_t + #include // for size_t + #include + #include "atomic.h" diff -Nru mediatomb-0.12.1/debian/patches/gcc_4.7_support.patch mediatomb-0.12.1/debian/patches/gcc_4.7_support.patch --- mediatomb-0.12.1/debian/patches/gcc_4.7_support.patch 1970-01-01 00:00:00.000000000 +0000 +++ mediatomb-0.12.1/debian/patches/gcc_4.7_support.patch 2012-10-05 08:56:20.000000000 +0000 @@ -0,0 +1,121 @@ +Description: Fix a FTBFS when using gcc-4.7 +Origin: other, http://pkgs.fedoraproject.org/gitweb/?p=mediatomb.git;a=commitdiff;h=b96e8410 +Last-Update: 2012-03-03 + +diff -up ./src/hash/dbo_hash.h.gcc47 ./src/hash/dbo_hash.h +--- ./src/hash/dbo_hash.h.gcc47 2012-01-14 11:55:22.520261056 -0500 ++++ ./src/hash/dbo_hash.h 2012-01-14 12:01:48.965302982 -0500 +@@ -106,7 +106,7 @@ public: + inline bool remove(KT key) + { + struct dbo_hash_slot *slot; +- if (! search(key, &slot)) ++ if (! this->search(key, &slot)) + return false; + slot->key = deletedKey; + slot->value->release(); +@@ -136,7 +136,7 @@ public: + inline void put(KT key, zmm::Ref value) + { + struct dbo_hash_slot *slot; +- search(key, &slot); ++ this->search(key, &slot); + put(key, (hash_slot_t)slot, value); + } + void put(KT key, hash_slot_t destSlot, zmm::Ref value) +@@ -162,7 +162,7 @@ public: + inline zmm::Ref get(KT key) + { + struct dbo_hash_slot *slot; +- bool found = search(key, &slot); ++ bool found = this->search(key, &slot); + if (found) + return zmm::Ref(slot->value); + else +@@ -174,7 +174,7 @@ public: + inline zmm::Ref get(KT key, hash_slot_t *destSlot) + { + struct dbo_hash_slot **slot = (struct dbo_hash_slot **)destSlot; +- bool found = search(key, slot); ++ bool found = this->search(key, slot); + if (found) + return zmm::Ref((*slot)->value); + else +diff -up ./src/hash/dbr_hash.h.gcc47 ./src/hash/dbr_hash.h +--- ./src/hash/dbr_hash.h.gcc47 2012-01-14 12:04:43.464643618 -0500 ++++ ./src/hash/dbr_hash.h 2012-01-14 12:05:24.111120552 -0500 +@@ -124,7 +124,7 @@ public: + inline bool remove(KT key) + { + struct dbr_hash_slot *slot; +- if (! search(key, &slot)) ++ if (! this->search(key, &slot)) + return false; + slot->key = deletedKey; + int array_slot = slot->array_slot; +@@ -134,7 +134,7 @@ public: + return true; + } + data_array[array_slot] = data_array[--this->count]; +- if (! search(data_array[array_slot], &slot)) ++ if (! this->search(data_array[array_slot], &slot)) + { + log_debug("DBR-Hash-Error: (%d; array_slot=%d; count=%d)\n", data_array[array_slot], array_slot, this->count); + throw zmm::Exception(_("DBR-Hash-Error: key in data_array not found in hashtable")); +@@ -146,7 +146,7 @@ public: + inline void put(KT key) + { + struct dbr_hash_slot *slot; +- if (! search(key, &slot)) ++ if (! this->search(key, &slot)) + { + #ifdef TOMBDEBUG + if (this->count >= realCapacity) +@@ -194,7 +194,7 @@ public: + inline bool exists(KT key) + { + struct dbr_hash_slot *slot; +- return search(key, &slot); ++ return this->search(key, &slot); + } + + /* +diff -up ./src/hash/dso_hash.h.gcc47 ./src/hash/dso_hash.h +--- ./src/hash/dso_hash.h.gcc47 2012-01-14 12:13:50.755582375 -0500 ++++ ./src/hash/dso_hash.h 2012-01-14 12:14:42.511463035 -0500 +@@ -100,7 +100,7 @@ public: + inline bool remove(zmm::String key) + { + struct dso_hash_slot *slot; +- if (! search(key, &slot)) ++ if (! this->search(key, &slot)) + return false; + slot->key->release(); + slot->value->release(); +@@ -112,7 +112,7 @@ public: + inline void put(zmm::String key, zmm::Ref value) + { + struct dso_hash_slot *slot; +- search(key, &slot); ++ this->search(key, &slot); + put(key, (hash_slot_t)slot, value); + } + void put(zmm::String key, hash_slot_t destSlot, zmm::Ref value) +@@ -141,7 +141,7 @@ public: + inline zmm::Ref get(zmm::String key) + { + struct dso_hash_slot *slot; +- bool found = search(key, &slot); ++ bool found = this->search(key, &slot); + if (found) + return zmm::Ref(slot->value); + else +@@ -153,7 +153,7 @@ public: + inline zmm::Ref get(zmm::String key, hash_slot_t *destSlot) + { + struct dso_hash_slot **slot = (struct dso_hash_slot **)destSlot; +- bool found = search(key, slot); ++ bool found = this->search(key, slot); + if (found) + return zmm::Ref((*slot)->value); + else diff -Nru mediatomb-0.12.1/debian/patches/series mediatomb-0.12.1/debian/patches/series --- mediatomb-0.12.1/debian/patches/series 2011-10-16 22:10:52.000000000 +0000 +++ mediatomb-0.12.1/debian/patches/series 2012-10-05 08:56:20.000000000 +0000 @@ -4,3 +4,5 @@ mediatomb-0.12.1-gcc46.patch libav_0.7_support.patch fix-ffmpeg-metadata.patch +gcc_4.6_support.patch +gcc_4.7_support.patch