X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/ee51436c9192c3494156aabe08cd0ac08676fa0c..8c9bc7fbba4ecf6a4d5eefec23b1563c8f16cf10:/clg.system

diff --git a/clg.system b/clg.system
index ccc8868..5b54302 100644
--- a/clg.system
+++ b/clg.system
@@ -31,9 +31,10 @@
  `(mk:defsystem clg
     :initially-do
     (progn
-      (pkg-exists-p "glib-2.0" :atleast-version "1.3.12")
-      (pkg-exists-p "pango" :atleast-version "0.23")
-      (pkg-exists-p "gtk+-2.0" :atleast-version "1.3.12"))
+      (pkg-exists-p "glib-2.0" :atleast-version "2.0.0")
+      (pkg-exists-p "pango" :atleast-version "1.0.0")
+      (pkg-exists-p "atk" :atleast-version "1.0.0")
+      (pkg-exists-p "gtk+-2.0" :atleast-version "2.0.0"))
     :source-pathname "clg:"
     :binary-pathname "clg:"
     :components
@@ -43,8 +44,8 @@
      (:module glib
       :initially-do
       (progn
-	(load-shared-library "libglib-1.3.so")
-	(load-shared-library "libgobject-1.3.so" :init "g_type_init"))
+	(load-shared-library "libglib-2.0.so")
+	(load-shared-library "libgobject-2.0.so" :init "g_type_init"))
       :components
       ((:file "callback"
 	:language :c
@@ -64,6 +65,7 @@
        (:file "gboxed" :depends-on ("gtype"))
        (:file "genums" :depends-on ("gtype"))
        (:file "gparam" :depends-on ("genums"))
+       (:file "ginterface" :depends-on ("gtype"))
        (:file "gobject" :depends-on ("gparam"))
        (:file "gcallback" :depends-on ("gtype" "gparam" "gobject" "callback"))
        (:file "glib-export"
@@ -76,8 +78,8 @@
       :binary-pathname "gdk;"
       :initially-do
       (progn
-	(load-shared-library "libgdk_pixbuf-1.3.so")
-	(load-shared-library "libgdk-x11-1.3.so"
+	(load-shared-library "libgdk_pixbuf-2.0.so")
+	(load-shared-library "libgdk-x11-2.0.so"
 	 :init "gdk_init"
 	 :prototype '(function
 		      c-call:void
@@ -98,19 +100,26 @@
 	(:file "gdk" :depends-on ("gdkevents")))
        :depends-on (glib "gdkglue"))
      (:module pango
-      :initially-do (load-shared-library "libpango.so")
+      :initially-do (load-shared-library "libpango-1.0.so")
        :components
        ((:file "pango-package")
         (:file "pango" :depends-on ("pango-package"))
         (:file "pango-export" :depends-on ("pango")))
        :depends-on (glib))
+     (:module atk
+      :initially-do (load-shared-library "libatk-1.0.so")
+       :components
+       ((:file "atk-package")
+        (:file "atk" :depends-on ("atk-package"))
+        (:file "atk-export" :depends-on ("atk")))
+       :depends-on (glib))
      (:file "gtkglue"
       :source-pathname "gtk;"
       :binary-pathname "gtk;"
       :initially-do
       (progn
 	(load-shared-library
-	 "libgtk-x11-1.3.so"
+	 "libgtk-x11-2.0.so"
 	 :init "gtk_init"
 	 :prototype '(function
 		      c-call:void
@@ -134,7 +143,4 @@
        (:file "gtkcontainer" :depends-on ("gtktypes"))
        (:file "gtk" :depends-on ("gtktypes"))
        (:file "gtkutils" :depends-on ("gtk")))
-      :depends-on (glib gdk pango "gtkglue")))))
-
-
-
+      :depends-on (glib gdk pango atk "gtkglue")))))