Fix compilation for Gtk with the new, stricter inheritance

[clg] / cairo / cairo.asd

diff --git a/cairo/cairo.asd b/cairo/cairo.asd
index 5f3669ee7bd0b6be8c9110417e9d5b65e3043190..337c5eb62a029a4382c0e496509eb434987b5a70 100644 (file)
--- a/cairo/cairo.asd
+++ b/cairo/cairo.asd
@@ -14,7 +14,15 @@
 (defsystem cairo
     :depends-on (gffi glib)
     :components ((:library "libcairo" 
-                 :libdir #.(pkg-variable "cairo" "libdir"))
+                           :libname #-win32 "libcairo" 
+                                    #+win32 "libcairo-2" 
+                           :libdir #.(pkg-libdir "cairo"))
+                (:library "libjpeg")
+                (:shared-object "cairo-alien" :pathname "alien/"
+                 :components ((:c-source-file "cairo-jpeg" 
+                               :cflags #.(pkg-cflags "cairo")))
+                 :depends-on ("libcairo" "libjpeg"))
                 (:file "defpackage")
-                (:file "cairo" :depends-on ("defpackage" "libcairo"))
+                (:file "cairo" 
+                 :depends-on ("defpackage" "libcairo" "cairo-alien"))
                 (:file "export" :depends-on ("cairo"))))