First go at using Gtk3. Everything builds but there is stuff (Pango modules) missing...

[moonshot.git] / mac-client-installer / moonshot-mac.modules

diff --git a/mac-client-installer/moonshot-mac.modules b/mac-client-installer/moonshot-mac.modules
index 90677dd..ea6053e 100644 (file)
--- a/mac-client-installer/moonshot-mac.modules
+++ b/mac-client-installer/moonshot-mac.modules
@@ -5,50 +5,42 @@
     
     <repository type="git" name="moonshot.janet.git"
     href="http://www.project-moonshot.org/git"/>
+       
+<!-- maybe use this if we are pulling yrus-sasl from cyrusimap.org -->
+<!--    <repository type="tarball" name="ftp.cyrus-sasl.org" default="yes" href="ftp://ftp.cyrusimap.org/cyrus-sasl/"/>-->
 
-    <repository type="git" name="moonshot-ui.janet.git"
-    href="http://www.project-moonshot.org/git/moonshot-ui.git"/>
-    
-    <repository type="git" name="moonshot-ui.gitorious.git"
-    href="git@gitorious.codethink.co.uk:moonshot-ui/moonshot-ui.git"/>
-    
-    <repository type="git" name="cyrus-sasl.janet.git"
-    href="http://www.project-moonshot.org/git/cyrus-sasl"/>
-    
-    <repository type="tarball" name="ftp.cyrus-sasl.org" default="yes"
-    href="ftp://ftp.cyrusimap.org/cyrus-sasl/"/>
-
-<!--    <include href="gtk-osx.modules"/> -->
   <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
     <metamodule id="meta-moonshot-mac-client">
         <dependencies>
-            <dep package="moonshot-ui"/>
             <dep package="cyrus-sasl"/> 
-            <dep package="moonshot"/> 
+            <dep package="moonshot-ui"/>
         </dependencies>
     </metamodule>
 
-    <autotools id="moonshot-ui" makeinstallargs="install DESTDIR=$HOME/moonshot/mac-client-installer/moonshot-ui" >
+    <autotools id="moonshot-ui" autogenargs="--prefix $HOME/moonshot/mac-client-installer/moonshot-ui --libdir $HOME/moonshot/mac-client-installer/moonshot-ui/lib" >
+ <!--       makeinstallargs="install DESTDIR=$HOME/moonshot/mac-client-installer/moonshot-ui"-->
         <branch 
-        repo="moonshot-ui.gitorious.git"/>
+            repo="moonshot.janet.git" module="moonshot-ui.git">
+        </branch>
         <dependencies>
             <dep package="libgee"/>
             <dep package="dbus-glib"/>
             <dep package="glib"/>
-            <dep package="gtk-doc"/>
             <dep package="libpng"/>
             <dep package="libtiff"/>
             <dep package="libjpeg"/>
-            <dep package="pango"/>
+<!--            <dep package="pango"/>
+                       <dep package="gtk-doc"/>
             <dep package="atk"/>
             <dep package="gdk-pixbuf"/>
-            <dep package="gtk+"/> 
+                       <dep package="gtk-mac-integration"/>
+                       <dep package="meta-gtk-osx-core"/>
+            <dep package="gtk+"/> -->
             <dep package="vala"/>
             <dep package="shared-mime-info"/>
             <dep package="meta-gtk-osx-themes"/>
-            <dep package="meta-gtk-osx-core"/>
-<!--            <dep package="gtk+-3.0"/> -->
-            <dep package="gtk-mac-integration"/>
+<!--        TODO move to gtk+-3.0 -->
+           <dep package="gtk+-3.0"/>
         </dependencies>
     </autotools>
     
@@ -61,23 +53,11 @@
         </dependencies>
     </tarball>
 
-    
-    <autotools id="moonshot" autogenargs="--enable-acceptor=no --with-krb5=$PREFIX/usr/local"
-        makeinstallargs="install DESTDIR=$HOME/moonshot/mac-client-installer/moonshot">
-        <branch 
-        repo="moonshot.janet.git" module="moonshot.git">
-        <patch file="0001-Move-moonshot-files-up.patch" strip="1"/>
-        </branch>
-        <dependencies>
-       </dependencies>
-    </autotools>
-    
-    <autotools id="cyrus-sasl" autogenargs="--with-gss_impl=mit"
+    <autotools id="cyrus-sasl" autogenargs="--prefix / --with-gss_impl=mit  --libdir /usr/local"
         makeinstallargs="install DESTDIR=$HOME/moonshot/mac-client-installer/sasl">
         <branch 
-        repo="cyrus-sasl.janet.git"/>
-        <dependencies>
-        </dependencies>
+            repo="moonshot.janet.git" module="cyrus-sasl.git">
+        </branch>
     </autotools>
 
 </moduleset>