diff options
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 3 | ||||
| -rw-r--r-- | packages/e17/e-wm_svn.bb | 5 | ||||
| -rw-r--r-- | packages/e17/illume_svn.bb | 13 | ||||
| -rw-r--r-- | packages/images/fso-image.bb | 8 | ||||
| -rw-r--r-- | packages/openmoko-projects/tichy_svn.bb | 1 |
5 files changed, 21 insertions, 9 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index f136c638f4..eab831c2eb 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -53,7 +53,6 @@ SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" -SRCREV_pn-illume ?= "35605" SRCREV_pn-illume-theme-asu ?= "170" SRCREV_pn-illume-theme-freesmartphone ?= "fcadedec08294c5eebd176483695828959a76e0b" SRCREV_pn-kismet ?= "2285" @@ -192,7 +191,7 @@ SRCREV_pn-zhone ?= "69e029bd85a1caaad4e5d61087836a8e1ea20dcc" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "35592" +EFL_SRCREV ?= "35727" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eet-native ?= "${EFL_SRCREV}" diff --git a/packages/e17/e-wm_svn.bb b/packages/e17/e-wm_svn.bb index 7c3e950569..5850183b89 100644 --- a/packages/e17/e-wm_svn.bb +++ b/packages/e17/e-wm_svn.bb @@ -6,6 +6,8 @@ PR = "r11" inherit e update-alternatives +RDEPENDS += "shared-mime-info mime-support" + SRC_URI = "\ svn://svn.enlightenment.org/svn/e/trunk;module=e;proto=http \ file://disable-e-cursor.patch;patch=1 \ @@ -16,6 +18,7 @@ S = "${WORKDIR}/e" EXTRA_OECONF = "\ --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ + --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ --x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ --enable-simple-x11 \ @@ -43,8 +46,6 @@ do_install_append() { install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/ } -RDEPENDS += "shared-mime-info mime-support" - FILES_${PN} = "\ ${bindir}/* \ ${libdir}/enlightenment/modules/*/*.* \ diff --git a/packages/e17/illume_svn.bb b/packages/e17/illume_svn.bb index 19bb3958d4..2c1521c813 100644 --- a/packages/e17/illume_svn.bb +++ b/packages/e17/illume_svn.bb @@ -20,8 +20,7 @@ EXTRA_OECONF = "\ " RRECOMMENDS_${PN} = "\ - wamerican \ - ${PN}-config \ + ${PN}-config-illume \ ${PN}-theme \ ${PN}-dicts-english-us \ ${PN}-keyboards-default \ @@ -30,18 +29,22 @@ RRECOMMENDS_${PN} = "\ " PACKAGES =+ "\ - ${PN}-config \ + ${PN}-config-illume \ + ${PN}-config-asu \ ${PN}-dicts-english-us \ ${PN}-keyboards-default \ ${PN}-keyboards-numbers \ ${PN}-keyboards-terminal \ " -PACKAGE_ARCH_${PN}-config = "all" +PACKAGE_ARCH_${PN}-config-illume = "all" +PACKAGE_ARCH_${PN}-config-asu = "all" PACKAGE_ARCH_${PN}-dicts-english-us = "all" PACKAGE_ARCH_${PN}-keyboards-default = "all" PACKAGE_ARCH_${PN}-keyboards-numbers = "all" +PACKAGE_ARCH_${PN}-keyboards-terminal = "all" -FILES_${PN}-config = "${datadir}/enlightenment/data/config/*/* ${datadir}/illume" +FILES_${PN}-config-illume = "${datadir}/enlightenment/data/config/illume/*" +FILES_${PN}-config-asu = "${datadir}/enlightenment/data/config/asu/*" FILES_${PN}-dicts-english-us = "${libdir}/enlightenment/modules/illume/dicts/English_*.dic" FILES_${PN}-keyboards-default = "${libdir}/enlightenment/modules/illume/keyboards/Default.kbd" FILES_${PN}-keyboards-numbers = "${libdir}/enlightenment/modules/illume/keyboards/Numbers.kbd" diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb index d6eaecd9fa..eabe00b0e6 100644 --- a/packages/images/fso-image.bb +++ b/packages/images/fso-image.bb @@ -24,6 +24,11 @@ XSERVER ?= "xserver-kdrive-fbdev" X_INSTALL = "\ e-wm \ illume \ + illume-config-illume \ + illume-dicts-english-us \ + illume-keyboards-default \ + illume-keyboards-numbers \ + illume-keyboards-terminal \ illume-theme-freesmartphone \ ${XSERVER} \ xserver-kdrive-common \ @@ -113,6 +118,7 @@ IMAGE_INSTALL = "\ ${TOOLS_INSTALL} \ ${PYTHON_INSTALL} \ ${ZHONE_INSTALL} \ + tichy \ " inherit image @@ -140,6 +146,8 @@ fso_rootfs_postprocess() { # minimal gtk theme foo mkdir -p ./etc/gtk-2.0/ echo 'gtk-font-name = "Sans 5"' >> ./etc/gtk-2.0/gtkrc + # fix strange iconv/gconf bug + ln -s libc.so.6 ./lib/libc.so cd $curdir } diff --git a/packages/openmoko-projects/tichy_svn.bb b/packages/openmoko-projects/tichy_svn.bb index 0b42fc6f70..4b8fe5eeb3 100644 --- a/packages/openmoko-projects/tichy_svn.bb +++ b/packages/openmoko-projects/tichy_svn.bb @@ -11,3 +11,4 @@ S = "${WORKDIR}/tichy" inherit distutils FILES_${PN} += "${datadir}" +RDEPENDS_${PN} += "python-pygame" |