[Python-modules-commits] r13449 - in packages/shiboken/trunk/debian (3 files)
odyx-guest at users.alioth.debian.org
odyx-guest at users.alioth.debian.org
Wed Jun 16 17:07:19 UTC 2010
Date: Wednesday, June 16, 2010 @ 17:07:04
Author: odyx-guest
Revision: 13449
Fix the Hurd FTBFS by importing u_4bab9a8_fix_Hurd_FTBFS.patch from
upstream.
Added:
packages/shiboken/trunk/debian/patches/u_4bab9a8_fix_Hurd_FTBFS.patch
Modified:
packages/shiboken/trunk/debian/changelog
packages/shiboken/trunk/debian/patches/series
Modified: packages/shiboken/trunk/debian/changelog
===================================================================
--- packages/shiboken/trunk/debian/changelog 2010-06-16 14:03:20 UTC (rev 13448)
+++ packages/shiboken/trunk/debian/changelog 2010-06-16 17:07:04 UTC (rev 13449)
@@ -1,3 +1,10 @@
+shiboken (0.3.2-2) unstable; urgency=low
+
+ * Fix the Hurd FTBFS by importing u_4bab9a8_fix_Hurd_FTBFS.patch from
+ upstream.
+
+ -- Didier Raboud <didier at raboud.com> Wed, 16 Jun 2010 19:06:09 +0200
+
shiboken (0.3.2-1) unstable; urgency=low
* New 0.3.2 upstream release
Modified: packages/shiboken/trunk/debian/patches/series
===================================================================
--- packages/shiboken/trunk/debian/patches/series 2010-06-16 14:03:20 UTC (rev 13448)
+++ packages/shiboken/trunk/debian/patches/series 2010-06-16 17:07:04 UTC (rev 13449)
@@ -1,2 +1,3 @@
+u_4bab9a8_fix_Hurd_FTBFS.patch
use_original_sparsehash.patch
fix_tests.patch
Added: packages/shiboken/trunk/debian/patches/u_4bab9a8_fix_Hurd_FTBFS.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/u_4bab9a8_fix_Hurd_FTBFS.patch (rev 0)
+++ packages/shiboken/trunk/debian/patches/u_4bab9a8_fix_Hurd_FTBFS.patch 2010-06-16 17:07:04 UTC (rev 13449)
@@ -0,0 +1,174 @@
+From 4bab9a89c8a0bd22b1a95e46cf75d9e2dd7f42e1 Mon Sep 17 00:00:00 2001
+From: Hugo Parente Lima <hugo.lima at openbossa.org>
+Date: Mon, 14 Jun 2010 15:03:29 -0300
+Subject: [PATCH] Fix problems on MacOSX due to uninitialized variables and mixing of int, uint and ulong variables.
+
+Reviewer: Marcelo Lira <marcelo.lira at openbossa.org>
+ Luciano Wolf <luciano.wolf at openbossa.org>
+---
+ tests/libother/otherobjecttype.cpp | 4 ++--
+ tests/libother/otherobjecttype.h | 2 +-
+ tests/libsample/bucket.cpp | 4 ++++
+ tests/libsample/bucket.h | 3 ++-
+ tests/libsample/collector.cpp | 22 +++++-----------------
+ tests/libsample/collector.h | 7 +++----
+ tests/libsample/echo.h | 6 ++++++
+ 7 files changed, 23 insertions(+), 25 deletions(-)
+
+Index: shiboken/tests/libother/otherobjecttype.cpp
+===================================================================
+--- shiboken.orig/tests/libother/otherobjecttype.cpp 2010-06-03 16:11:20.000000000 +0200
++++ shiboken/tests/libother/otherobjecttype.cpp 2010-06-16 19:04:17.000000000 +0200
+@@ -35,8 +35,8 @@
+ #include "otherobjecttype.h"
+
+ Collector&
+-operator<<(Collector& collector, OtherObjectType& obj)
++operator<<(Collector& collector, const OtherObjectType& obj)
+ {
+- collector << static_cast<int>(obj.identifier()*2);
++ collector << obj.identifier()*2;
+ return collector;
+ }
+Index: shiboken/tests/libother/otherobjecttype.h
+===================================================================
+--- shiboken.orig/tests/libother/otherobjecttype.h 2010-06-03 16:11:20.000000000 +0200
++++ shiboken/tests/libother/otherobjecttype.h 2010-06-16 19:04:17.000000000 +0200
+@@ -49,7 +49,7 @@
+ };
+
+
+-LIBOTHER_API Collector& operator<<(Collector&, OtherObjectType&);
++LIBOTHER_API Collector& operator<<(Collector&, const OtherObjectType&);
+
+ #endif // OTHEROBJECTTYPE_H
+
+Index: shiboken/tests/libsample/bucket.cpp
+===================================================================
+--- shiboken.orig/tests/libsample/bucket.cpp 2010-06-03 16:11:20.000000000 +0200
++++ shiboken/tests/libsample/bucket.cpp 2010-06-16 19:04:17.000000000 +0200
+@@ -37,6 +37,10 @@
+
+ using namespace std;
+
++Bucket::Bucket() : m_locked(false)
++{
++}
++
+ void Bucket::push(int x)
+ {
+ m_data.push_back(x);
+Index: shiboken/tests/libsample/bucket.h
+===================================================================
+--- shiboken.orig/tests/libsample/bucket.h 2010-06-03 16:11:20.000000000 +0200
++++ shiboken/tests/libsample/bucket.h 2010-06-16 19:04:17.000000000 +0200
+@@ -41,9 +41,10 @@
+
+ class ObjectType;
+
+-class LIBSAMPLE_API Bucket: public ObjectType
++class LIBSAMPLE_API Bucket : public ObjectType
+ {
+ public:
++ Bucket();
+ void push(int);
+ int pop();
+ bool empty();
+Index: shiboken/tests/libsample/collector.cpp
+===================================================================
+--- shiboken.orig/tests/libsample/collector.cpp 2010-06-03 16:11:20.000000000 +0200
++++ shiboken/tests/libsample/collector.cpp 2010-06-16 19:04:18.000000000 +0200
+@@ -34,41 +34,29 @@
+
+ #include "collector.h"
+
+-void
+-Collector::clear()
++void Collector::clear()
+ {
+ m_items.clear();
+ }
+
+-Collector&
+-Collector::operator<<(unsigned int item)
++Collector& Collector::operator<<(unsigned long item)
+ {
+ m_items.push_back(item);
+ return *this;
+ }
+
+-Collector&
+-Collector::operator<<(signed int item)
+-{
+- m_items.push_back(item);
+- return *this;
+-}
+-
+-Collector&
+-Collector::operator<<(const ObjectType *obj)
++Collector& Collector::operator<<(const ObjectType *obj)
+ {
+ m_items.push_back(obj->identifier());
+ return *this;
+ }
+
+-std::list<int>
+-Collector::items()
++std::list<unsigned long> Collector::items()
+ {
+ return m_items;
+ }
+
+-int
+-Collector::size()
++int Collector::size()
+ {
+ return (int) m_items.size();
+ }
+Index: shiboken/tests/libsample/collector.h
+===================================================================
+--- shiboken.orig/tests/libsample/collector.h 2010-06-03 16:11:20.000000000 +0200
++++ shiboken/tests/libsample/collector.h 2010-06-16 19:04:18.000000000 +0200
+@@ -48,16 +48,15 @@
+
+ void clear();
+
+- Collector& operator<<(unsigned int item);
+- Collector& operator<<(signed int item);
++ Collector& operator<<(unsigned long item);
+
+ Collector& operator<<(const ObjectType *);
+
+- std::list<int> items();
++ std::list<unsigned long> items();
+ int size();
+
+ private:
+- std::list<int> m_items;
++ std::list<unsigned long> m_items;
+
+ Collector(const Collector&);
+ Collector& operator=(const Collector&);
+Index: shiboken/tests/libsample/echo.h
+===================================================================
+--- shiboken.orig/tests/libsample/echo.h 2010-06-03 16:11:20.000000000 +0200
++++ shiboken/tests/libsample/echo.h 2010-06-16 19:04:18.000000000 +0200
+@@ -37,12 +37,18 @@
+
+ #include "libsamplemacros.h"
+
++class ObjectType;
++
+ class LIBSAMPLE_API Echo
+ {
+ public:
+ Echo(){}
+ ~Echo(){}
+
++ // These method are here just for compilation test purposes
++ Echo& operator<<(unsigned int item) { return *this; }
++ Echo& operator<<(signed int item) { return *this; }
++ Echo& operator<<(const ObjectType* item) { return *this; }
+ };
+
+ #endif
More information about the Python-modules-commits
mailing list