[gst-debugger] gst-debugger: remove sigc++lambda hack
- From: Marcin Kolny <mkolny src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gst-debugger] gst-debugger: remove sigc++lambda hack
- Date: Fri, 28 Aug 2015 16:37:29 +0000 (UTC)
commit ea460d3bff0c1c49b81e8795717ba4036d1943fa
Author: Marcin Kolny <marcin kolny gmail com>
Date: Fri Aug 28 18:36:31 2015 +0200
gst-debugger: remove sigc++lambda hack
It's not necessary since sigc++2 v 2.5.1
configure.ac | 2 +
src/gst-debugger/Makefile.am | 1 -
src/gst-debugger/main_window.cpp | 1 -
src/gst-debugger/modules/gst_message_module.cpp | 1 -
src/gst-debugger/modules/gst_qe_module.cpp | 1 -
src/gst-debugger/sigc++lambdahack.h | 28 -----------------------
6 files changed, 2 insertions(+), 32 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b23232a..3edb27a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,7 @@ AC_SUBST([GST_DEBUGGER_API_VERSION], [0.1])
AC_SUBST([GLIB_VERSION], [2.45.4])
AC_SUBST([GTK_VERSION], [3.15.4])
AC_SUBST([GSTREAMER_VERSION], 1.4.3)
+AC_SUBST([SIGCPP_2_VERSION], 2.5.1)
AC_SUBST([PROTOBUF_VERSION], [2.6.1])
AC_SUBST([PROTOBUF_C_VERSION], [1.1.1])
AC_SUBST([GVC_VERSION], [2.38])
@@ -21,6 +22,7 @@ AC_SUBST([GVC_VERSION], [2.38])
PKG_CHECK_MODULES([GIO], [gio-2.0 >= "$GLIB_VERSION"])
PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= $GTK_VERSION])
PKG_CHECK_MODULES(GTKMM, gtkmm-3.0 >= $GTK_VERSION)
+PKG_CHECK_MODULES(SIGCPP_2, sigc++-2.0 >= $SIGCPP_2_VERSION)
PKG_CHECK_MODULES([GSTREAMER], [gstreamer-$GST_API_VERSION >= $GSTREAMER_VERSION])
PKG_CHECK_MODULES(GSTMM, gstreamermm-$GST_API_VERSION >= $GSTREAMER_VERSION)
PKG_CHECK_MODULES(PROTOBUF, protobuf >= PROTOBUF_VERSION)
diff --git a/src/gst-debugger/Makefile.am b/src/gst-debugger/Makefile.am
index 3d6f2e5..cba23a4 100644
--- a/src/gst-debugger/Makefile.am
+++ b/src/gst-debugger/Makefile.am
@@ -18,7 +18,6 @@ gst_debugger_headers = \
common_model_columns.h \
gst-debugger-resources.h \
main_window.h \
- sigc++lambdahack.h \
ui_utils.h \
controller/base_controller.h \
controller/command_factory.h \
diff --git a/src/gst-debugger/main_window.cpp b/src/gst-debugger/main_window.cpp
index 3c0ce80..d924310 100644
--- a/src/gst-debugger/main_window.cpp
+++ b/src/gst-debugger/main_window.cpp
@@ -8,7 +8,6 @@
#include "config.h"
#include "main_window.h"
-#include "sigc++lambdahack.h"
#include "ui_utils.h"
#include "gst-debugger-resources.h"
diff --git a/src/gst-debugger/modules/gst_message_module.cpp b/src/gst-debugger/modules/gst_message_module.cpp
index d3d0eef..4724697 100644
--- a/src/gst-debugger/modules/gst_message_module.cpp
+++ b/src/gst-debugger/modules/gst_message_module.cpp
@@ -7,7 +7,6 @@
#include "gst_message_module.h"
#include "gvalue-converter/gvalue_enum.h"
-#include "sigc++lambdahack.h"
#include "common/deserializer.h"
#include "controller/command_factory.h"
#include "controller/controller.h"
diff --git a/src/gst-debugger/modules/gst_qe_module.cpp b/src/gst-debugger/modules/gst_qe_module.cpp
index 1ad3835..16e9ccf 100644
--- a/src/gst-debugger/modules/gst_qe_module.cpp
+++ b/src/gst-debugger/modules/gst_qe_module.cpp
@@ -6,7 +6,6 @@
*/
#include "gst_qe_module.h"
-#include "sigc++lambdahack.h"
#include "gvalue-converter/gvalue_base.h"
#include "gvalue-converter/gvalue_enum.h"
#include "common/deserializer.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]