From bb13f22dcdadc60b9efc510ea98d526fe42e7327ca8feb17ccdd335463ab766b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 8 Sep 2016 15:49:58 +0000 Subject: [PATCH] Accepting request 424937 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/424937 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/nemiver?expand=0&rev=40 --- nemiver-build-fix.patch | 35 +++++++++++++++++++++++++++++++++++ nemiver.changes | 6 ++++++ 2 files changed, 41 insertions(+) diff --git a/nemiver-build-fix.patch b/nemiver-build-fix.patch index 2497dc1..49d9d00 100644 --- a/nemiver-build-fix.patch +++ b/nemiver-build-fix.patch @@ -95,3 +95,38 @@ index b719c0d..f2f3229 100644 -- 2.7.3 +From 262cf9657f9c2727a816972b348692adcc666008 Mon Sep 17 00:00:00 2001 +From: Marcin Kolny +Date: Fri, 1 Jul 2016 19:45:05 +0200 +Subject: Use RefPtr::bool() operator in the conditions + +Since bool() operator in RefPtr class is explicit, +comparision with integer doesn't compile. +--- + src/persp/dbgperspective/nmv-dbg-perspective.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc +index be652db..ac207e4 100644 +--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc ++++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc +@@ -5672,7 +5672,7 @@ DBGPerspective::switch_to_asm (const common::DisassembleInfo &a_info, + a_source_editor->clear_decorations (); + + Glib::RefPtr asm_buf; +- if ((asm_buf = a_source_editor->get_assembly_source_buffer ()) == 0) { ++ if (!(asm_buf = a_source_editor->get_assembly_source_buffer ())) { + SourceEditor::setup_buffer_mime_and_lang (asm_buf, "text/x-asm"); + a_source_editor->register_assembly_source_buffer (asm_buf); + asm_buf = a_source_editor->get_assembly_source_buffer (); +@@ -5720,7 +5720,7 @@ DBGPerspective::switch_to_source_code () + + Glib::RefPtr source_buf; + UString source_path; +- if ((source_buf = source_editor->get_non_assembly_source_buffer ()) == 0) { ++ if (!(source_buf = source_editor->get_non_assembly_source_buffer ())) { + // Woops! + // We don't have any source code buffer. Let's try hard to get + // the source code corresponding to the current frame. For that, +-- +cgit v0.12 diff --git a/nemiver.changes b/nemiver.changes index f5fcb92..dc4fb2c 100644 --- a/nemiver.changes +++ b/nemiver.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jul 24 17:41:53 UTC 2016 - zaitor@opensuse.org + +- Add yet a buildfix commit from upstream to + nemiver-build-fix.patch. + ------------------------------------------------------------------- Thu Mar 17 16:45:52 UTC 2016 - zaitor@opensuse.org