[tracker/wip/mschraal/meson-log-domain] build: Set tracker as the log domain



commit 45a3041b372fc327d296c0b87cde9a7f86a0eaf9
Author: Marinus Schraal <mschraal gnome org>
Date:   Thu Nov 15 01:05:24 2018 +0100

    build: Set tracker as the log domain
    
    An oversight of the meson port.

 config.h.meson.in                        | 3 +++
 meson.build                              | 1 +
 src/libtracker-sparql/tracker-resource.c | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/config.h.meson.in b/config.h.meson.in
index 8c7f99937..412ce898f 100644
--- a/config.h.meson.in
+++ b/config.h.meson.in
@@ -24,6 +24,9 @@
 /* Define the gettext package to be used */
 #mesondefine GETTEXT_PACKAGE
 
+/* Define the GLib log domain */
+#mesondefine G_LOG_DOMAIN
+
 /* Define that GStreamer Discoverer should be used */
 #mesondefine GSTREAMER_BACKEND_DISCOVERER
 
diff --git a/meson.build b/meson.build
index e71807016..3fb2b83af 100644
--- a/meson.build
+++ b/meson.build
@@ -250,6 +250,7 @@ conf.set('SHAREDIR', '"@0@/@1@"'.format(get_option('prefix'), get_option('datadi
 conf.set('TRACKER_MINERS_DIR', '"@0@/@1@/tracker/miners"'.format(get_option('prefix'), 
get_option('datadir')))
 
 conf.set('GETTEXT_PACKAGE', '"tracker"')
+conf.set_quoted('G_LOG_DOMAIN', meson.project_name())
 conf.set('PACKAGE_VERSION', '"@0@"'.format(meson.project_version()))
 conf.set('TRACKER_VERSION', '"@0@"'.format(meson.project_version()))
 conf.set('TRACKER_MAJOR_VERSION', tracker_major_version)
diff --git a/src/libtracker-sparql/tracker-resource.c b/src/libtracker-sparql/tracker-resource.c
index 6000e3862..33fc65416 100644
--- a/src/libtracker-sparql/tracker-resource.c
+++ b/src/libtracker-sparql/tracker-resource.c
@@ -17,12 +17,13 @@
  * Boston, MA  02110-1301, USA.
  */
 
+#include "config.h"
+
 #include <glib.h>
 #include <json-glib/json-glib.h>
 
 #include <string.h>
 
-#include "config.h"
 #include <tracker-uri.h>
 #include <tracker-resource.h>
 #include <tracker-ontologies.h>


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