[glom/gtkmm4v4] Build: Use glibmm-2.56 instead of glibmm-2.54.



commit d828d5d3c134c0b8a8e15936df979e8a7af80a8a
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Oct 31 23:20:19 2017 +0100

    Build: Use glibmm-2.56 instead of glibmm-2.54.
    
    We renamed the (unstable ABI in glibmm.

 configure.ac                       |    2 +-
 glom/libglom/connectionpool.cc     |    4 ++--
 glom/libglom/libepc/dispatcher.h   |    2 +-
 glom/libglom/libepc/publisher.h    |    6 +++---
 glom/libglom/libepc/service-type.h |    2 +-
 po/POTFILES.in                     |    4 ++++
 6 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e1cd015..89857f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -321,7 +321,7 @@ AS_IF([test "x$ENABLE_DOCUMENTATION" != xno],
 MM_ARG_ENABLE_DOCUMENTATION
 MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag], [mm-common-libstdc++])
 MM_ARG_WITH_TAGFILE_DOC([libsigc++-3.0.tag], [sigc++-3.0])
-MM_ARG_WITH_TAGFILE_DOC([glibmm-2.54.tag], [glibmm-2.54])
+MM_ARG_WITH_TAGFILE_DOC([glibmm-2.56.tag], [glibmm-2.56])
 MM_ARG_WITH_TAGFILE_DOC([cairomm-1.16.tag], [cairomm-1.16])
 MM_ARG_WITH_TAGFILE_DOC([pangomm-2.42.tag], [pangomm-2.42])
 
diff --git a/glom/libglom/connectionpool.cc b/glom/libglom/connectionpool.cc
index fa629e2..b946403 100644
--- a/glom/libglom/connectionpool.cc
+++ b/glom/libglom/connectionpool.cc
@@ -33,8 +33,8 @@
 #ifdef G_OS_WIN32
 # include <windows.h>
 #else
-# include <libepc/shell.h> //For epc_shell_set_progress_hooks().
-# include <libepc/publisher.h>
+# include <libglom/libepc/shell.h> //For epc_shell_set_progress_hooks().
+# include <libglom/libepc/publisher.h>
 #endif
 
 #include <csignal> //To catch segfaults
diff --git a/glom/libglom/libepc/dispatcher.h b/glom/libglom/libepc/dispatcher.h
index 8c7e8a2..3a0fb69 100644
--- a/glom/libglom/libepc/dispatcher.h
+++ b/glom/libglom/libepc/dispatcher.h
@@ -21,7 +21,7 @@
 #ifndef __EPC_DISPATCHER_H__
 #define __EPC_DISPATCHER_H__
 
-#include <libepc/service-info.h>
+#include <libglom/libepc/service-info.h>
 
 G_BEGIN_DECLS
 
diff --git a/glom/libglom/libepc/publisher.h b/glom/libglom/libepc/publisher.h
index c087133..57ddb81 100644
--- a/glom/libglom/libepc/publisher.h
+++ b/glom/libglom/libepc/publisher.h
@@ -21,9 +21,9 @@
 #ifndef __EPC_PUBLISHER_H__
 #define __EPC_PUBLISHER_H__
 
-#include <libepc/contents.h>
-#include <libepc/dispatcher.h>
-#include <libepc/service-type.h>
+#include <libglom/libepc/contents.h>
+#include <libglom/libepc/dispatcher.h>
+#include <libglom/libepc/service-type.h>
 
 G_BEGIN_DECLS
 
diff --git a/glom/libglom/libepc/service-type.h b/glom/libglom/libepc/service-type.h
index 73b0020..3bc0ee1 100644
--- a/glom/libglom/libepc/service-type.h
+++ b/glom/libglom/libepc/service-type.h
@@ -21,7 +21,7 @@
 #ifndef __EPC_SERVICE_TYPE_H__
 #define __EPC_SERVICE_TYPE_H__
 
-#include <libepc/protocol.h>
+#include <libglom/libepc/protocol.h>
 
 /**
  * EPC_SERVICE_TYPE_HTTP:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cca3dcc..fa9825f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -56,6 +56,10 @@ glom/libglom/utils.cc
 glom/libglom/db_utils.cc
 glom/libglom/report_builder.cc
 glom/libglom/xsl_utils.cc
+glom/libglom/libepc/consumer.c
+glom/libglom/libepc/publisher.c
+glom/libglom/libepc/shell.c
+glom/libglom/libepc/tls.c
 glom/glom_create_from_example.cc
 glom/glom_export_po.cc
 glom/glom_export_po_all.cc


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]