lightdm done

5 files changed, 169 insertions, 4 deletions

diff --git a/remote/tools/gtk-greeter/data/etc/fonts/fonts.conf b/remote/tools/gtk-greeter/data/etc/fonts/fonts.conf
new file mode 100644
index 00000000..5eb6afe1
--- /dev/null
+++ b/remote/tools/gtk-greeter/data/etc/fonts/fonts.conf
@@ -0,0 +1,151 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/fonts.conf file to configure system font access -->
+<fontconfig>
+
+<!--
+	DO NOT EDIT THIS FILE.
+	IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED.
+	LOCAL CHANGES BELONG IN 'local.conf'.
+
+	The intent of this standard configuration file is to be adequate for
+	most environments.  If you have a reasonably normal environment and
+	have found problems with this configuration, they are probably
+	things that others will also want fixed.  Please submit any
+	problems to the fontconfig bugzilla system located at fontconfig.org
+
+	Note that the normal 'make install' procedure for fontconfig is to
+	replace any existing fonts.conf file with the new version.  Place
+	any local customizations in local.conf which this file references.
+
+	Keith Packard
+-->
+
+<!-- Font directory list -->
+
+	<dir>/usr/share/fonts</dir>
+	<dir>/usr/X11R6/lib/X11/fonts</dir> <dir>/usr/local/share/fonts</dir>
+	<dir>~/.fonts</dir>
+
+<!--
+  Accept deprecated 'mono' alias, replacing it with 'monospace'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>mono</string>
+		</test>
+		<edit name="family" mode="assign">
+			<string>monospace</string>
+		</edit>
+	</match>
+
+<!--
+  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans serif</string>
+		</test>
+		<edit name="family" mode="assign">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+<!--
+  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans</string>
+		</test>
+		<edit name="family" mode="assign">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+<!--
+  Load local system customization file
+-->
+	<include ignore_missing="yes">conf.d</include>
+
+<!-- Font cache directory list -->
+
+	<cachedir>/var/cache/fontconfig</cachedir>
+	<cachedir>~/.fontconfig</cachedir>
+
+	<config>
+<!--
+  These are the default Unicode chars that are expected to be blank
+  in fonts.  All other blank chars are assumed to be broken and
+  won't appear in the resulting charsets
+ -->
+		<blank>
+			<int>0x0020</int>	<!-- SPACE -->
+			<int>0x00A0</int>	<!-- NO-BREAK SPACE -->
+			<int>0x00AD</int>	<!-- SOFT HYPHEN -->
+			<int>0x034F</int>	<!-- COMBINING GRAPHEME JOINER -->
+			<int>0x0600</int>	<!-- ARABIC NUMBER SIGN -->
+			<int>0x0601</int>	<!-- ARABIC SIGN SANAH -->
+			<int>0x0602</int>	<!-- ARABIC FOOTNOTE MARKER -->
+			<int>0x0603</int>	<!-- ARABIC SIGN SAFHA -->
+			<int>0x06DD</int>	<!-- ARABIC END OF AYAH -->
+			<int>0x070F</int>	<!-- SYRIAC ABBREVIATION MARK -->
+			<int>0x115F</int>	<!-- HANGUL CHOSEONG FILLER -->
+			<int>0x1160</int>	<!-- HANGUL JUNGSEONG FILLER -->
+			<int>0x1680</int>	<!-- OGHAM SPACE MARK -->
+			<int>0x17B4</int>	<!-- KHMER VOWEL INHERENT AQ -->
+			<int>0x17B5</int>	<!-- KHMER VOWEL INHERENT AA -->
+			<int>0x180E</int>	<!-- MONGOLIAN VOWEL SEPARATOR -->
+			<int>0x2000</int>	<!-- EN QUAD -->
+			<int>0x2001</int>	<!-- EM QUAD -->
+			<int>0x2002</int>	<!-- EN SPACE -->
+			<int>0x2003</int>	<!-- EM SPACE -->
+			<int>0x2004</int>	<!-- THREE-PER-EM SPACE -->
+			<int>0x2005</int>	<!-- FOUR-PER-EM SPACE -->
+			<int>0x2006</int>	<!-- SIX-PER-EM SPACE -->
+			<int>0x2007</int>	<!-- FIGURE SPACE -->
+			<int>0x2008</int>	<!-- PUNCTUATION SPACE -->
+			<int>0x2009</int>	<!-- THIN SPACE -->
+			<int>0x200A</int>	<!-- HAIR SPACE -->
+			<int>0x200B</int>	<!-- ZERO WIDTH SPACE -->
+			<int>0x200C</int>	<!-- ZERO WIDTH NON-JOINER -->
+			<int>0x200D</int>	<!-- ZERO WIDTH JOINER -->
+			<int>0x200E</int>	<!-- LEFT-TO-RIGHT MARK -->
+			<int>0x200F</int>	<!-- RIGHT-TO-LEFT MARK -->
+			<int>0x2028</int>	<!-- LINE SEPARATOR -->
+			<int>0x2029</int>	<!-- PARAGRAPH SEPARATOR -->
+			<int>0x202A</int>	<!-- LEFT-TO-RIGHT EMBEDDING -->
+			<int>0x202B</int>	<!-- RIGHT-TO-LEFT EMBEDDING -->
+			<int>0x202C</int>	<!-- POP DIRECTIONAL FORMATTING -->
+			<int>0x202D</int>	<!-- LEFT-TO-RIGHT OVERRIDE -->
+			<int>0x202E</int>	<!-- RIGHT-TO-LEFT OVERRIDE -->
+			<int>0x202F</int>	<!-- NARROW NO-BREAK SPACE -->
+			<int>0x205F</int>	<!-- MEDIUM MATHEMATICAL SPACE -->
+			<int>0x2060</int>	<!-- WORD JOINER -->
+			<int>0x2061</int>	<!-- FUNCTION APPLICATION -->
+			<int>0x2062</int>	<!-- INVISIBLE TIMES -->
+			<int>0x2063</int>	<!-- INVISIBLE SEPARATOR -->
+			<int>0x206A</int>	<!-- INHIBIT SYMMETRIC SWAPPING -->
+			<int>0x206B</int>	<!-- ACTIVATE SYMMETRIC SWAPPING -->
+			<int>0x206C</int>	<!-- INHIBIT ARABIC FORM SHAPING -->
+			<int>0x206D</int>	<!-- ACTIVATE ARABIC FORM SHAPING -->
+			<int>0x206E</int>	<!-- NATIONAL DIGIT SHAPES -->
+			<int>0x206F</int>	<!-- NOMINAL DIGIT SHAPES -->
+			<int>0x2800</int>	<!-- BRAILLE PATTERN BLANK -->
+			<int>0x3000</int>	<!-- IDEOGRAPHIC SPACE -->
+			<int>0x3164</int>	<!-- HANGUL FILLER -->
+			<int>0xFEFF</int>	<!-- ZERO WIDTH NO-BREAK SPACE -->
+			<int>0xFFA0</int>	<!-- HALFWIDTH HANGUL FILLER -->
+			<int>0xFFF9</int>	<!-- INTERLINEAR ANNOTATION ANCHOR -->
+			<int>0xFFFA</int>	<!-- INTERLINEAR ANNOTATION SEPARATOR -->
+			<int>0xFFFB</int>	<!-- INTERLINEAR ANNOTATION TERMINATOR -->
+		</blank>
+<!--
+  Rescan configuration every 30 seconds when FcFontSetList is called
+ -->
+		<rescan>
+			<int>30</int>
+		</rescan>
+	</config>
+
+</fontconfig>
diff --git a/remote/tools/gtk-greeter/data/usr/share/backgrounds/ubuntu.jpg b/remote/tools/gtk-greeter/data/usr/share/backgrounds/ubuntu.jpg
new file mode 100644
index 00000000..004b2646
--- /dev/null
+++ b/remote/tools/gtk-greeter/data/usr/share/backgrounds/ubuntu.jpg
diff --git a/remote/tools/gtk-greeter/gtk-greeter.build b/remote/tools/gtk-greeter/gtk-greeter.build
index 96cb67c9..16b6b692 100644
--- a/remote/tools/gtk-greeter/gtk-greeter.build
+++ b/remote/tools/gtk-greeter/gtk-greeter.build
@@ -48,5 +48,7 @@ build () {
 post_copy() {
 	#copyi static data files
 	cp -r ${TOOL_DIR}/${TOOL}/data/* ${INIT_DIR}
-
+	gdk-pixbuf-query-loaders > ${INIT_DIR}/usr/lib/i386-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache
+	pango-querymodules > ${INIT_DIR}/etc/pango/pango.modules
+	gtk-update-icon-cache-3.0 ${INIT_DIR}/usr/share/icons/hicolor/
 }
diff --git a/remote/tools/gtk-greeter/gtk-greeter.conf b/remote/tools/gtk-greeter/gtk-greeter.conf
index 27f758ce..3eccb30e 100644
--- a/remote/tools/gtk-greeter/gtk-greeter.conf
+++ b/remote/tools/gtk-greeter/gtk-greeter.conf
@@ -1,7 +1,7 @@
 VERSION=lightdm-gtk-greeter-1.1.6
 URL=https://launchpad.net/lightdm-gtk-greeter/1.2/1.1.6/+download/lightdm-gtk-greeter-1.1.6.tar.gz
-DEPS="gtk+-3.0"
-REQUIRED_PACKAGES="libgdk-pixbuf2.0-0"
+DEPS="gtk+-3.0 libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common"
+REQUIRED_PACKAGES="libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common"
 REQUIRED_BINARIES="lightdm-gtk-greeter"
-REQUIRED_DIRECTORIES="/usr/share /usr/lib/i386-linux-gnu/gdk-pixbuf-2.0"
+REQUIRED_DIRECTORIES="/usr"
 REQUIRED_FILES="/etc/lightdm/lightdm-gtk-greeter.conf"
diff --git a/remote/tools/gtk-greeter/lightdm.diff b/remote/tools/gtk-greeter/lightdm.diff
new file mode 100644
index 00000000..c6c160e3
--- /dev/null
+++ b/remote/tools/gtk-greeter/lightdm.diff
@@ -0,0 +1,12 @@
+diff -p -up ./src/lightdm-gtk-greeter.c.0001 ./src/lightdm-gtk-greeter.c
+--- ./src/lightdm-gtk-greeter.c.0001	2012-08-30 17:39:09.000000000 +0000
++++ ./src/lightdm-gtk-greeter.c	2012-12-20 19:48:38.226379636 +0000
+@@ -799,6 +799,8 @@ main (int argc, char **argv)
+         background_pixbuf = gdk_pixbuf_new_from_file (path, &error);
+         if (!background_pixbuf)
+            g_warning ("Failed to load background: %s", error->message);
++        else
++           background_pixbuf = gdk_pixbuf_add_alpha (background_pixbuf, FALSE, 255, 255, 255);
+         g_clear_error (&error);
+         g_free (path);
+     }