From b9889633464f55998494130dcb76e8c068746b12 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 20 Sep 2017 16:05:56 +0200 Subject: [PATCH] nemiver: fix build --- srcpkgs/nemiver/patches/bool-conversion.patch | 26 +++++++++++++++++++ srcpkgs/nemiver/patches/fix-nullptr.patch | 23 ++++++++++++++++ srcpkgs/nemiver/template | 2 +- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/nemiver/patches/bool-conversion.patch create mode 100644 srcpkgs/nemiver/patches/fix-nullptr.patch diff --git a/srcpkgs/nemiver/patches/bool-conversion.patch b/srcpkgs/nemiver/patches/bool-conversion.patch new file mode 100644 index 0000000000..e865d2a22e --- /dev/null +++ b/srcpkgs/nemiver/patches/bool-conversion.patch @@ -0,0 +1,26 @@ +From e0e42221ceb77d88be64fac1c09792dc5c9e2f43 Mon Sep 17 00:00:00 2001 +From: Ben Iofel +Date: Thu, 17 Mar 2016 18:28:02 -0400 +Subject: 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 +--- ./src/dbgengine/nmv-dbg-common.h ++++ ./src/dbgengine/nmv-dbg-common.h +@@ -171,7 +171,7 @@ public: + + bool has_slot () const + { +- return m_slot; ++ return static_cast (m_slot); + } + + template +-- +cgit v0.12 + diff --git a/srcpkgs/nemiver/patches/fix-nullptr.patch b/srcpkgs/nemiver/patches/fix-nullptr.patch new file mode 100644 index 0000000000..81d855ee67 --- /dev/null +++ b/srcpkgs/nemiver/patches/fix-nullptr.patch @@ -0,0 +1,23 @@ + +--- ./src/persp/dbgperspective/nmv-dbg-perspective.cc.orig 2017-09-20 16:02:08.953676793 +0200 ++++ ./src/persp/dbgperspective/nmv-dbg-perspective.cc 2017-09-20 16:02:36.863981316 +0200 +@@ -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, +--- ./src/persp/dbgperspective/nmv-dbg-perspective.cc.orig 2017-09-20 15:24:58.771249130 +0200 ++++ ./src/persp/dbgperspective/nmv-dbg-perspective.cc 2017-09-20 15:25:04.202113802 +0200 +@@ -5672,7 +5672,7 @@ DBGPerspective::switch_to_asm (const com + 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 (); diff --git a/srcpkgs/nemiver/template b/srcpkgs/nemiver/template index b76299f7f9..96eb017225 100644 --- a/srcpkgs/nemiver/template +++ b/srcpkgs/nemiver/template @@ -1,7 +1,7 @@ # Template build file for 'nemiver'. pkgname=nemiver version=0.9.6 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure configure_args="--disable-static --enable-gsettings=yes