diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/angstrom/task-angstrom.bb | 5 | ||||
-rw-r--r-- | packages/e17/e-wm_0.16.999.027.bb | 22 | ||||
-rw-r--r-- | packages/fluxbox/fluxbox/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/fluxbox/fluxbox/apps.gpe.akita (renamed from packages/fluxbox/fluxbox-gpe/apps.gpe) | 0 | ||||
-rw-r--r-- | packages/fluxbox/fluxbox/apps.gpe.default | 7 | ||||
-rw-r--r-- | packages/fluxbox/fluxbox/fluxbox-gpe-session (renamed from packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session) | 0 | ||||
-rw-r--r-- | packages/fluxbox/fluxbox/fluxbox-gpe.session (renamed from packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session) | 0 | ||||
-rw-r--r-- | packages/fluxbox/fluxbox/gpe-init.patch (renamed from packages/fluxbox/fluxbox-gpe/gpe-init.patch) | 0 | ||||
-rw-r--r-- | packages/fluxbox/fluxbox/style.gpe-default (renamed from packages/fluxbox/fluxbox-gpe/style.gpe-default) | 0 | ||||
-rw-r--r-- | packages/fluxbox/fluxbox_0.99+1.0rc.bb (renamed from packages/fluxbox/fluxbox-gpe_1.0rc.bb) | 44 | ||||
-rw-r--r-- | packages/linux/linux-jlime-arm_2.6.17.bb | 4 | ||||
-rw-r--r-- | packages/x11-apps/twm_1.0.1.bb | 12 |
12 files changed, 54 insertions, 40 deletions
diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index 7447dc02e2..ec989659f1 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -24,6 +24,11 @@ RDEPENDS_angstrom-base-depends = "\ angstrom-version \ " +RRECOMMENDS_angstrom-base-depends = "\ + ${BOOTMODULES_RRECOMMENDS} \ + " + + RDEPENDS_angstrom-x11-base-depends := "\ diet-x11 \ virtual/xserver" diff --git a/packages/e17/e-wm_0.16.999.027.bb b/packages/e17/e-wm_0.16.999.027.bb index df78fbdcd0..5089ce23a4 100644 --- a/packages/e17/e-wm_0.16.999.027.bb +++ b/packages/e17/e-wm_0.16.999.027.bb @@ -3,20 +3,12 @@ DEPENDS = "evas-x11 ecore-x11 edje eet embryo e" LICENSE = "MIT" PR = "r3" -inherit e +inherit e update-alternatives SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \ file://fix-configure.patch;patch=1 \ file://Xsession.d/98enlightenment" -# cvs://anonymous@thinktux.net/root;module=e17/apps/e/data/themes;date=20050926" -# file://disable-splash.patch;patch=1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/default_entry.edc?rev=1.1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/focus.png?rev=1.1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry.png?rev=1.1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry_focus.png?rev=1.1" - - S = "${WORKDIR}/enlightenment-${PV}" PROFILE = "LOWRES_PDA" @@ -35,10 +27,6 @@ FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" do_compile_prepend() { find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' -# mv "${WORKDIR}/themes/default_entry.edc" "${S}/data/themes/" -# mv "${WORKDIR}/themes/images/focus.png" "${S}/data/themes/images/" -# mv "${WORKDIR}/themes/images/entry.png" "${S}/data/themes/images/" -# mv "${WORKDIR}/themes/images/entry_focus.png" "${S}/data/themes/images/" } do_install_append() { @@ -46,7 +34,7 @@ do_install_append() { install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d } -#pkg_postinst() { -# enlightenment_remote -menu-autoscroll-margin-set 5 -# enlightenment_remote -menu-autoscroll-cursor-margin-set 5 -#}
\ No newline at end of file +ALTERNATIVE_PATH = "${bindir}/enlightenment" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "16" diff --git a/packages/fluxbox/fluxbox/.mtn2git_empty b/packages/fluxbox/fluxbox/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/fluxbox/fluxbox/.mtn2git_empty diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe b/packages/fluxbox/fluxbox/apps.gpe.akita index 7aca442752..7aca442752 100644 --- a/packages/fluxbox/fluxbox-gpe/apps.gpe +++ b/packages/fluxbox/fluxbox/apps.gpe.akita diff --git a/packages/fluxbox/fluxbox/apps.gpe.default b/packages/fluxbox/fluxbox/apps.gpe.default new file mode 100644 index 0000000000..d7a0a83f22 --- /dev/null +++ b/packages/fluxbox/fluxbox/apps.gpe.default @@ -0,0 +1,7 @@ +[app] (title=Panel 0) + [Deco] {NONE} + [Sticky] {yes} +[end] +[app] (title=Panel 1) + [Deco] {NONE} +[end] diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session b/packages/fluxbox/fluxbox/fluxbox-gpe-session index f6e03ede7e..f6e03ede7e 100644 --- a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session +++ b/packages/fluxbox/fluxbox/fluxbox-gpe-session diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session b/packages/fluxbox/fluxbox/fluxbox-gpe.session index 16b7a2703a..16b7a2703a 100644 --- a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session +++ b/packages/fluxbox/fluxbox/fluxbox-gpe.session diff --git a/packages/fluxbox/fluxbox-gpe/gpe-init.patch b/packages/fluxbox/fluxbox/gpe-init.patch index c9836923d8..c9836923d8 100644 --- a/packages/fluxbox/fluxbox-gpe/gpe-init.patch +++ b/packages/fluxbox/fluxbox/gpe-init.patch diff --git a/packages/fluxbox/fluxbox-gpe/style.gpe-default b/packages/fluxbox/fluxbox/style.gpe-default index f94aaf7cdd..f94aaf7cdd 100644 --- a/packages/fluxbox/fluxbox-gpe/style.gpe-default +++ b/packages/fluxbox/fluxbox/style.gpe-default diff --git a/packages/fluxbox/fluxbox-gpe_1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb index 9cf8da0217..c222edb817 100644 --- a/packages/fluxbox/fluxbox-gpe_1.0rc.bb +++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb @@ -5,47 +5,53 @@ # Filename: fluxbox-gpe_1.0rc.bb # Date: 01-Jul-06 -DESCRIPTION = "The Fluxbox WindowManager for use with GPE" +DESCRIPTION = "The Fluxbox WindowManager" MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" HOMEPAGE = "http://fluxbox.sourceforge.net" LICENSE = "MIT" -RCONFLICTS = "fluxbox" +REALPV = "1.0rc" +PR = "r0" ###################################################################################### -PR = "r3" -S = "${WORKDIR}/fluxbox-${PV}" +S = "${WORKDIR}/fluxbox-${REALPV}" ###################################################################################### -SRC_URI = "http://switch.dl.sourceforge.net/sourceforge/fluxbox/fluxbox-${PV}.tar.gz \ - file://gpe-init.patch;patch=1\ +SRC_URI = "${SOURCEFORGE_MIRROR}/fluxbox/fluxbox-${REALPV}.tar.gz \ + file://gpe-init.patch;patch=1 \ file://apps.gpe.* \ file://style.gpe-default \ file://fluxbox-gpe-session \ - file://fluxbox-gpe.session" + file://fluxbox-gpe.session" ###################################################################################### -PACKAGES += "${PN}-styles" +PACKAGES = "${PN}-gpe ${PN}-styles ${PN}-doc ${PN}" DESCRIPTION_${PN}-styles = "The default styles for fluxbox" +DESCRIPTION_${PN}-gpe = "The Fluxbox WindowManager for use with GPE" +RDEPENDS_${PN}-gpe = "${PN}" ###################################################################################### FILES_${PN} = "/usr/bin \ /usr/share/fluxbox/init \ /usr/share/fluxbox/keys \ - /usr/share/fluxbox/menu \ - /usr/share/fluxbox/apps.gpe* \ - /usr/share/fluxbox/session \ - /usr/share/fluxbox/styles/gpe-default" + /usr/share/fluxbox/menu " + +FILES_${PN}-gpe = "/usr/share/fluxbox/apps.gpe* \ + /usr/share/fluxbox/styles/gpe-default \ + /usr/share/fluxbox/session \ + /usr/bin/fluxbox-gpe-session" FILES_${PN}-styles = "/usr/share/fluxbox/styles" +FILES_${PN}-doc = "/usr/share/man" + ###################################################################################### -inherit autotools +inherit autotools update-alternatives ###################################################################################### @@ -67,11 +73,7 @@ do_install_append() { ###################################################################################### -pkg_postinst_${PN}() { - update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15 -} - -pkg_postrm_${PN}() { - update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session -} - +ALTERNATIVE_PATH_${PN}-gpe = "${bindir}/fluxbox-gpe-session" +ALTERNATIVE_NAME_${PN}-gpe = "x-window-manager" +ALTERNATIVE_LINK_${PN}-gpe = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY_${PN}-gpe = "15" diff --git a/packages/linux/linux-jlime-arm_2.6.17.bb b/packages/linux/linux-jlime-arm_2.6.17.bb index 5db9de0d6e..194f0dc7c6 100644 --- a/packages/linux/linux-jlime-arm_2.6.17.bb +++ b/packages/linux/linux-jlime-arm_2.6.17.bb @@ -4,14 +4,14 @@ LICENSE = "GPL" PR = "r0" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'jornada7xx' +#COMPATIBLE_MACHINE = "jornada7xx" SRC_URI = "http://www.kernel.orgm/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \ file://defconf_jlime \ file://AsmArm-ArchSa1100-Jornada720.patch;patch=0 \ file://Cpu-Sa1110-Jornada720.patch;patch=0 \ file://Kconfig-Arch-Jornada720.patch;patch=0 \ - file://Kconfig-Keyboard-Jornada720.patch;patch=0\ + file://Kconfig-Keyboard-Jornada720.patch;patch=0 \ file://Kconfig-Touchscreen-Jornada720.patch;patch=0 \ file://Kconfig-Video-Jornada720.patch;patch=0 \ file://Mach-Sa1100-Jornada720.patch;patch=0 \ diff --git a/packages/x11-apps/twm_1.0.1.bb b/packages/x11-apps/twm_1.0.1.bb index 27dbb79eef..e02bc4cf7b 100644 --- a/packages/x11-apps/twm_1.0.1.bb +++ b/packages/x11-apps/twm_1.0.1.bb @@ -1,2 +1,14 @@ +PR = "r1" + include app-common.inc DEPENDS = "libx11 libxt libxmu" + +inherit update-alternatives + +ALTERNATIVE_PATH = "${bindir}/twm" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "1" + + + |