Commit 286babc7 authored by James Henstridge's avatar James Henstridge Committed by James Henstridge

Merge from jhbuild.bzr

bzr-revid: james@jamesh.id.au-20060623074407-cf5788369fb03397

2006-06-23  James Henstridge  <james@jamesh.id.au>

	* modulesets/gnome-2.10.modules (pango):
	* modulesets/gnome-2.12.modules (pango):
	* modulesets/gnome-2.14.modules (pango):
	* modulesets/gtk.modules (pango):
	* modulesets/gtk28.modules (pango): same here.

	* modulesets/gnome-2.16.modules (pango): depend on libXft rather
	than Xft.

	* modulesets/freedesktop.modules (RenderProto, libXrender, libXft):
	use the versions from the xorg repository.  Remove the obsolete
	old xlibs/xserver/xapps module definitions.  Addresses bug #345281.

	* scripts/upgrade-module-set.xsl (cvsmodule): fallback to
	checkoutdir and module values for "id" if it isn't given.

	* jhbuild/modtypes/autotools.py (parse_cvsmodule):
	(parse_svnmodule):
	(parse_archmodule): generate module name in the same way as the
	old code did for backward compatibility.
parent 8bad9f30
2006-06-23 James Henstridge <james@jamesh.id.au>
* modulesets/gnome-2.10.modules (pango):
* modulesets/gnome-2.12.modules (pango):
* modulesets/gnome-2.14.modules (pango):
* modulesets/gtk.modules (pango):
* modulesets/gtk28.modules (pango): same here.
* modulesets/gnome-2.16.modules (pango): depend on libXft rather
than Xft.
* modulesets/freedesktop.modules (RenderProto, libXrender, libXft):
use the versions from the xorg repository. Remove the obsolete
old xlibs/xserver/xapps module definitions. Addresses bug #345281.
* scripts/upgrade-module-set.xsl (cvsmodule): fallback to
checkoutdir and module values for "id" if it isn't given.
* jhbuild/modtypes/autotools.py (parse_cvsmodule):
(parse_svnmodule):
(parse_archmodule): generate module name in the same way as the
old code did for backward compatibility.
2006-06-21 Wouter Bolsterlee <uws+gnome@xs4all.nl>
* modulesets/gnome-2.14.modules: File-roller has a
......
......@@ -238,6 +238,9 @@ def parse_cvsmodule(node, config, repositories, default_repo):
supports_non_srcdir_builds = \
(node.getAttribute('supports-non-srcdir-builds') != 'no')
if not id:
id = checkoutdir or module
# override revision tag if requested.
autogenargs += ' ' + config.module_autogenargs.get(id, config.autogenargs)
makeargs += ' ' + config.module_makeargs.get(id, config.makeargs)
......@@ -284,6 +287,9 @@ def parse_svnmodule(node, config, repositories, default_repo):
supports_non_srcdir_builds = \
(node.getAttribute('supports-non-srcdir-builds') != 'no')
if not id:
id = checkoutdir or os.path.basename(module)
# override revision tag if requested.
autogenargs += ' ' + config.module_autogenargs.get(id, config.autogenargs)
makeargs += ' ' + config.module_makeargs.get(id, config.makeargs)
......@@ -321,6 +327,9 @@ def parse_archmodule(node, config, repositories, default_repo):
supports_non_srcdir_builds = \
(node.getAttribute('supports-non-srcdir-builds') != 'no')
if not id:
id = checkoutdir or version
autogenargs += ' ' + config.module_autogenargs.get(id, config.autogenargs)
makeargs += ' ' + config.module_makeargs.get(id, makeargs)
......
......@@ -22,14 +22,8 @@
<repository type="cvs" name="tango.freedesktop.org"
cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/tango"
password=""/>
<repository type="cvs" name="xlibs.freedesktop.org"
cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/xlibs"
password=""/>
<repository type="cvs" name="xserver.freedesktop.org"
cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/xserver"
password=""/>
<repository type="cvs" name="xapps.freedesktop.org"
cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/xapps"
<repository type="cvs" name="xorg.freedesktop.org"
cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/xorg"
password=""/>
<repository type="cvs" name="poppler.freedesktop.org"
cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/poppler"
......@@ -51,24 +45,12 @@
<repository type="tarball" name="cpan" href="http://search.cpan.org/CPAN/" />
<autotools id="luminocity">
<branch repo="gnome.org"/>
<dependencies>
<dep package="Xcomposite"/>
<dep package="Xdamage"/>
<dep package="Xrender"/>
<dep package="Xext"/>
<dep package="Xcursor"/>
<dep package="X11"/>
<dep package="Xtst"/>
</dependencies>
</autotools>
<autotools id="cairo">
<branch repo="git.freedesktop.org" module="cairo"/>
<dependencies>
<dep package="fontconfig"/>
<dep package="Xrender"/>
<dep package="libXrender"/>
<dep package="gtk-doc"/>
</dependencies>
<after>
......@@ -88,6 +70,10 @@
</after>
</tarball>
<autotools id="glitz">
<branch repo="cairo.freedesktop.org"/>
</autotools>
<autotools id="pycairo-1-0">
<branch repo="cairo.freedesktop.org" module="pycairo"
revision="RELEASE_1_0_2" checkoutdir="pycairo-1-0"/>
......@@ -201,346 +187,23 @@
<branch repo="startup-notification.freedesktop.org"/>
</autotools>
<autotools id="CompositeExt">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="XExtensions"/>
<dep package="FixesExt"/>
</dependencies>
</autotools>
<autotools id="DamageExt">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="FixesExt"/>
</dependencies>
</autotools>
<autotools id="FixesExt">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="XExtensions"/>
</dependencies>
</autotools>
<autotools id="ICE">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="xtrans"/>
<dep package="X11"/>
<dep package="Xproto"/>
</dependencies>
</autotools>
<autotools id="PanoramiXExt">
<branch repo="xlibs.freedesktop.org"/>
</autotools>
<autotools id="Randr">
<branch repo="xlibs.freedesktop.org"/>
</autotools>
<autotools id="Render" supports-non-srcdir-builds="no">
<branch repo="xlibs.freedesktop.org"/>
</autotools>
<autotools id="RecordExt">
<branch repo="xlibs.freedesktop.org"/>
</autotools>
<autotools id="ResourceExt">
<branch repo="xlibs.freedesktop.org"/>
</autotools>
<autotools id="SM">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="ICE"/>
<dep package="X11"/>
<dep package="Xproto"/>
</dependencies>
</autotools>
<autotools id="X11">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="xtrans"/>
<dep package="Xau"/>
<dep package="Xdmcp"/>
<dep package="XExtensions"/>
<dep package="Xproto"/>
</dependencies>
</autotools>
<autotools id="XExtensions">
<branch repo="xlibs.freedesktop.org"/>
<autotools id="RenderProto">
<branch repo="xorg.freedesktop.org"
module="proto/Render" checkoutdir="RenderProto" />
</autotools>
<autotools id="XRes">
<branch repo="xlibs.freedesktop.org"/>
<autotools id="libXrender" supports-non-srcdir-builds="no">
<branch repo="xorg.freedesktop.org"
module="lib/Xrender" checkoutdir="libXrender" />
<dependencies>
<dep package="ResourceExt"/>
<dep package="X11"/>
<dep package="Xext"/>
<dep package="RenderProto"/>
</dependencies>
</autotools>
<autotools id="Xau">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="Xproto"/>
</dependencies>
</autotools>
<autotools id="Xaw">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="Xproto"/>
<dep package="X11"/>
<dep package="Xt"/>
<dep package="Xmu"/>
<dep package="Xpm"/>
</dependencies>
</autotools>
<autotools id="Xcursor">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="Xrender"/>
<dep package="Xfixes"/>
</dependencies>
</autotools>
<autotools id="Xdamage">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="X11"/>
<dep package="DamageExt"/>
<dep package="Xfixes"/>
</dependencies>
</autotools>
<autotools id="Xdmcp">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="Xproto"/>
</dependencies>
</autotools>
<autotools id="Xext">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="X11"/>
<dep package="XExtensions"/>
<dep package="Xproto"/>
</dependencies>
</autotools>
<autotools id="Xfixes">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="FixesExt"/>
</dependencies>
</autotools>
<autotools id="Xfont">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="Xproto"/>
</dependencies>
</autotools>
<autotools id="Xft" supports-non-srcdir-builds="no">
<branch repo="xlibs.freedesktop.org"/>
<autotools id="libXft" supports-non-srcdir-builds="no">
<branch repo="xorg.freedesktop.org"
module="lib/Xft" checkoutdir="libXft" />
<dependencies>
<dep package="fontconfig"/>
<dep package="Xrender"/>
</dependencies>
</autotools>
<autotools id="Xi">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="Xproto"/>
<dep package="X11"/>
</dependencies>
</autotools>
<autotools id="Xinerama">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="Xproto"/>
<dep package="X11"/>
</dependencies>
</autotools>
<autotools id="Xmu">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="Xproto"/>
<dep package="X11"/>
</dependencies>
</autotools>
<autotools id="Xpm">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="Xproto"/>
<dep package="X11"/>
</dependencies>
</autotools>
<autotools id="Xproto">
<branch repo="xlibs.freedesktop.org"/>
</autotools>
<autotools id="Xrandr">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="Randr"/>
<dep package="Xext"/>
<dep package="Xrender"/>
</dependencies>
</autotools>
<autotools id="Xrender" supports-non-srcdir-builds="no">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="Render"/>
</dependencies>
</autotools>
<autotools id="Xt">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="SM"/>
<dep package="X11"/>
</dependencies>
</autotools>
<autotools id="Xtst">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="Xext"/>
<dep package="RecordExt"/>
<dep package="X11"/>
</dependencies>
</autotools>
<autotools id="Xv">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="X11"/>
</dependencies>
</autotools>
<autotools id="xtrans">
<branch repo="xlibs.freedesktop.org"/>
</autotools>
<autotools id="xkbfile">
<branch repo="xlibs.freedesktop.org"/>
</autotools>
<autotools id="xkbfile">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="X11"/>
</dependencies>
</autotools>
<metamodule id="meta-xlibs">
<dependencies>
<dep package="CompositeExt"/>
<dep package="DamageExt"/>
<dep package="FixesExt"/>
<dep package="ICE"/>
<dep package="PanoramiXExt"/>
<dep package="Randr"/>
<dep package="Render"/>
<dep package="ResourceExt"/>
<dep package="SM"/>
<dep package="X11"/>
<dep package="XExtensions"/>
<dep package="XRes"/>
<dep package="Xau"/>
<dep package="Xaw"/>
<dep package="Xcursor"/>
<dep package="Xdamage"/>
<dep package="Xdmcp"/>
<dep package="Xext"/>
<dep package="Xfixes"/>
<dep package="Xfont"/>
<dep package="Xft"/>
<dep package="Xi"/>
<dep package="Xmu"/>
<dep package="Xpm"/>
<dep package="Xproto"/>
<dep package="Xrandr"/>
<dep package="Xrender"/>
<dep package="Xt"/>
<dep package="Xtst"/>
<dep package="Xv"/>
<dep package="xtrans"/>
<dep package="xkbfile"/>
</dependencies>
</metamodule>
<!-- These use Arch now ...
<metamodule id="meta-debrix">
<dependencies>
<dep package="debrix" />
<dep package="debrix-driver-ati" />
<dep package="debrix-input-keyboard" />
<dep package="debrix-input-mouse" />
</dependencies>
</metamodule>
<cvsmodule id="debrix-driver-ati" cvsroot="xserver.freedesktop.org">
<dependencies>
<dep package="debrix" />
</dependencies>
</cvsmodule>
<cvsmodule id="debrix-input-keyboard" cvsroot="xserver.freedesktop.org">
<dependencies>
<dep package="debrix" />
</dependencies>
</cvsmodule>
<cvsmodule id="debrix-input-mouse" cvsroot="xserver.freedesktop.org">
<dependencies>
<dep package="debrix" />
</dependencies>
</cvsmodule>
<cvsmodule id="debrix" cvsroot="xserver.freedesktop.org">
<dependencies>
<dep package="PanoramiXExt" />
<dep package="xtrans" />
<dep package="FixesExt" />
<dep package="DamageExt" />
<dep package="Randr" />
<dep package="Render" />
<dep package="ResourceExt" />
<dep package="Xau" />
<dep package="Xext" />
<dep package="XExtensions" />
<dep package="Xfont" />
<dep package="Xproto" />
<dep package="xkbfile" />
<dep package="Xdmcp" />
</dependencies>
</cvsmodule>
-->
<autotools id="xserver">
<branch repo="xserver.freedesktop.org"/>
<dependencies>
<dep package="CompositeExt"/>
<dep package="xtrans"/>
<dep package="FixesExt"/>
<dep package="DamageExt"/>
<dep package="Randr"/>
<dep package="RecordExt"/>
<dep package="Render"/>
<dep package="ResourceExt"/>
<dep package="Xau"/>
<dep package="Xext"/>
<dep package="XExtensions"/>
<dep package="Xfont"/>
<dep package="Xproto"/>
<dep package="xkbfile"/>
</dependencies>
</autotools>
<autotools id="Xcomposite">
<branch repo="xlibs.freedesktop.org"/>
<dependencies>
<dep package="CompositeExt"/>
<dep package="Xfixes"/>
</dependencies>
</autotools>
<autotools id="xcompmgr">
<branch repo="xapps.freedesktop.org"/>
<dependencies>
<dep package="Xcomposite"/>
<dep package="Xdamage"/>
<dep package="Xrender"/>
</dependencies>
</autotools>
<autotools id="lightpipe">
<branch repo="xapps.freedesktop.org"/>
<dependencies>
<dep package="Xcomposite"/>
<dep package="Xdamage"/>
<dep package="Xrender"/>
<dep package="Xext"/>
<dep package="X11"/>
<dep package="Xtst"/>
<dep package="libXrender"/>
</dependencies>
</autotools>
......@@ -577,19 +240,17 @@
</autotools>
<autotools id="system-tools-backends-1.4">
<branch repo="system-tools-backends.freedesktop.org" module="system-tools-backends"
revision="stb-1-4" checkoutdir="system-tools-backends-1.4"/>
</autotools>
<autotools id="glitz">
<branch repo="cairo.freedesktop.org"/>
<branch repo="system-tools-backends.freedesktop.org"
module="system-tools-backends" revision="stb-1-4"
checkoutdir="system-tools-backends-1.4"/>
</autotools>
<autotools id="libdaemon">
<branch repo="libdaemon.0pointer.de" module="trunk" checkoutdir="libdaemon"/>
</autotools>
<!-- explicit disabling of qt3 and qt4 can be removed once avahi correctly detects what is available. -->
<!-- explicit disabling of qt3 and qt4 can be removed once avahi
correctly detects what is available. -->
<autotools id="avahi" autogenargs="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --disable-manpages --enable-compat-howl --enable-compat-libdns_sd">
<branch repo="avahi.0pointer.de" module="trunk" checkoutdir="avahi"/>
<dependencies>
......
......@@ -112,7 +112,7 @@
<branch revision="pango-1-8"/>
<dependencies>
<dep package="glib"/>
<dep package="Xft"/>
<dep package="libXft"/>
</dependencies>
</autotools>
<autotools id="atk">
......
......@@ -149,7 +149,7 @@
<dependencies>
<dep package="glib"/>
<dep package="cairo-1-0"/>
<dep package="Xft"/>
<dep package="libXft"/>
</dependencies>
</autotools>
<autotools id="atk">
......
......@@ -168,7 +168,7 @@
<dependencies>
<dep package="glib"/>
<dep package="cairo-1-0"/>
<dep package="Xft"/>
<dep package="libXft"/>
</dependencies>
</autotools>
<autotools id="atk">
......
......@@ -175,7 +175,7 @@
<dependencies>
<dep package="glib"/>
<dep package="cairo"/>
<dep package="Xft"/>
<dep package="libXft"/>
</dependencies>
</autotools>
<autotools id="atk">
......
......@@ -51,7 +51,7 @@
<dependencies>
<dep package="glib"/>
<dep package="cairo"/>
<dep package="Xft"/>
<dep package="libXft"/>
</dependencies>
</autotools>
<autotools id="atk">
......
......@@ -51,7 +51,7 @@
<dependencies>
<dep package="glib"/>
<dep package="cairo"/>
<dep package="Xft"/>
<dep package="libXft"/>
</dependencies>
</autotools>
<autotools id="atk">
......
......@@ -21,7 +21,20 @@
</xsl:template>
<xsl:template match="cvsmodule">
<autotools id="{@id}">
<autotools>
<xsl:attribute name="id">
<xsl:choose>
<xsl:when test="@id">
<xsl:value-of select="@id"/>
</xsl:when>
<xsl:when test="@checkoutdir">
<xsl:value-of select="@id"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="@module"/>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<xsl:if test="@autogenargs">
<xsl:copy-of select="@autogenargs" />
</xsl:if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment