diff options
author | Koen Kooi <koen@openembedded.org> | 2006-09-01 21:45:31 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2006-09-01 21:45:31 +0000 |
commit | 1c704adbc5b9bf4e0d902e2910356c9f6e9287ea (patch) | |
tree | 8d0aa277006f59d673b3a0f0625d3b001367b648 | |
parent | 890d766f7d6e3c35309d0155e5751e9d76376aa8 (diff) | |
parent | 0fd3efb404b5e56a2fb05c25653931b5771f58b3 (diff) |
merge of 'b0b77e51fdd4802821fa1c92b384ac48838955b2'
and 'f090702de43860d9ba4cb4911dc980b293defc81'
-rw-r--r-- | conf/distro/angstrom-2007.1.conf | 2 | ||||
-rw-r--r-- | packages/cairo/cairo_1.2.4.bb | 2 | ||||
-rw-r--r-- | packages/gpe-login/files/removeblue-fontsize8.patch | 14 | ||||
-rw-r--r-- | packages/gpe-login/gpe-login_0.87.bb | 9 |
4 files changed, 19 insertions, 8 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 9d14345111..b7350efec7 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -53,6 +53,8 @@ PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_VERSION_fontconfig = "2.3.95" PREFERRED_VERSION_freetype = "2.2.1" +#fix screen corruption issues +PREFERRED_VERSION_cairo = "1.2.2" #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" diff --git a/packages/cairo/cairo_1.2.4.bb b/packages/cairo/cairo_1.2.4.bb index bad6da8bde..662f685fb9 100644 --- a/packages/cairo/cairo_1.2.4.bb +++ b/packages/cairo/cairo_1.2.4.bb @@ -1,7 +1,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" -DEPENDS = "libx11 libpng fontconfig libxrender" +DEPENDS = "virtual/libx11 libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" PR = "r1" diff --git a/packages/gpe-login/files/removeblue-fontsize8.patch b/packages/gpe-login/files/removeblue-fontsize8.patch new file mode 100644 index 0000000000..4962c8401f --- /dev/null +++ b/packages/gpe-login/files/removeblue-fontsize8.patch @@ -0,0 +1,14 @@ +--- /tmp/gpe-login.gtkrc 2005-11-08 17:15:50.363302568 +0100 ++++ gpe-login-0.83/X11/gpe-login.gtkrc 2005-11-08 17:16:22.659392816 +0100 +@@ -1,9 +1,2 @@ +-gtk-font-name = "Sans 8" +-include "/usr/share/themes/Angelistic/gtk-2.0/gtkrc" +- +-style "default" +-{ +- bg[NORMAL] = "#90d8ff" +-} +- +-widget "*" style "default" ++gtk-font-name = "Sans 8" ++include "/usr/share/themes/Industrial/gtk-2.0/gtkrc" diff --git a/packages/gpe-login/gpe-login_0.87.bb b/packages/gpe-login/gpe-login_0.87.bb index 5d7f00530c..b548a1ad6b 100644 --- a/packages/gpe-login/gpe-login_0.87.bb +++ b/packages/gpe-login/gpe-login_0.87.bb @@ -7,13 +7,8 @@ PRIORITY = "optional" DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" RDEPENDS = "xkbd" RPROVIDES = "gpe-session-starter" -PR = "r0" +PR = "r1" -#apply a patch to set the fontsize for bigdpi (200+) devices to 5 -SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1" -SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1" -SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1" -SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1" -SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1" +SRC_URI += "file://removeblue-fontsize8.patch;patch=1" SRC_URI += " file://chvt-keylaunch.patch;patch=1 " |