Mercurial > gub

changeset 3579:d05479edb91d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not build freetype from source for cygwin. This should be easier to switch.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Thu, 21 Jun 2007 14:46:47 +0200
parents fcfeb826734c
children 803c53ca0d21
files gub/cygwin.py gub/specs/fontconfig.py gub/specs/freetype.py gub/specs/freetype2.py gub/specs/lilypond.py
diffstat 5 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/gub/cygwin.py	Wed Jun 13 13:43:52 2007 +0200
+++ b/gub/cygwin.py	Thu Jun 21 14:46:47 2007 +0200
@@ -255,7 +255,8 @@
     def __init__ (self, settings):
         self.settings = settings
         self.packages = {}
-        self.source = fontconfig_source + freetype_source + guile_source + libtool_source
+#        self.source = fontconfig_source + freetype_source + guile_source + libtool_source
+        self.source = fontconfig_source + guile_source + libtool_source
         self.load_packages ()
         
     def grok_setup_ini (self, file, skip=[]):
--- a/gub/specs/fontconfig.py	Wed Jun 13 13:43:52 2007 +0200
+++ b/gub/specs/fontconfig.py	Thu Jun 21 14:46:47 2007 +0200
@@ -158,8 +158,8 @@
         return ['devel', 'runtime', '']
 
     def get_build_dependencies (self):
-        #        return ['libtool', 'libfreetype2-devel', 'expat']
-        return ['libtool', 'freetype2', 'expat']
+        return ['libtool', 'libfreetype2-devel', 'expat']
+        #return ['libtool', 'freetype2', 'expat']
     
     def get_dependency_dict (self):
         return {
--- a/gub/specs/freetype.py	Wed Jun 13 13:43:52 2007 +0200
+++ b/gub/specs/freetype.py	Thu Jun 21 14:46:47 2007 +0200
@@ -66,7 +66,7 @@
              '%(builddir)s/Makefile',
              mode='a')
 
-class Freetype__cygwin (Freetype):
+class XFreetype__cygwin (Freetype):
     def __init__ (self, settings):
         Freetype.__init__ (self, settings)
         self.with_template (version='2.1.10', mirror=mirrors.nongnu_savannah)
--- a/gub/specs/freetype2.py	Wed Jun 13 13:43:52 2007 +0200
+++ b/gub/specs/freetype2.py	Thu Jun 21 14:46:47 2007 +0200
@@ -1,7 +1,7 @@
 from gub import mirrors
 from gub.specs import freetype
 
-class Freetype2__cygwin (freetype.Freetype__cygwin):
+class XFreetype2__cygwin (freetype.Freetype__cygwin):
     def __init__ (self, settings):
         freetype.Freetype__cygwin.__init__ (self, settings)
         self.with_template (version='2.1.10',
--- a/gub/specs/lilypond.py	Wed Jun 13 13:43:52 2007 +0200
+++ b/gub/specs/lilypond.py	Thu Jun 21 14:46:47 2007 +0200
@@ -204,7 +204,8 @@
             'glib2',
             'guile-runtime',
             'fontconfig-runtime', ## CYGWIN name: 'libfontconfig1',
-            'freetype2-runtime', ## CYGWIN name: 'libfreetype26',
+            #'freetype2-runtime', ## CYGWIN name: 'libfreetype26',
+            'libfreetype26',
             'libiconv2',
             'libintl8', 'libintl3',
             'pango-runtime',
@@ -250,7 +251,8 @@
             'guile',
             'python',
             'fontconfig', ## CYGWIN: 'libfontconfig-devel',
-            'freetype2', ## CYGWIN: 'libfreetype2-devel',
+            ##'freetype2', ## CYGWIN: 'libfreetype2-devel',
+            'libfreetype2-devel',
             # cygwin bug: pango-devel should depend on glib2-devel
             'pango-devel', 'glib2-devel',
             'urw-fonts'] + [