e17+efl: update to match latest additions and changes upstream

lots of changes:

1. eina added. now a dependency.
2. illume removed as separate source tree and module and part of e17's wm
3. e17's default theme now include illume support so no need for illume theme

these are fairly major but clean things up a lot. the e17 package splits out
config profile now (it includes all of them as recommends though). the user
can choose what profiel they want runtime. this is a "first time you run e"
thing or whenever you choose the default profile (you go back to the wizard).
also full intl support works with language selection etc. as long as glibc
has that locale support. lots of other bugfixes and improvements as well. if
you want "latest e+efl to work well" you will want these changes.

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index e8c88626ccd987e853b7f6bf9feb8dc61ec542d9..6b1d5d8fe68eb050046eec36ea32f3efd86be622 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -212,9 +212,11 @@ SRCREV_pn-zhone ?= "929c78f2e83faef526064231c17958eaef72eba3"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "36540"
+EFL_SRCREV ?= "37324"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
+SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
+SRCREV_pn-eina ?= "${EFL_SRCREV}"
 SRCREV_pn-eet-native ?= "${EFL_SRCREV}"
 SRCREV_pn-eet ?= "${EFL_SRCREV}"
 SRCREV_pn-evas-native ?= "${EFL_SRCREV}"

diff --git a/packages/e17/e-wm_svn.bb b/packages/e17/e-wm_svn.bb
index acbee85a702b3f7dbb2bd9cafb90b1e4f080829d..a641a2c34ad9b73b885e949b45344869853827b4 100644 (file)
--- a/packages/e17/e-wm_svn.bb
+++ b/packages/e17/e-wm_svn.bb
@@ -2,11 +2,51 @@ DESCRIPTION = "The Enlightenment Window Manager Version 17"
 DEPENDS = "eet evas ecore edje efreet edbus"
 LICENSE = "MIT BSD"
 PV = "0.16.999.043+svnr${SRCREV}"
-PR = "r15"
+PR = "r16"
 
 inherit e update-alternatives
 
-RDEPENDS += "shared-mime-info mime-support"
+RDEPENDS += "shared-mime-info mime-support edje-utils glibc-utils"
+
+PACKAGES =+ "\
+  ${PN}-config-default \
+  ${PN}-config-illume \
+  ${PN}-config-minimalist \
+  ${PN}-config-netbook \
+  ${PN}-config-scaleable \
+  ${PN}-config-standard \
+  ${PN}-theme-default \
+  ${PN}-theme-illume \
+  ${PN}-background-dark-gradient \
+  ${PN}-background-light-gradient \
+  ${PN}-images \
+  ${PN}-icons \
+  ${PN}-other \
+  ${PN}-input-methods \
+"
+
+RRECOMMENDS_${PN} = "\
+  ${PN}-config-default \
+  ${PN}-images \
+  ${PN}-icons \
+  ${PN}-other \
+  ${PN}-input-methods \
+"
+
+PACKAGE_ARCH_${PN}-config-default = "all"
+PACKAGE_ARCH_${PN}-config-illume = "all"
+PACKAGE_ARCH_${PN}-config-minimalist = "all"
+PACKAGE_ARCH_${PN}-config-netbook = "all"
+PACKAGE_ARCH_${PN}-config-scaleable = "all"
+PACKAGE_ARCH_${PN}-config-standard = "all"
+PACKAGE_ARCH_${PN}-theme-default = "all"
+PACKAGE_ARCH_${PN}-theme-illume = "all"
+PACKAGE_ARCH_${PN}-background-dark-gradient = "all"
+PACKAGE_ARCH_${PN}-background-light-gradient = "all"
+PACKAGE_ARCH_${PN}-images = "all"
+PACKAGE_ARCH_${PN}-icons = "all"
+PACKAGE_ARCH_${PN}-other = "all"
+PACKAGE_ARCH_${PN}-input-methods = "all"
 
 SRC_URI = "\
   svn://svn.enlightenment.org/svn/e/trunk;module=e;proto=http \
@@ -37,30 +77,53 @@ do_stage() {
 
 do_install_append() {
     # customising - should rather make this simple upstream
-    rm -rf ${D}${datadir}/enlightenment/data/backgrounds/*
-    rm -rf ${D}${datadir}/enlightenment/data/fonts/*
-    rm -rf ${D}${datadir}/enlightenment/data/other/*
     install -m 755 ${WORKDIR}/enlightenment_start.oe ${D}/${bindir}
     install -d ${D}/${sysconfdir}/xdg/menus
     install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/
+    for I in `find ${D}/${libdir}/enlightenment -name "*.a" -print`; do rm -f $I; done
+    for I in `find ${D}/${libdir}/enlightenment -name "*.la" -print`; do rm -f $I; done
 }
 
 FILES_${PN} = "\
   ${bindir}/* \
   ${libdir}/enlightenment/modules/*/*.* \
   ${libdir}/enlightenment/modules/*/*/* \
-  ${libdir}/enlightenment/preload/*.so \
-  ${datadir} \
+  ${datadir}/locale \
+  ${datadir}/enlightenment/data/icons \
+  ${datadir}/enlightenment/data/input_methods \
+  ${datadir}/enlightenment/data/config/profile.cfg \
   ${sysconfdir} \
 "
+FILES_${PN}-config-default = "${datadir}/enlightenment/data/config/default"
+FILES_${PN}-config-illume = "${datadir}/enlightenment/data/config/illume"
+FILES_${PN}-config-minimalist = "${datadir}/enlightenment/data/config/minimalist"
+FILES_${PN}-config-netbook = "${datadir}/enlightenment/data/config/netbook"
+FILES_${PN}-config-scaleable = "${datadir}/enlightenment/data/config/scaleable"
+FILES_${PN}-config-standard = "${datadir}/enlightenment/data/config/standard"
+FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj"
+FILES_${PN}-theme-illume = "${datadir}/enlightenment/data/themes/illume.edj"
+FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj"
+FILES_${PN}-background-dark-gradient = "${datadir}/enlightenment/data/backgrounds/Dark_Gradient.edj"
+FILES_${PN}-background-light-gradient = "${datadir}/enlightenment/data/backgrounds/Light_Gradient.edj"
+FILES_${PN}-images = "${datadir}/enlightenment/data/images"
+FILES_${PN}-icons = "${datadir}/enlightenment/data/icons"
+FILES_${PN}-other = "${datadir}/enlightenment/data/other"
+FILES_${PN}-input-methods = "${datadir}/enlightenment/data/input_methods"
+
+RRECOMMENDS_${PN}-config-default = "${PN}-theme-default"
+RRECOMMENDS_${PN}-config-illume = "${PN}-theme-illume"
+RRECOMMENDS_${PN}-config-minimalist = "${PN}-background-light-gradient \
+${PN}-theme-default"
+RRECOMMENDS_${PN}-config-netbook = "${PN}-background-dark-gradient \
+${PN}-theme-default"
+RRECOMMENDS_${PN}-config-scaleable = "${PN}-theme-default"
+RRECOMMENDS_${PN}-config-standard = "${PN}-theme-default"
+
 FILES_${PN}-dbg += "\
   ${libdir}/enlightenment/modules/*/*/.debug/ \
   ${libdir}/enlightenment/preload/.debug/ \
 "
-
-FILES_${PN}-dev += "\
-  ${libdir}/enlightenment/preload/*.?a \
-"
+FILES_${PN}-dev += "${libdir}/enlightenment/preload/*.?a"
 
 CONFFILES_${PN} = "/etc/xdg/menus/applications.menu"
 

diff --git a/packages/e17/illume-theme-illume_svn.bb b/packages/e17/illume-theme-illume_svn.bb
deleted file mode 100644 (file)
index eb313e0..0000000
--- a/packages/e17/illume-theme-illume_svn.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "Illume theme for Illume E module"
-HOMEPAGE = "http://www.enlightenment.org/"
-LICENSE = "MIT/BSD"
-DEPENDS = "edje-native eet-native"
-PV = "0.0+${PR}-svnr${SRCREV}"
-PR = "r1"
-
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=THEMES/b_and_w;proto=http"
-S = "${WORKDIR}/THEMES/b_and_w"
-
-do_compile() {
-   edje_cc illume.edc
-   edje_cc illume_init.edc
-}
-
-do_install() {
-    install -d ${D}${sysconfdir}/enlightenment
-    install -d ${D}${datadir}/enlightenment/data/themes/
-    install -d ${D}${datadir}/enlightenment/data/init/
-
-    # FIXME: hack. should modify profile.cfg and nto use enlightenment_start.oe
-    echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile
-
-    install -m 0644 ${S}/illume.edj ${D}${datadir}/enlightenment/data/themes/
-    install -m 0644 ${S}/illume_init.edj ${D}${datadir}/enlightenment/data/init/
-}
-
-RPROVIDES_${PN} = "illume-theme"
-CONFFILES_${PN} = "${sysconfdir}/enlightenment/default_profile"
-FILES_${PN} = "${sysconfdir}/enlightenment ${datadir}/enlightenment"
-
-PACKAGE_ARCH_${PN} = "all"
-

diff --git a/packages/efl1/eet-native_svn.bb b/packages/efl1/eet-native_svn.bb
index 0b0b5a4862d21b9bfc5b102f134bbc9e804953d1..454bc53a7b54b535cd5c0b21741f743314977238 100644 (file)
--- a/packages/efl1/eet-native_svn.bb
+++ b/packages/efl1/eet-native_svn.bb
@@ -1,6 +1,6 @@
 require eet_svn.bb
 inherit native
-DEPENDS = "zlib-native jpeg-native"
+DEPENDS = "zlib-native jpeg-native eina-native"
 # we no longer inherit pkgconfig, so we need to state this explicitly
 # (see explanation in efl.bbclass and autotools.bbclass)
 DEPENDS += "pkgconfig-native"

diff --git a/packages/efl1/eet_svn.bb b/packages/efl1/eet_svn.bb
index e801a543e7aee3a3558a1d81803ab709024b3e69..6f7a615fad9bfa757d35f05ede611c2b1b004a0b 100644 (file)
--- a/packages/efl1/eet_svn.bb
+++ b/packages/efl1/eet_svn.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "EET is the Enlightenment data storage library"
-DEPENDS = "zlib jpeg openssl"
+DEPENDS = "zlib jpeg openssl eina"
 LICENSE = "MIT BSD"
 PV = "1.0.1+svnr${SRCREV}"
 PR = "r3"

diff --git a/packages/efl1/eina-native_svn.bb b/packages/efl1/eina-native_svn.bb
new file mode 100644 (file)
index 0000000..8cc34bb
--- /dev/null
+++ b/packages/efl1/eina-native_svn.bb
@@ -0,0 +1,6 @@
+require eina_svn.bb
+inherit native
+DEPENDS = ""
+# we no longer inherit pkgconfig, so we need to state this explicitly
+# (see explanation in efl.bbclass and autotools.bbclass)
+DEPENDS += "pkgconfig-native"

diff --git a/packages/efl1/eina_svn.bb b/packages/efl1/eina_svn.bb
new file mode 100644 (file)
index 0000000..2344b4e
--- /dev/null
+++ b/packages/efl1/eina_svn.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "EET is the Enlightenment data storage library"
+DEPENDS = ""
+LICENSE = "LGPL"
+PV = "0.0.1+svnr${SRCREV}"
+PR = "r1"
+
+inherit efl
+
+EXTRA_OECONF = "\
+"
+
+FILES_${PN} += "${libdir}/eina"

diff --git a/packages/python/python-ecore_svn.bb b/packages/python/python-ecore_svn.bb
index 1b02bf77dfefb4ac16a33918c6059baba20ddcd0..78aebc62fc9efcecc09ed44d95769587dc13eaa4 100644 (file)
--- a/packages/python/python-ecore_svn.bb
+++ b/packages/python/python-ecore_svn.bb
@@ -1,5 +1,5 @@
 require python-efl.inc
-DEPENDS += "python-evas ecore"
+DEPENDS += "python-evas ecore eina"
 RDEPENDS += "python-evas"
 PV = "0.3.0+svnr${SRCREV}"
 PR = "r0"

diff --git a/packages/python/python-edje_svn.bb b/packages/python/python-edje_svn.bb
index 4e33847daeba64407a0e5df0b1ddb4bc19b710e0..532db0875f4b6a96f2b91e2ce5cc983cdd16a161 100644 (file)
--- a/packages/python/python-edje_svn.bb
+++ b/packages/python/python-edje_svn.bb
@@ -1,5 +1,5 @@
 require python-efl.inc
-DEPENDS += "edje python-evas"
+DEPENDS += "edje python-evas eina"
 RDEPENDS += "python-evas"
 PV = "0.3.0+svnr${SRCREV}"
 PR = "r0"

diff --git a/packages/python/python-evas_svn.bb b/packages/python/python-evas_svn.bb
index 6f53bf7e8d4284d2b7f680b593e4a72a604c03d8..2deb020b70369a82fe1289159a4a8fc6122f70ad 100644 (file)
--- a/packages/python/python-evas_svn.bb
+++ b/packages/python/python-evas_svn.bb
@@ -1,5 +1,5 @@
 require python-efl.inc
-DEPENDS += "evas"
+DEPENDS += "evas eina"
 PV = "0.3.0+svnr${SRCREV}"
 PR = "r0"