GNOME.org
 

[jhbuild] 3.22: Move Boxes to core

commit 6c7b7cca2f3544e7656c27bcd229b66e0d07c9fb
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Thu Mar 31 16:14:31 2016 -0500

    3.22: Move Boxes to core

 modulesets/gnome-apps-3.22.modules             |  129 ------------------------
 modulesets/gnome-suites-core-3.22.modules      |   34 ++++++
 modulesets/gnome-suites-core-deps-3.22.modules |   95 +++++++++++++++++
 3 files changed, 129 insertions(+), 129 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.22.modules b/modulesets/gnome-apps-3.22.modules
index 7b062a1..7bfa137 100644
--- a/modulesets/gnome-apps-3.22.modules
+++ b/modulesets/gnome-apps-3.22.modules
@@ -13,12 +13,6 @@
       href="git://github.com/"/>
   <repository type="git" name="wayland"
       href="git://anongit.freedesktop.org/git/wayland"/>
-  <repository type="git" name="git.libvirt.org"
-      href="git://libvirt.org/"/>
-  <repository type="git" name="gitlab.com"
-      href="https://gitlab.com/"/>
-  <repository type="tarball" name="spice"
-      href="http://www.spice-space.org/download/"/>
 
 <!-- tarball repos -->
   <repository type="tarball" name="gnome.org"
@@ -133,18 +127,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtk-vnc" autogenargs="--with-gtk=3.0 --enable-vala">
-    <branch/>
-    <dependencies>
-      <dep package="cairo"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="pulseaudio"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="guile">
     <if condition-set="freebsd">
       <autogenargs value="BDW_GC_CFLAGS=' ' BDW_GC_LIBS='-lgc-threaded'"/>
@@ -212,37 +194,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgovirt">
-    <branch/>
-    <dependencies>
-      <dep package="librest"/>
-      <dep package="intltool"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libosinfo"
-             autogenargs="--enable-tests=no --enable-werror=no">
-    <branch repo="gitlab.com" module="libosinfo/libosinfo.git"/>
-    <dependencies>
-      <dep package="libsoup"/>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="vala"/>
-      <dep package="wget"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libvirt-glib" autogenargs="--enable-werror=no">
-    <branch repo="git.libvirt.org" module="libvirt-glib.git"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="libvirt"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="nautilus-sendto">
     <branch/>
     <dependencies>
@@ -257,16 +208,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="phodav">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libsoup"/>
-      <dep package="avahi"/>
-      <dep package="libxml2"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="qqwing">
     <branch repo="qqwing"
             module="qqwing-${version}.tar.gz"
@@ -278,44 +219,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala --enable-webdav --enable-static">
-    <if condition-set="freebsd">
-      <autogenargs value="SSL_CFLAGS=' ' SSL_LIBS='-lssl'"/>
-    </if>
-    <branch repo="spice"
-            module="gtk/spice-gtk-0.29.tar.bz2"
-            version="0.29"
-            hash="sha256:44c7e22713246a2054c3c3b6e0280fd4c1fdbd2c8d33e5eb95bcda4748d5e973"
-            size="1277160"/>
-    <dependencies>
-      <dep package="cairo"/>
-      <dep package="cyrus-sasl"/>
-      <dep package="glib"/>
-      <dep package="gtk-doc"/>
-      <dep package="gtk+"/>
-      <dep package="libjpeg"/>
-      <dep package="openssl"/>
-      <dep package="opus"/>
-      <dep package="phodav"/>
-      <dep package="pixman"/>
-      <dep package="pulseaudio"/>
-      <dep package="spice-protocol"/>
-      <dep package="usbredir"/>
-      <dep package="vala"/>
-      <dep package="zlib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="spice-protocol">
-    <branch repo="spice"
-            module="releases/spice-protocol-0.12.9.tar.bz2"
-            version="0.12.9"
-            hash="sha256:290cf834dd156014d229b474e98006265ab9c5f63b4c471ea3b2cf8b2ff37876"
-            size="71766"/>
-    <dependencies>
-    </dependencies>
-  </autotools>
-
   <autotools id="telepathy-farstream" autogenargs="--disable-python">
     <branch repo="telepathy.freedesktop.org"/>
     <dependencies>
@@ -335,16 +238,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="usbredir">
-    <branch repo="spice"
-            module="usbredir/usbredir-0.7.tar.bz2"
-            version="0.7"
-            hash="sha256:0a63a0712b5dc62be9cca44f97270fea5d1ec1fe7dde0c11dc74a01c8e2006aa"/>
-    <dependencies>
-      <dep package="libusb1-1.0.9"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="weston" autogenargs="--disable-setuid-install">
     <branch repo="wayland"/>
     <dependencies>
@@ -554,27 +447,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-boxes" autogenargs="--enable-vala">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libxml2"/>
-      <dep package="gtk-vnc"/>
-      <dep package="libgovirt"/>
-      <dep package="libosinfo"/>
-      <dep package="libusb1-1.0.9"/>
-      <dep package="libvirt-glib"/>
-      <dep package="gtk+"/>
-      <dep package="spice-gtk"/>
-      <dep package="vala"/>
-      <dep package="tracker"/>
-      <dep package="gnome-themes-standard"/>
-      <if condition-set="linux">
-        <dep package="gudev"/>
-      </if>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-builder">
     <branch/>
     <dependencies>
@@ -1047,7 +919,6 @@
   <metamodule id="meta-gnome-core-incubator">
     <dependencies>
       <dep package="bijiben"/>
-      <dep package="gnome-boxes"/>
       <dep package="gnome-calendar"/>
       <dep package="gnome-dictionary"/>
       <dep package="gnome-music"/>
diff --git a/modulesets/gnome-suites-core-3.22.modules b/modulesets/gnome-suites-core-3.22.modules
index eb88f6b..c675243 100644
--- a/modulesets/gnome-suites-core-3.22.modules
+++ b/modulesets/gnome-suites-core-3.22.modules
@@ -463,6 +463,18 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gtk-vnc" autogenargs="--with-gtk=3.0 --enable-vala">
+    <branch/>
+    <dependencies>
+      <dep package="cairo"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="pulseaudio"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
  <autotools id="gvfs">
     <branch/>
     <dependencies>
@@ -763,6 +775,27 @@
     </suggests>
   </autotools>
 
+  <autotools id="gnome-boxes" autogenargs="--enable-vala">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libxml2"/>
+      <dep package="gtk-vnc"/>
+      <dep package="libgovirt"/>
+      <dep package="libosinfo"/>
+      <dep package="libusb1-1.0.9"/>
+      <dep package="libvirt-glib"/>
+      <dep package="gtk+"/>
+      <dep package="spice-gtk"/>
+      <dep package="vala"/>
+      <dep package="tracker"/>
+      <dep package="gnome-themes-standard"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-calculator" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
@@ -1238,6 +1271,7 @@
       <dep package="evince"/>
       <dep package="file-roller"/>
       <dep package="gedit"/>
+      <dep package="gnome-boxes"/>
       <dep package="gnome-calculator"/>
       <dep package="gnome-characters"/>
       <dep package="gnome-clocks"/>
diff --git a/modulesets/gnome-suites-core-deps-3.22.modules b/modulesets/gnome-suites-core-deps-3.22.modules
index 48b610e..4be0246 100644
--- a/modulesets/gnome-suites-core-deps-3.22.modules
+++ b/modulesets/gnome-suites-core-deps-3.22.modules
@@ -24,6 +24,10 @@
     href="git://linuxwacom.git.sourceforge.net/"/>
 <repository type="git" name="quvi"
     href="git://repo.or.cz/"/>
+  <repository type="git" name="gitlab.com"
+      href="https://gitlab.com/"/>
+<repository type="git" name="git.libvirt.org"
+    href="git://libvirt.org/"/>
 
 <!-- tarball repos -->
 <repository type="tarball" name="cairo.org"
@@ -62,6 +66,8 @@
     href="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/"/>
 <repository type="tarball" name="speech-dispatcher"
     href="http://devel.freebsoft.org/pub/projects/speechd/"/>
+<repository type="tarball" name="spice"
+    href="http://www.spice-space.org/download/"/>
 
 <include href="gnome-sysdeps-3.22.modules"/>
 
@@ -932,6 +938,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libgovirt">
+    <branch/>
+    <dependencies>
+      <dep package="librest"/>
+      <dep package="intltool"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libgrss">
     <branch/>
     <dependencies>
@@ -1047,6 +1062,18 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libosinfo"
+             autogenargs="--enable-tests=no --enable-werror=no">
+    <branch repo="gitlab.com" module="libosinfo/libosinfo.git"/>
+    <dependencies>
+      <dep package="libsoup"/>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="vala"/>
+      <dep package="wget"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libpeas"
              autogenargs="--enable-python3">
     <branch/>
@@ -1131,6 +1158,16 @@
     </suggests>
   </autotools>
 
+  <autotools id="libvirt-glib" autogenargs="--enable-werror=no">
+    <branch repo="git.libvirt.org" module="libvirt-glib.git"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="libvirt"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libwacom">
     <branch repo="sourceforge.net"
             module="linuxwacom/files/libwacom/libwacom-${version}.tar.bz2" version="0.13"
@@ -1271,6 +1308,16 @@
             size="1455359"/>
   </autotools>
 
+  <autotools id="phodav">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+      <dep package="avahi"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="pyatspi2" autogenargs="--with-python=python3" >
     <branch/>
     <dependencies>
@@ -1312,6 +1359,44 @@
     </dependencies>
   </autotools>
 
+  <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala --enable-webdav --enable-static">
+    <if condition-set="freebsd">
+      <autogenargs value="SSL_CFLAGS=' ' SSL_LIBS='-lssl'"/>
+    </if>
+    <branch repo="spice"
+            module="gtk/spice-gtk-0.29.tar.bz2"
+            version="0.29"
+            hash="sha256:44c7e22713246a2054c3c3b6e0280fd4c1fdbd2c8d33e5eb95bcda4748d5e973"
+            size="1277160"/>
+    <dependencies>
+      <dep package="cairo"/>
+      <dep package="cyrus-sasl"/>
+      <dep package="glib"/>
+      <dep package="gtk-doc"/>
+      <dep package="gtk+"/>
+      <dep package="libjpeg"/>
+      <dep package="openssl"/>
+      <dep package="opus"/>
+      <dep package="phodav"/>
+      <dep package="pixman"/>
+      <dep package="pulseaudio"/>
+      <dep package="spice-protocol"/>
+      <dep package="usbredir"/>
+      <dep package="vala"/>
+      <dep package="zlib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="spice-protocol">
+    <branch repo="spice"
+            module="releases/spice-protocol-0.12.9.tar.bz2"
+            version="0.12.9"
+            hash="sha256:290cf834dd156014d229b474e98006265ab9c5f63b4c471ea3b2cf8b2ff37876"
+            size="71766"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
   <autotools id="telepathy-glib" autogenargs="--enable-vala-bindings --disable-fatal-warnings">
     <pkg-config>telepathy-glib.pc</pkg-config>
     <branch repo="telepathy.freedesktop.org"/>
@@ -1399,6 +1484,16 @@
     </dependencies>
   </autotools>
 
+  <autotools id="usbredir">
+    <branch repo="spice"
+            module="usbredir/usbredir-0.7.tar.bz2"
+            version="0.7"
+            hash="sha256:0a63a0712b5dc62be9cca44f97270fea5d1ec1fe7dde0c11dc74a01c8e2006aa"/>
+    <dependencies>
+      <dep package="libusb1-1.0.9"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="vala" autogenargs="--enable-vapigen" supports-non-srcdir-builds="no">
     <pkg-config>libvala-0.32.pc</pkg-config>
     <branch />
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]