[jhbuild] [2.32] Use gnome-2-32 branch for nautilus
- From: Vincent Untz <vuntz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] [2.32] Use gnome-2-32 branch for nautilus
- Date: Fri, 13 Aug 2010 10:15:24 +0000 (UTC)
commit b09d349dc1cdc35ddd6a7203467df69870a7900c
Author: Vincent Untz <vuntz gnome org>
Date: Fri Aug 13 12:12:09 2010 +0200
[2.32] Use gnome-2-32 branch for nautilus
Also remove gnome-desktop-3 since it's now unneeded, and move
gtk-engines-3 to the gnome-2.32 moduleset.
Only epiphany requires gtk+-3 in the gnome-suites moduleset now.
modulesets/gnome-2.32.modules | 8 ++++++++
modulesets/gnome-suites-2.32.modules | 31 +++----------------------------
2 files changed, 11 insertions(+), 28 deletions(-)
---
diff --git a/modulesets/gnome-2.32.modules b/modulesets/gnome-2.32.modules
index 1284a08..f670520 100644
--- a/modulesets/gnome-2.32.modules
+++ b/modulesets/gnome-2.32.modules
@@ -2535,6 +2535,14 @@
</dependencies>
</autotools>
+ <autotools id="gtk-engines-3" autogenargs="--enable-deprecated">
+ <branch checkoutdir="gtk-engines-3" module="gtk-engines"/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="gtk+-3"/>
+ </dependencies>
+ </autotools>
+
<autotools id="libpeas">
<branch module="libpeas/0.5/libpeas-0.5.4.tar.bz2" repo="gnome.org"
version="0.5.4"
diff --git a/modulesets/gnome-suites-2.32.modules b/modulesets/gnome-suites-2.32.modules
index 953a5e7..4da8613 100644
--- a/modulesets/gnome-suites-2.32.modules
+++ b/modulesets/gnome-suites-2.32.modules
@@ -701,21 +701,6 @@
</dependencies>
</autotools>
- <autotools id="gnome-desktop-3" autogenargs="--with-gnome-distributor=JHBuild">
- <branch checkoutdir="gnome-desktop-3" module="gnome-desktop"/>
- <dependencies>
- <dep package="intltool"/>
- <dep package="glib"/>
- <dep package="gtk+-3"/>
- <dep package="gconf"/>
- <dep package="startup-notification"/>
- <dep package="gnome-themes"/>
- <dep package="rarian"/>
- <dep package="gnome-doc-utils"/>
- <dep package="gvfs"/> <!-- gvfs-copy used in autogen.sh -->
- </dependencies>
- </autotools>
-
<autotools id="gnome-disk-utility">
<branch/>
<dependencies>
@@ -1103,14 +1088,6 @@
</dependencies>
</autotools>
- <autotools id="gtk-engines-3" autogenargs="--enable-deprecated">
- <branch checkoutdir="gtk-engines-3" module="gtk-engines"/>
- <dependencies>
- <dep package="intltool"/>
- <dep package="gtk+-3"/>
- </dependencies>
- </autotools>
-
<autotools id="gtkhtml">
<branch/>
<dependencies>
@@ -1259,15 +1236,15 @@
</autotools>
<autotools id="nautilus">
- <branch/>
+ <branch revision="gnome-2-32"/>
<dependencies>
<dep package="intltool"/>
<dep package="rarian"/>
<dep package="glib"/>
- <dep package="gtk+-3"/>
+ <dep package="gtk+"/>
<dep package="pango"/>
<dep package="libxml2"/>
- <dep package="gnome-desktop-3"/>
+ <dep package="gnome-desktop"/>
</dependencies>
<suggests>
<dep package="exempi"/>
@@ -1859,7 +1836,6 @@
<dep package="atk"/>
<dep package="glib"/>
<dep package="gtk+"/>
- <dep package="gtk+-3"/>
<dep package="gtk-doc"/>
<dep package="pango"/>
<dep package="meta-gnome-devel-platform-upcoming-deprecations"/>
@@ -1928,7 +1904,6 @@
<dep package="gst-plugins-base"/>
<dep package="gst-plugins-good"/>
<dep package="gtk-engines"/>
- <dep package="gtk-engines-3"/>
<dep package="gtkhtml"/>
<dep package="gtksourceview"/>
<dep package="gucharmap"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]