From: Jeremy Bicha <jeremy.bicha@canonical.com>
Date: Fri, 2 Dec 2022 03:05:42 +0000 (-0500)
Subject: Build with libcloudproviders
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~60
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=da4ac7759a7d2d1739822c54b0efd4e4d860eefd;p=gtk%2B3.0.git

Build with libcloudproviders

This wasn't enabled years ago because it caused a test failure
with the autotools tests. But we've switched to meson now and
finally it looks like libcloudproviders has fixed enough issues
---

diff --git a/debian/control b/debian/control
index c825b5a713..3a75a4841d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: gtk+3.0
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Simon McVittie <smcv@debian.org>, Jeremy Bicha <jbicha@ubuntu.com>
+Uploaders: Simon McVittie <smcv@debian.org>, Jeremy Bícha <jbicha@ubuntu.com>
 Build-Depends: adwaita-icon-theme-full <!nocheck>,
                at-spi2-core <!nocheck>,
                dbus-daemon <!nocheck>,
@@ -18,6 +18,7 @@ Build-Depends: adwaita-icon-theme-full <!nocheck>,
                libatk-bridge2.0-dev (>= 2.15.1),
                libatk1.0-dev (>= 2.35.1),
                libcairo2-dev (>= 1.14.0),
+               libcloudproviders-dev (>= 0.3.2),
                libcolord-dev (>= 0.1.9),
                libcups2-dev (>= 1.7),
                libegl1-mesa-dev [linux-any],
diff --git a/debian/control.in b/debian/control.in
index cf49e8523e..10d59d2786 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -18,6 +18,7 @@ Build-Depends: adwaita-icon-theme-full <!nocheck>,
                libatk-bridge2.0-dev (>= 2.15.1),
                libatk1.0-dev (>= 2.35.1),
                libcairo2-dev (>= 1.14.0),
+               libcloudproviders-dev (>= 0.3.2),
                libcolord-dev (>= 0.1.9),
                libcups2-dev (>= 1.7),
                libegl1-mesa-dev [linux-any],
diff --git a/debian/rules b/debian/rules
index b294cf68db..ee0ac06fcf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -120,6 +120,13 @@ else
 configure_flags_deb += -Dgtk_doc=true
 endif
 
+ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes), yes)
+# Not in main repository
+configure_flags_deb += -Dcloudproviders=false
+else
+configure_flags_deb += -Dcloudproviders=true
+endif
+
 configure_flags_udeb = \
 	-Dbroadway_backend=false \
 	-Dcolord=no \