[grilo-plugins] pocket: Remove stand-alone C pocket plugin
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo-plugins] pocket: Remove stand-alone C pocket plugin
- Date: Tue, 21 Jul 2015 12:41:32 +0000 (UTC)
commit b53c916d12dfc393991155e126859103f681142d
Author: Bastien Nocera <hadess hadess net>
Date: Sun Jul 19 15:00:38 2015 +0200
pocket: Remove stand-alone C pocket plugin
It's been replaced by a Lua version.
configure.ac | 53 --
po/POTFILES.in | 1 -
src/Makefile.am | 6 +-
src/pocket/Makefile.am | 48 --
src/pocket/channel-pocket.svg | 137 -----
src/pocket/gnome-pocket.c | 1052 ---------------------------------------
src/pocket/gnome-pocket.h | 124 -----
src/pocket/grl-pocket.c | 393 ---------------
src/pocket/grl-pocket.h | 76 ---
src/pocket/grl-pocket.xml | 10 -
src/pocket/pocket.gresource.xml | 6 -
11 files changed, 1 insertions(+), 1905 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f480ad5..bdc98c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,8 +144,6 @@ PKG_CHECK_MODULES(OAUTH, oauth, HAVE_OAUTH=yes, HAVE_OAUTH=no)
PKG_CHECK_MODULES(GOA, [goa-1.0 >= 3.7.1], HAVE_GOA=yes, HAVE_GOA=no)
-PKG_CHECK_MODULES(GOA_WITH_POCKET, [goa-1.0 >= 3.11.4], HAVE_GOA_WITH_POCKET=yes, HAVE_GOA_WITH_POCKET=no)
-
PKG_CHECK_MODULES(TOTEM_PL_PARSER, totem-plparser >= 3.4.1, HAVE_TOTEM_PL_PARSER=yes,
HAVE_TOTEM_PL_PARSER=no)
PKG_CHECK_MODULES(TOTEM_PL_PARSER_MINI, totem-plparser-mini >= 3.4.1, HAVE_TOTEM_PL_PARSER_MINI=yes,
HAVE_TOTEM_PL_PARSER_MINI=no)
@@ -505,56 +503,6 @@ fi
AC_SUBST(DEPS_FLICKR_LIBS)
# ----------------------------------------------------------
-# BUILD POCKET PLUGIN
-# ----------------------------------------------------------
-
-AC_ARG_ENABLE(pocket,
- AC_HELP_STRING([--enable-pocket],
- [enable Pocket plugin (default: auto)]),
- [
- case "$enableval" in
- yes)
- if test "x$HAVE_JSON_GLIB" = "xno"; then
- AC_MSG_ERROR([json-glib not found, install it or use --disable-pocket])
- fi
- if test "x$HAVE_GOA_WITH_POCKET" = "xno"; then
- AC_MSG_ERROR([goa-1.0 >= 3.11.4 not found, install it or use --disable-pocket])
- fi
- if test "x$HAVE_REST" = "xno"; then
- AC_MSG_ERROR([rest >= 0.7.90 not found, install it or use --disable-pocket])
- fi
- if test "x$HAVE_TOTEM_PL_PARSER" = "xno"; then
- AC_MSG_ERROR([totem-pl-parser not found, install it or use --disable-pocket])
- fi
- ;;
- esac
- ],
- [
- if test "x$HAVE_JSON_GLIB" = "xyes" -a "x$HAVE_GOA_WITH_POCKET" = "xyes" -a "x$HAVE_REST" =
"xyes" -a "x$HAVE_TOTEM_PL_PARSER" = "xyes"; then
- enable_pocket=yes
- else
- enable_pocket=no
- fi
- ])
-
-AM_CONDITIONAL([POCKET_PLUGIN], [test "x$enable_pocket" = "xyes"])
-GRL_PLUGINS_ALL="$GRL_PLUGINS_ALL pocket"
-if test "x$enable_pocket" = "xyes"
-then
- GRL_PLUGINS_ENABLED="$GRL_PLUGINS_ENABLED pocket"
-fi
-
-POCKET_PLUGIN_ID="grl-pocket"
-AC_SUBST(POCKET_PLUGIN_ID)
-AC_DEFINE_UNQUOTED([POCKET_PLUGIN_ID], ["$POCKET_PLUGIN_ID"], [Pocket plugin ID])
-
-DEPS_POCKET_CFLAGS="$DEPS_CFLAGS $JSON_CFLAGS $GOA_WITH_POCKET_CFLAGS $REST_CFLAGS $TOTEM_PL_PARSER_CFLAGS"
-AC_SUBST(DEPS_POCKET_CFLAGS)
-
-DEPS_POCKET_LIBS="$DEPS_LIBS $JSON_LIBS $GOA_WITH_POCKET_LIBS $REST_LIBS $TOTEM_PL_PARSER_LIBS"
-AC_SUBST(DEPS_POCKET_LIBS)
-
-# ----------------------------------------------------------
# BUILD PODCASTS PLUGIN
# ----------------------------------------------------------
@@ -1446,7 +1394,6 @@ AC_CONFIG_FILES([
src/metadata-store/Makefile
src/opensubtitles/Makefile
src/optical-media/Makefile
- src/pocket/Makefile
src/podcasts/Makefile
src/raitv/Makefile
src/shoutcast/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c373a8e..45c1ecd 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -15,7 +15,6 @@ src/magnatune/grl-magnatune.c
src/metadata-store/grl-metadata-store.c
src/opensubtitles/grl-opensubtitles.c
src/optical-media/grl-optical-media.c
-src/pocket/grl-pocket.c
src/podcasts/grl-podcasts.c
src/raitv/grl-raitv.c
src/shoutcast/grl-shoutcast.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 92a0a31..d0b9e14 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -70,10 +70,6 @@ if OPTICAL_MEDIA_PLUGIN
SUBDIRS += optical-media
endif
-if POCKET_PLUGIN
-SUBDIRS += pocket
-endif
-
if PODCASTS_PLUGIN
SUBDIRS += podcasts
endif
@@ -117,6 +113,6 @@ endif
DIST_SUBDIRS = \
apple-trailers bliptv bookmarks dleyna dmap filesystem flickr freebox gravatar jamendo \
lastfm-albumart local-metadata lua-factory magnatune metadata-store opensubtitles \
- optical-media pocket podcasts raitv shoutcast thetvdb tmdb tracker vimeo youtube
+ optical-media podcasts raitv shoutcast thetvdb tmdb tracker vimeo youtube
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]