e-wm: use E_WM_SYSACTIONS variable instead of hardcoded e-wm-sysactions runtime dependency
PATCH 1/1 e-wm: use E_WM_SYSACTIONS variable instead of hardcoded e-wm-sysactions runtime dependency
* e-wm-sysactions-shr doesn't need RPROVIDES anymore
* fixes last multiple providers notice I had
NOTE: multiple providers are available for runtime e-wm-sysactions (e-wm, e-wm-sysactions-shr)
NOTE: consider defining a PREFERRED_PROVIDER entry to match e-wm-sysactions
--- conf/distro/shr.conf | 1 + recipes/e17/e-wm_svn.bb | 6 ++++-- recipes/images/illume-image.bb | 3 ++- recipes/shr/e-wm-sysactions-shr_git.bb | 4 +--- 4 files changed, 8 insertions(+), 6 deletions(-)
conf/distro/shr.conf +1 -0
@@ -115,6 +115,7 @@ IMAGE_INITSCRIPTS = "initscripts-shr" IPKG_VARIANT = "opkg" #Illume settings +E_WM_SYSACTIONS = "e-wm-sysactions-shr" ILLUME_CONFIG = "e-wm-config-illume2-shr" ILLUME_THEME = "e-wm-theme-illume-gry"
recipes/e17/e-wm_svn.bb +4 -2
@@ -3,7 +3,7 @@ DEPENDS = "eet evas ecore edje efreet edbus eeze" LICENSE = "MIT BSD" SRCNAME = "e" PV = "0.16.999.060+svnr${SRCPV}" -PR = "r18" +PR = "r19" SRCREV = "${EFL_SRCREV}" inherit e update-alternatives
@@ -91,13 +91,15 @@ PACKAGES =+ "\ illume-keyboard-default-terminal \ " +E_WM_SYSACTIONS ?= "${PN}-sysactions" + RRECOMMENDS_${PN} = "\ ${PN}-config-default \ ${PN}-images \ ${PN}-icons \ ${PN}-other \ ${PN}-input-methods \ - ${PN}-sysactions \ + ${E_WM_SYSACTIONS} \ " PACKAGE_ARCH_${PN}-config-default = "all"
recipes/images/illume-image.bb +2 -1
@@ -10,6 +10,7 @@ SPLASH = "exquisite exquisite-themes exquisite-theme-illume" # Default illume theme ILLUME_THEME ?= "e-wm-theme-illume" ILLUME_CONFIG ?= "e-wm-config-illume2" +E_WM_SYSACTIONS ?= "e-wm-sysactions" # getting the base system up BASE_INSTALL = "\
@@ -43,7 +44,7 @@ X_INSTALL = "\ mime-support \ e-wm \ e-wm-menu \ - e-wm-sysactions \ + ${E_WM_SYSACTIONS} \ ${ILLUME_CONFIG} \ ${ILLUME_THEME} \ e-wm-config-standard \
recipes/shr/e-wm-sysactions-shr_git.bb +1 -3
@@ -3,12 +3,10 @@ SECTION = "e/utils" LICENSE = "MIT BSD" SRCREV = "bbcec18f0ebd47e4f6eea88b9b774edf7400e752" PV = "1.2+gitr${SRCPV}" -PR = "r5" +PR = "r6" PACKAGE_ARCH = "all" -RPROVIDES_${PN} = "e-wm-sysactions" RCONFLICTS_${PN} = "e-wm-sysactions" -#RREPLACES_${PN} = "e-wm-sysactions" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
Signature · 1 line
1.7.4.1
PATCH v2 1/1 e-wm: use ESYSACTIONS, EMENU, ECONFIG, ETHEME variables instead of hardcoded e-wm-sysactions/e-wm-menu runtime dependency
* ILLUME_THEME/ILLUME_CONFIG were renamed to ETHEME/ECONFIG to use the same variable names as task-demo-x11/task-beagleboard-*
* e-wm-sysactions-shr doesn't need RPROVIDES anymore
* fixes last multiple providers notice I had
NOTE: multiple providers are available for runtime e-wm-sysactions (e-wm, e-wm-sysactions-shr)
NOTE: consider defining a PREFERRED_PROVIDER entry to match e-wm-sysactions
--- conf/distro/shr.conf | 6 ++++-- recipes/e17/e-wm_svn.bb | 6 ++++-- recipes/freesmartphone/menu-freesmartphone.bb | 4 ++-- recipes/images/fso-illume-image.bb | 2 +- recipes/images/fso-image.inc | 2 +- recipes/images/illume-image.bb | 14 ++++++++------ recipes/shr/e-wm-config-illume2-shr_git.bb | 9 ++++++--- recipes/shr/e-wm-sysactions-shr_git.bb | 4 +--- recipes/tasks/task-shr-minimal.bb | 3 +-- recipes/tasks/task-x11-illume.bb | 8 ++++---- 10 files changed, 32 insertions(+), 26 deletions(-)
conf/distro/shr.conf +4 -2
@@ -115,8 +115,10 @@ IMAGE_INITSCRIPTS = "initscripts-shr" IPKG_VARIANT = "opkg" #Illume settings -ILLUME_CONFIG = "e-wm-config-illume2-shr" -ILLUME_THEME = "e-wm-theme-illume-gry" +ESYSACTIONS = "e-wm-sysactions-shr" +EMENU = "e-wm-menu-shr" +ECONFIG = "e-wm-config-illume2-shr" +ETHEME = "e-wm-theme-illume-gry" # From minimal.conf
recipes/e17/e-wm_svn.bb +4 -2
@@ -3,7 +3,7 @@ DEPENDS = "eet evas ecore edje efreet edbus eeze" LICENSE = "MIT BSD" SRCNAME = "e" PV = "0.16.999.060+svnr${SRCPV}" -PR = "r18" +PR = "r19" SRCREV = "${EFL_SRCREV}" inherit e update-alternatives
@@ -91,13 +91,15 @@ PACKAGES =+ "\ illume-keyboard-default-terminal \ " +ESYSACTIONS ?= "${PN}-sysactions" + RRECOMMENDS_${PN} = "\ ${PN}-config-default \ ${PN}-images \ ${PN}-icons \ ${PN}-other \ ${PN}-input-methods \ - ${PN}-sysactions \ + ${ESYSACTIONS} \ " PACKAGE_ARCH_${PN}-config-default = "all"
recipes/freesmartphone/menu-freesmartphone.bb +2 -2
@@ -1,7 +1,7 @@ DESCRIPTION = "XDG menu file for the freesmartphone.org project" LICENSE = "PD" PV = "0.1" -PR = "r0" +PR = "r1" SRC_URI = "file://applications.menu"
@@ -10,7 +10,7 @@ do_install() { install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/ } -RPROVIDES_${PN} = "e-wm-menu" +RCONFLICTS_${PN} = "e-wm-menu" CONFFILES_${PN} = "${sysconfdir}/xdg/menus/applications.menu" FILES_${PN} = "${sysconfdir}/xdg/menus/applications.menu"
recipes/images/fso-illume-image.bb +1 -1
@@ -14,7 +14,7 @@ BASE_INSTALL = "\ task-base \ " -ILLUME_THEME = "illume-theme-fso" +ETHEME = "illume-theme-fso" X_INSTALL = "\ task-x11-illume \
recipes/images/fso-image.inc +1 -1
@@ -9,7 +9,7 @@ BASE_INSTALL = "\ task-base \ " -ILLUME_THEME = "illume-theme-freesmartphone" +ETHEME = "illume-theme-freesmartphone" X_INSTALL = "\ task-x11-illume \
recipes/images/illume-image.bb +8 -6
@@ -8,8 +8,10 @@ IMAGE_LINGUAS = "en-us de-de fr-fr pt-br ca-es zh-cn zh-tw bg-bg cs-cz da-dk nl- SPLASH = "exquisite exquisite-themes exquisite-theme-illume" # Default illume theme -ILLUME_THEME ?= "e-wm-theme-illume" -ILLUME_CONFIG ?= "e-wm-config-illume2" +ETHEME ?= "e-wm-theme-illume" +ECONFIG ?= "e-wm-config-illume2" +ESYSACTIONS ?= "e-wm-sysactions" +EMENU ?= "e-wm-menu" # getting the base system up BASE_INSTALL = "\
@@ -42,10 +44,10 @@ X_INSTALL = "\ shared-mime-info \ mime-support \ e-wm \ - e-wm-menu \ - e-wm-sysactions \ - ${ILLUME_CONFIG} \ - ${ILLUME_THEME} \ + ${EMENU} \ + ${ESYSACTIONS} \ + ${ECONFIG} \ + ${ETHEME} \ e-wm-config-standard \ e-wm-config-netbook \ e-wm-config-minimalist \
recipes/shr/e-wm-config-illume2-shr_git.bb +6 -3
@@ -5,7 +5,7 @@ LICENSE = "MIT BSD" RDEPENDS_${PN} = "shr-e-gadgets" SRCREV = "b166fa3c8f7160c0102877d32ee3ad09c8afaa7d" PV = "1.2+gitr${SRCPV}" -PR = "r7" +PR = "r8" inherit e
@@ -19,9 +19,12 @@ EXTRA_OECONF = "\ FILES_${PN} = "${datadir}/enlightenment/data/config/illume2-shr" +ESYSACTIONS ?= "e-wm-sysactions" +EMENU ?= "e-wm-menu" + RRECOMMENDS_${PN} = "\ - e-wm-sysactions-shr \ - e-wm-menu-shr \ + ${ESYSACTIONS} \ + ${EMENU} \ illume-keyboard-default-alpha \ illume-keyboard-numeric-alt \ illume-keyboard-default-terminal \
recipes/shr/e-wm-sysactions-shr_git.bb +1 -3
@@ -3,12 +3,10 @@ SECTION = "e/utils" LICENSE = "MIT BSD" SRCREV = "bbcec18f0ebd47e4f6eea88b9b774edf7400e752" PV = "1.2+gitr${SRCPV}" -PR = "r5" +PR = "r6" PACKAGE_ARCH = "all" -RPROVIDES_${PN} = "e-wm-sysactions" RCONFLICTS_${PN} = "e-wm-sysactions" -#RREPLACES_${PN} = "e-wm-sysactions" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/tasks/task-shr-minimal.bb +1 -2
@@ -1,5 +1,5 @@ DESCRIPTION = "SHR Lite Image Feed" -PR = "r40" +PR = "r41" PV = "2.0" LICENSE = "GPL"
@@ -107,7 +107,6 @@ RDEPENDS_${PN}-audio = "\ RDEPENDS_${PN}-x = "\ task-x11-illume \ task-fonts-truetype-core \ - e-wm-menu-shr \ shr-wizard \ shr-theme-gry \ xcursor-transparent-theme \
recipes/tasks/task-x11-illume.bb +4 -4
@@ -9,8 +9,8 @@ PR = "r1" inherit task # Default illume theme -ILLUME_THEME ?= "e-wm-theme-illume" -ILLUME_CONFIG ?= "e-wm-config-illume2" +ETHEME ?= "e-wm-theme-illume" +ECONFIG ?= "e-wm-config-illume2" RDEPENDS_${PN} = "\ task-x11-server \
@@ -18,6 +18,6 @@ RDEPENDS_${PN} = "\ # xserver-kdrive-splash-illume \ \ e-wm \ - ${ILLUME_CONFIG} \ - ${ILLUME_THEME} \ + ${ECONFIG} \ + ${ETHEME} \ "
Signature · 1 line
1.7.4.1