[jhbuild] 3.6: pango depends on harfbuzz now

[Matthias Clasen <matthiasc src gnome org>]

commit a8d8e2b3c56af4c61bbf89667a9ea76ec90c3b9f
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Aug 18 14:07:11 2012 -0400

    3.6: pango depends on harfbuzz now
    
    Add harfbuzz, and its dependency, ragel.
    The patch to make ragel build with gcc 4.7 is taken
    from the Fedora package.

 modulesets/gnome-suites-core-deps-3.6.modules |   26 +++++
 patches/ragel-6.6-gcc47-lookup.patch          |  143 +++++++++++++++++++++++++
 2 files changed, 169 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.6.modules b/modulesets/gnome-suites-core-deps-3.6.modules
index 4948a7c..ee66996 100644
--- a/modulesets/gnome-suites-core-deps-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-3.6.modules
@@ -55,6 +55,8 @@
     href="http://libhangul.googlecode.com/files/"/>
 <repository type="tarball" name="ibus"
     href="http://ibus.googlecode.com/files/"/>
+<repository type="tarball" name="complang.org"
+    href="http://www.complang.org/"/>
 
 <include href="gnome-suites-core-deps-base-3.6.modules"/>
 
@@ -264,6 +266,7 @@
       <dep package="cairo"/>
       <dep package="gtk-doc"/>
       <dep package="gobject-introspection"/>
+      <dep package="harfbuzz"/>
     </dependencies>
   </autotools>
 
@@ -384,6 +387,19 @@
     </dependencies>
   </autotools>
 
+  <autotools id="harfbuzz" autogenargs="">
+    <branch repo="freedesktop.org"
+            module="harfbuzz/release/harfbuzz-0.9.2.tar.bz2"
+            version="0.9.2"
+            hash="sha256:c9b581d6357a32043b84ec78179390b582448de790deb487dfdb90b632dc8558"
+            size="716910">
+    </branch>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="ragel"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="librest">
     <branch/>
     <dependencies>
@@ -908,6 +924,16 @@
     </dependencies>
   </autotools>
 
+  <autotools id="ragel">
+    <branch repo="complang.org"
+            module="ragel/ragel-6.7.tar.gz"
+            version="6.7"
+            hash="sha256:46df8e3f117a730f8896061c95ea8e8f53e9789cb053c2eea047833724fd7a30"
+            size="1182734">
+      <patch file="ragel-6.6-gcc47-lookup.patch" strip="1" />
+    </branch>
+  </autotools>
+
   <autotools id="startup-notification">
     <pkg-config>libstartup-notification-1.0.pc</pkg-config>
     <branch repo="freedesktop.org"
diff --git a/patches/ragel-6.6-gcc47-lookup.patch b/patches/ragel-6.6-gcc47-lookup.patch
new file mode 100644
index 0000000..0609995
--- /dev/null
+++ b/patches/ragel-6.6-gcc47-lookup.patch
@@ -0,0 +1,143 @@
+--- ragel-6.6/aapl/avlcommon.h.gcc47	2008-10-08 04:36:00.000000000 +0900
++++ ragel-6.6/aapl/avlcommon.h	2012-07-27 13:38:25.316949293 +0900
+@@ -881,9 +881,9 @@ template <AVLMEL_TEMPDEF> Element *AvlTr
+ 		}
+ 
+ #ifdef AVL_BASIC
+-		keyRelation = compare( *element, *curEl );
++		keyRelation = this->compare( *element, *curEl );
+ #else
+-		keyRelation = compare( element->BASEKEY(getKey()), 
++		keyRelation = this->compare( element->BASEKEY(getKey()), 
+ 				curEl->BASEKEY(getKey()) );
+ #endif
+ 
+@@ -920,7 +920,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTr
+ 	long keyRelation;
+ 
+ 	while (curEl) {
+-		keyRelation = compare( *element, *curEl );
++		keyRelation = this->compare( *element, *curEl );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 )
+@@ -969,7 +969,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTr
+ 			return element;
+ 		}
+ 
+-		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
++		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 ) {
+@@ -1023,7 +1023,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTr
+ 			return element;
+ 		}
+ 
+-		keyRelation = compare(key, curEl->getKey());
++		keyRelation = this->compare(key, curEl->getKey());
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 ) {
+@@ -1058,7 +1058,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTr
+ 	long keyRelation;
+ 
+ 	while (curEl) {
+-		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
++		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 )
+--- ragel-6.6/aapl/bstcommon.h.gcc47	2008-10-08 04:36:00.000000000 +0900
++++ ragel-6.6/aapl/bstcommon.h	2012-07-27 13:38:25.317949416 +0900
+@@ -361,7 +361,7 @@ template <BST_TEMPL_DEF> bool BstTable<B
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -373,12 +373,12 @@ template <BST_TEMPL_DEF> bool BstTable<B
+ 
+ 			lower = mid - 1;
+ 			while ( lower != lowEnd && 
+-					compare(key, GET_KEY(*lower)) == 0 )
++					this->compare(key, GET_KEY(*lower)) == 0 )
+ 				lower--;
+ 
+ 			upper = mid + 1;
+ 			while ( upper != highEnd && 
+-					compare(key, GET_KEY(*upper)) == 0 )
++					this->compare(key, GET_KEY(*upper)) == 0 )
+ 				upper++;
+ 			
+ 			low = (Element*)lower + 1;
+@@ -419,7 +419,7 @@ template <BST_TEMPL_DEF> Element *BstTab
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -457,7 +457,7 @@ template <BST_TEMPL_DEF> Element *BstTab
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -508,7 +508,7 @@ template <BST_TEMPL_DEF> Element *BstTab
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -603,7 +603,7 @@ template <BST_TEMPL_DEF> Element *BstTab
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
++		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -662,7 +662,7 @@ template <BST_TEMPL_DEF> Element *BstTab
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
++		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+--- ragel-6.6/aapl/bubblesort.h.gcc47	2008-10-08 04:36:00.000000000 +0900
++++ ragel-6.6/aapl/bubblesort.h	2012-07-27 13:38:25.322950031 +0900
+@@ -72,7 +72,7 @@ template <class T, class Compare> void B
+ 		changed = false;
+ 		for ( long i = 0; i < len-pass; i++ ) {
+ 			/* Do we swap pos with the next one? */
+-			if ( compare( data[i], data[i+1] ) > 0 ) {
++			if ( this->compare( data[i], data[i+1] ) > 0 ) {
+ 				char tmp[sizeof(T)];
+ 
+ 				/* Swap the two items. */
+--- ragel-6.6/aapl/mergesort.h.gcc47	2008-10-08 04:36:00.000000000 +0900
++++ ragel-6.6/aapl/mergesort.h	2012-07-27 13:39:50.772464997 +0900
+@@ -110,7 +110,7 @@ template< class T, class Compare> void M
+ 		}
+ 		else {
+ 			/* Both upper and lower left. */
+-			if ( compare(*lower, *upper) <= 0 )
++			if ( this->compare(*lower, *upper) <= 0 )
+ 				memcpy( dest++, lower++, sizeof(T) );
+ 			else
+ 				memcpy( dest++, upper++, sizeof(T) );