1 |
commit: 79fa8d8e323486d947edf672fbe364153a362137 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 30 19:23:09 2016 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 30 20:36:40 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79fa8d8e |
7 |
|
8 |
dev-util/nemiver: Upstream patches to fix build failures (#587958 by Kobboi) |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
.../nemiver/files/nemiver-0.9.6-bool-build.patch | 36 ++++++++++++++++++++ |
13 |
.../nemiver/files/nemiver-0.9.6-fix-build.patch | 39 ++++++++++++++++++++++ |
14 |
dev-util/nemiver/nemiver-0.9.6.ebuild | 19 ++++++++--- |
15 |
3 files changed, 89 insertions(+), 5 deletions(-) |
16 |
|
17 |
diff --git a/dev-util/nemiver/files/nemiver-0.9.6-bool-build.patch b/dev-util/nemiver/files/nemiver-0.9.6-bool-build.patch |
18 |
new file mode 100644 |
19 |
index 0000000..dac65a8 |
20 |
--- /dev/null |
21 |
+++ b/dev-util/nemiver/files/nemiver-0.9.6-bool-build.patch |
22 |
@@ -0,0 +1,36 @@ |
23 |
+From 262cf9657f9c2727a816972b348692adcc666008 Mon Sep 17 00:00:00 2001 |
24 |
+From: Marcin Kolny <marcin.kolny@×××××.com> |
25 |
+Date: Fri, 1 Jul 2016 19:45:05 +0200 |
26 |
+Subject: Use RefPtr::bool() operator in the conditions |
27 |
+ |
28 |
+Since bool() operator in RefPtr class is explicit, |
29 |
+comparision with integer doesn't compile. |
30 |
+--- |
31 |
+ src/persp/dbgperspective/nmv-dbg-perspective.cc | 4 ++-- |
32 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
33 |
+ |
34 |
+diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc |
35 |
+index be652db..ac207e4 100644 |
36 |
+--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc |
37 |
++++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc |
38 |
+@@ -5672,7 +5672,7 @@ DBGPerspective::switch_to_asm (const common::DisassembleInfo &a_info, |
39 |
+ a_source_editor->clear_decorations (); |
40 |
+ |
41 |
+ Glib::RefPtr<Gsv::Buffer> asm_buf; |
42 |
+- if ((asm_buf = a_source_editor->get_assembly_source_buffer ()) == 0) { |
43 |
++ if (!(asm_buf = a_source_editor->get_assembly_source_buffer ())) { |
44 |
+ SourceEditor::setup_buffer_mime_and_lang (asm_buf, "text/x-asm"); |
45 |
+ a_source_editor->register_assembly_source_buffer (asm_buf); |
46 |
+ asm_buf = a_source_editor->get_assembly_source_buffer (); |
47 |
+@@ -5720,7 +5720,7 @@ DBGPerspective::switch_to_source_code () |
48 |
+ |
49 |
+ Glib::RefPtr<Gsv::Buffer> source_buf; |
50 |
+ UString source_path; |
51 |
+- if ((source_buf = source_editor->get_non_assembly_source_buffer ()) == 0) { |
52 |
++ if (!(source_buf = source_editor->get_non_assembly_source_buffer ())) { |
53 |
+ // Woops! |
54 |
+ // We don't have any source code buffer. Let's try hard to get |
55 |
+ // the source code corresponding to the current frame. For that, |
56 |
+-- |
57 |
+cgit v0.12 |
58 |
+ |
59 |
|
60 |
diff --git a/dev-util/nemiver/files/nemiver-0.9.6-fix-build.patch b/dev-util/nemiver/files/nemiver-0.9.6-fix-build.patch |
61 |
new file mode 100644 |
62 |
index 0000000..59a893a |
63 |
--- /dev/null |
64 |
+++ b/dev-util/nemiver/files/nemiver-0.9.6-fix-build.patch |
65 |
@@ -0,0 +1,39 @@ |
66 |
+From e0e42221ceb77d88be64fac1c09792dc5c9e2f43 Mon Sep 17 00:00:00 2001 |
67 |
+From: Ben Iofel <iofelben@×××××.com> |
68 |
+Date: Thu, 17 Mar 2016 18:28:02 -0400 |
69 |
+Subject: Fix compiliation warnings & errors |
70 |
+ |
71 |
+--- |
72 |
+ src/dbgengine/nmv-dbg-common.h | 2 +- |
73 |
+ src/dbgengine/nmv-i-var-list-walker.h | 2 +- |
74 |
+ 2 files changed, 2 insertions(+), 2 deletions(-) |
75 |
+ |
76 |
+diff --git a/src/dbgengine/nmv-dbg-common.h b/src/dbgengine/nmv-dbg-common.h |
77 |
+index ad3cc00..0edac7c 100644 |
78 |
+--- a/src/dbgengine/nmv-dbg-common.h |
79 |
++++ b/src/dbgengine/nmv-dbg-common.h |
80 |
+@@ -171,7 +171,7 @@ public: |
81 |
+ |
82 |
+ bool has_slot () const |
83 |
+ { |
84 |
+- return m_slot; |
85 |
++ return static_cast<bool> (m_slot); |
86 |
+ } |
87 |
+ |
88 |
+ template<class T> |
89 |
+diff --git a/src/dbgengine/nmv-i-var-list-walker.h b/src/dbgengine/nmv-i-var-list-walker.h |
90 |
+index b719c0d..f2f3229 100644 |
91 |
+--- a/src/dbgengine/nmv-i-var-list-walker.h |
92 |
++++ b/src/dbgengine/nmv-i-var-list-walker.h |
93 |
+@@ -22,7 +22,7 @@ |
94 |
+ * |
95 |
+ *See COPYRIGHT file copyright information. |
96 |
+ */ |
97 |
+-#ifndef __NMV_VAR_LIST_WALKER_H__ |
98 |
++#ifndef __NMV_I_VAR_LIST_WALKER_H__ |
99 |
+ #define __NMV_I_VAR_LIST_WALKER_H__ |
100 |
+ |
101 |
+ #include "nmv-i-var-walker.h" |
102 |
+-- |
103 |
+cgit v0.12 |
104 |
+ |
105 |
|
106 |
diff --git a/dev-util/nemiver/nemiver-0.9.6.ebuild b/dev-util/nemiver/nemiver-0.9.6.ebuild |
107 |
index 684b996..e0b0942 100644 |
108 |
--- a/dev-util/nemiver/nemiver-0.9.6.ebuild |
109 |
+++ b/dev-util/nemiver/nemiver-0.9.6.ebuild |
110 |
@@ -1,9 +1,8 @@ |
111 |
-# Copyright 1999-2014 Gentoo Foundation |
112 |
+# Copyright 1999-2016 Gentoo Foundation |
113 |
# Distributed under the terms of the GNU General Public License v2 |
114 |
# $Id$ |
115 |
|
116 |
-EAPI="5" |
117 |
-GCONF_DEBUG="yes" |
118 |
+EAPI=6 |
119 |
GNOME2_LA_PUNT="yes" |
120 |
|
121 |
inherit eutils gnome2 |
122 |
@@ -14,10 +13,10 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nemiver" |
123 |
LICENSE="GPL-2" |
124 |
SLOT="0" |
125 |
KEYWORDS="amd64 x86" |
126 |
-IUSE="memoryview" |
127 |
+IUSE="debug memoryview" |
128 |
|
129 |
RDEPEND=" |
130 |
- >=dev-libs/glib-2.16:2 |
131 |
+ >=dev-libs/glib-2.16:2[dbus] |
132 |
>=dev-cpp/glibmm-2.30:2 |
133 |
>=dev-cpp/gtkmm-3:3.0 |
134 |
>=dev-cpp/gtksourceviewmm-3:3.0 |
135 |
@@ -39,11 +38,21 @@ DEPEND="${RDEPEND} |
136 |
virtual/pkgconfig |
137 |
" |
138 |
|
139 |
+PATCHES=( |
140 |
+ # Use RefPtr::bool() operator in the conditions, fixed in next |
141 |
+ # version |
142 |
+ "${FILESDIR}/${P}-bool-build.patch" |
143 |
+ |
144 |
+ # Fix compiliation warnings & errors, fixed in next version |
145 |
+ "${FILESDIR}/${P}-fix-build.patch" |
146 |
+) |
147 |
+ |
148 |
src_configure() { |
149 |
gnome2_src_configure \ |
150 |
--disable-dynamiclayout \ |
151 |
--disable-static \ |
152 |
--disable-symsvis \ |
153 |
--enable-gsettings \ |
154 |
+ $(use_enable debug) \ |
155 |
$(use_enable memoryview) |
156 |
} |