summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2007-03-28 15:40:45 +0000
committerPhilipp Zabel <philipp.zabel@gmail.com>2007-03-28 15:40:45 +0000
commit5b1a6c9f5b4e26ccbd401e544f973d61fc1b3eea (patch)
treea82e2149e4fec750111cfd69d43dbbf061d5f742
parentb8637ac39ef2ffdb98926f4583c0b22a56b69fef (diff)
parentcc8325b1fb8a380182d6bb2167aa116d620c4f79 (diff)
merge of '53fc298d41b61bb31958787f71e60f0ada0ea33d'
and '802b2506dd668da5a8ecfb587a125d087042597a'
-rw-r--r--packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb25
-rw-r--r--packages/openmoko-base/openmoko-theme-standard_svn.bb3
-rw-r--r--packages/xorg-app/xorg-app-common.inc2
3 files changed, 28 insertions, 2 deletions
diff --git a/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb
new file mode 100644
index 0000000000..0c19db77ac
--- /dev/null
+++ b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution, qvga version"
+SECTION = "openmoko/base"
+PV = "0.0+svn${SRCDATE}"
+PR = "r0"
+
+inherit openmoko-base
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=themes;proto=http"
+S = "${WORKDIR}"
+
+dirs = "themes/openmoko-standard"
+
+do_install() {
+ find ${WORKDIR} -name ".svn" | xargs rm -rf
+ install -d ${D}${datadir}/themes/
+ for i in ${dirs}; do
+ cp -fpPR ${WORKDIR}/$i ${D}${datadir}/themes/
+ done
+
+ install -d ${D}${sysconfdir}/gtk-2.0
+ echo 'include "${datadir}/themes/openmoko-standard-qvga/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
+}
+
+PACKAGE_ARCH = "all"
+FILES_${PN} = "${datadir} ${sysconfdir}"
diff --git a/packages/openmoko-base/openmoko-theme-standard_svn.bb b/packages/openmoko-base/openmoko-theme-standard_svn.bb
index e7a6def235..6265526de6 100644
--- a/packages/openmoko-base/openmoko-theme-standard_svn.bb
+++ b/packages/openmoko-base/openmoko-theme-standard_svn.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
SECTION = "openmoko/base"
PV = "0.0+svn${SRCDATE}"
-PR = "r3"
+PR = "r4"
inherit openmoko-base
@@ -21,4 +21,5 @@ do_install() {
echo 'include "${datadir}/themes/openmoko-standard/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
}
+PACKAGE_ARCH = "all"
FILES_${PN} = "${datadir} ${sysconfdir}"
diff --git a/packages/xorg-app/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc
index 15f76ab5e2..a33d107675 100644
--- a/packages/xorg-app/xorg-app-common.inc
+++ b/packages/xorg-app/xorg-app-common.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.x.org"
SECTION = "x11/applications"
LICENSE = "MIT-X"
-#DEPENDS = ""
+DEPENDS = "util-macros"
XORG_PN = "${PN}"
XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}"
SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/app/${XORG_PN}-${PV}.tar.bz2"