[jhbuild] 3.28: colord hard-depends on libgudev



commit 3876d00ec952633ae60e755e449b692355a44f8f
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Sat Jan 20 16:25:35 2018 +0800

    3.28: colord hard-depends on libgudev
    
    I am not sure whether the dependency on libgudev is acceptable for other
    operating systems, but I think it is OK for FreeBSD because we already
    have a libudev implementation based on FreeBSD devd.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=792379

 modulesets/gnome-suites-core-deps-3.28.modules |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.28.modules b/modulesets/gnome-suites-core-deps-3.28.modules
index 045db87..53dcf99 100644
--- a/modulesets/gnome-suites-core-deps-3.28.modules
+++ b/modulesets/gnome-suites-core-deps-3.28.modules
@@ -263,6 +263,15 @@ the module and we will just change it to use a tarball anyway.
     <if condition-unset="systemd">
       <mesonargs value="-Denable-systemd=false"/>
     </if>
+    <if condition-unset="linux">
+      <mesonargs value="-Denable-udev-rules=false"/>
+    </if>
+    <if condition-unset="udev-hwdb">
+      <!-- Setting the path of pnp.ids file is required to disable hwdb -->
+      <if condition-set="freebsd">
+        <mesonargs value="-Dwith-pnp-ids=/usr/local/share/pnpids/pnp.ids"/>
+      </if>
+    </if>
     <branch repo="github.com" checkoutdir="colord" module="hughsie/colord.git"/>
     <dependencies>
       <dep package="argyll"/>
@@ -270,6 +279,7 @@ the module and we will just change it to use a tarball anyway.
       <dep package="dbus"/>
       <dep package="sqlite3"/>
       <dep package="lcms2"/>
+      <dep package="libgudev"/>
       <dep package="gobject-introspection"/>
       <dep package="docbook-utils"/>
       <dep package="docbook-xml"/>
@@ -279,7 +289,6 @@ the module and we will just change it to use a tarball anyway.
       <if condition-set="linux">
         <dep package="libgusb"/>
         <dep package="libusb1"/>
-        <dep package="libgudev"/>
       </if>
       <if condition-set="systemd">
         <dep package="libsystemd"/>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]