[Commits] [SCM] claws branch, gtk2, updated. 3.19.1-95-g76b6779e9

paul at claws-mail.org paul at claws-mail.org
Sun Nov 5 16:53:04 UTC 2023


The branch, gtk2 has been updated
       via  76b6779e9e2d06fa409b2d9fe710844b8e2a878e (commit)
      from  c1654e793e7ce8a8c4acffd57adcf4197b47a32d (commit)

Summary of changes:
 INSTALL                 |  3 ---
 configure.ac            | 37 -------------------------------------
 manual/en/plugins.xml   | 12 +-----------
 manual/es/plugins.xml   | 11 -----------
 manual/fr/plugins.xml   | 10 ----------
 po/POTFILES.in          |  3 ---
 src/plugins/Makefile.am |  1 -
 7 files changed, 1 insertion(+), 76 deletions(-)


- Log -----------------------------------------------------------------
commit 76b6779e9e2d06fa409b2d9fe710844b8e2a878e
Author: Paul <paul at claws-mail.org>
Date:   Sun Nov 5 16:51:49 2023 +0000

    don't build or distribute the gdata plugin

diff --git a/INSTALL b/INSTALL
index 40135e053..203c45932 100644
--- a/INSTALL
+++ b/INSTALL
@@ -48,9 +48,6 @@ D-Bus (>= 0.60)
 Enchant (and dictionaries) (>= 1.0.0)
     for spell-checker support
     https://abiword.github.io/enchant/
-GData (>= 0.6.4)
-    for GData plugin support
-    https://wiki.gnome.org/action/show/Projects/libgdata
 GnuPG (>= 1.2.1) and GPGME (>=  0.4.5)
     for GnuPG and S/MIME plugin support
     https://www.gnupg.org/
diff --git a/configure.ac b/configure.ac
index e60e6a7f8..e4ebe1ac2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1148,10 +1148,6 @@ AC_ARG_ENABLE(fetchinfo-plugin,
 		[  --disable-fetchinfo-plugin      Do not build fetchinfo plugin],
 		[enable_fetchinfo_plugin=$enableval], [enable_fetchinfo_plugin=auto])
 
-AC_ARG_ENABLE(gdata-plugin,
-		[  --disable-gdata-plugin          Do not build gdata plugin],
-		[enable_gdata_plugin=$enableval], [enable_gdata_plugin=auto])
-
 AC_ARG_ENABLE(keyword_warner-plugin,
 		[  --disable-keyword_warner-plugin   Do not build keyword_warner plugin],
 		[enable_keyword_warner_plugin=$enableval], [enable_keyword_warner_plugin=auto])
@@ -1243,7 +1239,6 @@ dnl either yes or no, and do the AC_SUBST calls.
 
 dnl Archive:		libarchive
 dnl Fancy:		Webkit, curl, optionally libsoup-gnome
-dnl Gdata:		libgdata
 dnl Litehtml		a C++ compiler, >=glib-2.36, cairo, fontconfig, gumbo, curl
 dnl Libravatar:		libcurl
 dnl Notification:	optionally libnotify  unity/messaging-menu
@@ -1313,11 +1308,6 @@ AC_CHECK_LIB([archive], [archive_read_new],
 		       HAVE_ARCHIVE=no
 		       )
 
-dnl libgdata *******************************************************************
-PKG_CHECK_MODULES(GDATA, libgdata >= 0.17.2, HAVE_GDATA=yes, HAVE_GDATA=no)
-AC_SUBST(GDATA_CFLAGS)
-AC_SUBST(GDATA_LIBS)
-
 dnl cairo **********************************************************************
 PKG_CHECK_MODULES(CAIRO, cairo >= 1.12.0, HAVE_CAIRO=yes, HAVE_CAIRO=no)
 AC_SUBST(CAIRO_CFLAGS)
@@ -1670,31 +1660,6 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-AC_MSG_CHECKING([whether to build gdata plugin])
-if test x"$enable_gdata_plugin" != xno; then
-	dependencies_missing=""
-
-	if test x"$HAVE_GDATA" = xno; then
-		dependencies_missing="libgdata $dependencies_missing"
-	fi
-
-	if test x"$dependencies_missing" = x; then
-		PLUGINS="$PLUGINS gdata"
-		AC_MSG_RESULT(yes)
-	elif test x"$enable_gdata_plugin" = xauto; then
-		AC_MSG_RESULT(no)
-		AC_MSG_WARN("Plugin gdata will not be built; missing $dependencies_missing")
-		enable_gdata_plugin=no
-		MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS gdata"
-	else
-		AC_MSG_RESULT(no)
-		AC_MSG_ERROR("Plugin gdata cannot be built; missing $dependencies_missing")
-	fi
-else
-	DISABLED_PLUGINS="$DISABLED_PLUGINS gdata"
-	AC_MSG_RESULT(no)
-fi
-
 AC_MSG_CHECKING([whether to build keyword_warner plugin])
 if test x"$enable_keyword_warner_plugin" != xno; then
 	PLUGINS="$PLUGINS keyword_warner"
@@ -2183,7 +2148,6 @@ AM_CONDITIONAL(BUILD_DEMO_PLUGIN,		test x"$enable_demo_plugin" != xno)
 AM_CONDITIONAL(BUILD_DILLO_PLUGIN,		test x"$enable_dillo_plugin" != xno)
 AM_CONDITIONAL(BUILD_FANCY_PLUGIN,		test x"$enable_fancy_plugin" != xno)
 AM_CONDITIONAL(BUILD_FETCHINFO_PLUGIN,		test x"$enable_fetchinfo_plugin" != xno)
-AM_CONDITIONAL(BUILD_GDATA_PLUGIN,		test x"$enable_gdata_plugin" != xno)
 AM_CONDITIONAL(BUILD_KEYWORD_WARNER_PLUGIN,	test x"$enable_keyword_warner_plugin" != xno)
 AM_CONDITIONAL(BUILD_LIBRAVATAR_PLUGIN,		test x"$enable_libravatar_plugin" != xno)
 AM_CONDITIONAL(BUILD_LITEHTML_VIEWER_PLUGIN,	test x"$enable_litehtml_viewer_plugin" != xno)
@@ -2241,7 +2205,6 @@ src/plugins/fancy/Makefile
 src/plugins/fancy/version.rc
 src/plugins/fetchinfo/Makefile
 src/plugins/fetchinfo/version.rc
-src/plugins/gdata/Makefile
 src/plugins/keyword_warner/Makefile
 src/plugins/keyword_warner/version.rc
 src/plugins/litehtml_viewer/Makefile
diff --git a/manual/en/plugins.xml b/manual/en/plugins.xml
index 485ec94f3..b50a72657 100644
--- a/manual/en/plugins.xml
+++ b/manual/en/plugins.xml
@@ -153,17 +153,7 @@
 	  </para>
 	</listitem>
       </varlistentry>
-      <varlistentry>
-	<term>GData</term>
-	<listitem>
-	  <para>
-	Provides an interface to Google services using the gdata library.
-	Currently, the only implemented functionality is to include Google
-	Contacts in the Tab-address completion.
-	  </para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
+     <varlistentry>
 	<term>Keyword Warner</term>
 	<listitem>
 	  <para>
diff --git a/manual/es/plugins.xml b/manual/es/plugins.xml
index 89ebbabb4..4ba0d4063 100644
--- a/manual/es/plugins.xml
+++ b/manual/es/plugins.xml
@@ -162,17 +162,6 @@
 	  </para>
 	</listitem>
       </varlistentry>
-      <varlistentry>
-	<term>GData</term>
-	<listitem>
-	  <para>
-	Proporciona un interface para los servicios de Google usando la
-	biblioteca gdata. La única funcionalidad implmementada actualmente
-	es incluir los contactos de Google en la función de auto-completar
-	direcciones con el tabulador.
-	  </para>
-	</listitem>
-      </varlistentry>
       <varlistentry>
 	<term>Aviso de palabras clave</term>
 	<listitem>
diff --git a/manual/fr/plugins.xml b/manual/fr/plugins.xml
index 4ca9c79b5..a201a06dd 100644
--- a/manual/fr/plugins.xml
+++ b/manual/fr/plugins.xml
@@ -156,16 +156,6 @@
 	  </para>
         </listitem>
       </varlistentry>
-      <varlistentry>
-        <term>GData</term>
-        <listitem>
-          <para>
-	Fournit une interface vers les services Google via la bibliothèque gdata.
-	Pour l'instant, la seule fonctionnalité implémentée est d'inclure les
-	contacts Google dans la complétion d'adresses.
-	  </para>
-        </listitem>
-      </varlistentry>
       <varlistentry>
 	<term>Keyword Warner</term>
 	<listitem>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6dd20a736..a05b546d7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -110,9 +110,6 @@ src/plugins/fancy/fancy_prefs.c
 src/plugins/fancy/fancy_viewer.c
 src/plugins/fetchinfo/fetchinfo_plugin.c
 src/plugins/fetchinfo/fetchinfo_plugin_gtk.c
-src/plugins/gdata/cm_gdata_contacts.c
-src/plugins/gdata/cm_gdata_prefs.c
-src/plugins/gdata/gdata_plugin.c
 src/plugins/keyword_warner/keyword_warner.c
 src/plugins/keyword_warner/keyword_warner_prefs.c
 src/plugins/libravatar/libravatar.c
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 3961b3edf..fff6071ed 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -18,7 +18,6 @@ SUBDIRS = \
 	dillo \
 	fancy \
 	fetchinfo \
-	gdata \
 	keyword_warner \
 	litehtml_viewer \
 	libravatar \

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list