Mercurial > gub

changeset 5362:bb89fda94d3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cairo, gtk+: first darwin attempt.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Tue, 14 Jul 2009 12:23:05 +0200
parents 22c85912fa88
children 1b148c0d2101
files gub/specs/cairo.py gub/specs/gtk+.py
diffstat 2 files changed, 22 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/cairo.py	Tue Jul 14 12:22:45 2009 +0200
+++ b/gub/specs/cairo.py	Tue Jul 14 12:23:05 2009 +0200
@@ -20,19 +20,30 @@
 #                'poppler-devel',
                 'zlib-devel']
 
-class Cairo__mingw (Cairo):
+class Cairo_without_X11 (Cairo):
     def configure_command (self):
         return (Cairo.configure_command (self)
-                + ' --enable-win32=yes'
-                + ' --enable-win32-font=yes'
-                + ' --enable-ft'
                 + ' --disable-xlib'
                 + ' --disable-xlib-xrender'
                 + ' --disable-xcb'
-                + ' LDFLAGS=-lpthread'
                 )
     def _get_build_dependencies (self):
         return ([x for x in Cairo._get_build_dependencies (self)
                  if 'libx' not in x
                  and 'poppler' not in x] # poppler does not build for mingw
+                )
+
+class Cairo__mingw (Cairo_without_X11):
+    def configure_command (self):
+        return (Cairo_without_X11.configure_command (self)
+                + ' --enable-win32=yes'
+                + ' --enable-win32-font=yes'
+                + ' --enable-ft'
+                + ' LDFLAGS=-lpthread'
+                )
+    def _get_build_dependencies (self):
+        return (Cairo_without_X11._get_build_dependencies (self)
                 + ['pthreads-w32-devel'])
+
+class Cairo__darwin (Cairo_without_X11):
+    pass
--- a/gub/specs/gtk+.py	Tue Jul 14 12:22:45 2009 +0200
+++ b/gub/specs/gtk+.py	Tue Jul 14 12:23:05 2009 +0200
@@ -62,12 +62,14 @@
 class Gtk_x___freebsd__x86 (Gtk_x___freebsd):
     patches = Gtk_x___freebsd.patches + ['gtk+-2.15.3-configure.in-have-iswalnum.patch']
 
-class Gtk_x___mingw (Gtk_x_):
+class Gtk_x_without_X11 (Gtk_x_):
     #source = 'http://ftp.acc.umu.se/pub/GNOME/sources/gtk+/2.14/gtk+-2.14.7.tar.gz'
     source = 'http://ftp.gnome.org/pub/GNOME/platform/2.26/2.26.3/sources/gtk+-2.16.4.tar.gz'
     def _get_build_dependencies (self):
         return [x for x in Gtk_x_._get_build_dependencies (self)
                 if 'libx' not in x]
+
+class Gtk_x___mingw (Gtk_x_without_X11):
     def LDFLAGS (self):
         return '-Wl,-rpath -Wl,%(system_prefix)s/lib %(rpath)s'
     def gtk_so_extension (self):
@@ -100,3 +102,6 @@
         return (Gtk_x_.configure_command (self)
                 + ' --disable-glibtest'
                 + ' --disable-test-print-backend')
+
+class Gtk_x___darwin (Gtk_x_without_X11):
+    pass