GNOME.org
 

[tracker] src/miners/flickr: Removed

commit 2a91a2d43d320ad26762ee81688406e59d180e48
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Mar 15 11:07:34 2013 +0000

    src/miners/flickr: Removed
    
    This is going to eventually end up in the GNOME Photos application most likely
    and this was discussed as part of this thread:
    https://mail.gnome.org/archives/tracker-list/2013-March/msg00007.html

 Makefile.am                                        |    1 -
 configure.ac                                       |   35 -
 data/.gitignore                                    |    1 -
 data/Makefile.am                                   |   10 -
 data/dbus/Makefile.am                              |    6 -
 ...rg.freedesktop.Tracker1.Miner.Flickr.service.in |    3 -
 data/icons/scalable/Makefile.am                    |    8 +-
 data/icons/scalable/tracker-miner-flickr.svg       |  206 -----
 data/miners/Makefile.am                            |    6 -
 data/miners/tracker-miner-flickr.desktop.in.in     |    7 -
 data/tracker-miner-flickr.desktop.in.in            |   18 -
 po/POTFILES.in                                     |    2 -
 po/POTFILES.skip                                   |    1 -
 src/miners/Makefile.am                             |    4 -
 src/miners/flickr/.gitignore                       |    2 -
 src/miners/flickr/Makefile.am                      |   31 -
 src/miners/flickr/tracker-miner-flickr.vala        |  972 --------------------
 src/miners/flickr/tracker-writeback.c              |  189 ----
 src/miners/flickr/tracker-writeback.h              |   48 -
 19 files changed, 1 insertions(+), 1549 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 218c26f..e193bd9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -93,7 +93,6 @@ DISTCHECK_CONFIGURE_FLAGS =                            \
        --enable-gtk-doc                               \
        --enable-introspection                         \
        --disable-miner-rss                            \
-       --disable-miner-flickr                         \
        --disable-miner-evolution                      \
        --disable-miner-thunderbird                    \
        --disable-miner-firefox                        \
diff --git a/configure.ac b/configure.ac
index ac2efaa..42b6fac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -434,16 +434,6 @@ PKG_CHECK_MODULES(TRACKER_MINER_RSS, [$TRACKER_MINER_RSS_REQUIRED],
                   [have_tracker_miner_rss=yes],
                   [have_tracker_miner_rss=no])
 
-# Check requirements for tracker-miner-flickr
-TRACKER_MINER_FLICKR_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
-                               rest-0.7     >= $REST_REQUIRED"
-
-PKG_CHECK_MODULES(TRACKER_MINER_FLICKR, [$TRACKER_MINER_FLICKR_REQUIRED],
-                  [have_tracker_miner_flickr=yes],
-                  [have_tracker_miner_flickr=no])
-
-TRACKER_MINER_FLICKR_LIBS="$TRACKER_MINER_FLICKR_LIBS -lz -lm"
-
 # Check requirements for tracker-utils
 TRACKER_UTILS_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
                         gio-unix-2.0 >= $GLIB_REQUIRED"
@@ -1160,29 +1150,6 @@ fi
 AM_CONDITIONAL(HAVE_TRACKER_MINER_FS, test "x$have_tracker_miner_fs" = "xyes")
 
 ##################################################################
-# Check for tracker-miner-flickr
-##################################################################
-
-AC_ARG_ENABLE(miner_flickr,
-              AS_HELP_STRING([--enable-miner-flickr],
-                             [enable Flickr miner [[default=auto]]]),,
-                             [enable_tracker_miner_flickr=auto])
-
-enable_tracker_miner_flickr=$enable_miner_flickr
-
-if test "x$enable_tracker_miner_flickr" = "xyes"; then
-   if test "x$have_tracker_miner_flickr" != "xyes"; then
-      AC_MSG_ERROR([Couldn't find tracker-miner-flickr dependencies ($TRACKER_MINER_FLICKR_REQUIRED).])
-   fi
-else
-   if test "x$enable_tracker_miner_flickr" = "xno"; then
-      have_tracker_miner_flickr="no  (disabled)"
-   fi
-fi
-
-AM_CONDITIONAL(HAVE_TRACKER_MINER_FLICKR, test "x$have_tracker_miner_flickr" = "xyes")
-
-##################################################################
 # Check for tracker-miner-rss
 ##################################################################
 
@@ -2273,7 +2240,6 @@ AC_CONFIG_FILES([
        src/miners/Makefile
        src/miners/fs/Makefile
        src/miners/rss/Makefile
-       src/miners/flickr/Makefile
        src/tracker-store/Makefile
        src/tracker-control/Makefile
        src/tracker-extract/Makefile
@@ -2445,7 +2411,6 @@ Data Miners:
        Evolution:                              $have_tracker_miner_evolution 
($tracker_miner_evolution_install_dir)
         Thunderbird:                            $have_tracker_miner_thunderbird 
($tracker_miner_thunderbird_install_dir)
         FireFox:                                $have_tracker_miner_firefox 
($tracker_miner_firefox_install_dir)
-       Flickr:                                 $have_tracker_miner_flickr
 
 Plugins:
 
diff --git a/data/.gitignore b/data/.gitignore
index 8348853..590a630 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -2,6 +2,5 @@
 tracker-miner-fs.desktop.in
 tracker-status-icon.desktop.in
 tracker-store.desktop.in
-tracker-miner-flickr.desktop.in
 tracker-miner-rss.desktop.in
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 26b4b16..67adfa1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,10 +11,6 @@ tracker-miner-fs.desktop.in: tracker-miner-fs.desktop.in.in
        @sed -e "s|@libexecdir[ ]|${libexecdir}|"      \
             -e "s|@VERSION[ ]|${VERSION}|" $< > $@
 
-tracker-miner-flickr.desktop.in: tracker-miner-flickr.desktop.in.in
-       @$(SED) -e "s|@libexecdir[ ]|${libexecdir}|"   \
-            -e "s|@VERSION[ ]|${VERSION}|" $< > $@
-
 tracker-miner-rss.desktop.in: tracker-miner-rss.desktop.in.in
        @$(SED) -e "s|@libexecdir[ ]|${libexecdir}|"   \
             -e "s|@VERSION[ ]|${VERSION}|" $< > $@
@@ -22,14 +18,12 @@ tracker-miner-rss.desktop.in: tracker-miner-rss.desktop.in.in
 desktop_in_in_files =                                  \
        tracker-store.desktop.in.in                    \
        tracker-miner-fs.desktop.in.in                 \
-       tracker-miner-flickr.desktop.in.in             \
        tracker-miner-rss.desktop.in.in
 
 # Second take those new .in files and translate them
 desktop_in_files =                                     \
        tracker-store.desktop.in                       \
        tracker-miner-fs.desktop.in                    \
-       tracker-miner-flickr.desktop.in                \
        tracker-miner-rss.desktop.in
 
 # Third we choose what we want installed based on config
@@ -45,10 +39,6 @@ if HAVE_TRACKER_MINER_RSS
 autostart_DATA += tracker-miner-rss.desktop
 endif
 
-if HAVE_TRACKER_MINER_FLICKR
-autostart_DATA += tracker-miner-flickr.desktop
-endif
-
 @INTLTOOL_DESKTOP_RULE@
 
 # Set up pkg-config .pc files for exported libraries
diff --git a/data/dbus/Makefile.am b/data/dbus/Makefile.am
index eb1c8c6..193f799 100644
--- a/data/dbus/Makefile.am
+++ b/data/dbus/Makefile.am
@@ -22,7 +22,6 @@ service_in_files = \
        org.freedesktop.Tracker1.Miner.EMails.service.in \
        org.freedesktop.Tracker1.Miner.Files.service.in \
        org.freedesktop.Tracker1.Miner.Userguides.service.in \
-       org.freedesktop.Tracker1.Miner.Flickr.service.in \
        org.freedesktop.Tracker1.Miner.RSS.service.in  \
        org.freedesktop.Tracker1.Extract.service.in \
        org.freedesktop.Tracker1.Writeback.service.in
@@ -56,11 +55,6 @@ if HAVE_TRACKER_MINER_RSS
 service_DATA += org.freedesktop.Tracker1.Miner.RSS.service
 endif
 
-if HAVE_TRACKER_MINER_FLICKR
-service_DATA += org.freedesktop.Tracker1.Miner.Flickr.service
-endif
-
-
 EXTRA_DIST = \
        $(service_in_files) \
        $(config_DATA) \
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index 1d5552c..e5c1489 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -6,10 +6,4 @@ icon_DATA = tracker.svg
 minericonsdir = $(datadir)/tracker/icons
 minericons_DATA =
 
-if HAVE_TRACKER_MINER_FLICKR
-minericons_DATA += tracker-miner-flickr.svg
-endif
-
-EXTRA_DIST =                                           \
-       $(icon_DATA)                                   \
-       tracker-miner-flickr.svg
+EXTRA_DIST = $(icon_DATA)
diff --git a/data/miners/Makefile.am b/data/miners/Makefile.am
index a0abed6..272cef0 100644
--- a/data/miners/Makefile.am
+++ b/data/miners/Makefile.am
@@ -5,7 +5,6 @@ desktop_in_in_files =                                  \
        tracker-miner-applications.desktop.in.in       \
        tracker-miner-evolution.desktop.in.in          \
        tracker-miner-files.desktop.in.in              \
-       tracker-miner-flickr.desktop.in.in             \
        tracker-miner-rss.desktop.in.in
 
 desktop_in_files =                                     \
@@ -13,7 +12,6 @@ desktop_in_files =                                     \
        tracker-miner-applications.desktop.in          \
        tracker-miner-evolution.desktop.in             \
        tracker-miner-files.desktop.in                 \
-       tracker-miner-flickr.desktop.in                \
        tracker-miner-rss.desktop.in
 
 tracker_minersdir = $(datadir)/tracker/miners
@@ -39,10 +37,6 @@ if HAVE_TRACKER_MINER_RSS
 tracker_miners_DATA += tracker-miner-rss.desktop
 endif
 
-if HAVE_TRACKER_MINER_FLICKR
-tracker_miners_DATA += tracker-miner-flickr.desktop
-endif
-
 @INTLTOOL_DESKTOP_RULE@
 
 %.desktop.in: %.desktop.in.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index dcfe58c..a10f205 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,9 +11,7 @@ data/miners/tracker-miner-userguides.desktop.in.in
 data/miners/tracker-miner-applications.desktop.in.in
 data/miners/tracker-miner-evolution.desktop.in.in
 data/miners/tracker-miner-files.desktop.in.in
-data/miners/tracker-miner-flickr.desktop.in.in
 data/miners/tracker-miner-rss.desktop.in.in
-data/tracker-miner-flickr.desktop.in.in
 data/tracker-miner-fs.desktop.in.in
 data/tracker-miner-rss.desktop.in.in
 data/tracker-store.desktop.in.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 731f4a0..ca1f637 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,6 +1,5 @@
 # List of source files that should NOT be translated.
 # Please keep this file sorted alphabetically.
-data/tracker-miner-flickr.desktop.in
 data/tracker-miner-fs.desktop.in
 data/tracker-miner-rss.desktop.in
 data/tracker-status-icon.desktop.in
diff --git a/src/miners/Makefile.am b/src/miners/Makefile.am
index dd1afb0..9f017c6 100644
--- a/src/miners/Makefile.am
+++ b/src/miners/Makefile.am
@@ -9,7 +9,3 @@ endif
 if HAVE_TRACKER_MINER_RSS
 SUBDIRS += rss
 endif
-
-if HAVE_TRACKER_MINER_FLICKR
-SUBDIRS += flickr
-endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]