Hello community,
here is the log from the commit of package c++-gtk-utils for openSUSE:Factory checked in at 2012-03-29 11:35:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/c++-gtk-utils (Old)
and /work/SRC/openSUSE:Factory/.c++-gtk-utils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "c++-gtk-utils", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/c++-gtk-utils/c++-gtk-utils.changes 2012-03-09 21:22:03.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.c++-gtk-utils.new/c++-gtk-utils.changes 2012-03-29 11:35:19.000000000 +0200
@@ -1,0 +2,5 @@
+Sat Mar 17 21:19:38 UTC 2012 - dimstar@opensuse.org
+
+- Add c++-gtk-utils-gcc47.patch: Fix build with gcc 4.7.
+
+-------------------------------------------------------------------
New:
----
c++-gtk-utils-gcc47.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ c++-gtk-utils.spec ++++++
--- /var/tmp/diff_new_pack.PyoBTk/_old 2012-03-29 11:35:20.000000000 +0200
+++ /var/tmp/diff_new_pack.PyoBTk/_new 2012-03-29 11:35:20.000000000 +0200
@@ -1,6 +1,7 @@
#
# spec file for package c++-gtk-utils
#
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 Malcolm J Lewis
#
# All modifications and additions to the file contributed by third parties
@@ -15,18 +16,21 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%define soname 2_0-0
Name: c++-gtk-utils
Version: 2.0.6
Release: 0
-License: LGPL-2.1
Summary: Lightweight library for GTK+ programs using C++
-Url: http://cxx-gtk-utils.sourceforge.net/
+License: LGPL-2.1
Group: System/Libraries
+Url: http://cxx-gtk-utils.sourceforge.net/
Source0: http://sourceforge.net/projects/cxx-gtk-utils/files/cxx-gtk-utils/%{version}/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM c++-gtk-utils-fix-incorrect-fsf-address.patch sf#3484267 malcolmlewis@opensuse.org -- Fix incorrect FSF address.
Patch0: c++-gtk-utils-fix-incorrect-fsf-address.patch
+# PATCH-FIX-UPSTREAM c++-gtk-utils-gcc47.patch sf#3510500 dimstar@opensuse.org -- Fix build with gcc 4.7
+Patch1: c++-gtk-utils-gcc47.patch
BuildRequires: gcc-c++
%if 0%{?favor_gtk2}
%define _gtk 2
@@ -67,6 +71,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%if 0%{?favor_gtk2}
++++++ c++-gtk-utils-gcc47.patch ++++++
Index: c++-gtk-utils-2.0.6/c++-gtk-utils/gstream.h
===================================================================
--- c++-gtk-utils-2.0.6.orig/c++-gtk-utils/gstream.h
+++ c++-gtk-utils-2.0.6/c++-gtk-utils/gstream.h
@@ -1416,7 +1416,7 @@ public:
const GobjHandle<GConverter>& converter = GobjHandle<GConverter>()):
std::basic_ostream(0),
buf(stream, manage, converter) {
- rdbuf(&buf);
+ this->rdbuf(&buf);
}
/**
@@ -1429,7 +1429,7 @@ public:
*/
// using uniform initializer syntax here confuses doxygen
basic_gostream(): std::basic_ostream(0) {
- rdbuf(&buf);
+ this->rdbuf(&buf);
}
/**
@@ -1696,7 +1696,7 @@ public:
const GobjHandle<GConverter>& converter = GobjHandle<GConverter>()):
std::basic_istream(0),
buf(stream, manage, converter) {
- rdbuf(&buf);
+ this->rdbuf(&buf);
}
/**
@@ -1709,7 +1709,7 @@ public:
*/
// using uniform initializer syntax here confuses doxygen
basic_gistream(): std::basic_istream(0) {
- rdbuf(&buf);
+ this->rdbuf(&buf);
}
/**
@@ -1979,7 +1979,7 @@ public:
const GobjHandle<GConverter>& output_converter = GobjHandle<GConverter>()):
std::basic_iostream(0),
buf(stream, manage, input_converter, output_converter) {
- rdbuf(&buf); // std::basic_ios is a virtual base class
+ this->rdbuf(&buf); // std::basic_ios is a virtual base class
}
/**
Index: c++-gtk-utils-2.0.6/c++-gtk-utils/fdstream.h
===================================================================
--- c++-gtk-utils-2.0.6.orig/c++-gtk-utils/fdstream.h
+++ c++-gtk-utils-2.0.6/c++-gtk-utils/fdstream.h
@@ -694,7 +694,7 @@ public:
// using uniform initializer syntax here confuses doxygen
basic_fdostream(int fd, bool manage = true): std::basic_ostream(0),
buf(fd, manage) { // pass the descriptor at construction
- rdbuf(&buf);
+ this->rdbuf(&buf);
}
/**
@@ -1116,7 +1116,7 @@ public:
// using uniform initializer syntax here confuses doxygen
basic_fdistream (int fd, bool manage = true) : std::basic_istream(0),
buf(fd, manage) { // pass the descriptor at construction
- rdbuf(&buf);
+ this->rdbuf(&buf);
}
/**
Index: c++-gtk-utils-2.0.6/c++-gtk-utils/fdstream.tpp
===================================================================
--- c++-gtk-utils-2.0.6.orig/c++-gtk-utils/fdstream.tpp
+++ c++-gtk-utils-2.0.6/c++-gtk-utils/fdstream.tpp
@@ -206,7 +206,7 @@ basic_fdoutbuf::overflow
// the stream must be full: empty buffer and then put c in buffer
if (flush_buffer() == -1) return traits_type::eof();
if (traits_type::eq_int_type(traits_type::eof(), c)) return traits_type::not_eof(c);
- return sputc(c);
+ return this->sputc(c);
}
#ifndef FDSTREAM_USE_STD_N_READ_WRITE
Index: c++-gtk-utils-2.0.6/c++-gtk-utils/gstream.tpp
===================================================================
--- c++-gtk-utils-2.0.6.orig/c++-gtk-utils/gstream.tpp
+++ c++-gtk-utils-2.0.6/c++-gtk-utils/gstream.tpp
@@ -738,7 +738,7 @@ basic_gstreambuf::overfl
if (flush_buffer() == -1) return traits_type::eof();
if (traits_type::eq_int_type(traits_type::eof(), c)) return traits_type::not_eof(c);
// write c to output buffer
- return sputc(c);
+ return this->sputc(c);
}
#ifndef CGU_GSTREAM_USE_STD_N_READ_WRITE
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org