GNOME.org
 

[tracker] build: Fix build failure from missing tracker-ontologies.h

commit cb608ef15e2640721391e15d684b0acfc8bccd28
Author: Marcus Karlsson <mk acc umu se>
Date:   Wed Oct 29 12:09:19 2014 +0100

    build: Fix build failure from missing tracker-ontologies.h
    
    Building tracker fails due to tracker-ontologies.h being missing. The
    header file was moved in commit a4d60c19 from libtracker-common to
    libtracker-sparql. Include the file from the correct location.
    
    A number of defines from tracker-ontologies.h were also renamed in
    a4d60c19. Update them where necessary.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=739347

 src/miners/rss/tracker-miner-rss.c                 |    6 ++--
 src/plugins/evolution/tracker-evolution-plugin.c   |    2 +-
 src/tracker-extract/tracker-extract-libav.c        |    2 +-
 src/tracker-writeback/tracker-writeback-playlist.c |    8 ++--
 src/tracker-writeback/tracker-writeback-taglib.c   |   16 +++++-----
 src/tracker-writeback/tracker-writeback-xmp.c      |   33 ++++++++++---------
 6 files changed, 34 insertions(+), 33 deletions(-)
---
diff --git a/src/miners/rss/tracker-miner-rss.c b/src/miners/rss/tracker-miner-rss.c
index cae6b17..05ebf01 100644
--- a/src/miners/rss/tracker-miner-rss.c
+++ b/src/miners/rss/tracker-miner-rss.c
@@ -25,7 +25,7 @@
 #include <libgrss.h>
 
 #include <libtracker-common/tracker-dbus.h>
-#include <libtracker-common/tracker-ontologies.h>
+#include <libtracker-sparql/tracker-ontologies.h>
 
 #include <glib/gi18n.h>
 
@@ -167,7 +167,7 @@ tracker_miner_rss_init (TrackerMinerRSS *object)
        priv->now_fetching = 0;
 
        g_message ("Listening for GraphUpdated changes on D-Bus interface...");
-       g_message ("  arg0:'%s'", TRACKER_MFO_PREFIX "FeedChannel");
+       g_message ("  arg0:'%s'", TRACKER_PREFIX_MFO "FeedChannel");
 
        priv->graph_updated_id =
                g_dbus_connection_signal_subscribe  (priv->connection,
@@ -175,7 +175,7 @@ tracker_miner_rss_init (TrackerMinerRSS *object)
                                                     "org.freedesktop.Tracker1.Resources",
                                                     "GraphUpdated",
                                                     "/org/freedesktop/Tracker1/Resources",
-                                                    TRACKER_MFO_PREFIX "FeedChannel",
+                                                    TRACKER_PREFIX_MFO "FeedChannel",
                                                     G_DBUS_SIGNAL_FLAGS_NONE,
                                                     graph_updated_cb,
                                                     object,
diff --git a/src/plugins/evolution/tracker-evolution-plugin.c 
b/src/plugins/evolution/tracker-evolution-plugin.c
index c00c653..94c6cc8 100644
--- a/src/plugins/evolution/tracker-evolution-plugin.c
+++ b/src/plugins/evolution/tracker-evolution-plugin.c
@@ -80,10 +80,10 @@
 #include <libedataserver/eds-version.h>
 
 /* Back to sanity */
+#include <libtracker-sparql/tracker-ontologies.h>
 #include <libtracker-sparql/tracker-sparql.h>
 
 #include <libtracker-common/tracker-date-time.h>
-#include <libtracker-common/tracker-ontologies.h>
 #include <libtracker-common/tracker-utils.h>
 #include <libtracker-common/tracker-type-utils.h>
 
diff --git a/src/tracker-extract/tracker-extract-libav.c b/src/tracker-extract/tracker-extract-libav.c
index 78b0071..500d7d8 100644
--- a/src/tracker-extract/tracker-extract-libav.c
+++ b/src/tracker-extract/tracker-extract-libav.c
@@ -21,7 +21,7 @@
 
 #include <glib.h>
 
-#include <libtracker-common/tracker-ontologies.h>
+#include <libtracker-sparql/tracker-ontologies.h>
 #include <libtracker-common/tracker-utils.h>
 
 #include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-writeback/tracker-writeback-playlist.c 
b/src/tracker-writeback/tracker-writeback-playlist.c
index 64958a3..2fb8610 100644
--- a/src/tracker-writeback/tracker-writeback-playlist.c
+++ b/src/tracker-writeback/tracker-writeback-playlist.c
@@ -25,7 +25,7 @@
 
 #include <totem-pl-parser.h>
 
-#include <libtracker-common/tracker-ontologies.h>
+#include <libtracker-sparql/tracker-ontologies.h>
 
 #include "tracker-writeback-file.h"
 
@@ -216,7 +216,7 @@ writeback_playlist_update_file_metadata (TrackerWritebackFile     *writeback_fil
 
        for (n = 0; n < values->len; n++) {
                const GStrv row = g_ptr_array_index (values, n);
-               if (g_strcmp0 (row[2], TRACKER_NFO_PREFIX "entryCounter") == 0) {
+               if (g_strcmp0 (row[2], TRACKER_PREFIX_NFO "entryCounter") == 0) {
                        rewrite_playlist (connection, file, row[0]);
                        break;
                }
@@ -237,8 +237,8 @@ const gchar * const *
 writeback_module_get_rdf_types (void)
 {
        static const gchar *rdftypes[] = {
-               TRACKER_NFO_PREFIX "MediaList",
-               TRACKER_NFO_PREFIX "MediaFileListEntry",
+               TRACKER_PREFIX_NFO "MediaList",
+               TRACKER_PREFIX_NFO "MediaFileListEntry",
                NULL
        };
 
diff --git a/src/tracker-writeback/tracker-writeback-taglib.c 
b/src/tracker-writeback/tracker-writeback-taglib.c
index 40e290e..0c30edd 100644
--- a/src/tracker-writeback/tracker-writeback-taglib.c
+++ b/src/tracker-writeback/tracker-writeback-taglib.c
@@ -26,7 +26,7 @@
 
 #include <glib-object.h>
 
-#include <libtracker-common/tracker-ontologies.h>
+#include <libtracker-sparql/tracker-ontologies.h>
 
 #include "tracker-writeback-file.h"
 
@@ -159,11 +159,11 @@ writeback_taglib_update_file_metadata (TrackerWritebackFile     *writeback_file,
        for (n = 0; n < values->len; n++) {
                const GStrv row = g_ptr_array_index (values, n);
 
-               if (g_strcmp0 (row[2], TRACKER_NIE_PREFIX "title") == 0) {
+               if (g_strcmp0 (row[2], TRACKER_PREFIX_NIE "title") == 0) {
                        taglib_tag_set_title (tag, row[3]);
                }
 
-               if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "performer") == 0) {
+               if (g_strcmp0 (row[2], TRACKER_PREFIX_NMM "performer") == 0) {
                        gchar *artist_name = writeback_taglib_get_artist_name (connection, row[3]);
 
                        if (artist_name) {
@@ -172,7 +172,7 @@ writeback_taglib_update_file_metadata (TrackerWritebackFile     *writeback_file,
                        }
                }
 
-               if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "musicAlbum") == 0) {
+               if (g_strcmp0 (row[2], TRACKER_PREFIX_NMM "musicAlbum") == 0) {
                        gchar *album_name = writeback_taglib_get_album_name (connection, row[3]);
 
                        if (album_name) {
@@ -181,15 +181,15 @@ writeback_taglib_update_file_metadata (TrackerWritebackFile     *writeback_file,
                        }
                }
 
-               if (g_strcmp0 (row[2], TRACKER_RDFS_PREFIX "comment") == 0) {
+               if (g_strcmp0 (row[2], TRACKER_PREFIX_RDFS "comment") == 0) {
                        taglib_tag_set_comment (tag, row[3]);
                }
 
-               if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "genre") == 0) {
+               if (g_strcmp0 (row[2], TRACKER_PREFIX_NMM "genre") == 0) {
                        taglib_tag_set_genre (tag, row[3]);
                }
 
-               if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "trackNumber") == 0) {
+               if (g_strcmp0 (row[2], TRACKER_PREFIX_NMM "trackNumber") == 0) {
                        taglib_tag_set_track (tag, atoi (row[3]));
                }
        }
@@ -281,7 +281,7 @@ const gchar * const *
 writeback_module_get_rdf_types (void)
 {
        static const gchar *rdftypes[] = {
-               TRACKER_NFO_PREFIX "Audio",
+               TRACKER_PREFIX_NFO "Audio",
                NULL
        };
 
diff --git a/src/tracker-writeback/tracker-writeback-xmp.c b/src/tracker-writeback/tracker-writeback-xmp.c
index 36d3036..6da1315 100644
--- a/src/tracker-writeback/tracker-writeback-xmp.c
+++ b/src/tracker-writeback/tracker-writeback-xmp.c
@@ -32,6 +32,7 @@
 #include <gio/gio.h>
 
 #include <libtracker-common/tracker-common.h>
+#include <libtracker-sparql/tracker-ontologies.h>
 #include <libtracker-sparql/tracker-sparql.h>
 
 #include "tracker-writeback-file.h"
@@ -293,7 +294,7 @@ writeback_xmp_update_file_metadata (TrackerWritebackFile     *wbf,
                 * the actual camera did, anyway? Even if the user overwrites them in
                 * the RDF store ... (does he know what he's doing anyway?) */
 
-               if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "meteringMode") == 0) {
+               if (g_strcmp0 (row[2], TRACKER_PREFIX_NMM "meteringMode") == 0) {
 
                        xmp_delete_property (xmp, NS_EXIF, "MeteringMode");
 
@@ -306,28 +307,28 @@ writeback_xmp_update_file_metadata (TrackerWritebackFile     *wbf,
                           6 = Partial
                           255 = other  */
 
-                       if        (g_strcmp0 (row[3], TRACKER_NMM_PREFIX 
"metering-mode-center-weighted-average") == 0) {
+                       if        (g_strcmp0 (row[3], TRACKER_PREFIX_NMM 
"metering-mode-center-weighted-average") == 0) {
                                xmp_set_property (xmp, NS_EXIF, "MeteringMode", "0", 0);
-                       } else if (g_strcmp0 (row[3], TRACKER_NMM_PREFIX "metering-mode-average") == 0) {
+                       } else if (g_strcmp0 (row[3], TRACKER_PREFIX_NMM "metering-mode-average") == 0) {
                                xmp_set_property (xmp, NS_EXIF, "MeteringMode", "1", 0);
-                       } else if (g_strcmp0 (row[3], TRACKER_NMM_PREFIX "metering-mode-spot") == 0) {
+                       } else if (g_strcmp0 (row[3], TRACKER_PREFIX_NMM "metering-mode-spot") == 0) {
                                xmp_set_property (xmp, NS_EXIF, "MeteringMode", "3", 0);
-                       } else if (g_strcmp0 (row[3], TRACKER_NMM_PREFIX "metering-mode-multispot") == 0) {
+                       } else if (g_strcmp0 (row[3], TRACKER_PREFIX_NMM "metering-mode-multispot") == 0) {
                                xmp_set_property (xmp, NS_EXIF, "MeteringMode", "4", 0);
-                       } else if (g_strcmp0 (row[3], TRACKER_NMM_PREFIX "metering-mode-pattern") == 0) {
+                       } else if (g_strcmp0 (row[3], TRACKER_PREFIX_NMM "metering-mode-pattern") == 0) {
                                xmp_set_property (xmp, NS_EXIF, "MeteringMode", "5", 0);
-                       } else if (g_strcmp0 (row[3], TRACKER_NMM_PREFIX "metering-mode-partial") == 0) {
+                       } else if (g_strcmp0 (row[3], TRACKER_PREFIX_NMM "metering-mode-partial") == 0) {
                                xmp_set_property (xmp, NS_EXIF, "MeteringMode", "6", 0);
                        } else {
                                xmp_set_property (xmp, NS_EXIF, "MeteringMode", "255", 0);
                        }
                }
 
-               if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "whiteBalance") == 0) {
+               if (g_strcmp0 (row[2], TRACKER_PREFIX_NMM "whiteBalance") == 0) {
 
                        xmp_delete_property (xmp, NS_EXIF, "WhiteBalance");
 
-                       if (g_strcmp0 (row[3], TRACKER_NMM_PREFIX "white-balance-auto") == 0) {
+                       if (g_strcmp0 (row[3], TRACKER_PREFIX_NMM "white-balance-auto") == 0) {
                                /* 0 = Auto white balance
                                 * 1 = Manual white balance */
                                xmp_set_property (xmp, NS_EXIF, "WhiteBalance", "0", 0);
@@ -336,11 +337,11 @@ writeback_xmp_update_file_metadata (TrackerWritebackFile     *wbf,
                        }
                }
 
-               if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "flash") == 0) {
+               if (g_strcmp0 (row[2], TRACKER_PREFIX_NMM "flash") == 0) {
 
                        xmp_delete_property (xmp, NS_EXIF, "Flash");
 
-                       if (g_strcmp0 (row[3], TRACKER_NMM_PREFIX "flash-on") == 0) {
+                       if (g_strcmp0 (row[3], TRACKER_PREFIX_NMM "flash-on") == 0) {
                                /* 0 = Flash did not fire
                                 * 1 = Flash fired */
                                xmp_set_property (xmp, NS_EXIF, "Flash", "1", 0);
@@ -353,29 +354,29 @@ writeback_xmp_update_file_metadata (TrackerWritebackFile     *wbf,
                /* TODO: Don't write row[3] as-is here, read xmp_specification.pdf,
                   page 84 (bottom). */
 
-               if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "focalLength") == 0) {
+               if (g_strcmp0 (row[2], TRACKER_PREFIX_NMM "focalLength") == 0) {
                        xmp_delete_property (xmp, NS_EXIF, "FocalLength");
                        xmp_set_property (xmp, NS_EXIF, "FocalLength", row[3], 0);
                }
 
-               if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "exposureTime") == 0) {
+               if (g_strcmp0 (row[2], TRACKER_PREFIX_NMM "exposureTime") == 0) {
                        xmp_delete_property (xmp, NS_EXIF, "ExposureTime");
                        xmp_set_property (xmp, NS_EXIF, "ExposureTime", row[3], 0);
                }
 
-               if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "isoSpeed") == 0) {
+               if (g_strcmp0 (row[2], TRACKER_PREFIX_NMM "isoSpeed") == 0) {
                        xmp_delete_property (xmp, NS_EXIF, "ISOSpeedRatings");
                        xmp_set_property (xmp, NS_EXIF, "ISOSpeedRatings", row[3], 0);
                }
 
-               if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "fnumber") == 0) {
+               if (g_strcmp0 (row[2], TRACKER_PREFIX_NMM "fnumber") == 0) {
                        xmp_delete_property (xmp, NS_EXIF, "FNumber");
                        xmp_set_property (xmp, NS_EXIF, "FNumber", row[3], 0);
                }
 
 
                /* Totally deprecated: this uses nfo:Equipment nowadays */
-               if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "camera") == 0) {
+               if (g_strcmp0 (row[2], TRACKER_PREFIX_NMM "camera") == 0) {
                        gchar *work_on = g_strdup (row[3]);
                        gchar *ptr = strchr (work_on, ' ');
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]