Fix compilation for Gtk with the new, stricter inheritance

[clg] / gdk / gdk.asd

diff --git a/gdk/gdk.asd b/gdk/gdk.asd
index 61882544bf69a62ab3ec9b03571a35a7864de44a..849756c655b062bedbe58b8e53d2b26a82048af5 100644 (file)
--- a/gdk/gdk.asd
+++ b/gdk/gdk.asd
@@ -5,28 +5,30 @@
 
 (in-package "GDK-SYSTEM")
 
-(pkg-exists-p "gtk+-2.0" :atleast-version "2.4.0")
-
-(when (string>= (pkg-version "gtk+-2.0") "2.6.0")
-  (pushnew :gtk2.6 *features*))
-
-(when (string>= (pkg-version "gtk+-2.0") "2.8.0")
-  (pushnew :gtk2.8 *features*))
+(pkg-exists-p "gdk-2.0" :atleast-version "2.4.0" :error t)
 
 (defsystem gdk
-    :depends-on (glib pango #+gtk2.8 cairo)
+    :depends-on (gffi glib pango
+                #?(pkg-exists-p "gdk-2.0" :atleast-version "2.14.0")gio 
+                #?(pkg-exists-p "gdk-2.0" :atleast-version "2.8.0")cairo)
     :components ((:file "defpackage")
                 (:library "libgdk_pixbuf-2.0" 
-                          :libdir #.(pkg-variable "gtk+-2.0" "libdir"))
-                (:library "libgdk-x11-2.0" 
-                          :libdir #.(pkg-variable "gtk+-2.0" "libdir"))
-                (:unix-dso "alien"
-                           :components ((:c-source-file "glue"
-                                         :cflags #.(pkg-cflags "gtk+-2.0"))))
-                (:file "gdktypes" :depends-on ("defpackage" "alien" 
+                 :libdir #.(pkg-libdir "gdk-2.0")
+                 :libname #-win32 "libgdk_pixbuf-2.0"
+                          #+win32 "libgdk_pixbuf-2.0-0")
+                (:library "libgdk-2.0" 
+                 :libdir #.(pkg-libdir "gdk-2.0")
+                 :libname #-win32 "libgdk-x11-2.0"
+                          #+win32 "libgdk-win32-2.0-0")
+                (:shared-object "gdk-alien" :pathname "alien/"
+                 :ldflags #.(pkg-libs "gdk-2.0")
+                 :components ((:c-source-file "glue"
+                               :cflags #.(pkg-cflags "gdk-2.0")))
+                 :depends-on (#+cmu "libgdk-2.0"))
+                (:file "gdktypes" :depends-on ("defpackage" "gdk-alien" 
                                                "libgdk_pixbuf-2.0" 
-                                               "libgdk-x11-2.0"))
+                                               "libgdk-2.0"))
                 (:file "gdkevents" :depends-on ("gdktypes"))
                 (:file "pixbuf" :depends-on ("gdktypes"))
                 (:file "gdk" :depends-on ("gdkevents"))
-                (:file "export" :depends-on ("gdkevents" "gdktypes" "gdk"))))
+                (:file "export" :depends-on ("gdktypes" "gdkevents" "pixbuf" "gdk"))))