Package: meson
Version: 0.56.0-1.1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
Control: affects -1 + src:cinnamon-settings-daemon

cinnamon-settings-daemon fails to cross build from source, because meson
fails to locate cups. meson tried methods pkg-config and config-tool.
Unfortunately, cups upstream refuses to add a pkg-config file (see
https://github.com/apple/cups/issues/3128) and the config-tool method
refuses to use cups-config. The cups-config tool is architecture
agnostic and can very well be used during cross compilation. All we have
to do is add it to the cross file. I've attached a patch for your
convenience.

Helmut
diff --minimal -Nru meson-0.56.0/debian/changelog meson-0.56.0/debian/changelog
--- meson-0.56.0/debian/changelog       2020-11-28 15:30:07.000000000 +0100
+++ meson-0.56.0/debian/changelog       2020-12-17 17:30:01.000000000 +0100
@@ -1,3 +1,10 @@
+meson (0.56.0-1.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Add support for cups-config to debcrossgen. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Thu, 17 Dec 2020 17:30:01 +0100
+
 meson (0.56.0-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --minimal -Nru meson-0.56.0/debian/debcrossgen 
meson-0.56.0/debian/debcrossgen
--- meson-0.56.0/debian/debcrossgen     2020-10-30 09:28:05.000000000 +0100
+++ meson-0.56.0/debian/debcrossgen     2020-12-17 17:30:01.000000000 +0100
@@ -110,6 +110,10 @@
             ofile.write("pkgconfig = '%s'\n" % locate_path("%s-pkg-config" % 
host_arch))
         except ValueError:
             pass # pkg-config is optional
+        try:
+            ofile.write("cups-config = '%s'\n" % locate_path("cups-config"))
+        except ValueError:
+            pass # cups-config is optional
         ofile.write('\n[properties]\n')
         write_args_from_envvars(ofile)
         ofile.write('\n[host_machine]\n')

Reply via email to