Hello community, here is the log from the commit of package gnome-commander for openSUSE:Factory checked in at 2012-03-22 12:32:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-commander (Old) and /work/SRC/openSUSE:Factory/.gnome-commander.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-commander", Maintainer is "gnome-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-commander/gnome-commander.changes 2012-01-05 19:11:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-commander.new/gnome-commander.changes 2012-03-22 12:32:23.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 17 22:46:51 UTC 2012 - dims...@opensuse.org + +- Add gnome-commander-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- gnome-commander-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-commander.spec ++++++ --- /var/tmp/diff_new_pack.upx90V/_old 2012-03-22 12:32:24.000000000 +0100 +++ /var/tmp/diff_new_pack.upx90V/_new 2012-03-22 12:32:24.000000000 +0100 @@ -24,6 +24,8 @@ Group: Productivity/File utilities Url: http://www.nongnu.org/gcmd/ Source: http://download.gnome.org/sources/gnome-commander/1.2/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gnome-commander-gcc47.patch dims...@opensuse.org -- Fix build with gcc 4.7. Taken from git, commit a8cf386. +Patch0: gnome-commander-gcc47.patch BuildRequires: chmlib-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -53,6 +55,7 @@ %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build ++++++ gnome-commander-gcc47.patch ++++++ >From a8cf386412f9c287d7d96dc1762d7b0f247d8908 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka <mtas...@fedoraproject.org> Date: Thu, 05 Jan 2012 20:20:53 +0000 Subject: Fix for gcc-4.7 compiling problem --- diff --git a/src/dict.h b/src/dict.h index 229fe4a..0d21a3b 100644 --- a/src/dict.h +++ b/src/dict.h @@ -55,8 +55,8 @@ class DICT template <typename KEY, typename VAL> inline void DICT<KEY,VAL>::add(const KEY k, const VAL &v) { - std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(make_pair(k,(const VAL *) NULL)); - std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(make_pair(v,(const KEY *) NULL)); + std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(std::make_pair(k,(const VAL *) NULL)); + std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(std::make_pair(v,(const KEY *) NULL)); if (k_pos.second) k_pos.first->second = &v_pos.first->first; -- cgit v0.9.0.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
