[Python-modules-commits] [shiboken] 02/06: merge patched into master

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch master
in repository shiboken.

commit c2f2be19903ee83601ac88a01100832d0865ea7a
Merge: aa25271 66cf66d
Author: Didier Raboud <odyx at debian.org>
Date:   Sat Jul 9 16:24:52 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...am-to-bool-explicitely-to-work-with-GCC-6.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/libsample/simplefile.cpp                     |  4 +--
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index deb2a2b,0000000..5633016
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- cf263fb6ec94cc1aa1f1c475ab4c6d34b15d0079
- cf263fb6ec94cc1aa1f1c475ab4c6d34b15d0079
++66cf66d63dbe88b8af702d9fde0a543bada788e1
++66cf66d63dbe88b8af702d9fde0a543bada788e1
 +03fc87ff2910234f9085225174bc0c072bc5a47c
 +03fc87ff2910234f9085225174bc0c072bc5a47c
 +shiboken_1.2.2.orig.tar.bz2
 +55731616791500750ef373f382057a43e133fa08
 +1073776
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0008-Cast-ifstream-to-bool-explicitely-to-work-with-GCC-6.patch
index 0000000,0000000..29261cb
new file mode 100644
--- /dev/null
+++ b/debian/patches/0008-Cast-ifstream-to-bool-explicitely-to-work-with-GCC-6.patch
@@@ -1,0 -1,0 +1,30 @@@
++From 66cf66d63dbe88b8af702d9fde0a543bada788e1 Mon Sep 17 00:00:00 2001
++From: Didier Raboud <odyx at debian.org>
++Date: Sat, 9 Jul 2016 16:24:33 +0200
++Subject: Cast ifstream to bool explicitely, to work with GCC-6
++
++Bug-Debian: #811669
++---
++ tests/libsample/simplefile.cpp | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/tests/libsample/simplefile.cpp b/tests/libsample/simplefile.cpp
++index deac166..20369f2 100644
++--- a/tests/libsample/simplefile.cpp
+++++ b/tests/libsample/simplefile.cpp
++@@ -90,13 +90,13 @@ bool
++ SimpleFile::exists() const
++ {
++     std::ifstream ifile(p->m_filename);
++-    return ifile;
+++    return static_cast<bool>(ifile);
++ }
++ 
++ bool
++ SimpleFile::exists(const char* filename)
++ {
++     std::ifstream ifile(filename);
++-    return ifile;
+++    return static_cast<bool>(ifile);
++ }
++ 
diff --cc debian/patches/series
index 68fa852,0000000..df0bdb9
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,0 +1,8 @@@
 +cmake_selectDefaultPython.patch
 +pythonversionindep.patch
 +python3.3-and-multiarch.patch
 +python3.3-nolong.patch
 +memleak-instead-crash.patch
 +fix_py3_expect.patch
 +pkg-config-depend-on-python.patch
++0008-Cast-ifstream-to-bool-explicitely-to-work-with-GCC-6.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/shiboken.git