basis: Load images.{tiff,png} by default for FreeBSD. Add platforms back.

diff --git a/basis/images/loader/gtk/platforms.txt b/basis/images/loader/gtk/platforms.txt
index 96031308249065be59553fbc30ba95b9d08831ce..53926d300dc802dae72729c7f66153f0ebe3f412 100644 (file)
--- a/basis/images/loader/gtk/platforms.txt
+++ b/basis/images/loader/gtk/platforms.txt
@@ -1,2 +1,3 @@
 linux
 macosx
+bsd

diff --git a/basis/ui/backend/gtk/gtk.factor b/basis/ui/backend/gtk/gtk.factor
index 80d76cbc524dd166174a4edd60cb71fd2ee12634..fb7cee86e9b8e23690aed399dfdd2f9073121ad7 100644 (file)
--- a/basis/ui/backend/gtk/gtk.factor
+++ b/basis/ui/backend/gtk/gtk.factor
@@ -515,7 +515,7 @@ M: gtk-ui-backend (with-ui)
 M: gtk-ui-backend stop-event-loop
     gtk_main_quit ;
 
-os linux? [
+os { linux freebsd } member? [
     gtk-ui-backend ui-backend set-global
 ] when
 

diff --git a/basis/ui/images/images.factor b/basis/ui/images/images.factor
index fb54ab7cfa5a6b39a6c83543c964a13796197779..163af6fbc7c6897f0ce379c0be30d50684060d94 100644 (file)
--- a/basis/ui/images/images.factor
+++ b/basis/ui/images/images.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs cache combinators images.loader kernel
-memoize namespaces opengl.textures system ui.gadgets.worlds
-vocabs ;
+memoize namespaces opengl.textures sequences system
+ui.gadgets.worlds vocabs ;
 IN: ui.images
 
 TUPLE: image-name path ;
@@ -34,5 +34,9 @@ PRIVATE>
 {
     { [ os macosx? ] [ "images.loader.cocoa" require ] }
     { [ os windows?  ] [ "images.loader.gdiplus" require ] }
+    { [ os { freebsd } member? ] [
+        "images.png" require
+        "images.tiff" require
+    ] }
     [ "images.loader.gtk" require ]
 } cond

diff --git a/basis/ui/text/pango/platforms.txt b/basis/ui/text/pango/platforms.txt
index a08e1f35eb7c510c1d29584d7edc575339876a01..a26481a4e135cfb434f13c73aa86d291da4f598f 100644 (file)
--- a/basis/ui/text/pango/platforms.txt
+++ b/basis/ui/text/pango/platforms.txt
@@ -1 +1,2 @@
 linux
+bsd