From c364ec3910f818bf56e52e157c87506968ac6b04 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Tue, 19 Nov 2013 18:00:16 -0700
Subject: [PATCH] gtk-screen: Eliminate compile-system.

---
 src/gtk-screen/compile.scm | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/gtk-screen/compile.scm b/src/gtk-screen/compile.scm
index d6db56c99..e86b782e9 100644
--- a/src/gtk-screen/compile.scm
+++ b/src/gtk-screen/compile.scm
@@ -2,9 +2,20 @@
 
 ;;;; Compile the Gtk-Screen system
 
-(fluid-let ((load/suppress-loading-message? #t))
-  (load-option 'CREF)
-  ;; DISPLAY need not be set.
-  (ignore-errors (lambda () (load-option 'GTK))))
+(load-option 'CREF)
+(load-option 'SOS)
+(load-option 'GTK)
 
-(compile-system "gtk-screen" (directory-pathname (current-load-pathname)))
\ No newline at end of file
+(with-working-directory-pathname (directory-pathname (current-load-pathname))
+  (lambda ()
+    (if (name->package '(EDWIN SCREEN GTK-SCREEN))
+	(error "The (EDWIN SCREEN GTK-SCREEN) package already exists.")
+	(let ((package-set (package-set-pathname "gtk-screen")))
+	  (if (not (file-modification-time<? "gtk-screen.pkg" package-set))
+	      (cref/generate-trivial-constructor "gtk-screen"))
+	  (construct-packages-from-file (fasload package-set))))
+
+    (let ((env (->environment '(edwin screen gtk-screen))))
+      (compile-file "gtk-screen" '() env)
+      (compile-file "gtk-faces"  '() env))
+    (cref/generate-constructors "gtk-screen" 'ALL)))
\ No newline at end of file
-- 
2.25.1