From bcf9b1af35c2aa42f670eafd890acf45452fef2f Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Mon, 18 Jun 2007 11:25:48 +0000 Subject: [PATCH] Win32 patch applied Organization: Straylight/Edgeware From: espen --- cairo/cairo.asd | 4 +++- gdk/gdk.asd | 6 ++++-- glib/glib.asd | 16 ++++++++++------ gtk/gtk.asd | 2 +- pango/pango.asd | 23 ++++++++++++++++++----- rsvg/rsvg.asd | 2 +- 6 files changed, 37 insertions(+), 16 deletions(-) diff --git a/cairo/cairo.asd b/cairo/cairo.asd index 5f3669e..a320bea 100644 --- 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 a2d7f56..2ac3c0b 100644 --- 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 06db406..58ffaf7 100644 --- 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 e3b31a0..f56cde8 100644 --- 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 3718806..1d2b42b 100644 --- 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 b5e7323..b8235a0 100644 --- 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")))) -- [mdw]