From 1b710839c35c9da8ee40ad7047210e4a82ff00d7b963d68e0e6e7dd90950596d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 7 Apr 2016 15:00:50 +0000 Subject: [PATCH] Accepting request 384756 from GNOME:Next Tweak .changes, resub - Fix build! OBS-URL: https://build.opensuse.org/request/show/384756 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/nemiver?expand=0&rev=38 --- nemiver-build-fix.patch | 97 +++++++++++++++++++++++++++++++++++++++++ nemiver.changes | 6 +++ nemiver.spec | 5 ++- 3 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 nemiver-build-fix.patch diff --git a/nemiver-build-fix.patch b/nemiver-build-fix.patch new file mode 100644 index 0000000..2497dc1 --- /dev/null +++ b/nemiver-build-fix.patch @@ -0,0 +1,97 @@ +From 49f3edbc3f0f0cfbbde57efe88be4cbf921bf779 Mon Sep 17 00:00:00 2001 +From: Sebastian Rasmussen +Date: Fri, 20 Feb 2015 19:21:28 +0100 +Subject: 744865 Fix typo in singular form of string +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + * src/persp/dbgperspective/nmv-call-stack.cc + (CallStack::Priv::append_frames_to_tree_view): Fix typo in + singular form of string + +Signed-off-by: Marek Černocký +--- + src/persp/dbgperspective/nmv-call-stack.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/persp/dbgperspective/nmv-call-stack.cc b/src/persp/dbgperspective/nmv-call-stack.cc +index 68b80d1..b79a9f6 100644 +--- a/src/persp/dbgperspective/nmv-call-stack.cc ++++ b/src/persp/dbgperspective/nmv-call-stack.cc +@@ -765,7 +765,7 @@ struct CallStack::Priv { + store_iter = store->append (); + UString msg; + msg.printf (ngettext ("(Click here to see the next %d row of the " +- "call stack", ++ "call stack)", + "(Click here to see the next %d rows of the " + "call stack)", + nb_frames_expansion_chunk), +-- +cgit v0.12 + + +From 7005393a8c4d914eac9705e7f47818d0f4de3578 Mon Sep 17 00:00:00 2001 +From: Marcin Kolny +Date: Wed, 7 Oct 2015 12:16:49 +0200 +Subject: build fix + +--- + src/confmgr/nmv-gconf-mgr.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/confmgr/nmv-gconf-mgr.cc b/src/confmgr/nmv-gconf-mgr.cc +index 672935b..e212ff6 100644 +--- a/src/confmgr/nmv-gconf-mgr.cc ++++ b/src/confmgr/nmv-gconf-mgr.cc +@@ -32,6 +32,7 @@ + NEMIVER_BEGIN_NAMESPACE (nemiver) + + using nemiver::common::GCharSafePtr; ++using nemiver::common::GErrorSafePtr; + + class GConfMgr : public IConfMgr { + GConfMgr (const GConfMgr &); +-- +cgit v0.12 + +From 0ad382f79c6249fe0a46121d04fca0a2044bcfc0 Mon Sep 17 00:00:00 2001 +From: Ben Iofel +Date: Thu, 17 Mar 2016 18:28:02 -0400 +Subject: [PATCH] Fix compiliation warnings & errors + +--- + src/dbgengine/nmv-dbg-common.h | 2 +- + src/dbgengine/nmv-i-var-list-walker.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/dbgengine/nmv-dbg-common.h b/src/dbgengine/nmv-dbg-common.h +index ad3cc00..0edac7c 100644 +--- a/src/dbgengine/nmv-dbg-common.h ++++ b/src/dbgengine/nmv-dbg-common.h +@@ -171,7 +171,7 @@ public: + + bool has_slot () const + { +- return m_slot; ++ return static_cast (m_slot); + } + + template +diff --git a/src/dbgengine/nmv-i-var-list-walker.h b/src/dbgengine/nmv-i-var-list-walker.h +index b719c0d..f2f3229 100644 +--- a/src/dbgengine/nmv-i-var-list-walker.h ++++ b/src/dbgengine/nmv-i-var-list-walker.h +@@ -22,7 +22,7 @@ + * + *See COPYRIGHT file copyright information. + */ +-#ifndef __NMV_VAR_LIST_WALKER_H__ ++#ifndef __NMV_I_VAR_LIST_WALKER_H__ + #define __NMV_I_VAR_LIST_WALKER_H__ + + #include "nmv-i-var-walker.h" +-- +2.7.3 + diff --git a/nemiver.changes b/nemiver.changes index d8112a7..f5fcb92 100644 --- a/nemiver.changes +++ b/nemiver.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 17 16:45:52 UTC 2016 - zaitor@opensuse.org + +- Add nemiver-build-fix.patch: Fix build with new mm stack, patches + from upstream git, and one from bugzilla (bgo#763840). + ------------------------------------------------------------------- Fri Oct 23 18:36:47 UTC 2015 - zaitor@opensuse.org diff --git a/nemiver.spec b/nemiver.spec index d8232cb..8d363f6 100644 --- a/nemiver.spec +++ b/nemiver.spec @@ -1,7 +1,7 @@ # # spec file for package nemiver # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,8 @@ License: GPL-2.0+ Group: Development/Tools/Debuggers Url: http://home.gna.org/nemiver/ Source0: http://download.gnome.org/sources/nemiver/0.9/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM nemiver-build-fix.patch bgo#763840 zaitor@opensuse.org -- Fix build with new mm stack +Patch0: nemiver-build-fix.patch %if 0%{?scm_bootstrap} BuildRequires: gnome-common %endif @@ -71,6 +73,7 @@ This package contains the development files to build debugger backend. %lang_package %prep %setup -q +%patch0 -p1 # Disabled from ver 0.9.6, it breaks the build. #translation-update-upstream