From ebd747180e3a94e8312f5f0e7f58d3c208fd1b21 Mon Sep 17 00:00:00 2001 From: Chris Lord Date: Tue, 4 Oct 2005 17:01:36 +0000 Subject: [PATCH] - Remove /etc/gtk-2.0/gtkrc that forced Clearlooks - Make matchbox themes without a corresponding gtk theme use Clearlooks - Add settings-daemon, matchbox-config-gtk and leafpad to meta-oh - Add settings-daemon - Add matchbox-config-gtk - Change Leafpad desktop shortcut from 'Leafpad' to 'Notes' git-svn-id: https://svn.o-hand.com/repos/poky@120 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../packages/leafpad/files/leafpad.desktop | 2 +- openembedded/packages/leafpad/leafpad_0.8.4.bb | 1 + .../matchbox-config-gtk_svn.bb | 11 +++++++++++ .../matchbox-poky/etc/gtk-2.0/gtkrc | 2 -- .../matchbox-poky/matchbox-poky_0.1.bb | 2 +- .../packages/matchbox-themes-gtk/files/gtkrc | 2 +- .../matchbox-themes-gtk/matchbox-themes-gtk.bb | 2 +- openembedded/packages/meta/meta-oh.bb | 4 +++- .../settings-daemon/files/70settings-daemon | 3 +++ .../settings-daemon/settings-daemon_svn.bb | 18 ++++++++++++++++++ 10 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 openembedded/packages/matchbox-config-gtk/matchbox-config-gtk_svn.bb delete mode 100644 openembedded/packages/matchbox-poky/matchbox-poky/etc/gtk-2.0/gtkrc create mode 100755 openembedded/packages/settings-daemon/files/70settings-daemon create mode 100644 openembedded/packages/settings-daemon/settings-daemon_svn.bb diff --git a/openembedded/packages/leafpad/files/leafpad.desktop b/openembedded/packages/leafpad/files/leafpad.desktop index 7c75817128..0e582794ea 100644 --- a/openembedded/packages/leafpad/files/leafpad.desktop +++ b/openembedded/packages/leafpad/files/leafpad.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Name=Leafpad +Name=Notes Exec=/usr/bin/leafpad Icon=leafpad.png Terminal=false diff --git a/openembedded/packages/leafpad/leafpad_0.8.4.bb b/openembedded/packages/leafpad/leafpad_0.8.4.bb index 6faabec514..c26f149777 100644 --- a/openembedded/packages/leafpad/leafpad_0.8.4.bb +++ b/openembedded/packages/leafpad/leafpad_0.8.4.bb @@ -3,6 +3,7 @@ DEPENDS = "gtk+" SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz \ file://leafpad.desktop \ file://leafpad.png" +PR = "r1" inherit autotools pkgconfig diff --git a/openembedded/packages/matchbox-config-gtk/matchbox-config-gtk_svn.bb b/openembedded/packages/matchbox-config-gtk/matchbox-config-gtk_svn.bb new file mode 100644 index 0000000000..49edb7bd32 --- /dev/null +++ b/openembedded/packages/matchbox-config-gtk/matchbox-config-gtk_svn.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Matchbox gtk theme configuration application." +LICENSE = "GPL" +DEPENDS = "gconf libglade gtk+" +RDEPENDS = "settings-daemon" +PV = "0.0cvs${CVSDATE}" +S = "${WORKDIR}/${PN}" + +SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" + +inherit autotools pkgconfig + diff --git a/openembedded/packages/matchbox-poky/matchbox-poky/etc/gtk-2.0/gtkrc b/openembedded/packages/matchbox-poky/matchbox-poky/etc/gtk-2.0/gtkrc deleted file mode 100644 index 34e98fd3be..0000000000 --- a/openembedded/packages/matchbox-poky/matchbox-poky/etc/gtk-2.0/gtkrc +++ /dev/null @@ -1,2 +0,0 @@ -include "/usr/share/themes/Clearlooks/gtk-2.0/gtkrc" - diff --git a/openembedded/packages/matchbox-poky/matchbox-poky_0.1.bb b/openembedded/packages/matchbox-poky/matchbox-poky_0.1.bb index a11b834d64..78ffa39519 100644 --- a/openembedded/packages/matchbox-poky/matchbox-poky_0.1.bb +++ b/openembedded/packages/matchbox-poky/matchbox-poky_0.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Custom MB session files for poky" LICENSE = "GPL" SECTION = "x11" RDEPENDS = "matchbox matchbox-applet-startup-monitor gtk-theme-clearlooks" -PR = "r8" +PR = "r9" SRC_URI = "file://etc" S = ${WORKDIR} diff --git a/openembedded/packages/matchbox-themes-gtk/files/gtkrc b/openembedded/packages/matchbox-themes-gtk/files/gtkrc index b22b9972cd..6dc40c0aa5 100644 --- a/openembedded/packages/matchbox-themes-gtk/files/gtkrc +++ b/openembedded/packages/matchbox-themes-gtk/files/gtkrc @@ -1 +1 @@ -include "/usr/share/themes/Angelistic/gtk-2.0/gtkrc" +include "/usr/share/themes/Clearlooks/gtk-2.0/gtkrc" diff --git a/openembedded/packages/matchbox-themes-gtk/matchbox-themes-gtk.bb b/openembedded/packages/matchbox-themes-gtk/matchbox-themes-gtk.bb index 74010ba2f9..602a96efa3 100644 --- a/openembedded/packages/matchbox-themes-gtk/matchbox-themes-gtk.bb +++ b/openembedded/packages/matchbox-themes-gtk/matchbox-themes-gtk.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" DEPENDS = "matchbox-wm gtk-clearlooks-engine" RDEPENDS = "matchbox-wm gtk-clearlooks-engine" SECTION = "x11/base" -PR = "r1" +PR = "r2" SRC_URI = "file://gtkrc" diff --git a/openembedded/packages/meta/meta-oh.bb b/openembedded/packages/meta/meta-oh.bb index 525d0ff64b..5cb7db037c 100644 --- a/openembedded/packages/meta/meta-oh.bb +++ b/openembedded/packages/meta/meta-oh.bb @@ -2,7 +2,7 @@ PACKAGES = "oh-base-depends oh-task-base" # oh-task-base DESCRIPTION = "Meta-package for OpenHand Palmtop Environment" MAINTAINER = "Richard Purdie " -PR = "r16" +PR = "r17" ALLOW_EMPTY = "1" @@ -18,6 +18,7 @@ oh-task-base = "\ matchbox-poky \ matchbox-keyboard \ matchbox-stroke \ + matchbox-config-gtk \ matchbox-panel-manager \ matchbox-panel-hacks \ matchbox-themes-extra \ @@ -29,6 +30,7 @@ oh-task-base = "\ xserver-nodm-init \ chkhinge26 \ usbinit \ + settings-daemon \ minimo \ gtk+ \ gtk-clearlooks-engine \ diff --git a/openembedded/packages/settings-daemon/files/70settings-daemon b/openembedded/packages/settings-daemon/files/70settings-daemon new file mode 100755 index 0000000000..e687dabe4b --- /dev/null +++ b/openembedded/packages/settings-daemon/files/70settings-daemon @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/bin/settings-daemon & diff --git a/openembedded/packages/settings-daemon/settings-daemon_svn.bb b/openembedded/packages/settings-daemon/settings-daemon_svn.bb new file mode 100644 index 0000000000..45b498da59 --- /dev/null +++ b/openembedded/packages/settings-daemon/settings-daemon_svn.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Settings-daemon is a bridge between xst/gpe-confd and gconf" +LICENSE = "GPL" +DEPENDS = "gconf glib-2.0" + +SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ + file://70settings-daemon" + +S = "${WORKDIR}/${PN}" + +inherit autotools pkgconfig gettext + +FILES_${PN} = "${bindir} ${sysconfdir}" + +do_install_append () { + install -d ${D}/${sysconfdir}/X11/Xsession.d + install -m 755 ${WORKDIR}/70settings-daemon ${D}/${sysconfdir}/X11/Xsession.d/ +} +