[jhbuild] 3.24: Use mozjs31 and gjs/mutter/gnome-shell master
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] 3.24: Use mozjs31 and gjs/mutter/gnome-shell master
- Date: Mon, 12 Dec 2016 04:02:28 +0000 (UTC)
commit fd4a44b080f0a21f2f39a0797bfd856b4469fb69
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sun Dec 11 22:01:33 2016 -0600
3.24: Use mozjs31 and gjs/mutter/gnome-shell master
modulesets/gnome-suites-core-3.24.modules | 4 ++--
modulesets/gnome-suites-core-deps-3.24.modules | 4 ++--
modulesets/gnome-sysdeps-3.24.modules | 6 ------
3 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.24.modules b/modulesets/gnome-suites-core-3.24.modules
index 15ce8f9..498b301 100644
--- a/modulesets/gnome-suites-core-3.24.modules
+++ b/modulesets/gnome-suites-core-3.24.modules
@@ -337,7 +337,7 @@
<if condition-unset="linux">
<autogenargs value="--disable-networkmanager"/>
</if>
- <branch revision="gnome-3-22"/>
+ <branch/>
<dependencies>
<dep package="accountsservice"/>
<dep package="caribou"/>
@@ -484,7 +484,7 @@
<if condition-unset="wayland">
<autogenargs value="--disable-wayland-egl-server"/>
</if>
- <branch revision="gnome-3-22"/>
+ <branch/>
<dependencies>
<dep package="cairo"/>
<dep package="egl"/>
diff --git a/modulesets/gnome-suites-core-deps-3.24.modules b/modulesets/gnome-suites-core-deps-3.24.modules
index 292b4b0..09bd0a4 100644
--- a/modulesets/gnome-suites-core-deps-3.24.modules
+++ b/modulesets/gnome-suites-core-deps-3.24.modules
@@ -560,12 +560,12 @@
<if condition-set="coverage">
<autogenargs value="--enable-coverage"/>
</if>
- <branch revision="gnome-3-22"/>
+ <branch/>
<dependencies>
<dep package="m4-common"/>
<dep package="dbus-glib"/>
<dep package="gobject-introspection"/>
- <dep package="js24"/>
+ <dep package="mozjs31"/>
<if condition-set="coverage">
<dep package="lcov"/>
</if>
diff --git a/modulesets/gnome-sysdeps-3.24.modules b/modulesets/gnome-sysdeps-3.24.modules
index d1c30cc..f4186d1 100644
--- a/modulesets/gnome-sysdeps-3.24.modules
+++ b/modulesets/gnome-sysdeps-3.24.modules
@@ -396,12 +396,6 @@
version="0.11"/>
</systemmodule>
- <systemmodule id="js24">
- <pkg-config>mozjs-24.pc</pkg-config>
- <branch repo="system"
- version="24.2"/>
- </systemmodule>
-
<systemmodule id="krb5">
<branch repo="system"/>
<systemdependencies>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]