[gimp/gimp-2-8] build: Update osx build files and README.



commit d2d8563e5e6502c63e121b62a2286e6c8fafe8f0
Author: Clayton Walker <blender3dartist gmail com>
Date:   Fri Jan 25 22:24:11 2013 -0700

    build: Update osx build files and README.

 build/osx/README         |   39 +++-
 build/osx/gimp.modules   |  610 ++++++++++++++++++++++++++++++++--------------
 build/osx/jhbuildrc-gimp |    2 +-
 3 files changed, 467 insertions(+), 184 deletions(-)
---
diff --git a/build/osx/README b/build/osx/README
index e6a3d1c..77b51dd 100644
--- a/build/osx/README
+++ b/build/osx/README
@@ -1,8 +1,14 @@
-This are simple step-by-step instructions on how to build gimp on Mac OSX. This guide assumes that you are already somewhat familiar with jhbuild. Before you begin, it's best to remove all references to previous jhbuild, MacPorts, or HomeBrew install from your .profile. Simply renaming it would suffice.
+This are simple step-by-step instructions on how to build gimp on Mac OSX. This guide assumes that you are already somewhat familiar with jhbuild. Before you begin, it's best to remove all references to previous jhbuild, MacPorts, or HomeBrew install from your .profile. Sometimes configure will still pick up random libraries installed in other prefixes (like /opt/local/ or /opt/X11 for example). I recommend moving /opt/ to /opt2/ during the build process.
 
 The dollar sign precedes terminal commands.
 
-These coomands will check for a .profile in your $HOME directory. If one exists, it will rename it.
+Temporarily moving a MacPorts or XQuartz installation to another prefix:
+$ sudo mv /opt /opt2
+
+To move the files back:
+$ sudo mv /opt2 /opt
+
+These commands will check for a .profile in your $HOME directory. If one exists, it will rename it.
 $ if [ -f $HOME/.profile ];
 $ then
 $ mv $HOME/.profile $HOME/.profile-backup
@@ -15,6 +21,7 @@ Once you have git set up, you should download and install jhbuild:
 
 $ cd $HOME
 $ curl -O http://git.gnome.org/browse/gtk-osx/plain/gtk-osx-build-setup.sh
+$ chmod +x gtk-osx-build-setup.sh
 $ sh gtk-osx-build-setup.sh
 
 Now add the jhbuild path to your shell and new .profile:
@@ -29,9 +36,31 @@ $ curl -o $HOME/.jhbuildrc-gimp http://git.gnome.org/browse/gimp/plain/build/osx
 Now you can download and install gimp, where 'gimp' is the directory prefix, and '10.6' is the minimum version you are building gimp for. As it stands, you should be able to leave the values as they are.
 
 $ JHB=gimp GIMP_SDK=10.6 jhbuild bootstrap --ignore-system
-$ JHB=gimp GIMP_SDK=10.6 jhbuild build gimp-python
 
+Now we'll start with freetype, since it's a troublesome one.
+$ JHB=gimp GIMP_SDK=10.6 jhbuild build freetype
+
+The funny thing about jhbuild is that it's no perfect. Meaning you'll have to coax it along. To begin with, neither freetype nor zlib will actually bother configuring themselves. To fix this, you'll need to drop out of jhbuild (or simply open up another Terminal window) and enter the jhbuild shell.
+$ JHB=gimp GIMP_SDK=10.6 jhbuild shell
+
+Then, cd into the freetype and zlib and pass the proper configure commands yourself.
+$ cd ~/gimp/10.6/source/freetype[freetype version here]
+$ ./configure --prefix=$PREFIX
+$ make -j3
+$ make -j3 install
+
+Do the same for zlib when the error comes about.
+$ JHB=gimp GIMP_SDK=10.6 jhbuild build zlib
+
+NOTE: When the perl module pops up, it may tell you that it can neither make nor install. That's fine, just enter "2" and then press the enter key, and then press "2" again and hit the enter key again.
+
+Now that all of that is taken care of, we can finally move on. In order to build gimp, just type this in.
+
+$ JHB=gimp GIMP_SDK=10.6 jhbuild build gimp-2.8
+
+## Ignore ##
 This should work. However, in the odd change that, during the compiling of gimp, docbook.make (or the like) is not found, you should copy and paste the configure script and options in the gimp source folder. Note, all you need to do is configure gimp once, then jhbuild will be able to handle gimp by itself.
+## Ignore ##
 
 In order to create a .app you'll need to download an install gtk-mac-bundler.
 This will install gtk-mac-bundler into ~/.local/bin.
@@ -44,7 +73,7 @@ $ make install
 Now create the gimp.app.
 
 $ cd $HOME/gimp/10.6/source/gimp/build/osx
-$ gtk-mac-bundler gimp-python.bundle
+$ gtk-mac-bundler gimp-2.8.bundle
 
-Please note that this is not a finished process, and there are a few issues that still need to be fixed. Please joing #gimp on irc.gimp.org if you have any questions.
+Please note that this is not a finished process, and there are a few issues that still need to be fixed. Please join #gimp on irc.gimp.org if you have any questions.
 
diff --git a/build/osx/gimp.modules b/build/osx/gimp.modules
index c3a7564..d3d87d6 100644
--- a/build/osx/gimp.modules
+++ b/build/osx/gimp.modules
@@ -54,15 +54,24 @@
   <repository type="git" name="git.cairographics.org"
               href="git://git.cairographics.org/git"/>
 
+  <repository type="tarball" name="icu"
+	      href="http://download.icu-project.org/files/icu4c/"/>
+
+<repository type="tarball" name="harfbuzz"
+	      href="http://www.freedesktop.org/software/harfbuzz/release/"/>
+
   <!-- meta-gtk-osx-bootstrap -->
 
-  <autotools id="libpng" autogenargs="--enable-shared --disable-gtk-theme" autogen-sh="configure">
+  <autotools id="libpng"
+             autogenargs="--enable-shared"
+             autogen-sh="configure">
     <branch module="libpng/libpng-1.5.12.tar.xz"
             version="1.5.10"
 	    repo="sourceforge"/>
   </autotools>
 
-  <autotools id="gtk-doc" autogenargs="--disable-scrollkeeper --with-xml-catalog=$JHBUILD_PREFIX/etc/xml/catalog"
+  <autotools id="gtk-doc"
+             autogenargs="--disable-scrollkeeper --with-xml-catalog=$JHBUILD_PREFIX/etc/xml/catalog"
 	     makeargs="-k -i" makeinstallargs="-k -i install"
 	     autogen-sh="configure">
     <branch module="gtk-doc/1.18/gtk-doc-1.18.tar.bz2"
@@ -75,29 +84,36 @@
   </autotools>
 
   <autotools id="libjpeg">
-    <branch module="jpegsrc.v8d.tar.gz" version="8d"
+    <branch module="jpegsrc.v8d.tar.gz"
+            version="8d"
             repo="jpeg"
             checkoutdir="jpeg-8">
     </branch>
   </autotools>
 
-  <autotools id="libtiff" autogen-sh="configure"
+  <autotools id="libtiff"
+             autogen-sh="configure"
 	     autogenargs="--without-x --without-apple-opengl-framework">
-    <branch version="4.0.2" module="libtiff/tiff-4.0.2.tar.gz"
+    <branch version="4.0.2"
+            module="libtiff/tiff-4.0.2.tar.gz"
 	    repo="libtiff"/>
     <dependencies>
       <dep package="libjpeg"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gtk-osx-docbook" autogen-sh="configure" >
-     <branch repo="sourceforge" module="gtk-osx/gtk-osx-docbook-1.1.tar.gz"
-	     version="1.1"/>
+  <autotools id="gtk-osx-docbook"
+             autogen-sh="configure" >
+    <branch repo="sourceforge"
+            module="gtk-osx/gtk-osx-docbook-1.1.tar.gz"
+	    version="1.1"/>
   </autotools>
 
 
-  <autotools id="gnome-doc-utils" autogenargs="--disable-scrollkeeper">
-    <branch module="gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz" version="0.20.10"
+  <autotools id="gnome-doc-utils"
+             autogenargs="--disable-scrollkeeper">
+    <branch module="gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz"
+            version="0.20.10"
 	    hash="sha256:cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6"/>
     <dependencies>
       <dep package="gnome-common"/>
@@ -109,40 +125,50 @@
   </autotools>
 
   <autotools id="expat" autogen-sh="configure">
-    <branch module="expat/expat-2.1.0.tar.gz" version="2.1.0"
+    <branch module="expat/expat-2.1.0.tar.gz"
+            version="2.1.0"
 	    repo="sourceforge"/>
   </autotools>
 
-  <perl id="perl-xml-parser" makeargs="EXPATLIBPATH=${prefix}/lib EXPATINCPATH=${prefix}/include; make -j3; make -j3 install PREFIX=${prefix}">
+  <perl id="perl-xml-parser"
+        makeargs="EXPATLIBPATH=${prefix}/lib EXPATINCPATH=${prefix}/include; make -j3; make -j3 install PREFIX=${prefix}">
     <branch repo="cpan"
-        module="authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz"
-version="2.41"/>
+            module="authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz"
+            version="2.41"/>
     <dependencies>
       <dep package="expat"/>
     </dependencies>
   </perl>
 
-  <perl id="perl-xml-simple" makeargs="EXPATLIBPATH=${prefix}/lib EXPATINCPATH=${prefix}/include; make -j3; make -j3 install PREFIX=${prefix}">
+  <perl id="perl-xml-simple"
+        makeargs="EXPATLIBPATH=${prefix}/lib EXPATINCPATH=${prefix}/include; make -j3; make -j3 install PREFIX=${prefix}">
     <branch repo="cpan"
-        module="authors/id/G/GR/GRANTM/XML-Simple-2.18.tar.gz" version="2.18"
-        size="71129" md5sum="593aa8001e5c301cdcdb4bb3b63abc33"/>
+            module="authors/id/G/GR/GRANTM/XML-Simple-2.18.tar.gz"
+            version="2.18"
+            size="71129"
+            md5sum="593aa8001e5c301cdcdb4bb3b63abc33"/>
     <dependencies>
       <dep package="perl-xml-parser"/>
     </dependencies>
   </perl>
 
-  <autotools id="hicolor-icon-theme" autogen-sh="configure">
-    <branch module="hicolor-icon-theme-0.11.tar.gz" repo="icon-theme"
+  <autotools id="hicolor-icon-theme"
+             autogen-sh="configure">
+    <branch module="hicolor-icon-theme-0.11.tar.gz"
+            repo="icon-theme"
 	    version="0.11" />
   </autotools>
 
   <autotools id="gnome-common">
-    <branch module="gnome-common/2.34/gnome-common-2.34.0.tar.bz2" version="2.34.0"
+    <branch module="gnome-common/2.34/gnome-common-2.34.0.tar.bz2"
+            version="2.34.0"
 	    hash="sha256:7a9c4f9ab975501c36be3192aa61641abca045a215d519d7d00527706f1de1df"/>
   </autotools>
 
-  <autotools id="intltool" autogen-sh="configure">
-    <branch repo="intltool" module="0.50.2/+download/intltool-0.50.2.tar.gz"
+  <autotools id="intltool"
+             autogen-sh="configure">
+    <branch repo="intltool"
+            module="0.50.2/+download/intltool-0.50.2.tar.gz"
 	    version="0.50.2"
 	    hash="md5:23fbd879118253cb99aeac067da5f591"/>
     <dependencies>
@@ -151,31 +177,40 @@ version="2.41"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libxml2" autogen-sh="configure">
-    <branch version="2.8.0" module="libxml2-2.8.0.tar.gz"
+  <autotools id="libxml2"
+             autogen-sh="configure">
+    <branch version="2.8.0"
+            module="libxml2-2.8.0.tar.gz"
 	    repo="xmlsoft.org"/>
     <dependencies>
       <dep package="python"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libxslt" autogen-sh="configure">
-    <branch version="1.1.26" module="libxslt-1.1.26.tar.gz"
+  <autotools id="libxslt"
+             autogen-sh="configure">
+    <branch version="1.1.26"
+            module="libxslt-1.1.26.tar.gz"
 	    repo="xmlsoft.org"/>
     <dependencies>
       <dep package="libxml2"/>
     </dependencies>
   </autotools>
 
-  <autotools id="freetype" autogen-sh="configure">
-    <branch module="freetype/freetype-2.4.10.tar.gz" version="2.4.10"
+  <autotools id="freetype"
+             autogen-sh="configure">
+    <branch module="freetype/freetype-2.4.10.tar.gz"
+            version="2.4.10"
             repo="sourceforge">
     </branch>
   </autotools>
 
-  <autotools id="fontconfig" autogen-sh="configure"
+  <autotools id="fontconfig"
+             autogen-sh="configure"
 	     autogenargs="--disable-docs">
-    <branch repo="fontconfig" version="2.10.1" module="fontconfig-2.10.1.tar.gz"/>
+    <branch repo="fontconfig"
+            version="2.10.91"
+            module="fontconfig-2.10.91.tar.bz2"/>
     <dependencies>
       <dep package="expat"/>
       <dep package="freetype"/>
@@ -211,11 +246,14 @@ version="2.41"/>
 
   <!-- meta-gtk-osx-core -->
 
-  <autotools id="gtk+" autogen-sh="autogen.sh"
+  <autotools id="gtk+"
+             autogen-sh="autogen.sh"
              autogenargs="--with-gdktarget=quartz --disable-gtk-doc --enable-gtk-doc=no --enable-gtk-doc-html=no --enable-gtk-doc-pdf=no --enable-quartz-relocation --without-x --with-xinput --enable-xinerama"
-             autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s">
-    <branch repo="git.gnome.org" module="gtk+" revision="gtk-2-24">
-<patch file="https://dl.dropbox.com/u/942685/gimp/gtk+/0001-Add-extended-input-support-to-GTK-Quartz.patch"; strip="1"/>
+             autogen-template="%(srcdir)s/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s">
+    <branch repo="git.gnome.org"
+            module="gtk+"
+            revision="gtk-2-24">
+      <patch file="https://dl.dropbox.com/u/942685/gimp/gtk+/0001-Add-extended-input-support-to-GTK-Quartz.patch"; strip="1"/>
     </branch>
     <dependencies>
       <dep package="glib"/>
@@ -237,16 +275,21 @@ version="2.41"/>
     </after>
   </metamodule>
 
-  <autotools id="libmng" autogen-sh="unmaintained/autogen.sh">
-    <branch module="libmng/libmng-1.0.10.tar.bz2" version="1.0.10"
+  <autotools id="libmng"
+             autogen-sh="configure">
+    <branch module="libmng/libmng-1.0.10.tar.bz2"
+            version="1.0.10"
 	    repo="sourceforge"/>
     <dependencies>
       <dep package="zlib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libwmf" autogen-sh="configure" autogenargs="--without-x --with-expat --with-jpeg">
-    <branch module="wvware/libwmf-0.2.8.4.tar.gz" version="0.2.8.4"
+  <autotools id="libwmf"
+             autogen-sh="configure"
+             autogenargs="--without-x --with-expat --with-jpeg">
+    <branch module="wvware/libwmf-0.2.8.4.tar.gz"
+            version="0.2.8.4"
 	    repo="sourceforge"/>
     <dependencies>
       <dep package="zlib"/>
@@ -257,9 +300,11 @@ version="2.41"/>
     </dependencies>
   </autotools>
 
-  <autotools id="librsvg" autogen-sh="configure"
+  <autotools id="librsvg"
+             autogen-sh="configure"
 	     autogenargs="--disable-static --disable-Bsymbolic --enable-introspection=no">
-    <branch module="librsvg/2.36/librsvg-2.36.2.tar.xz" version="2.36.2"
+    <branch module="librsvg/2.36/librsvg-2.36.2.tar.xz"
+            version="2.36.2"
 	    hash="sha256:3906ad8aa5426f6db3891de98d3b72143155282f63c306a71fdb42f3246a1f08"/>
     <dependencies>
       <dep package="libcroco"/>
@@ -269,9 +314,11 @@ version="2.41"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libcroco" autogen-sh="configure"
+  <autotools id="libcroco"
+             autogen-sh="configure"
 	     autogenargs="--disable-static --enable-shared --disable-Bsymbolic">
-    <branch module="libcroco/0.6/libcroco-0.6.5.tar.xz" version="0.6.5"
+    <branch module="libcroco/0.6/libcroco-0.6.5.tar.xz"
+            version="0.6.5"
 	    hash="sha256:2c6959c3644e889264a61c35ddf17401c86943681d4fe3c1682ecd9acabda7e3"/>
     <dependencies>
       <dep package="glib"/>
@@ -279,8 +326,11 @@ version="2.41"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xmlcatmgr" autogen-sh="configure" autogenargs="--mandir=$PREFIX/share/man">
-    <branch module="xmlcatmgr/xmlcatmgr-2.2.tar.gz" version="2.2"
+  <autotools id="xmlcatmgr"
+             autogen-sh="configure"
+             autogenargs="--mandir=$PREFIX/share/man">
+    <branch module="xmlcatmgr/xmlcatmgr-2.2.tar.gz"
+            version="2.2"
 	    repo="sourceforge"/>
     <dependencies>
       <dep package="libxml2"/>
@@ -288,7 +338,9 @@ version="2.41"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gtk-doc2" autogen-sh="configure" autogenargs="--with-xml-catalog=$PREFIX/etc/xml/catalog">
+  <autotools id="gtk-doc2"
+             autogen-sh="configure"
+             autogenargs="--with-xml-catalog=$PREFIX/etc/xml/catalog">
     <branch repo="ftp.gnome.org"
             module="gtk-doc/1.18/gtk-doc-1.18.tar.xz"
             version="1.18"
@@ -300,22 +352,29 @@ version="2.41"/>
     </dependencies>
   </autotools>
 
-  <autotools id="docbook-xsl" autogen-sh="configure" autogenargs="--with-xml-catalog=$PREFIX/etc/xml/catalog">
+  <autotools id="docbook-xsl"
+             autogen-sh="configure"
+             autogenargs="--with-xml-catalog=$PREFIX/etc/xml/catalog">
     <branch repo="sourceforge"
             module="docbook/docbook-xsl-doc-1.77.1.tar.bz2"
             version="1.77.1"
             hash="sha256:d19824d7136250b9414742af39d8e4d2847899c2a3f19422d713d069152092da"/>
   </autotools>
 
-  <autotools id="libffi" autogenargs="--disable-builddir">
-    <branch module="libffi/libffi-3.0.11.tar.gz" repo="sourceware.org"
-            version="3.0.11" checkoutdir="atgreen-libffi-873d687"/>
+  <autotools id="libffi"
+             autogenargs="--disable-builddir">
+    <branch module="libffi/libffi-3.0.11.tar.gz"
+            repo="sourceware.org"
+            version="3.0.11"
+            checkoutdir="atgreen-libffi-873d687"/>
   </autotools>
 
-  <autotools id="glib" autogen-sh="configure" autogenargs="--with-libiconv=native">
-    <branch module="glib/2.33/glib-2.33.10.tar.xz"  version="2.33.10"
-        hash="sha256:6caf18eb963aa2c3c7c0dc63201021bc29e7972c60d191f566e8971af77e9505">
-      <patch file="https://dl.dropbox.com/u/942685/gimp/glib/glib-gunicollate.diff"; strip="1" />
+  <autotools id="glib"
+             autogen-sh="configure"
+             autogenargs="--with-libiconv=native">
+    <branch module="glib/2.35/glib-2.35.4.tar.xz"
+            version="2.35.4"
+            hash="sha256:a10a309e9567e345612c23284fe30b9f14ecafc5d5e6b427bf9745db95ffd568">
     </branch>
     <dependencies>
       <dep package="libffi"/>
@@ -325,8 +384,10 @@ version="2.41"/>
     </dependencies>
   </autotools>
 
-  <autotools id="shared-mime-info" autogenargs="" autogen-sh="configure">
-    <branch version="1.0" module="~hadess/shared-mime-info-1.0.tar.xz"
+  <autotools id="shared-mime-info"
+             autogen-sh="configure">
+    <branch version="1.0"
+            module="~hadess/shared-mime-info-1.0.tar.xz"
             repo="freedesktop"/>
     <dependencies>
       <dep package="glib"/>
@@ -335,23 +396,29 @@ version="2.41"/>
     </dependencies>
   </autotools>
 
-  <autotools id="desktop-file-utils" autogenargs="" autogen-sh="configure">
-    <branch version="0.20" module="software/desktop-file-utils/releases/desktop-file-utils-0.20.tar.xz"
+  <autotools id="desktop-file-utils"
+             autogen-sh="configure">
+    <branch version="0.20"
+            module="software/desktop-file-utils/releases/desktop-file-utils-0.20.tar.xz"
             repo="freedesktop"/>
     <dependencies>
       <dep package="glib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-mime-data" autogenargs="" autogen-sh="configure">
-    <branch version="2.18.0" module="gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2"/>
+  <autotools id="gnome-mime-data"
+             autogen-sh="configure">
+    <branch version="2.18.0"
+            module="gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2"/>
     <dependencies>
       <dep package="perl-xml-parser"/>
     </dependencies>
   </autotools>
 
-  <autotools id="atk" autogen-sh="configure">
-    <branch module="atk/2.5/atk-2.5.4.tar.xz" version="2.5.4"
+  <autotools id="atk"
+             autogen-sh="configure">
+    <branch module="atk/2.5/atk-2.5.4.tar.xz"
+            version="2.5.4"
             hash="sha256:af6d6d8ec4543f338bf2476974de69891b7419913dd1cf4a94d53696bcc14aab"/>
     <dependencies>
       <dep package="glib"/>
@@ -362,8 +429,11 @@ version="2.41"/>
     </dependencies>
   </autotools>
 
-  <autotools id="pixman" autogenargs="--disable-gtk" autogen-sh="configure">
-    <branch version="0.26.2" module="pixman-0.26.2.tar.gz"
+  <autotools id="pixman"
+             autogenargs="--disable-gtk"
+             autogen-sh="configure">
+    <branch version="0.26.2"
+            module="pixman-0.26.2.tar.gz"
             repo="cairographics"
             hash="sha1:3c7d72b5b52e6d301efc68aa480f0737a641bdd3"/>
     <dependencies>>
@@ -376,11 +446,13 @@ version="2.41"/>
     </dependencies>
   </autotools>
 
-  <autotools id="cairo"  autogen-sh="configure"
-             autogenargs="--enable-pdf --enable-quartz --enable-xlib=no --without-x">
-    <branch module="cairo-1.12.2.tar.xz"  version="1.12.2"
+  <autotools id="cairo"
+             autogen-sh="configure"
+             autogenargs="--enable-pdf --enable-quartz --enable-quartz-font --enable-quartz-image --enable-ft --enable-png --enable-xlib=no --without-x">
+    <branch module="cairo-1.12.10.tar.xz" 
+            version="1.12.10"
             repo="cairographics"
-            hash="sha1:bc2ee50690575f16dab33af42a2e6cdc6451e3f9">
+            hash="sha1:be06d5aaa272bbbd08380f71ca710d5612881493">
     </branch>
     <dependencies>
       <dep package="pixman"/>
@@ -388,22 +460,56 @@ version="2.41"/>
       <dep package="fontconfig"/>
       <dep package="freetype"/>
       <dep package="libpng"/>
-      <dep package="zlib"/>
       <dep package="expat"/>
       <dep package="glib"/>
+      <dep package="zlib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="pango"  autogen-sh="configure"
+  <autotools id="icu"
+             autogen-sh="source/configure"
+             autogenargs=""
+             makeargs="-k -C modules; make">
+    <branch version="50.1.2"
+            repo="icu"
+            module="50.1.2/icu4c-50_1_2-src.tgz"
+            checkoutdir="icu"
+            hash="md5:beb98aa972219c9fcd9c8a71314943c9">
+    </branch>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <autotools id="harfbuzz"
+             autogen-sh="configure"
+             autogenargs="">
+    <branch version="0.9.12"
+            repo="harfbuzz"
+            module="harfbuzz-0.9.12.tar.bz2"
+            hash="sha256:c653f70a275e98d109a9f1271373a6e80978c97298d723cb3f370351852f9da5">
+    </branch>
+    <dependencies>
+      <dep package="cairo"/>
+      <dep package="glib"/>
+      <dep package="fontconfig"/>
+      <dep package="icu"/>
+      <dep package="freetype"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="pango"
+             autogen-sh="configure"
              autogenargs="--without-x --with-included-modules=basic-coretext --enable-shared --disable-silent-rules --with-included-modules"
              makeargs="-k -C modules; make">
-    <branch version="1.30.1" module="pango/1.30/pango-1.30.1.tar.xz"
-            hash="sha256:3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe">
+    <branch version="1.32.6"
+            module="pango/1.32/pango-1.32.6.tar.xz"
+            hash="sha256:8e9a3eadebf30a31640f2b3ae0fb455cf92d10d1cad246d0ffe72ec595905174">
     </branch>
     <dependencies>
       <dep package="cairo"/>
       <dep package="libpng"/>
       <dep package="fontconfig"/>
+      <dep package="harfbuzz"/>
       <dep package="glib"/>
       <dep package="gtk-doc"/>
       <dep package="gobject-introspection"/>
@@ -411,7 +517,8 @@ version="2.41"/>
   </autotools>
 
   <autotools id="gdk-pixbuf">
-    <branch module="gdk-pixbuf/2.26/gdk-pixbuf-2.26.3.tar.xz" version="2.26.3"
+    <branch module="gdk-pixbuf/2.26/gdk-pixbuf-2.26.3.tar.xz"
+            version="2.26.3"
             hash="sha256:a22373a72621c6f73e8c216410aeb46e3bb05b477e600b6ac481a47ecd4c09cc"/>
     <dependencies>
       <dep package="libpng"/>
@@ -428,7 +535,9 @@ version="2.41"/>
   <autotools id="babl" >
     <!--<branch repo="ftp.gtk.org" version="0.1.10"
             module="babl/0.1/babl-0.1.10.tar.bz2"/>-->
-    <branch repo="git.gnome.org" module="babl" revision="master"/>
+    <branch repo="git.gnome.org"
+            module="babl"
+            revision="master"/>
     <dependencies>
       <dep package="gobject-introspection"/>
       <!-- This is only to keep the proper build order -->
@@ -436,10 +545,14 @@ version="2.41"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gegl" autogen-sh="autogen.sh" autogenargs="--disable-docs --enable-introspection=no">
+  <autotools id="gegl"
+             autogen-sh="autogen.sh"
+             autogenargs="--disable-docs --enable-introspection=no">
     <!--<branch repo="ftp.gtk.org" version="0.2.0"
             module="gegl/0.2/gegl-0.2.0.tar.bz2"/>-->
-    <branch repo="git.gnome.org" module="gegl" revision="master"/>
+    <branch repo="git.gnome.org"
+            module="gegl"
+            revision="master"/>
     <dependencies>
       <dep package="babl"/>
       <dep package="glib"/>
@@ -454,19 +567,25 @@ version="2.41"/>
     </dependencies>
   </autotools>
 
-  <autotools id="lcms" autogen-sh="configure">
-    <branch module="lcms/lcms-1.19.tar.gz" version="1.19" repo="sourceforge"
-            />
+  <autotools id="lcms"
+             autogen-sh="configure">
+    <branch module="lcms/lcms-1.19.tar.gz"
+            version="1.19"
+            repo="sourceforge"/>
   </autotools>
 
-  <autotools id="lcms2" autogen-sh="configure">
-    <branch module="lcms/lcms2-2.3.tar.gz" version="2.3" repo="sourceforge"
-            />
+  <autotools id="lcms2"
+             autogen-sh="configure">
+    <branch module="lcms/lcms2-2.3.tar.gz"
+            version="2.3"
+            repo="sourceforge"/>
   </autotools>
 
-  <autotools id="poppler" autogen-sh="configure">
-    <branch module="poppler-0.20.0.tar.gz" version="0.20.0" repo="poppler"
-    />
+  <autotools id="poppler"
+             autogen-sh="configure">
+    <branch module="poppler-0.20.0.tar.gz"
+            version="0.20.0"
+            repo="poppler"/>
     <dependencies>
       <dep package="lcms"/>
       <dep package="libjpeg"/>
@@ -477,42 +596,88 @@ version="2.41"/>
     </dependencies>
   </autotools>
 
-  <autotools id="jasper" autogen-sh="configure"
+  <autotools id="jasper"
+             autogen-sh="configure"
              autogenargs="--enable-shared">
-    <branch module="jasper-1.900.1.zip" version="1.900.1" repo="jasper"
-    />
+    <branch module="jasper-1.900.1.zip"
+            version="1.900.1"
+            repo="jasper"/>
     <dependencies>
       <dep package="libjpeg"/>
     </dependencies>
   </autotools>
 
-  <autotools id="exif" autogen-sh="configure">
-    <branch module="libexif/libexif-0.6.21.tar.bz2" version="0.6.21" repo="sourceforge"
-    />
+  <autotools id="exif"
+             autogen-sh="configure">
+    <branch module="libexif/libexif-0.6.21.tar.bz2"
+            version="0.6.21"
+            repo="sourceforge"/>
     <dependencies>
       <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
-  <autotools id="iso-codes" autogen-sh="configure">
-    <branch module="iso-codes_3.38.orig.tar.xz" version="3.38" repo="iso-codes" checkoutdir="iso-codes-3.37"/>
+  <autotools id="iso-codes"
+             autogen-sh="configure">
+    <branch module="iso-codes_3.38.orig.tar.xz"
+            version="3.38"
+            repo="iso-codes"
+            checkoutdir="iso-codes-3.37"/>
   </autotools>
 
-  <autotools id="gimp-python"  autogen-sh="autogen.sh"
-             autogenargs="--without-x --disable-docs --without-gvfs --without-dbus --without-wmf --enable-binreloc" skip-autogen="never"
-	     autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+<!-- Removed line, above makeargs:
+Libdir and prefix both have double slashes in front of them.
+autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/%(autogen-sh)s prefix %(prefix)s libdir %(libdir)s %(autogenargs)s"
+-->
+
+  <autotools id="gimp-2.8"
+             autogen-sh="autogen.sh"
+             autogenargs="--without-x --disable-docs --without-gvfs --without-dbus --without-wmf --enable-binreloc"
+             skip-autogen="never"
              makeargs='LDFLAGS="-framework Carbon"'>
     <!--<branch module="gimp/v2.8/gimp-2.8.0.tar.bz2" version="2.8.0"
             md5sum="28997d14055f15db063eb92e1c8a7ebb" repo="gimp">
     </branch>-->
-    <branch repo="git.gnome.org" module="gimp" revision="gimp-2-8"/>
+    <branch repo="git.gnome.org"
+            module="gimp"
+            revision="gimp-2-8"
+            checkoutdir="gimp-2.8"/>
+    <dependencies>
+      <dep package="gtk-doc"/>
+      <dep package="libpng"/>
+      <dep package="libjpeg"/>
+      <dep package="libtiff"/>
+      <dep package="exif"/>
+      <!--<dep package="libmng"/>-->
+      <dep package="librsvg"/>
+      <dep package="lcms"/>
+      <dep package="fontconfig"/>
+      <dep package="gegl"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="poppler"/>
+      <dep package="iso-codes"/>
+      <dep package="jasper"/>
+      <dep package="meta-gtk-osx-python"/>
+      <dep package="tango-icon-theme"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gimp-master"
+             autogen-sh="autogen.sh"
+             autogenargs="--without-x --disable-docs --without-gvfs --without-dbus --without-wmf --enable-binreloc"
+             skip-autogen="never"
+             makeargs='LDFLAGS="-framework Carbon"'>
+    <branch repo="git.gnome.org"
+            module="gimp"
+            revision="master"
+            checkoutdir="gimp-master"/>
     <dependencies>
       <dep package="gtk-doc"/>
       <dep package="libpng"/>
       <dep package="libjpeg"/>
       <dep package="libtiff"/>
       <dep package="exif"/>
-      <dep package="libmng"/>
       <dep package="librsvg"/>
       <dep package="lcms"/>
       <dep package="fontconfig"/>
@@ -529,60 +694,82 @@ version="2.41"/>
 
   <!-- Start help files -->
 
-  <autotools id="gimp-help" autogenargs="--without-gimp" makeargs="ALL_LINGUAS=en" autogen-sh="autogen.sh">
-    <branch module="gimp/help/gimp-help-2.8.0.tar.bz2" version="2.8.0"
+  <autotools id="gimp-help"
+             autogenargs="--without-gimp"
+             makeargs="ALL_LINGUAS=en"
+             autogen-sh="autogen.sh">
+    <branch module="gimp/help/gimp-help-2.8.0.tar.bz2"
+            version="2.8.0"
             repo="gimp"/>
     <dependencies>
       <dep package="pngcrush"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gimp-help-git" autogenargs="--without-gimp" makeargs="ALL_LINGUAS=en" autogen-sh="autogen.sh">
-    <branch module="gimp-help-2" reversion="master"
+  <autotools id="gimp-help-git"
+             autogenargs="--without-gimp"
+             makeargs="ALL_LINGUAS=en"
+             autogen-sh="autogen.sh">
+    <branch module="gimp-help-2"
+            reversion="master"
             repo="git.gnome.org"/>
     <dependencies>
       <dep package="pngcrush"/>
     </dependencies>
   </autotools>
 
-  <autotools id="pngcrush" makeargs="-f Makefile" makeinstallargs="-f Makefile" skip-autogen="skip-autogen">
-    <branch module="pmt/pngcrush-1.7.37.tar.xz" version="1.7.37"
+  <autotools id="pngcrush"
+             makeargs="-f Makefile"
+             makeinstallargs="-f Makefile"
+             skip-autogen="skip-autogen">
+    <branch module="pmt/pngcrush-1.7.37.tar.xz"
+            version="1.7.37"
 	    repo="sourceforge"/>
   </autotools>
 
   <!-- End help files -->
 
-  <autotools id="murrine-engine" autogen-sh="configure">
-    <branch module="murrine/0.98/murrine-0.98.2.tar.xz" version="0.98.2"
+  <autotools id="murrine-engine"
+             autogen-sh="configure">
+    <branch module="murrine/0.98/murrine-0.98.2.tar.xz"
+            version="0.98.2"
 	    hash="sha256:e9c68ae001b9130d0f9d1b311e8121a94e5c134b82553ba03971088e57d12c89"/>
   </autotools>
 
-  <autotools id="gtk-engines2" autogen-sh="configure"
-        autogenargs="--enable-shared --enable-animation --disable-crux --disable-hc --disable-industrial --disable-mist --disable-redmond --disable-glide --disable-thinice">
-    <branch module="gtk-engines/2.20/gtk-engines-2.20.2.tar.gz" version="2.20.2"
+  <autotools id="gtk-engines2"
+             autogen-sh="configure"
+             autogenargs="--enable-shared --enable-animation --disable-crux --disable-hc --disable-industrial --disable-mist --disable-redmond --disable-glide --disable-thinice">
+    <branch module="gtk-engines/2.20/gtk-engines-2.20.2.tar.gz"
+            version="2.20.2"
 	    hash="sha256:aa65209c824a71feb82c31a6c5bdee22658874cff4fca610d174d983c807c22f">
 <patch file="https://dl.dropbox.com/u/942685/gimp/gtk-engines2/patch-engines-clearlooks-src-animation.c.diff"; strip="0"/>
     </branch>
   </autotools>
 
-  <autotools id="gnome-themes" autogen-sh="configure"
-        autogenargs="--enable-shared --enable-all-themes">
-    <branch module="gnome-themes/2.30/gnome-themes-2.30.2.tar.gz" version="2.30.2"
+  <autotools id="gnome-themes"
+             autogen-sh="configure"
+             autogenargs="--enable-shared --enable-all-themes">
+    <branch module="gnome-themes/2.30/gnome-themes-2.30.2.tar.gz"
+            version="2.30.2"
 	    hash="sha256:928c114940c16cde6e25f3ac80b5b9dfef836d88a78461f79e016103a44f100e"/>
     <dependencies>
       <dep package="gtk-engines2"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-themes-standard" autogen-sh="configure"
-        autogenargs="--enable-shared --disable-gtk3-engines">
-    <branch module="gnome-themes-standard/3.5/gnome-themes-standard-3.5.90.tar.xz" version="3.5"
+  <autotools id="gnome-themes-standard"
+             autogen-sh="configure"
+             autogenargs="--enable-shared --disable-gtk3-engines">
+    <branch module="gnome-themes-standard/3.5/gnome-themes-standard-3.5.90.tar.xz"
+            version="3.5"
 	    hash="sha256:4a508ff5a959a9f4e8b0d76673f420b0d7fb6b91bf9647d5a5a258563f6ee510"/>
   </autotools>
 
-  <autotools id="tango-icon-theme" autogenargs="--disable-icon-framing"
+  <autotools id="tango-icon-theme"
+             autogenargs="--disable-icon-framing"
              autogen-sh="configure">
-    <branch repo="tango.freedesktop.org" version="0.8.90"
+    <branch repo="tango.freedesktop.org"
+            version="0.8.90"
             module="tango-icon-theme-0.8.90.tar.gz"/>
     <dependencies>
       <dep package="icon-naming-utils"/>
@@ -590,17 +777,21 @@ version="2.41"/>
     </dependencies>
   </autotools>
 
-  <autotools id="icon-naming-utils" autogen-sh="configure">
-    <branch repo="tango.freedesktop.org"  version="0.8.90"
+  <autotools id="icon-naming-utils"
+             autogen-sh="configure">
+    <branch repo="tango.freedesktop.org"
+            version="0.8.90"
             module="icon-naming-utils-0.8.90.tar.gz"/>
     <after>
       <dep package="gtk-doc"/>
     </after>
   </autotools>
 
-  <autotools id="gtk-quartz-engine" autogen-sh="autogen.sh">
+  <autotools id="gtk-quartz-engine"
+             autogen-sh="autogen.sh">
     <branch module="gtk-osx/gtk-quartz-engine-0.2.tar.gz"
-            repo="sourceforge" version="0.2" />
+            repo="sourceforge"
+            version="0.2" />
     <after>
       <dep package="gtk+"/>
     </after>
@@ -631,21 +822,25 @@ version="2.41"/>
       <dep package="py2cairo"/>
       <dep package="pygobject"/>
       <dep package="pygtk"/>
-      <dep package="gtk-mac-integration-python"/>
+      <!--<dep package="gtk-mac-integration-python"/>-->
     </dependencies>
   </metamodule>
 
-  <autotools id="berkeleydb" autogen-sh="dist/configure"
-         autogen-template="cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" makeargs="-C build_unix"
-         makeinstallargs="-C build_unix install">
-
+  <autotools id="berkeleydb"
+             autogen-sh="dist/configure"
+             autogen-template="cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+             makeargs="-C build_unix"
+             makeinstallargs="-C build_unix install">
     <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
         repo="oracle" />
   </autotools>
 
-  <autotools id="python" autogenargs="--enable-shared" autogen-sh="configure">
+  <autotools id="python"
+             autogenargs="--enable-shared"
+             autogen-sh="configure">
     <branch repo="python"
-	    module="2.7.2/Python-2.7.2.tar.bz2" version="2.7.2">
+	    module="2.7.2/Python-2.7.2.tar.bz2"
+            version="2.7.2">
     </branch>
     <after>
       <dep package="berkeleydb"/>
@@ -653,8 +848,11 @@ version="2.41"/>
     </after>
   </autotools>
 
-  <autotools id="py2cairo" autogen-sh="autogen.sh">
-    <branch repo="git.cairographics.org" module="py2cairo" revision="master"/>
+  <autotools id="py2cairo"
+             autogen-sh="autogen.sh">
+    <branch repo="git.cairographics.org"
+            module="py2cairo"
+            revision="master"/>
     <dependencies>
       <dep package="cairo"/>
     </dependencies>
@@ -681,8 +879,11 @@ version="2.41"/>
      with later versions it installs as pygobject2 and PyGObject 3
      installs as pygobject3. Introspection is disabled here, because
      gir-scanner isn't smart enough to co-install them. -->
-  <autotools id="pygobject" autogen-sh="configure" autogenargs=" --enable-introspection=no">
-    <branch version="2.28.6" module="pygobject/2.28/pygobject-2.28.6.tar.bz2"
+  <autotools id="pygobject"
+             autogen-sh="configure"
+             autogenargs=" --enable-introspection=no">
+    <branch version="2.28.6"
+            module="pygobject/2.28/pygobject-2.28.6.tar.bz2"
             hash="sha256:e4bfe017fa845940184c82a4d8949db3414cb29dfc84815fb763697dc85bdcee"/>
     <dependencies>
       <dep package="gtk+"/>
@@ -694,9 +895,11 @@ version="2.41"/>
     </dependencies>
   </autotools>
 
- <autotools id="pygtk" autogen-sh="configure" 
+ <autotools id="pygtk"
+            autogen-sh="configure" 
 	     autogenargs="CFLAGS=&quot;$CFLAGS -xobjective-c&quot; lt_cv_sys_global_symbol_pipe=&quot;'sed -n -e '\''s/^.*[ ]\([BCDEGRST][BCDEGRST]*\)[ ][ ]*_\([_A-Za-z][_A-Za-z0-9]*\)$/\1 _\2 \2/p'\'' | sed '\''/ __gnu_lto/d'\'''&quot;">
-    <branch version="2.24.0" module="pygtk/2.24/pygtk-2.24.0.tar.bz2"
+    <branch version="2.24.0"
+            module="pygtk/2.24/pygtk-2.24.0.tar.bz2"
             hash="sha256:cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912">
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/pygtk-libtool.patch"; strip="1"/>
     </branch>
@@ -709,7 +912,8 @@ version="2.41"/>
     </after>
   </autotools>
 
-  <autotools id="gtk-mac-integration-python" autogen-sh="configure"
+  <autotools id="gtk-mac-integration-python"
+             autogen-sh="configure"
              autogenargs="--enable-python">
     <branch module="gtk-mac-integration/1.0/gtk-mac-integration-1.0.1.tar.bz2"
             version="1.0.1"
@@ -723,17 +927,23 @@ version="2.41"/>
   </autotools>
 
  <!-- Ghostscript GPL -->
-  <autotools id="ghostscript" autogenargs="--disable-compile-inits --disable-cups --without-luratech --with-system-libtiff --disable-gtk --without-x --enable-dynamic" autogen-sh="configure">
-    <branch version="9.06" module="ghostscript/ghostscript-9.06.tar.gz"
+  <autotools id="ghostscript"
+             autogenargs="--disable-compile-inits --disable-cups --without-luratech --with-system-libtiff --disable-gtk --without-x --enable-dynamic"
+             autogen-sh="configure">
+    <branch version="9.06"
+            module="ghostscript/ghostscript-9.06.tar.gz"
 	    repo="sourceforge"/>
   </autotools>
 
 <!-- Language Support -->
-  <repository type="tarball" name="iso-codes"
+  <repository type="tarball"
+              name="iso-codes"
 	      href="http://pkg-isocodes.alioth.debian.org/downloads/"/>
 
-  <autotools id="iso-codes" autogen-sh="configure">
-    <branch repo="iso-codes" module="iso-codes-3.38.tar.xz"
+  <autotools id="iso-codes"
+             autogen-sh="configure">
+    <branch repo="iso-codes"
+            module="iso-codes-3.38.tar.xz"
             version="0.4.1"
 	    hash="md5:df8dacc718116dae3db453a4d85c018a"/>
     <dependencies>
@@ -744,31 +954,43 @@ version="2.41"/>
 
   <!-- Ufraw plugin -->
 
-  <repository type="tarball" name="gtkimageview"
+  <repository type="tarball"
+              name="gtkimageview"
 	      href="http://ftp.riken.jp/pub/FreeBSD/ports/local-distfiles/kwm/"/>
   <!--<repository type="tarball" name="ufraw"
 	      href="http://ftp.riken.jp/pub/FreeBSD/ports/local-distfiles/kwm/"/>-->
-  <repository type="cvs" name="ufraw"
-    cvsroot=":pserver:anonymous ufraw cvs sourceforge net:/cvsroot/ufraw"
-    password=""/>
-
-  <repository type="svn" name="svn.berlios.de"
-    href="http://svn.berlios.de/svnroot/repos/"/>
-
-  <autotools id="lensfun" autogen-sh="configure" autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --libdir=%(libdir)s %(autogenargs)s">
-    <branch repo="svn.berlios.de" module="lensfun/trunk" version="0.2.6">
+  <repository type="cvs"
+              name="ufraw"
+              cvsroot=":pserver:anonymous ufraw cvs sourceforge net:/cvsroot/ufraw"
+              password=""/>
+
+  <repository type="svn"
+              name="svn.berlios.de"
+              href="http://svn.berlios.de/svnroot/repos/"/>
+
+  <autotools id="lensfun"
+             autogen-sh="configure"
+             autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --libdir=%(libdir)s %(autogenargs)s">
+    <branch repo="svn.berlios.de"
+            module="lensfun/trunk"
+            version="0.2.6">
       <patch file="https://dl.dropbox.com/u/942685/gimp/lensfun/patch-pkgconfig.diff"; strip="1" />
       <patch file="https://dl.dropbox.com/u/942685/gimp/lensfun/patch-build-tibs-target-mac-mak.diff"; strip="1" />
     </branch>
   </autotools>
 
-  <autotools id="gtkimageview" autogen-sh="configure">
-    <branch repo="gtkimageview" module="gtkimageview-1.6.4.tar.gz"
+  <autotools id="gtkimageview"
+             autogen-sh="configure">
+    <branch repo="gtkimageview"
+            module="gtkimageview-1.6.4.tar.gz"
             version="1.6.4"/>
   </autotools>
 
-  <autotools id="ufraw" autogen-sh="autogen.sh" makeargs="CC=clang">
-    <branch repo="ufraw" module="ufraw"
+  <autotools id="ufraw"
+             autogen-sh="autogen.sh"
+             makeargs="CC=clang">
+    <branch repo="ufraw"
+            module="ufraw"
             version="0.18"/>
     <dependencies>
       <dep package="lensfun"/>
@@ -778,43 +1000,58 @@ version="2.41"/>
 
   <!-- Webkit browser -->
 
-  <autotools id="zlib" autogen-sh="configure">
-    <branch repo="sourceforge" module="libpng/zlib-1.2.7.tar.bz2"
+  <autotools id="zlib"
+             autogen-sh="configure">
+    <branch repo="sourceforge"
+            module="libpng/zlib-1.2.7.tar.bz2"
             version="1.2.7"/>
   </autotools>
 
   <!-- Web plugin -->
 
-  <autotools id="saveforweb" autogen-sh="autogen.sh">
-    <branch repo="github-git" module="auris/gimp-save-for-web.git" revision="master"/>
+  <autotools id="saveforweb"
+             autogen-sh="autogen.sh">
+    <branch repo="github-git"
+            module="auris/gimp-save-for-web.git"
+            revision="master"/>
   </autotools>
 
   <!-- Resynthesizer plugin -->
 
-  <repository type="git" name="github-git"
+  <repository type="git"
+              name="github-git"
               href="https://github.com/"/>
 
-  <autotools id="resynthesizer" autogen-sh="autogen.sh">
-    <branch repo="github-git" module="bootchk/resynthesizer.git" revision="master"/>
+  <autotools id="resynthesizer"
+             autogen-sh="autogen.sh">
+    <branch repo="github-git"
+            module="bootchk/resynthesizer.git"
+            revision="master"/>
   </autotools>
 
   <!-- Liquid rescale plugin -->
 
-  <repository type="tarball" name="liblqr"
+  <repository type="tarball"
+              name="liblqr"
 	      href="http://liblqr.wikidot.com/local--files/en:download-page/"/>
-  <repository type="tarball" name="gimp-lqr-plugin"
+  <repository type="tarball"
+              name="gimp-lqr-plugin"
 	      href="http://liquidrescale.wikidot.com/local--files/en:download-page-sources/"/>
 
-  <autotools id="liblqr" autogen-sh="configure">
-    <branch repo="liblqr" module="liblqr-1-0.4.1.tar.bz2"
+  <autotools id="liblqr"
+             autogen-sh="configure">
+    <branch repo="liblqr"
+            module="liblqr-1-0.4.1.tar.bz2"
             version="0.4.1"/>
     <after>
       <dep package="gimp-python"/>
     </after>
   </autotools>
 
-  <autotools id="gimp-lqr-plugin" autogen-sh="configure">
-    <branch repo="gimp-lqr-plugin" module="gimp-lqr-plugin-0.7.1.tar.bz2"
+  <autotools id="gimp-lqr-plugin"
+             autogen-sh="configure">
+    <branch repo="gimp-lqr-plugin"
+            module="gimp-lqr-plugin-0.7.1.tar.bz2"
             version="0.7.1"/>
     <dependencies>
     </dependencies>
@@ -825,38 +1062,55 @@ version="2.41"/>
 
   <!-- ReFocus plugin -->
 
-  <autotools id="refocus-it" autogenargs="--enable-shared" makeargs="CC=clang" autogen-sh="configure">
-    <branch version="2.0.0" module="refocus-it/refocus-it-2.0.0.tar.gz"
+  <autotools id="refocus-it"
+             autogenargs="--enable-shared"
+             makeargs="CC=clang"
+             autogen-sh="configure">
+    <branch version="2.0.0"
+            module="refocus-it/refocus-it-2.0.0.tar.gz"
 	    repo="sourceforge"/>
   </autotools>
 
   <!-- BIMP plugin-->
 
-  <autotools id="pcre" autogenargs="--enable-shared" autogen-sh="configure">
-    <branch version="8.31" module="pcre/pcre-8.31.tar.gz"
+  <autotools id="pcre"
+             autogenargs="--enable-shared"
+             autogen-sh="configure">
+    <branch version="8.31"
+            module="pcre/pcre-8.31.tar.gz"
 	    repo="sourceforge"/>
   </autotools>
 
   <!-- GMIC plugin -->
 
-  <repository type="tarball" name="fftw"
+  <repository type="tarball"
+              name="fftw"
 	      href="ftp://ftp.fftw.org/pub/fftw/"/>
-  <repository type="tarball" name="github-tar"
+  <repository type="tarball"
+              name="github-tar"
 	      href="https://github.com/downloads/"/>
 
-  <autotools id="fftw" autogen-sh="configure">
-    <branch repo="fftw" module="fftw-3.3.2.tar.gz"
+  <autotools id="fftw"
+             autogen-sh="configure">
+    <branch repo="fftw"
+            module="fftw-3.3.2.tar.gz"
 	    version="3.3.2"
 	    hash="md5:6977ee770ed68c85698c7168ffa6e178"/>
   </autotools>
 
-  <autotools id="ilmbase" autogenargs="--enable-shared" autogen-sh="configure">
-    <branch version="1.0.3" module="openexr/openexr/ilmbase-1.0.3.tar.gz"
+  <autotools id="ilmbase"
+             autogenargs="--enable-shared"
+             autogen-sh="configure">
+    <branch version="1.0.3"
+            module="openexr/openexr/ilmbase-1.0.3.tar.gz"
 	    repo="github-tar"/>
   </autotools>
 
-  <autotools id="openexr" autogenargs="--enable-shared --disable-ilmbasetest" autogen-sh="configure">
-    <branch version="8.31" module="openexr/openexr/openexr-1.7.1.tar.gz"
+  <autotools id="openexr"
+             autogenargs="--enable-shared --disable-ilmbasetest"
+             autogen-sh="configure">
+    <branch version="8.31"
+            module="openexr/openexr/openexr-1.7.1.tar.gz"
 	    repo="github-tar"/>
     <dependencies>
       <dep package="ilmbase"/>
diff --git a/build/osx/jhbuildrc-gimp b/build/osx/jhbuildrc-gimp
index 32bd3d4..516bebb 100644
--- a/build/osx/jhbuildrc-gimp
+++ b/build/osx/jhbuildrc-gimp
@@ -41,4 +41,4 @@ os.environ['MAKE'] = 'make -j3'
 skip.append("libiconv")
 
 # Main module set
-moduleset = "~/gimp/directory/jhbuild/gimp.modules"
+moduleset = "http://git.gnome.org/browse/gimp/plain/build/osx/gimp.modules?h=gimp-2-8";



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]