[Python-modules-commits] r13103 - in packages/shiboken/trunk/debian (3 files)

[odyx-guest at users.alioth.debian.org]

    Date: Thursday, May 27, 2010 @ 15:59:05
  Author: odyx-guest
Revision: 13103

Add upstream patch to fix 3 release arches FTBFSes

Added:
  packages/shiboken/trunk/debian/patches/u_ftbfs_missing_file_44071543.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-05-27 11:31:12 UTC (rev 13102)
+++ packages/shiboken/trunk/debian/changelog	2010-05-27 15:59:05 UTC (rev 13103)
@@ -1,11 +1,15 @@
-shiboken (0.3.1-2) UNRELEASED; urgency=low
+shiboken (0.3.1-2) unstable; urgency=low
 
   * shiboken depends on generatorrunner (Closes: #581215)
 
-  * Fix FTBFSes on mips{,el} by adding ftbfs_mips.patch
-    - Uses hash-style=both on all arches.
+  * Fix various FTBFSes:
+    - On mips{,el} by adding ftbfs_mips.patch to use
+      hash-style=both on all arches.
+    - On ia64, powerpc and s390 by stealing
+      u_ftbfs_missing_file_44071543.patch from upstream to fix
+      declaration of class SimpleFile.
 
- -- Didier Raboud <didier at raboud.com>  Thu, 20 May 2010 16:08:23 +0200
+ -- Didier Raboud <didier at raboud.com>  Thu, 27 May 2010 15:31:49 +0200
 
 shiboken (0.3.1-1) unstable; urgency=low
 

Modified: packages/shiboken/trunk/debian/patches/series
===================================================================
--- packages/shiboken/trunk/debian/patches/series	2010-05-27 11:31:12 UTC (rev 13102)
+++ packages/shiboken/trunk/debian/patches/series	2010-05-27 15:59:05 UTC (rev 13103)
@@ -1,3 +1,4 @@
 use_original_sparsehash.patch
 fix_tests.patch
 ftbfs_mips.patch
+u_ftbfs_missing_file_44071543.patch

Added: packages/shiboken/trunk/debian/patches/u_ftbfs_missing_file_44071543.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/u_ftbfs_missing_file_44071543.patch	                        (rev 0)
+++ packages/shiboken/trunk/debian/patches/u_ftbfs_missing_file_44071543.patch	2010-05-27 15:59:05 UTC (rev 13103)
@@ -0,0 +1,157 @@
+From 440715431fb1abae0a089eaeae76df0686558097 Mon Sep 17 00:00:00 2001
+From: Renato Filho <renato.filho at openbossa.org>
+Date: Wed, 26 May 2010 19:28:08 -0300
+Subject: [PATCH] Fixed declaration of class SimpleFile.
+
+Move FILE member to internal structor to avoid errors on compilation of
+debian PPC.
+
+Reviewer: Luciano Wolf <luciano.wolf at openbossa.org>
+---
+ tests/libsample/simplefile.cpp |   57 ++++++++++++++++++++++++++++++++++-----
+ tests/libsample/simplefile.h   |   29 +++++---------------
+ 2 files changed, 56 insertions(+), 30 deletions(-)
+
+diff --git a/tests/libsample/simplefile.cpp b/tests/libsample/simplefile.cpp
+index c79152b..1dc378a 100644
+--- a/tests/libsample/simplefile.cpp
++++ b/tests/libsample/simplefile.cpp
+@@ -32,18 +32,59 @@
+  * 02110-1301 USA
+  */
+ 
++#include <stdlib.h>
++#include <string.h>
+ #include <fstream>
+ #include "simplefile.h"
+ 
++class SimpleFile_p
++{
++public:
++    SimpleFile_p(const char* filename) : m_descriptor(0), m_size(0)
++    {
++        m_filename = strdup(filename);
++    }
++
++    ~SimpleFile_p()
++    {
++        free(m_filename);
++    }
++
++    char* m_filename;
++    FILE* m_descriptor;
++    long m_size;
++};
++
++SimpleFile::SimpleFile(const char* filename)
++{
++    p = new SimpleFile_p(filename);
++}
++
++SimpleFile::~SimpleFile()
++{
++    close();
++    delete p;
++}
++
++const char* SimpleFile::filename()
++{
++    return p->m_filename;
++}
++
++long SimpleFile::size()
++{
++    return p->m_size;
++}
++
+ bool
+ SimpleFile::open()
+ {
+-    if ((m_descriptor = fopen(m_filename, "rb")) == 0)
++    if ((p->m_descriptor = fopen(p->m_filename, "rb")) == 0)
+         return false;
+ 
+-    fseek(m_descriptor, 0, SEEK_END);
+-    m_size = ftell(m_descriptor);
+-    rewind(m_descriptor);
++    fseek(p->m_descriptor, 0, SEEK_END);
++    p->m_size = ftell(p->m_descriptor);
++    rewind(p->m_descriptor);
+ 
+     return true;
+ }
+@@ -51,16 +92,16 @@ SimpleFile::open()
+ void
+ SimpleFile::close()
+ {
+-    if (m_descriptor) {
+-        fclose(m_descriptor);
+-        m_descriptor = 0;
++    if (p->m_descriptor) {
++        fclose(p->m_descriptor);
++        p->m_descriptor = 0;
+     }
+ }
+ 
+ bool
+ SimpleFile::exists() const
+ {
+-    std::ifstream ifile(m_filename);
++    std::ifstream ifile(p->m_filename);
+     return ifile;
+ }
+ 
+diff --git a/tests/libsample/simplefile.h b/tests/libsample/simplefile.h
+index 67797e7..9f7d042 100644
+--- a/tests/libsample/simplefile.h
++++ b/tests/libsample/simplefile.h
+@@ -38,29 +38,16 @@
+ #include "libsamplemacros.h"
+ #include <stdio.h>
+ 
++class SimpleFile_p;
++
+ class LIBSAMPLE_API SimpleFile
+ {
+ public:
+-    explicit SimpleFile(const char* filename)
+-        : m_filename(filename), m_descriptor(0), m_size(0)
+-    {
+-    }
+-
+-    ~SimpleFile()
+-    {
+-        this->close();
+-    }
+-
+-    const char* filename()
+-    {
+-        return m_filename;
+-    }
+-
+-    long size()
+-    {
+-        return m_size;
+-    }
++    explicit SimpleFile(const char* filename);
++    ~SimpleFile();
+ 
++    const char* filename();
++    long size();
+     bool open();
+     void close();
+ 
+@@ -68,9 +55,7 @@ public:
+     static bool exists(const char* filename);
+ 
+ private:
+-    const char* m_filename;
+-    FILE* m_descriptor;
+-    long m_size;
++    SimpleFile_p *p;
+ };
+ 
+ #endif // SIMPLEFILE_H
+-- 
+1.6.1
+