[PATCH modular 00/15] jhbuild fixes + 7.6 moduleset

[Dan Nicholson]

On Mon, Mar 07, 2011 at 11:56:11AM +0100, Dirk Wallenstein wrote:
> On Mon, Mar 07, 2011 at 09:15:26AM +0100, Dirk Wallenstein wrote:
> > On Sun, Mar 06, 2011 at 09:29:45AM -0800, Dan Nicholson wrote:
> > > A while back I was working on a moduleset for 7.6:
> > > 
> > > http://lists.x.org/archives/xorg-devel/2010-November/016108.html
> > > 
> > > As I worked on addressing the issues pointed out there, I uncovered a
> > > bunch more fixes for the original moduleset that were needed. Patches
> > > 01 - 12 contain those fixes.
> > > 
> > > Patches 13 - 15 contain the 7.6 moduleset and script for updating it.
> > > Since the last time, I've filled out the moduleset to cover all modules
> > > included in 7.6 and added stable releases for modules in xorg.modules
> > > but not in the katamari.
> > > 
> > > Dan Nicholson (15):
> > >   jhbuild: Clean up formatting of xorg.modules
> > >   jhbuild: Use git.freedesktop.org as default repository
> > >   jhbuild: Remove duplicate xtrans module
> > >   jhbuild: Build xcursorgen for cursors dependency
> > >   jhbuild: Build openchrome driver from svn
> > >   jhbuild: Build applications included in the katamari
> > >   jhbuild: No xserver DDXs require xkbui anymore
> > >   jhbuild: Reorder and rename font modules sanely
> > >   jhbuild: Add definitions for remaining font modules
> > >   jhbuild: Move font modules before drivers
> > >   jhbuild: Group external modules at top of moduleset
> > >   jhbuild: Don't build broken impact driver
> > >   jhbuild: Add moduleset with tarballs used for 7.6 katamari
> > >   jhbuild: Add script for updating moduleset tarball definitions
> > >   release.sh: Update jhbuild moduleset with --moduleset
> > > 
> > >  release.sh          |   23 +
> > >  update-moduleset.sh |   72 ++
> > >  xorg-7.6.modules    | 2190 +++++++++++++++++++++++++++++++++++++++++++++++++++
> > >  xorg.modules        | 1340 ++++++++++++++++++++++----------
> > >  4 files changed, 3225 insertions(+), 400 deletions(-)
> > >  create mode 100755 update-moduleset.sh
> > >  create mode 100644 xorg-7.6.modules
> > > 
> > 
> > I can't find a commit to apply them onto among the top 7 commits.
> 
> It's this:
> 
> diff --git a/xorg.modules b/xorg.modules
> index 9c186b4..28bca16 100644
> --- a/xorg.modules
> +++ b/xorg.modules
> @@ -38,10 +38,11 @@
>    </autotools>
>  
>    <autotools id="makedepend">
> +    <branch repo="git.freedesktop.org" module="xorg/util/makedepend" checkoutdir="xorg/util/makedepend" />
>      <dependencies>
>        <dep package="macros"/>
> +      <dep package="x11proto"/>
>      </dependencies>
> -    <branch repo="git.freedesktop.org" module="xorg/util/makedepend" checkoutdir="xorg/util/makedepend" />
>    </autotools>
>  
>    <autotools id="xorg-sgml-doctools">

Oops, sorry about that. I was rebasing my patches over Cyril's and this
was one difference I found. I added the patch on my local master and
rebased this patchset over it. Unfortunately, I forgot to send that one.
See below.

Dan