GNOME.org
 

[jhbuild/wip/ptomato/macos: 7/12] modules: Disable X11 if not in x11 condition

commit 6b059cba17b4948989c468075c86962b6dd76a32
Author: Philip Chimento <philip chimento gmail com>
Date:   Thu Nov 3 22:11:35 2016 -0700

    modules: Disable X11 if not in x11 condition

 modulesets/gnome-suites-core-3.10.modules      |    4 ++++
 modulesets/gnome-suites-core-3.12.modules      |   11 ++++++++++-
 modulesets/gnome-suites-core-3.14.modules      |   11 ++++++++++-
 modulesets/gnome-suites-core-3.16.modules      |   11 ++++++++++-
 modulesets/gnome-suites-core-3.18.modules      |   11 ++++++++++-
 modulesets/gnome-suites-core-3.20.modules      |   11 ++++++++++-
 modulesets/gnome-suites-core-3.22.modules      |    7 ++++++-
 modulesets/gnome-suites-core-3.24.modules      |    7 ++++++-
 modulesets/gnome-suites-core-3.8.modules       |    4 ++++
 modulesets/gnome-suites-core-deps-3.10.modules |    8 +++++++-
 modulesets/gnome-suites-core-deps-3.12.modules |    7 ++++++-
 modulesets/gnome-suites-core-deps-3.14.modules |    7 ++++++-
 modulesets/gnome-suites-core-deps-3.16.modules |    7 ++++++-
 modulesets/gnome-suites-core-deps-3.18.modules |    7 ++++++-
 modulesets/gnome-suites-core-deps-3.20.modules |    7 ++++++-
 modulesets/gnome-suites-core-deps-3.22.modules |   11 ++++++++++-
 modulesets/gnome-suites-core-deps-3.24.modules |    7 ++++++-
 modulesets/gnome-suites-core-deps-3.8.modules  |    7 ++++++-
 18 files changed, 129 insertions(+), 16 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.10.modules b/modulesets/gnome-suites-core-3.10.modules
index 57136be..530887a 100644
--- a/modulesets/gnome-suites-core-3.10.modules
+++ b/modulesets/gnome-suites-core-3.10.modules
@@ -66,6 +66,10 @@
              supports-non-srcdir-builds="no"
              autogenargs="--enable-vala-bindings --disable-strict --disable-uoa">
     <branch/>
+    <if condition-unset="x11">
+      <!-- Without X11, only gcr-base-1.0 is available, not gcr-1.0 -->
+      <autogenargs value="--disable-gtk"/>
+    </if>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libsoup"/>
diff --git a/modulesets/gnome-suites-core-3.12.modules b/modulesets/gnome-suites-core-3.12.modules
index fdb9136..f7588ab 100644
--- a/modulesets/gnome-suites-core-3.12.modules
+++ b/modulesets/gnome-suites-core-3.12.modules
@@ -32,11 +32,16 @@
 <!-- Core User Shell -->
 
   <autotools id="at-spi2-core">
+    <if condition-unset="x11">
+      <autogenargs value="--disable-x11"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="glib"/>
-      <dep package="libXtst"/>
+      <if condition-set="x11">
+        <dep package="libXtst"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -69,6 +74,10 @@
     <!-- We uninstall the old copy before installing, because the our usage
          of DESTDIR and libtool's relinking interfere and cause camel providers
          to link against the install version of libcamel. -->
+    <if condition-unset="x11">
+      <!-- Without X11, only gcr-base-1.0 is available, not gcr-1.0 -->
+      <autogenargs value="--disable-gtk"/>
+    </if>
     <branch revision="evolution-data-server-3-12"/>
     <dependencies>
       <dep package="intltool"/>
diff --git a/modulesets/gnome-suites-core-3.14.modules b/modulesets/gnome-suites-core-3.14.modules
index 4082b3e..5647147 100644
--- a/modulesets/gnome-suites-core-3.14.modules
+++ b/modulesets/gnome-suites-core-3.14.modules
@@ -32,11 +32,16 @@
 <!-- Core User Shell -->
 
   <autotools id="at-spi2-core">
+    <if condition-unset="x11">
+      <autogenargs value="--disable-x11"/>
+    </if>
     <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="glib"/>
-      <dep package="libXtst"/>
+      <if condition-set="x11">
+        <dep package="libXtst"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -72,6 +77,10 @@
     <if condition-set="freebsd">
       <autogenargs value="DB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
     </if>
+    <if condition-unset="x11">
+      <!-- Without X11, only gcr-base-1.0 is available, not gcr-1.0 -->
+      <autogenargs value="--disable-gtk"/>
+    </if>
     <branch revision="evolution-data-server-3-12"/>
     <dependencies>
       <dep package="intltool"/>
diff --git a/modulesets/gnome-suites-core-3.16.modules b/modulesets/gnome-suites-core-3.16.modules
index db1034b..7653ee0 100644
--- a/modulesets/gnome-suites-core-3.16.modules
+++ b/modulesets/gnome-suites-core-3.16.modules
@@ -32,11 +32,16 @@
 <!-- Core User Shell -->
 
   <autotools id="at-spi2-core">
+    <if condition-unset="x11">
+      <autogenargs value="--disable-x11"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="glib"/>
-      <dep package="libXtst"/>
+      <if condition-set="x11">
+        <dep package="libXtst"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -70,6 +75,10 @@
     <if condition-set="freebsd">
       <autogenargs value="DB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
     </if>
+    <if condition-unset="x11">
+      <!-- Without X11, only gcr-base-1.0 is available, not gcr-1.0 -->
+      <autogenargs value="--disable-gtk"/>
+    </if>
     <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="intltool"/>
diff --git a/modulesets/gnome-suites-core-3.18.modules b/modulesets/gnome-suites-core-3.18.modules
index 268df60..705ac59 100644
--- a/modulesets/gnome-suites-core-3.18.modules
+++ b/modulesets/gnome-suites-core-3.18.modules
@@ -32,11 +32,16 @@
 <!-- Core User Shell -->
 
   <autotools id="at-spi2-core">
+    <if condition-unset="x11">
+      <autogenargs value="--disable-x11"/>
+    </if>
     <branch revision="gnome-3-18"/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="glib"/>
-      <dep package="libXtst"/>
+      <if condition-set="x11">
+        <dep package="libXtst"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -70,6 +75,10 @@
     <if condition-set="freebsd">
       <autogenargs value="DB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
     </if>
+    <if condition-unset="x11">
+      <!-- Without X11, only gcr-base-1.0 is available, not gcr-1.0 -->
+      <autogenargs value="--disable-gtk"/>
+    </if>
     <branch revision="gnome-3-18"/>
     <dependencies>
       <dep package="intltool"/>
diff --git a/modulesets/gnome-suites-core-3.20.modules b/modulesets/gnome-suites-core-3.20.modules
index 0e85402..f6f332e 100644
--- a/modulesets/gnome-suites-core-3.20.modules
+++ b/modulesets/gnome-suites-core-3.20.modules
@@ -63,11 +63,16 @@
   </autotools>
 
   <autotools id="at-spi2-core">
+    <if condition-unset="x11">
+      <autogenargs value="--disable-x11"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="glib"/>
-      <dep package="libXtst"/>
+      <if condition-set="x11">
+        <dep package="libXtst"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -90,6 +95,10 @@
     <if condition-set="freebsd">
       <autogenargs value="DB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
     </if>
+    <if condition-unset="x11">
+      <!-- Without X11, only gcr-base-1.0 is available, not gcr-1.0 -->
+      <autogenargs value="--disable-gtk"/>
+    </if>
     <branch revision="gnome-3-20"/>
     <dependencies>
       <dep package="intltool"/>
diff --git a/modulesets/gnome-suites-core-3.22.modules b/modulesets/gnome-suites-core-3.22.modules
index e929604..b271434 100644
--- a/modulesets/gnome-suites-core-3.22.modules
+++ b/modulesets/gnome-suites-core-3.22.modules
@@ -63,11 +63,16 @@
   </autotools>
 
   <autotools id="at-spi2-core">
+    <if condition-unset="x11">
+      <autogenargs value="--disable-x11"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="glib"/>
-      <dep package="libXtst"/>
+      <if condition-set="x11">
+        <dep package="libXtst"/>
+      </if>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-3.24.modules b/modulesets/gnome-suites-core-3.24.modules
index ff2cf4b..060cf0e 100644
--- a/modulesets/gnome-suites-core-3.24.modules
+++ b/modulesets/gnome-suites-core-3.24.modules
@@ -63,11 +63,16 @@
   </autotools>
 
   <autotools id="at-spi2-core">
+    <if condition-unset="x11">
+      <autogenargs value="--disable-x11"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="glib"/>
-      <dep package="libXtst"/>
+      <if condition-set="x11">
+        <dep package="libXtst"/>
+      </if>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-3.8.modules b/modulesets/gnome-suites-core-3.8.modules
index 9400555..b5b6500 100644
--- a/modulesets/gnome-suites-core-3.8.modules
+++ b/modulesets/gnome-suites-core-3.8.modules
@@ -63,6 +63,10 @@
              supports-non-srcdir-builds="no"
              autogenargs="--enable-vala-bindings --disable-strict --disable-uoa">
     <branch revision="gnome-3-8"/>
+    <if condition-unset="x11">
+      <!-- Without X11, only gcr-base-1.0 is available, not gcr-1.0 -->
+      <autogenargs value="--disable-gtk"/>
+    </if>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libsoup"/>
diff --git a/modulesets/gnome-suites-core-deps-3.10.modules b/modulesets/gnome-suites-core-deps-3.10.modules
index d8c0e1e..871391b 100644
--- a/modulesets/gnome-suites-core-deps-3.10.modules
+++ b/modulesets/gnome-suites-core-deps-3.10.modules
@@ -123,14 +123,20 @@
   </autotools>
 
   <autotools id="gcr">
+    <if condition-unset="x11">
+      <autogenargs value="--without-gtk"/>
+    </if>
     <branch revision="gnome-3-10"/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
       <dep package="p11-kit"/>
+      <dep package="vala"/>
+      <if condition-set="x11">
+        <dep package="gtk+"/>
+      </if>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-deps-3.12.modules b/modulesets/gnome-suites-core-deps-3.12.modules
index ab202ef..9fd8628 100644
--- a/modulesets/gnome-suites-core-deps-3.12.modules
+++ b/modulesets/gnome-suites-core-deps-3.12.modules
@@ -147,15 +147,20 @@
   </autotools>
 
   <autotools id="gcr">
+    <if condition-unset="x11">
+      <autogenargs value="--without-gtk"/>
+    </if>
     <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
       <dep package="p11-kit"/>
       <dep package="vala"/>
+      <if condition-set="x11">
+        <dep package="gtk+"/>
+      </if>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-deps-3.14.modules b/modulesets/gnome-suites-core-deps-3.14.modules
index 08492d4..aec1da4 100644
--- a/modulesets/gnome-suites-core-deps-3.14.modules
+++ b/modulesets/gnome-suites-core-deps-3.14.modules
@@ -148,15 +148,20 @@
   </autotools>
 
   <autotools id="gcr">
+    <if condition-unset="x11">
+      <autogenargs value="--without-gtk"/>
+    </if>
     <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
       <dep package="p11-kit"/>
       <dep package="vala"/>
+      <if condition-set="x11">
+        <dep package="gtk+"/>
+      </if>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-deps-3.16.modules b/modulesets/gnome-suites-core-deps-3.16.modules
index 58e2dc7..259fe80 100644
--- a/modulesets/gnome-suites-core-deps-3.16.modules
+++ b/modulesets/gnome-suites-core-deps-3.16.modules
@@ -145,15 +145,20 @@
   </autotools>
 
   <autotools id="gcr">
+    <if condition-unset="x11">
+      <autogenargs value="--without-gtk"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
       <dep package="p11-kit"/>
       <dep package="vala"/>
+      <if condition-set="x11">
+        <dep package="gtk+"/>
+      </if>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-deps-3.18.modules b/modulesets/gnome-suites-core-deps-3.18.modules
index 9d23950..5b14cd5 100644
--- a/modulesets/gnome-suites-core-deps-3.18.modules
+++ b/modulesets/gnome-suites-core-deps-3.18.modules
@@ -163,15 +163,20 @@
   </autotools>
 
   <autotools id="gcr">
+    <if condition-unset="x11">
+      <autogenargs value="--without-gtk"/>
+    </if>
     <branch revision="gnome-3-18"/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
       <dep package="p11-kit"/>
       <dep package="vala"/>
+      <if condition-set="x11">
+        <dep package="gtk+"/>
+      </if>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index 3bb2e54..411ba1a 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -314,15 +314,20 @@
   </autotools>
 
   <autotools id="gcr">
+    <if condition-unset="x11">
+      <autogenargs value="--without-gtk"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
       <dep package="p11-kit"/>
       <dep package="vala"/>
+      <if condition-set="x11">
+        <dep package="gtk+"/>
+      </if>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-deps-3.22.modules b/modulesets/gnome-suites-core-deps-3.22.modules
index 71c49a1..accf326 100644
--- a/modulesets/gnome-suites-core-deps-3.22.modules
+++ b/modulesets/gnome-suites-core-deps-3.22.modules
@@ -284,6 +284,10 @@
     <if condition-set="freebsd">
       <autogenargs value="DB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
     </if>
+    <if condition-unset="x11">
+      <!-- Without X11, only gcr-base-1.0 is available, not gcr-1.0 -->
+      <autogenargs value="--disable-gtk"/>
+    </if>
     <branch revision="gnome-3-22"/>
     <dependencies>
       <dep package="intltool"/>
@@ -364,15 +368,20 @@
   </autotools>
 
   <autotools id="gcr">
+    <if condition-unset="x11">
+      <autogenargs value="--without-gtk"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
       <dep package="p11-kit"/>
       <dep package="vala"/>
+      <if condition-set="x11">
+        <dep package="gtk+"/>
+      </if>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-deps-3.24.modules b/modulesets/gnome-suites-core-deps-3.24.modules
index 579806d..4ddd3e1 100644
--- a/modulesets/gnome-suites-core-deps-3.24.modules
+++ b/modulesets/gnome-suites-core-deps-3.24.modules
@@ -364,15 +364,20 @@
   </autotools>
 
   <autotools id="gcr">
+    <if condition-unset="x11">
+      <autogenargs value="--without-gtk"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
       <dep package="p11-kit"/>
       <dep package="vala"/>
+      <if condition-set="x11">
+        <dep package="gtk+-3"/>
+      </if>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-deps-3.8.modules b/modulesets/gnome-suites-core-deps-3.8.modules
index bd47966..c4761eb 100644
--- a/modulesets/gnome-suites-core-deps-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-3.8.modules
@@ -105,14 +105,19 @@
   </autotools>
 
   <autotools id="gcr">
+    <if condition-unset="x11">
+      <autogenargs value="--without-gtk"/>
+    </if>
     <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
       <dep package="p11-kit"/>
+      <if condition-set="x11">
+        <dep package="gtk+"/>
+      </if>
     </dependencies>
   </autotools>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]