Win32 patch applied

diff --git a/cairo/cairo.asd b/cairo/cairo.asd
index 5f3669ee7bd0b6be8c9110417e9d5b65e3043190..a320bea56921efa5bf391f21ad02429b4bea3409 100644 (file)
--- a/cairo/cairo.asd
+++ b/cairo/cairo.asd
@@ -14,7 +14,9 @@
 (defsystem cairo
     :depends-on (gffi glib)
     :components ((:library "libcairo" 
-                 :libdir #.(pkg-variable "cairo" "libdir"))
+                           :libname #-win32 "libcairo" 
+                                    #+win32 "libcairo-2" 
+                           :libdir #.(pkg-variable "cairo" "libdir"))
                 (:file "defpackage")
                 (:file "cairo" :depends-on ("defpackage" "libcairo"))
                 (:file "export" :depends-on ("cairo"))))

diff --git a/gdk/gdk.asd b/gdk/gdk.asd
index a2d7f568cbec4ea48563a736a2054c81f3f3fd95..2ac3c0b6ff6f7da5de6116792e77424bbd4240a0 100644 (file)
--- a/gdk/gdk.asd
+++ b/gdk/gdk.asd
@@ -11,9 +11,11 @@
     :depends-on (gffi glib pango #?(pkg-exists-p "gdk-2.0" :atleast-version "2.8.0") cairo)
     :components ((:file "defpackage")
                 (:library "libgdk_pixbuf-2.0" 
-                          :libdir #.(pkg-variable "gdk-2.0" "libdir"))
+                          :libdir #.(pkg-libdir "gdk-2.0")
+                          :libname #-win32 "libgdk_pixbuf-2.0" 
+                                   #+win32 "libgdk_pixbuf-2.0-0")
                 (:library "libgdk-2.0" 
-                          :libdir #.(pkg-variable "gdk-2.0" "libdir")
+                          :libdir #.(pkg-libdir "gdk-2.0")
                           :libname #-win32 "libgdk-x11-2.0"
                                    #+win32 "libgdk-win32-2.0-0")
                 (:unix-dso "alien"

diff --git a/glib/glib.asd b/glib/glib.asd
index 06db406ad58a183de76c52e684bf8197c89bef94..58ffaf77cb35ed4a178d2b96b24d3964e9ccdbb4 100644 (file)
--- a/glib/glib.asd
+++ b/glib/glib.asd
@@ -23,12 +23,16 @@
                 (:unix-dso "preload"
                  :components ((:c-source-file "logging"
                                :cflags #.(pkg-cflags "glib-2.0"))))
-                (:library "libglib-2.0" 
-                           :libdir #.(pkg-variable "glib-2.0" "libdir")
-                           :depends-on ("preload"))
-                (:library "libgobject-2.0" 
-                           :libdir #.(pkg-variable "glib-2.0" "libdir")
-                           :depends-on ("libglib-2.0"))
+                (:library "libglib-2.0"
+                          :libdir #.(pkg-libdir "glib-2.0")
+                          :libname #-win32 "libglib-2.0"
+                                   #+win32 "libglib-2.0-0"
+                          :depends-on ("preload"))
+                (:library "libgobject-2.0"
+                          :libdir #.(pkg-libdir "glib-2.0")
+                          :libname #-win32 "libgobject-2.0"
+                                   #+win32 "libgobject-2.0-0"
+                          :depends-on ("libglib-2.0"))
                 (:unix-dso "alien"
                  :components ((:c-source-file "gobject" 
                                :cflags #.(pkg-cflags "glib-2.0")))

diff --git a/gtk/gtk.asd b/gtk/gtk.asd
index e3b31a0d887fbb68efb71869163c71bc7cbe5509..f56cde8b5ca9f6f414c5cc751c04c18e95fbfb4d 100644 (file)
--- a/gtk/gtk.asd
+++ b/gtk/gtk.asd
@@ -13,7 +13,7 @@
     :depends-on (gffi glib gdk pango atk)
     :components ((:file "defpackage")
                 (:library "libgtk-2.0" 
-                          :libdir #.(pkg-variable "gtk+-2.0" "libdir")
+                          :libdir #.(pkg-libdir "gtk+-2.0")
                           :libname #-win32 "libgtk-x11-2.0"
                                    #+win32 "libgtk-win32-2.0-0")
                 (:unix-dso "alien"

diff --git a/pango/pango.asd b/pango/pango.asd
index 37188060afb25c75c35cfcb0437eba0ccc088d69..1d2b42b6eaf367ba4e09c30a56b06101b203bb5b 100644 (file)
--- a/pango/pango.asd
+++ b/pango/pango.asd
@@ -11,11 +11,24 @@
 
 (defsystem pango
     :depends-on (gffi glib cairo)
-    :components ((:library "libpango-1.0" :libdir #.(pkg-variable "pango" "libdir"))
-                (:library "libpangoxft-1.0" :libdir #.(pkg-variable "pango" "libdir"))
-                (:library "libpangoft2-1.0" :libdir #.(pkg-variable "pango" "libdir"))
-                (:library "libpangocairo-1.0" :libdir #.(pkg-variable "pango" "libdir"))
+    :components ((:library "libpango-1.0"
+                          :libname #-win32 "libpango-1.0"
+                                   #+win32 "libpango-1.0-0"
+                          :libdir #.(pkg-libdir "pango"))
+                (:library "libpangoxft-1.0"
+                          :libname #-win32 "libpangoxft-1.0"
+                                   #+win32 "libpangowin32-1.0-0"
+                          :libdir #.(pkg-libdir "pango"))
+                (:library "libpangoft2-1.0" 
+                          :libname #-win32 "libpangoft2-1.0" 
+                                   #+win32 "libpangoft2-1.0-0" 
+                          :libdir #.(pkg-libdir "pango"))
+                (:library "libpangocairo-1.0"
+                          :libname #-win32 "libpangocairo-1.0" 
+                                   #+win32 "libpangocairo-1.0-0" 
+                          :libdir #.(pkg-libdir "pango"))
                 (:file "defpackage")
-                (:file "pango" :depends-on ("defpackage" "libpango-1.0" "libpangoxft-1.0" "libpangocairo-1.0"))
+                (:file "pango" :depends-on ("defpackage"
+                                            "libpango-1.0" "libpangoxft-1.0" "libpangoft2-1.0" "libpangocairo-1.0"))
                 (:file "export" :depends-on ("pango"))))
 

diff --git a/rsvg/rsvg.asd b/rsvg/rsvg.asd
index b5e7323071eb5deccfddd36cf8d045610527d5a6..b8235a03b595d62f6c9407b332862005d12a32ed 100644 (file)
--- a/rsvg/rsvg.asd
+++ b/rsvg/rsvg.asd
@@ -12,7 +12,7 @@
 (defsystem rsvg
     :depends-on (gffi glib gdk cairo)
     :components ((:library "librsvg-2" 
-                 :libdir #.(pkg-variable "librsvg-2.0" "libdir"))
+                 :libdir #.(pkg-libdir "librsvg-2.0"))
                 (:file "defpackage")
                 (:file "rsvg" :depends-on ("defpackage" "librsvg-2"))
                 (:file "export" :depends-on ("rsvg"))))