blob: b1cb4f2a7c24e1cc0d802926540dd5a1387eb26c [file] [log] [blame]
diff -urN lambda-gtk-0.1.orig/examples.lisp lambda-gtk-0.1/examples.lisp
--- lambda-gtk-0.1.orig/examples.lisp 2004-11-30 07:30:55.000000000 -0600
+++ lambda-gtk-0.1/examples.lisp 2005-03-05 15:18:20.000000000 -0600
@@ -6,6 +6,8 @@
;;;
;;; Example 1, Hello World
+(in-package gtk-user)
+
(gtk:define-signal-handler bye1 :void (widget data)
widget data ; stop unused var compiler nagging
(format t "bye!~%")
diff -urN lambda-gtk-0.1.orig/gtkffi-cmusbcl.lisp lambda-gtk-0.1/gtkffi-cmusbcl.lisp
--- lambda-gtk-0.1.orig/gtkffi-cmusbcl.lisp 2004-11-30 07:25:43.000000000 -0600
+++ lambda-gtk-0.1/gtkffi-cmusbcl.lisp 2005-03-05 15:19:40.000000000 -0600
@@ -8,9 +8,10 @@
;;; located and *gtk-libfiles* better agree with whatever the unix
;;; command 'pkg-config gtk+-2.0 --libs' returns on your system.
-(in-package :cl-user)
+(in-package :gtk-user)
+
(eval-when (:compile-toplevel :load-toplevel :execute)
- (export '(*gtk-libdir* *gtk-libfiles*) :cl-user)
+ (export '(*gtk-libdir* *gtk-libfiles*) :gtk-user)
(defvar *gtk-libdir* #+:darwin "/sw/lib/" #-:darwin "/usr/lib/")
(defvar *gtk-libfiles*
'("libgtk-x11-2.0" "libgdk-x11-2.0" "libatk-1.0"
@@ -34,7 +35,7 @@
p
(error "Library ~S not found. Either GTK is not installed or else cl-user:*gtk-libdir* needs to be set to the directory containing GTK on your machine." p))))
#+:sbcl
- (dolist (l *gtk-libfiles*) (load-shared-object (libpath l)))
+ (dolist (l *gtk-libfiles*) (sb-alien:load-shared-object (libpath l)))
#+:cmu
(dolist (l *gtk-libfiles*) (ext:load-foreign (libpath l)))))
diff -urN lambda-gtk-0.1.orig/lambda-gtk.asd lambda-gtk-0.1/lambda-gtk.asd
--- lambda-gtk-0.1.orig/lambda-gtk.asd 1969-12-31 18:00:00.000000000 -0600
+++ lambda-gtk-0.1/lambda-gtk.asd 2005-03-06 14:53:05.000000000 -0600
@@ -0,0 +1,17 @@
+;;;; -*- mode: lisp; package: common-lisp -*-
+
+(defpackage lambda-gtk-system
+ (:use #:common-lisp
+ #:asdf))
+
+(in-package lambda-gtk-system)
+
+(defsystem lambda-gtk
+ :components ((:file "packages")
+ (:file "gtkffi-cmusbcl" :depends-on ("packages"))))
+
+(defsystem lambda-gtk-examples
+ :components ((:file "examples"))
+ :depends-on (lambda-gtk))
+
+;;;; lambda-gtk.asd ends here
diff -urN lambda-gtk-0.1.orig/packages.lisp lambda-gtk-0.1/packages.lisp
--- lambda-gtk-0.1.orig/packages.lisp 1969-12-31 18:00:00.000000000 -0600
+++ lambda-gtk-0.1/packages.lisp 2005-03-05 15:12:36.000000000 -0600
@@ -0,0 +1,8 @@
+;;;; -*- mode: lisp; package: common-lisp -*-
+
+(in-package common-lisp)
+
+(defpackage gtk-user
+ (:use :common-lisp))
+
+;;;; packages.lisp ends here