[gtk/pgriffis/remove-cloudprint-gtk3] Remove Google Cloud Print backend This service was shut down at the start of 2021
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/pgriffis/remove-cloudprint-gtk3] Remove Google Cloud Print backend This service was shut down at the start of 2021
- Date: Mon, 5 Jul 2021 15:53:02 +0000 (UTC)
commit c77ea5101e55b8690127beed14b26dd3520889b5
Author: Patrick Griffis <pgriffis igalia com>
Date: Mon Jul 5 10:52:31 2021 -0500
Remove Google Cloud Print backend
This service was shut down at the start of 2021
.gitlab-ci/test-docker-meson.sh | 2 +-
configure.ac | 36 -
meson_options.txt | 2 +-
modules/printbackends/Makefile.am | 6 +-
modules/printbackends/cloudprint/Makefile.am | 40 -
.../cloudprint/gtkcloudprintaccount.c | 677 -------------
.../cloudprint/gtkcloudprintaccount.h | 74 --
.../cloudprint/gtkprintbackendcloudprint.c | 1053 --------------------
.../cloudprint/gtkprintbackendcloudprint.h | 40 -
.../cloudprint/gtkprintercloudprint.c | 231 -----
.../cloudprint/gtkprintercloudprint.h | 43 -
modules/printbackends/meson.build | 23 -
po-properties/POTFILES.in | 2 -
po/POTFILES.in | 2 -
14 files changed, 3 insertions(+), 2228 deletions(-)
---
diff --git a/.gitlab-ci/test-docker-meson.sh b/.gitlab-ci/test-docker-meson.sh
index 469af621f7..a116839a9d 100755
--- a/.gitlab-ci/test-docker-meson.sh
+++ b/.gitlab-ci/test-docker-meson.sh
@@ -15,7 +15,7 @@ meson \
-Dx11_backend=true \
-Dwayland_backend=true \
-Dxinerama=yes \
- -Dprint_backends="file,lpr,test,cloudprint,cups" \
+ -Dprint_backends="file,lpr,test,cups" \
${EXTRA_MESON_FLAGS:-} \
_build
diff --git a/configure.ac b/configure.ac
index 5455af6a2e..51f9bc3a33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1576,38 +1576,6 @@ fi
AM_CONDITIONAL(HAVE_TRACKER3, test "x$have_tracker3" = "xyes")
-# Checks to see if we should compile with cloudprint backend for GTK+
-#
-
-AC_ARG_ENABLE(cloudprint,
- [AS_HELP_STRING([--disable-cloudprint],
- [disable cloudprint print backend])],,
- [enable_cloudprint=auto])
-
-if test "x$enable_cloudprint" = "xno"; then
- AM_CONDITIONAL(HAVE_CLOUDPRINT, false)
-else
- PKG_CHECK_MODULES(REST, [rest-0.7], have_rest=yes, have_rest=no)
- PKG_CHECK_MODULES(JSON_GLIB, [json-glib-1.0], have_json_glib=yes, have_json_glib=no)
- if test "x$have_rest" = "xyes" -a "x$have_json_glib" = "xyes"; then
- PRINT_BACKENDS="$PRINT_BACKENDS cloudprint"
- have_cloudprint=yes
- fi
- AM_CONDITIONAL(HAVE_CLOUDPRINT, test "x$have_cloudprint" = "xyes")
-fi
-
-if test "x$enable_cloudprint" = "xyes" -a "x$have_rest" = "xno"; then
- AC_MSG_ERROR([
-*** rest not found.
-])
-fi
-
-if test "x$enable_cloudprint" = "xyes" -a "x$have_json_glib" = "xno"; then
- AC_MSG_ERROR([
-*** json-glib not found.
-])
-fi
-
gtk_save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS"
@@ -1650,9 +1618,6 @@ fi
if test "$have_papi" != "yes" -a "$have_cups" != "yes"; then
GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,lpr"
fi
-if test "$have_cloudprint" = "yes"; then
- GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cloudprint"
-fi
AC_SUBST(GTK_PRINT_BACKENDS)
################################################################
@@ -1994,7 +1959,6 @@ modules/Makefile
modules/input/Makefile
modules/printbackends/Makefile
modules/printbackends/cups/Makefile
-modules/printbackends/cloudprint/Makefile
modules/printbackends/lpr/Makefile
modules/printbackends/file/Makefile
modules/printbackends/papi/Makefile
diff --git a/meson_options.txt b/meson_options.txt
index 4f605b41ba..1ca55b1467 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -22,7 +22,7 @@ option('tracker3', type: 'boolean', value: false,
# Print backends
option('print_backends', type : 'string', value : 'auto',
- description : 'Build the specified print backends (comma-separated list, any of
"cloudprint,cups,file,lpr,papi,test" or "auto")')
+ description : 'Build the specified print backends (comma-separated list, any of "cups,file,lpr,papi,test"
or "auto")')
option('colord', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
description : 'Build colord support for the CUPS printing backend')
diff --git a/modules/printbackends/Makefile.am b/modules/printbackends/Makefile.am
index f292fea851..76e3e2c8af 100644
--- a/modules/printbackends/Makefile.am
+++ b/modules/printbackends/Makefile.am
@@ -2,10 +2,6 @@ include $(top_srcdir)/Makefile.decl
SUBDIRS = file lpr
-if HAVE_CLOUDPRINT
-SUBDIRS += cloudprint
-endif
-
if HAVE_CUPS
SUBDIRS += cups
endif
@@ -18,7 +14,7 @@ if HAVE_PAPI
SUBDIRS += papi
endif
-DIST_SUBDIRS = cloudprint cups file lpr test papi
+DIST_SUBDIRS = cups file lpr test papi
EXTRA_DIST += \
meson.build
diff --git a/modules/printbackends/meson.build b/modules/printbackends/meson.build
index 7ffe671c4b..0964fccd12 100644
--- a/modules/printbackends/meson.build
+++ b/modules/printbackends/meson.build
@@ -1,7 +1,6 @@
# Print backend config: 'auto' means all backends we have dependencies for,
# the specific backend names mean we should fail if dependencies are missing
all_print_backends = [
- 'cloudprint',
'cups',
'file',
'lpr',
@@ -58,16 +57,6 @@ if enabled_print_backends.contains('papi')
endif
endif
-if enabled_print_backends.contains('cloudprint')
- rest_dep = dependency('rest-0.7', required : print_strict_deps)
- json_glib_dep = dependency('json-glib-1.0', required : print_strict_deps)
- if rest_dep.found() and json_glib_dep.found()
- print_backends += ['cloudprint']
- else
- message('\'cloudprint\' backend disabled: missing dependencies')
- endif
-endif
-
if enabled_print_backends.contains('cups')
cups_dep = dependency('cups', version : '>=1.7', required: print_strict_deps)
if cups_dep.found()
@@ -136,18 +125,6 @@ if print_backends.contains('test')
install : true)
endif
-if print_backends.contains('cloudprint')
- shared_module('printbackend-cloudprint',
- 'cloudprint/gtkprintbackendcloudprint.c',
- 'cloudprint/gtkprintercloudprint.c',
- 'cloudprint/gtkcloudprintaccount.c',
- c_args: printbackends_args,
- dependencies: [ libgtk_dep, rest_dep, json_glib_dep ],
- install_dir: printbackends_install_dir,
- name_suffix: module_suffix,
- install : true)
-endif
-
if print_backends.contains('cups')
shared_module('printbackend-cups',
'cups/gtkprintbackendcups.c',
diff --git a/po-properties/POTFILES.in b/po-properties/POTFILES.in
index ad8bff90c0..8dae6a5f76 100644
--- a/po-properties/POTFILES.in
+++ b/po-properties/POTFILES.in
@@ -346,8 +346,6 @@ modules/input/imviqr.c
modules/input/imwayland.c
modules/input/imwaylandgtk.c
modules/input/imxim.c
-modules/printbackends/cloudprint/gtkprintbackendcloudprint.c
-modules/printbackends/cloudprint/gtkprintercloudprint.c
modules/printbackends/cups/gtkprintbackendcups.c
modules/printbackends/cups/gtkprintercups.c
modules/printbackends/file/gtkprintbackendfile.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ddeb305acc..cb09da8767 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -397,8 +397,6 @@ modules/input/imviqr.c
modules/input/imwayland.c
modules/input/imwaylandgtk.c
modules/input/imxim.c
-modules/printbackends/cloudprint/gtkprintbackendcloudprint.c
-modules/printbackends/cloudprint/gtkprintercloudprint.c
modules/printbackends/cups/gtkprintbackendcups.c
modules/printbackends/cups/gtkprintercups.c
modules/printbackends/file/gtkprintbackendfile.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]