[packages/nemiver] Update to 0.9.6
megabajt
megabajt at pld-linux.org
Sun Sep 24 18:10:09 CEST 2017
commit 25394930f82944229787534040affe3c24683b5d
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date: Sun Sep 24 18:08:47 2017 +0200
Update to 0.9.6
- added patches from fedora to fix build with new gcc
- removed applied upstream patches
0001-Fix-compiliation-warnings-errors.patch | 39 +++++++
...se-RefPtr-bool-operator-in-the-conditions.patch | 36 +++++++
GErrorSafePtr.patch | 119 ---------------------
NativeGObjectSafePtr.patch | 90 ----------------
vte-0.38.patch | 96 -----------------
5 files changed, 75 insertions(+), 305 deletions(-)
---
diff --git a/0001-Fix-compiliation-warnings-errors.patch b/0001-Fix-compiliation-warnings-errors.patch
new file mode 100644
index 0000000..db1446a
--- /dev/null
+++ b/0001-Fix-compiliation-warnings-errors.patch
@@ -0,0 +1,39 @@
+From e0e42221ceb77d88be64fac1c09792dc5c9e2f43 Mon Sep 17 00:00:00 2001
+From: Ben Iofel <iofelben at gmail.com>
+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 ad3cc00b..0edac7c0 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<bool> (m_slot);
+ }
+
+ template<class T>
+diff --git a/src/dbgengine/nmv-i-var-list-walker.h b/src/dbgengine/nmv-i-var-list-walker.h
+index b719c0de..f2f3229d 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.13.0
+
diff --git a/0001-Use-RefPtr-bool-operator-in-the-conditions.patch b/0001-Use-RefPtr-bool-operator-in-the-conditions.patch
new file mode 100644
index 0000000..3414d25
--- /dev/null
+++ b/0001-Use-RefPtr-bool-operator-in-the-conditions.patch
@@ -0,0 +1,36 @@
+From 262cf9657f9c2727a816972b348692adcc666008 Mon Sep 17 00:00:00 2001
+From: Marcin Kolny <marcin.kolny at gmail.com>
+Date: Fri, 1 Jul 2016 19:45:05 +0200
+Subject: [PATCH] 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 be652db5..ac207e49 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<Gsv::Buffer> 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<Gsv::Buffer> 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,
+--
+2.13.0
+
diff --git a/GErrorSafePtr.patch b/GErrorSafePtr.patch
deleted file mode 100644
index 5c364db..0000000
--- a/GErrorSafePtr.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From ce7b6454f3da80d19c7952fb125729f8ee61e7f6 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir at gnome.org>
-Date: Fri, 16 May 2014 14:15:04 +0200
-Subject: 730243 Consolidate GErrorSafePtr definitions
-
- * src/common/nmv-ustring.cc: Remove local copy of GErrorSafePtr.
- (wstring_to_ustring): Use GErrorSafePtr from nmv-error.h
- instead of local copy.
- (ustring_to_wstring): Likewise.
- * src/confmgr/nmv-gconf-mgr.cc: Remove local copy of
- GErrorSafePtr.
- * src/common/nmv-safe-ptr-utils.h: Move the copy of
- GErrorSafePtr definition here.
-
-Signed-off-by: Dodji Seketeli <dodji at seketeli.org>
-
-diff --git a/src/common/nmv-safe-ptr-utils.h b/src/common/nmv-safe-ptr-utils.h
-index 27b0f85..fdeb350 100644
---- a/src/common/nmv-safe-ptr-utils.h
-+++ b/src/common/nmv-safe-ptr-utils.h
-@@ -99,13 +99,29 @@ struct DelUnicharsUnref {
- }
- };
-
-+struct GErrorRef {
-+ void
-+ operator () (GError *)
-+ {}
-+};
-+
-+struct GErrorUnref {
-+ void
-+ operator () (GError *a_error)
-+ {
-+ if (a_error) {
-+ g_error_free (a_error);
-+ }
-+ }
-+};
-+
- typedef SafePtr <gchar, CharsRef, GCharUnref> GCharSafePtr;
- typedef SafePtr <Object, ObjectRef, ObjectUnref> ObjectSafePtr;
- typedef SafePtr <gchar, CharsRef, DelCharsUnref> CharSafePtr;
- typedef SafePtr <gunichar, UnicharsRef, DelUnicharsUnref> UnicharSafePtr;
-+typedef SafePtr<GError, GErrorRef, GErrorUnref> GErrorSafePtr;
-
- NEMIVER_END_NAMESPACE(common)
- NEMIVER_END_NAMESPACE(nemiver)
-
- #endif
--
-diff --git a/src/common/nmv-ustring.cc b/src/common/nmv-ustring.cc
-index f5dfe49..41a1a26 100644
---- a/src/common/nmv-ustring.cc
-+++ b/src/common/nmv-ustring.cc
-@@ -479,21 +479,6 @@ WString::assign (super_type::size_type a_n, gunichar a_c)
- return *this;
- }
-
--struct GErrorRef {
-- void operator () (GError *)
-- {
-- }
--};
--
--struct GErrorUnref {
-- void operator () (GError *a_err)
-- {
-- if (a_err) {
-- g_error_free (a_err);
-- }
-- }
--};
--
- bool
- wstring_to_ustring (const WString &a_wstr,
- UString &a_ustr)
-@@ -504,7 +489,7 @@ wstring_to_ustring (const WString &a_wstr,
- utf8_buf.reset (g_ucs4_to_utf8 (a_wstr.c_str (),
- a_wstr.size (), &wstr_len,
- &utf8_bytes_len, &err));
-- SafePtr<GError, GErrorRef, GErrorUnref> error;
-+ GErrorSafePtr error;
- error.reset (err);
- if (error) {
- LOG_ERROR ("got error conversion error: '" << error->message << "'");
-@@ -531,7 +516,7 @@ ustring_to_wstring (const UString &a_ustr,
- &utf8_bytes_len,
- &wstr_len,
- &err));
-- SafePtr<GError, GErrorRef, GErrorUnref> error;
-+ GErrorSafePtr error;
- error.reset (err);
- if (error) {
- LOG_ERROR ("got error conversion error: '" << error->message << "'");
-diff --git a/src/confmgr/nmv-gconf-mgr.cc b/src/confmgr/nmv-gconf-mgr.cc
-index fd7ff1c..672935b 100644
---- a/src/confmgr/nmv-gconf-mgr.cc
-+++ b/src/confmgr/nmv-gconf-mgr.cc
-@@ -92,16 +92,6 @@ public:
-
- //static const char * NEMIVER_KEY_DIR = "/app/nemiver";
-
--struct GErrorRef {
-- void operator () (GError *a_error) {if (a_error) {}}
--};
--
--struct GErrorUnref {
-- void operator () (GError *a_error) {if (a_error) {g_error_free (a_error);}}
--};
--
--typedef SafePtr<GError, GErrorRef, GErrorUnref> GErrorSafePtr;
--
- void
- client_notify_func (GConfClient *a_client,
- const char* a_key,
---
-cgit v0.10.1
-
diff --git a/NativeGObjectSafePtr.patch b/NativeGObjectSafePtr.patch
deleted file mode 100644
index b1e5846..0000000
--- a/NativeGObjectSafePtr.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 33749faf4b0b9b13e4e7e186a6237ca6ad916378 Mon Sep 17 00:00:00 2001
-From: Dodji Seketeli <dodji at seketeli.org>
-Date: Mon, 7 Jul 2014 13:42:04 +0200
-Subject: Consolidate NativeGObjectSafePtr definitions
-
- * src/persp/dbgperspective/nmv-dbg-perspective.cc
- (RefGObjectNative, UnrefGObjectNative): Move the definition of
- these functors ...
- * src/common/nmv-safe-ptr-utils.h: ... here.
-
-Signed-off-by: Dodji Seketeli <dodji at seketeli.org>
-
-diff --git a/src/common/nmv-safe-ptr-utils.h b/src/common/nmv-safe-ptr-utils.h
-index fdeb350..72211e8 100644
---- a/src/common/nmv-safe-ptr-utils.h
-+++ b/src/common/nmv-safe-ptr-utils.h
-@@ -30,7 +30,7 @@
- #ifndef __NMV_SAFE_PTR_UTILS_H__
- #define __NMV_SAFE_PTR_UTILS_H__
-
--#include <glib.h>
-+#include <glib-object.h>
- #include "nmv-object.h"
- #include "nmv-safe-ptr.h"
- #include "nmv-namespace.h"
-@@ -115,11 +115,32 @@ struct GErrorUnref {
- }
- };
-
-+struct RefGObjectNative {
-+ void operator () (void *a_object)
-+ {
-+ if (a_object && G_IS_OBJECT (a_object)) {
-+ g_object_ref (G_OBJECT (a_object));
-+ }
-+ }
-+};
-+
-+struct UnrefGObjectNative {
-+ void operator () (void *a_object)
-+ {
-+ if (a_object && G_IS_OBJECT (a_object)) {
-+ g_object_unref (G_OBJECT (a_object));
-+ }
-+ }
-+};
-+
- typedef SafePtr <gchar, CharsRef, GCharUnref> GCharSafePtr;
- typedef SafePtr <Object, ObjectRef, ObjectUnref> ObjectSafePtr;
- typedef SafePtr <gchar, CharsRef, DelCharsUnref> CharSafePtr;
- typedef SafePtr <gunichar, UnicharsRef, DelUnicharsUnref> UnicharSafePtr;
- typedef SafePtr<GError, GErrorRef, GErrorUnref> GErrorSafePtr;
-+typedef SafePtr<void*,
-+ RefGObjectNative,
-+ UnrefGObjectNative> NativeGObjectSafePtr;
-
- NEMIVER_END_NAMESPACE(common)
- NEMIVER_END_NAMESPACE(nemiver)
-diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
-index 6e07ce7..6a7ff1b 100644
---- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
-+++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
-@@ -836,24 +836,6 @@ struct UnrefGObject {
- }
- };
-
--struct RefGObjectNative {
-- void operator () (void *a_object)
-- {
-- if (a_object && G_IS_OBJECT (a_object)) {
-- g_object_ref (G_OBJECT (a_object));
-- }
-- }
--};
--
--struct UnrefGObjectNative {
-- void operator () (void *a_object)
-- {
-- if (a_object && G_IS_OBJECT (a_object)) {
-- g_object_unref (G_OBJECT (a_object));
-- }
-- }
--};
--
- static
- void gio_file_monitor_cb (const Glib::RefPtr<Gio::File>& file,
- const Glib::RefPtr<Gio::File>& other_file,
---
-cgit v0.10.1
-
diff --git a/vte-0.38.patch b/vte-0.38.patch
deleted file mode 100644
index ba7b38e..0000000
--- a/vte-0.38.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index d3fc668..94d3a40 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -359,10 +359,29 @@ AC_SUBST(NEMIVERCOMMON_LIBS)
- AC_SUBST(NEMIVERCOMMON_CFLAGS)
-
- dnl library dependencies for the nemiver common UI module
-+
-+dnl first what vte should we use?
-+PKG_CHECK_EXISTS([vte-2.90 >= $LIBVTE_VERSION],
-+ [HAS_VTE_2_90=yes],
-+ [HAS_VTR_2_90=no])
-+
-+PKG_CHECK_EXISTS([vte-2.91 >= $LIBVTE_VERSION],
-+ [HAS_VTE_2_91=yes],
-+ [HAS_VTE_2_91=no])
-+
-+if test x$HAS_VTE_2_91 = xyes; then
-+ VTE_TO_USE=vte-2.91
-+ AC_DEFINE(HAS_VTE_2_91,1,[libvte 2.91 support])
-+else
-+ VTE_TO_USE=vte-2.90
-+ AC_DEFINE(HAS_VTE_2_90,1,[libvtr 2.90 support])
-+fi
-+
-+dnl then the other libraries of uicommon module.
- DEP_UICOMMON=" gtkmm-3.0 >= $LIBGTKMM_VERSION \
- gtk+-3.0 >= $LIBGTK_VERSION \
- gtksourceviewmm-3.0 >= $LIBGTKSOURCEVIEWMM_VERSION \
-- vte-2.90 >= $LIBVTE_VERSION"
-+ $VTE_TO_USE >= $LIBVTE_VERSION"
-
- PKG_CHECK_MODULES(NEMIVERUICOMMON, $DEP_UICOMMON $DEP_COMMON $DEP_MEMORYVIEW)
- NEMIVERUICOMMON_CFLAGS="$NEMIVERUICOMMON_CFLAGS $CPPUNIT_CFLAGS"
-@@ -385,7 +404,7 @@ AC_SUBST(NEMIVERWORKBENCH_CFLAGS)
-
- dnl library dependencies for the nemiver debug perspective plugin
- DEP_PERSP="gtksourceviewmm-3.0 >= $LIBGTKSOURCEVIEWMM_VERSION \
-- vte-2.90 >= $LIBVTE_VERSION"
-+ $VTE_TO_USE >= $LIBVTE_VERSION"
-
- PKG_CHECK_MODULES(NEMIVERDBGPERSP, $DEP_UICOMMON $DEP_VFS $DEP_PERSP $DEP_MEMORYVIEW $DEP_DYNAMICLAYOUT)
- NEMIVERDBGPERSP_LIBS="$NEMIVERDBGPERSP_LIBS $CPPUNIT_LIBS"
-diff --git a/src/uicommon/nmv-terminal.cc b/src/uicommon/nmv-terminal.cc
-index 9985e6b..42408c7 100644
---- a/src/uicommon/nmv-terminal.cc
-+++ b/src/uicommon/nmv-terminal.cc
-@@ -46,6 +46,7 @@
- #include <gtkmm/menu.h>
- #include <gtkmm/builder.h>
- #include <gtkmm/uimanager.h>
-+#include <pangomm/fontdescription.h>
- #include <vte/vte.h>
- #include <glib/gi18n.h>
- #include "common/nmv-exception.h"
-@@ -137,11 +137,18 @@ struct Terminal::Priv {
- THROW_IF_FAIL (vte);
-
- // Mandatory for vte 0.14
-+#ifdef HAS_VTE_2_91
-+ Pango::FontDescription font_desc ("monospace");
-+ vte_terminal_set_font (vte, font_desc.gobj());
-+#else // HAS_VTE_2_90
- vte_terminal_set_font_from_string (vte, "monospace");
-+#endif
-
- vte_terminal_set_scroll_on_output (vte, TRUE);
- vte_terminal_set_scrollback_lines (vte, 1000);
-+#ifdef HAS_VTE_2_90
- vte_terminal_set_emulation (vte, "xterm");
-+#endif
-
- widget = Glib::wrap (w);
- THROW_IF_FAIL (widget);
-@@ -267,7 +274,17 @@ struct Terminal::Priv {
- THROW_IF_FAIL (slave_pty);
- THROW_IF_FAIL (master_pty);
-
-+#ifdef HAS_VTE_2_91
-+ GError *err = 0;
-+ VtePty *p = vte_pty_new_foreign_sync (master_pty, 0, &err);
-+ GErrorSafePtr error (err);
-+ SafePtr<VtePty, RefGObjectNative, UnrefGObjectNative> pty (p);
-+ THROW_IF_FAIL2 (!error, error->message);
-+
-+ vte_terminal_set_pty (vte, pty.get());
-+#else //HAS_VTE_2_90
- vte_terminal_set_pty (vte, master_pty);
-+#endif
- return true;
- }
- };//end Terminal::Priv--
---
-cgit v0.10.1
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nemiver.git/commitdiff/25394930f82944229787534040affe3c24683b5d
More information about the pld-cvs-commit
mailing list