GNOME.org
 

[gtk-osx: 2/7] Move icu out of unsupported

commit 6494a16227b9403e7f848e770f9c5b67e1bec04d
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Dec 14 00:40:15 2014 -0500

    Move icu out of unsupported
    
    We require it as a dependency of harfbuzz, so it shouldn't be in
    gtk-osx-unsupported anymore.

 modulesets-stable/gtk-osx-bootstrap.modules     |    8 ++++++++
 modulesets-stable/gtk-osx-unsupported.modules   |    8 --------
 modulesets-unstable/gtk-osx-bootstrap.modules   |    9 ++++++++-
 modulesets-unstable/gtk-osx-unsupported.modules |    9 +++------
 modulesets/gtk-osx-bootstrap.modules            |    8 ++++++++
 modulesets/gtk-osx-unsupported.modules          |    8 --------
 6 files changed, 27 insertions(+), 23 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 3bccc4d..6afd83b 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -25,6 +25,8 @@
   <repository type="tarball" name="cups"
              href="http://ftp.easysw.com/pub/"/>
   <repository type="tarball" name="itstool" href="http://files.itstool.org/"/>
+  <repository type="tarball" name="icu"
+              href="http://download.icu-project.org/files/"/>
 
   <autotools id='readline' autogen-sh="configure">
     <branch repo="ftp.gnu.org" module="readline/readline-6.3.tar.gz"
@@ -125,6 +127,12 @@
     </dependencies>
   </autotools>
 
+  <autotools id="icu" autogen-sh="source/configure"
+             makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
+    <branch repo="icu" version="54.1" checkoutdir="icu"
+            module="icu4c/54.1/icu4c-54_1-src.tgz"/>
+  </autotools>
+
   <autotools id="harfbuzz" autogen-sh="configure"
              autogenargs="--with-coretext --with-freetype --with-icu">
     <branch repo="harfbuzz" module="harfbuzz-0.9.35.tar.bz2" version="0.9.35">
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 4dec946..80cf38f 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -21,8 +21,6 @@
               href="http://curl.haxx.se/download/"/>
   <repository type="tarball" name="webkit.org"
               href="http://www.webkitgtk.org/releases/"/>
-  <repository type='tarball' name='icu'
-             href='http://download.icu-project.org/files/'/>
   <repository type="tarball" name="p11-glue"
               href="http://p11-glue.freedesktop.org/releases/"/>
   <repository type="tarball" name="gnutls" href="ftp://ftp.gnutls.org/"/>
@@ -208,10 +206,4 @@
       <dep package="meta-gtk-osx-core"/>
     </after>
   </autotools>
-
-  <autotools id='icu' autogen-sh='source/configure'
-            makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
-    <branch repo='icu' version='54.1' checkoutdir='icu'
-            module='icu4c/54.1/icu4c-54_1-src.tgz'/>
-  </autotools>
 </moduleset>
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 338b12a..6aa6e1f 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -25,6 +25,8 @@
   <repository type="tarball" name="cups"
              href="http://ftp.easysw.com/pub/"/>
   <repository type="git" name="gitorious" href="https://gitorious.org/"/>
+  <repository type="tarball" name="icu"
+              href="http://download.icu-project.org/files/"/>
 
   <autotools id='readline' autogen-sh="configure">
     <branch repo="ftp.gnu.org" module="readline/readline-6.3.tar.gz"
@@ -127,7 +129,12 @@
     </dependencies>
   </autotools>
 
- 
+  <autotools id="icu" autogen-sh="source/configure"
+             makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
+    <branch repo="icu" version="54.1" checkoutdir="icu"
+            module="icu4c/54.1/icu4c-54_1-src.tgz"/>
+  </autotools>
+
   <autotools id="harfbuzz" autogenargs="--with-coretext --with-icu">
     <branch repo="freedesktop" module="harfbuzz"/>
     <dependencies>
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index 757fc01..898e5b9 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -29,10 +29,13 @@
              href="git://anongit.freedesktop.org"/>
   <repository type="git" name="lysator"
              href="https://git.lysator.liu.se/"/>
+<<<<<<< HEAD
   <repository type="tarball" name="icu"
              href="http://download.icu-project.org/files/"/>
   <repository type="git" name="gitorious" href="git://gitorious.org/"/>
   <repository type="tarball" name="gnutls" href="ftp://ftp.gnutls.org/"/>
+=======
+>>>>>>> Move icu out of unsupported
 
   <metamodule id="meta-gtk-osx-unsupported">
     <dependencies>
@@ -165,12 +168,6 @@
     </dependencies>
   </cmake>
 
-  <autotools id='icu' autogen-sh='source/configure'
-            makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
-    <branch repo='icu' version='54.1' checkoutdir='icu'
-            module='icu4c/54.1/icu4c-54_1-src.tgz'/>
-  </autotools>
-
   <!-- This is WebKitGTK 1.x, for GTK 2.x.
     disable-geolocation: Requires geoclue. No module for this yet.
     disable-video: Requires gstreamer. If you want video, add to .jhbuildrc:
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 9d65a41..8e151a6 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -25,6 +25,8 @@
   <repository type="tarball" name="cups"
              href="http://ftp.easysw.com/pub/"/>
   <repository type="git" name="gitorious" href="https://gitorious.org/"/>
+  <repository type="tarball" name="icu"
+              href="http://download.icu-project.org/files/"/>
 
   <autotools id='readline' autogen-sh="configure">
     <branch repo="ftp.gnu.org" module="readline/readline-6.3.tar.gz"
@@ -121,6 +123,12 @@
     </dependencies>
   </autotools>
 
+  <autotools id="icu" autogen-sh="source/configure"
+             makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
+    <branch repo="icu" version="54.1" checkoutdir="icu"
+            module="icu4c/54.1/icu4c-54_1-src.tgz"/>
+  </autotools>
+
   <autotools id="harfbuzz"
              autogenargs="--with-coretext --with-freetype --with-icu">
     <branch repo="freedesktop" tag="0.9.35"/>
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index a3fa7df..9c681bb 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -20,8 +20,6 @@
               tags-template="tags/%(tag)s"/>
   <repository type="tarball" name="webkit.org"
               href="http://www.webkitgtk.org/releases/"/>
-  <repository type='tarball' name='icu'
-             href='http://download.icu-project.org/files/'/>
   <repository type="git" name="freedesktop"
               href="git://anongit.freedesktop.org"/>
   <repository type="git" name="lysator"
@@ -172,12 +170,6 @@
             module="libtasn1/libtasn1-4.2.tar.gz"/>
   </autotools>
 
-  <autotools id='icu' autogen-sh='source/configure'
-            makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
-    <branch repo='icu' version='54.1' checkoutdir='icu'
-            module='icu4c/54.1/icu4c-54_1-src.tgz'/>
-  </autotools>
-
   <!-- This is WebKitGTK 1.x, for GTK 2.x.
     disable-geolocation: Requires geoclue. No module for this yet.
     disable-video: Requires gstreamer. If you want video, add to .jhbuildrc:
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]