Fix compilation for Gtk with the new, stricter inheritance

[clg] / pango / pango.asd

diff --git a/pango/pango.asd b/pango/pango.asd
index fbb895ba46caabe04ba03c8ac6f89edacfb30b84..1d2b42b6eaf367ba4e09c30a56b06101b203bb5b 100644 (file)
--- a/pango/pango.asd
+++ b/pango/pango.asd
@@ -1,17 +1,34 @@
 ;;; -*- Mode: lisp -*-
 
-(defpackage #:pango-system
-  (:use #:common-lisp #:asdf #:pkg-config #:sharedlib))
+(defpackage "PANGO-SYSTEM"
+  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG"))
 
 
-(in-package #:pango-system)
+(in-package "PANGO-SYSTEM")
 
-(pkg-exists-p "pango" :atleast-version "1.4.0")
+(pkg-exists-p "pango" :atleast-version "1.4.0" :error t)
 
-(sharedlib:load-shared-library "libpango-1.0")
 
 (defsystem pango
-    :depends-on (glib)
-    :components ((:file "defpackage")
-                (:file "pango" :depends-on ("defpackage"))
+    :depends-on (gffi glib cairo)
+    :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" "libpangoft2-1.0" "libpangocairo-1.0"))
                 (:file "export" :depends-on ("pango"))))
+