GNOME.org
 

[gnome-modulesets] Resync with current modulesets

commit a075135304bb6417c6eaf8738a51befe88d40990
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Oct 31 16:38:44 2016 +0000

    Resync with current modulesets

 gnome-apps.modules      |   21 ++++-----------------
 gnome-core-deps.modules |   31 +++++++++++++++----------------
 gnome-core.modules      |    1 +
 gnome-sysdeps.modules   |   11 +++++------
 gnome-world.modules     |   30 +++++++++++++++++++++---------
 5 files changed, 46 insertions(+), 48 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index 559db2e..6aabc48 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -227,20 +227,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="bijiben">
-    <branch/>
-    <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="tracker"/>
-      <dep package="clutter-gtk"/>
-      <dep package="gtk+-3"/>
-      <dep package="libxml2"/>
-      <dep package="glib"/>
-      <dep package="WebKit1"/>
-      <dep package="evolution-data-server"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="dconf-editor">
     <branch/>
     <dependencies>
@@ -304,7 +290,8 @@
     </suggests>
   </autotools>
 
-  <autotools id="evolution" autogenargs="--disable-libcryptui --disable-pst-import">
+  <cmake id="evolution"
+         cmakeargs="-DENABLE_LIBCRYPTUI=OFF -DENABLE_PST_IMPORT=OFF">
     <branch/>
     <dependencies>
       <dep package="atk"/>
@@ -333,6 +320,7 @@
       <dep package="libxml2"/>
       <dep package="nspr"/>
       <dep package="nss"/>
+      <dep package="openldap"/>
       <dep package="shared-mime-info"/>
       <dep package="spamassassin"/>
       <dep package="WebKit"/>
@@ -342,7 +330,7 @@
       <dep package="geoclue"/>
       <dep package="geocode-glib"/>
     </suggests>
-  </autotools>
+  </cmake>
 
   <autotools id="ghex">
     <branch/>
@@ -820,7 +808,6 @@
   -->
   <metamodule id="meta-gnome-core-incubator">
     <dependencies>
-      <dep package="bijiben"/>
       <dep package="gnome-dictionary"/>
       <dep package="gnome-music"/>
       <dep package="seahorse"/>
diff --git a/gnome-core-deps.modules b/gnome-core-deps.modules
index 5ca0c78..e822e13 100644
--- a/gnome-core-deps.modules
+++ b/gnome-core-deps.modules
@@ -276,15 +276,10 @@
     </dependencies>
   </autotools>
 
-  <autotools id="evolution-data-server"
-             supports-non-srcdir-builds="no"
-             autogenargs="--enable-vala-bindings --disable-strict --disable-uoa --disable-google-auth"
-             uninstall-before-install="true">
-    <!-- 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. -->
+  <cmake id="evolution-data-server"
+         cmakeargs="-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON -DENABLE_UOA=OFF 
-DENABLE_GOOGLE_AUTH=OFF">
     <if condition-set="freebsd">
-      <autogenargs value="DB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
+      <cmakeargs value="-DDB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
     </if>
     <branch/>
     <dependencies>
@@ -303,11 +298,12 @@
       <dep package="libdb"/>
       <dep package="libsecret"/>
       <dep package="WebKit"/>
+      <dep package="openldap"/>
     </dependencies>
     <suggests>
       <dep package="nss"/>
     </suggests>
-  </autotools>
+  </cmake>
 
   <autotools id="folks"
              autogenargs="--enable-eds-backend --disable-libsocialweb-backend --disable-fatal-warnings"
@@ -645,13 +641,13 @@
     </dependencies>
   </meson>
 
-  <autotools id="graphene">
+  <meson id="graphene">
     <branch repo="github.com" checkoutdir="graphene" module="ebassi/graphene.git"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
     </dependencies>
-  </autotools>
+  </meson>
 
   <autotools id="gst-plugins-bad"
              autogenargs="--disable-fatal-warnings"
@@ -732,7 +728,9 @@
       <dep package="gdk-pixbuf"/>
       <dep package="gtk-doc"/>
       <dep package="gobject-introspection"/>
+      <dep package="graphene"/>
       <dep package="libepoxy"/>
+      <dep package="m4-common"/>
       <if condition-unset="quartz">
         <dep package="at-spi2-atk"/>
       </if>
@@ -1180,7 +1178,7 @@
   </autotools>
 
   <meson id="libhttpseverywhere">
-    <branch repo="github.com" checkoutdir="libhttpseverywhere" module="grindhold/libhttpseverywhere.git"/>
+    <branch revision="v0.2"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -1576,7 +1574,7 @@
 
   <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala --enable-webdav --enable-static">
     <if condition-set="freebsd">
-      <autogenargs value="SSL_CFLAGS=' ' SSL_LIBS='-lssl -lcrypto'"/>
+      <autogenargs value="SSL_CFLAGS=' ' SSL_LIBS='-lssl -lcrypto' OPENSSL_CFLAGS=' ' OPENSSL_LIBS='-lssl 
-lcrypto'"/>
     </if>
     <branch repo="spice"
             module="gtk/spice-gtk-0.33.tar.bz2"
@@ -1717,6 +1715,7 @@
     <branch />
     <dependencies>
       <dep package="glib"/>
+      <dep package="vala-bootstrap"/>
     </dependencies>
   </autotools>
 
@@ -1752,9 +1751,9 @@
     </if>
     <pkg-config>webkit2gtk-4.0.pc</pkg-config>
     <branch repo="webkitgtk.org"
-            module="webkitgtk-2.14.0.tar.xz" version="2.14.0"
-            hash="sha256:0513ad836c624a3d24bdf1a99f4b4aead984ab6684150bc70f16db651590ea0a"
-            size="13412028">
+            module="webkitgtk-2.15.1.tar.xz" version="2.15.1"
+            hash="sha256:43b57d79d636a76f6ee3fbcf2a7e63aba7b86931b2113fa8dd59ca674f95ed80"
+            size="13761228">
     </branch>
     <dependencies>
       <dep package="c++"/>
diff --git a/gnome-core.modules b/gnome-core.modules
index 87cc66e..134db59 100644
--- a/gnome-core.modules
+++ b/gnome-core.modules
@@ -776,6 +776,7 @@
       <dep package="libsoup"/>
       <dep package="libxml2"/>
       <dep package="m4-common"/>
+      <dep package="mpc"/>
       <dep package="mpfr"/>
       <dep package="vala"/>
       <dep package="yelp-tools"/>
diff --git a/gnome-sysdeps.modules b/gnome-sysdeps.modules
index 28ba83e..f28a35d 100644
--- a/gnome-sysdeps.modules
+++ b/gnome-sysdeps.modules
@@ -547,6 +547,11 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="libarchive">
+    <pkg-config>libarchive.pc</pkg-config>
+    <branch repo="system" version="3.2.0"/>
+  </systemmodule>
+
   <systemmodule id="libcap">
     <branch repo="system"/>
     <systemdependencies>
@@ -838,12 +843,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="nettle">
-    <pkg-config>nettle.pc</pkg-config>
-    <branch repo="system"
-            version="3.2"/>
-  </systemmodule>
-
   <systemmodule id="nss">
     <pkg-config>nss.pc</pkg-config>
     <branch repo="system"
diff --git a/gnome-world.modules b/gnome-world.modules
index d012188..e5a4fc6 100644
--- a/gnome-world.modules
+++ b/gnome-world.modules
@@ -55,8 +55,6 @@
       href="http://hotwire-shell.googlecode.com/svn/"/>
   <repository type="hg" name="hg.circular-chaos.org"
     href="http://hg.circular-chaos.org"; />
-  <repository type="svn" name="transmissionbt.com"
-    href="svn://svn.m0k.org/Transmission/" />
   <repository type="svn" name="svn.async.com.br"
       href="svn://svn.async.com.br/"/>
   <repository type="svn" name="flumotion.code.fluendo.com"
@@ -1636,8 +1634,8 @@
   </tarball>
 
   <autotools id="transmission">
-    <branch repo="transmissionbt.com"
-            module="trunk"
+    <branch repo="github.com"
+            module="transmission/transmission.git"
             checkoutdir="transmission"/>
     <dependencies>
       <dep package="gtk+-2"/>
@@ -2349,7 +2347,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="evolution-mapi">
+  <cmake id="evolution-mapi">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
@@ -2357,9 +2355,9 @@
       <dep package="evolution"/>
       <dep package="libmapi"/>
     </dependencies>
-  </autotools>
+  </cmake>
 
-  <autotools id="evolution-ews">
+  <cmake id="evolution-ews">
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -2371,7 +2369,7 @@
       <dep package="sqlite3"/>
       <dep package="libical"/>
     </dependencies>
-  </autotools>
+  </cmake>
 
   <autotools id="libglade">
     <branch/>
@@ -3234,7 +3232,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="flatpak" autogenargs="--enable-sudo">
+  <autotools id="flatpak" autogenargs="--disable-sudo --disable-system-helper">
     <branch repo="github.com"
             module="flatpak/flatpak"/>
     <dependencies>
@@ -3395,4 +3393,18 @@
     </dependencies>
   </autotools>
 
+  <autotools id="bijiben">
+    <branch/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="tracker"/>
+      <dep package="clutter-gtk"/>
+      <dep package="gtk+-3"/>
+      <dep package="libxml2"/>
+      <dep package="glib"/>
+      <dep package="WebKit1"/>
+      <dep package="evolution-data-server"/>
+    </dependencies>
+  </autotools>
+
 </moduleset>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]