From e2593de656ec8498d0c55b1b8a5fb2dbf32aec92977acf751e7dacac854a834f Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 5 Mar 2010 10:42:16 +0000 Subject: [PATCH] Accepting request 33783 from GNOME:Apps Copy from GNOME:Apps/nemiver based on submit request 33783 from user dimstar OBS-URL: https://build.opensuse.org/request/show/33783 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nemiver?expand=0&rev=18 --- nemiver-gcc45.patch | 34 ++++++++++++++++++++++++++++++++++ nemiver.changes | 7 +++++++ nemiver.spec | 21 +++++---------------- 3 files changed, 46 insertions(+), 16 deletions(-) create mode 100644 nemiver-gcc45.patch diff --git a/nemiver-gcc45.patch b/nemiver-gcc45.patch new file mode 100644 index 0000000..55eb17a --- /dev/null +++ b/nemiver-gcc45.patch @@ -0,0 +1,34 @@ +From 9978746e91b8c6789d792bdc926306db0873c74c Mon Sep 17 00:00:00 2001 +From: Dodji Seketeli +Date: Sat, 27 Feb 2010 21:14:38 +0000 +Subject: Fix build with gcc 4.5 + + * src/common/nmv-object.cc: Class name is Object, not + Object::Object. +--- +Index: nemiver-0.7.3/src/common/nmv-object.cc +=================================================================== +--- nemiver-0.7.3.orig/src/common/nmv-object.cc ++++ nemiver-0.7.3/src/common/nmv-object.cc +@@ -59,7 +59,7 @@ Object::Object (Object const &a_object): + *m_priv = *a_object.m_priv; + } + +-Object::Object& ++Object& + Object::operator= (Object const &a_object) + { + if (this == &a_object) +Index: nemiver-0.7.3/src/langs/nmv-cpp-ast.cc +=================================================================== +--- nemiver-0.7.3.orig/src/langs/nmv-cpp-ast.cc ++++ nemiver-0.7.3/src/langs/nmv-cpp-ast.cc +@@ -64,7 +64,7 @@ Token::Token (const Token &a_t) + m_int_value = a_t.get_int_value (); + } + +-Token::Token& ++Token& + Token::operator= (const Token &a_t) + { + m_kind = a_t.get_kind (); diff --git a/nemiver.changes b/nemiver.changes index b853cda..64e3aa7 100644 --- a/nemiver.changes +++ b/nemiver.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 2 11:32:12 UTC 2010 - dimstar@opensuse.org + +- Add nemiver-gcc45.patch to fix build with GCC 4.5, patch taken + from upstram git commit 997874 and extended to also solve + bgo#611588. + ------------------------------------------------------------------- Mon Dec 7 13:58:18 CET 2009 - dimstar@opensuse.org diff --git a/nemiver.spec b/nemiver.spec index 49d8ac4..5e7c319 100644 --- a/nemiver.spec +++ b/nemiver.spec @@ -1,7 +1,7 @@ # # spec file for package nemiver (Version 0.7.3) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Url: http://home.gna.org/nemiver/ Name: nemiver Version: 0.7.3 -Release: 1 +Release: 2 License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: boost-devel @@ -45,6 +45,8 @@ Requires: gdb Group: Development/Tools/Debuggers Summary: Nemiver graphical debugger Source0: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM nemiver-gcc45.patch dimstar@opensuse.org -- Fix build with GCC 4.5. Taken from upstream. +Patch0: nemiver-gcc45.patch Requires: %{name}-lang = %{version} %gconf_schemas_prereq @@ -53,13 +55,6 @@ Nemiver is a standalone graphical debugger that integrates well in the GNOME desktop environment. It currently features a backend which uses the well known GNU Debugger gdb to debug C / C++ programs. - - -Authors: --------- - Dodji Seketeli - Jonathon Jongsma - %package devel License: GPLv2+ Summary: Nemiver graphical debugger - Development files @@ -76,16 +71,10 @@ the well known GNU Debugger gdb to debug C / C++ programs. This package contains the development files to build debugger backend. - - -Authors: --------- - Dodji Seketeli - Jonathon Jongsma - %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build