diff options
| -rw-r--r-- | packages/e17/e-wm_0.16.999.015.bb | 17 | ||||
| -rw-r--r-- | packages/efl/ecore.inc | 11 | ||||
| -rw-r--r-- | packages/efl/edje_0.5.0.015.bb | 7 | ||||
| -rw-r--r-- | packages/efl/evas-x11_0.9.9.015.bb | 2 | ||||
| -rw-r--r-- | packages/efl/evas.inc | 9 |
5 files changed, 19 insertions, 27 deletions
diff --git a/packages/e17/e-wm_0.16.999.015.bb b/packages/e17/e-wm_0.16.999.015.bb index 51d20ca387..7c3aceb536 100644 --- a/packages/e17/e-wm_0.16.999.015.bb +++ b/packages/e17/e-wm_0.16.999.015.bb @@ -11,10 +11,11 @@ SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz file://remove-large-fonts.patch;patch=1 \ file://disable-splash.patch;patch=1 \ file://Xsession.d/98enlightenment \ - 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" + cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e/data/themes;date=20050926" +# 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}" @@ -34,10 +35,10 @@ EXTRA_OECONF = "--with-profile=${PROFILE} \ FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" do_compile_prepend() { - mv "${WORKDIR}/default_entry.edc?rev=1.1" "${S}/data/themes/default_entry.edc" - mv "${WORKDIR}/focus.png?rev=1.1" "${S}/data/themes/images/focus.png" - mv "${WORKDIR}/entry.png?rev=1.1" "${S}/data/themes/images/entry.png" - mv "${WORKDIR}/entry_focus.png?rev=1.1" "${S}/data/themes/images/entry_focus.png" + 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() { diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc index 575bb9e5ba..ffc9df6b92 100644 --- a/packages/efl/ecore.inc +++ b/packages/efl/ecore.inc @@ -12,10 +12,7 @@ inherit efl SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \ file://configure.patch;patch=1 \ file://fix-tslib-configure.patch;patch=1 \ - http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/libs/ecore/m4/ac_attribute.m4?rev=1.1 \ - http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/libs/ecore/m4/ac_expand_dir.m4?rev=1.1 \ - http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/libs/ecore/m4/ac_path_generic.m4?rev=1.2 \ - http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/libs/ecore/m4/pkg.m4?rev=1.2" + cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/ecore/m4;date=20050926" S = "${WORKDIR}/ecore-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore" @@ -27,10 +24,8 @@ headers = "" parts = "<override me>" do_configure_prepend() { - install -D "${WORKDIR}/ac_attribute.m4?rev=1.1" "${S}/m4/ac_attribute.m4" - mv "${WORKDIR}/ac_expand_dir.m4?rev=1.1" "${S}/m4/ac_expand_dir.m4" - mv "${WORKDIR}/ac_path_generic.m4?rev=1.2" "${S}/m4/ac_path_generic.m4" - mv "${WORKDIR}/pkg.m4?rev=1.2" "${S}/m4/pkg.m4" + install -d "${S}/m4" + install "${WORKDIR}/m4/"*.m4 "${S}/m4" aclocal -I m4 } diff --git a/packages/efl/edje_0.5.0.015.bb b/packages/efl/edje_0.5.0.015.bb index a6fca4f55c..3c3a4fdcc7 100644 --- a/packages/efl/edje_0.5.0.015.bb +++ b/packages/efl/edje_0.5.0.015.bb @@ -6,8 +6,7 @@ PR = "r1" inherit efl -SRC_URI += "http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/libs/edje/m4/ac_expand_dir.m4?rev=1.1 \ - http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/libs/edje/m4/ac_path_generic.m4?rev=1.2" +SRC_URI += "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/edje/m4;date=20050926" LEAD_SONAME = "libedje.so" @@ -16,7 +15,7 @@ FILES_${PN}-dev += "${bindir}" RDEPENDS_${PN}-dev += "cpp" do_configure_prepend() { - install -D "${WORKDIR}/ac_expand_dir.m4?rev=1.1" "${S}/m4/ac_expand_dir.m4" - mv "${WORKDIR}/ac_path_generic.m4?rev=1.2" "${S}/m4/ac_path_generic.m4" + install -d "${S}/m4" + install "${WORKDIR}/m4/"*.m4 "${S}/m4" aclocal -I m4 } diff --git a/packages/efl/evas-x11_0.9.9.015.bb b/packages/efl/evas-x11_0.9.9.015.bb index 8e51a2a873..68b0c1c860 100644 --- a/packages/efl/evas-x11_0.9.9.015.bb +++ b/packages/efl/evas-x11_0.9.9.015.bb @@ -1,5 +1,5 @@ include evas.inc -DEPENDS += "x11 xext" +DEPENDS += "x11 xext freetype" PR = "r3" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index dee8f88d54..14d5cd3e32 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -13,9 +13,7 @@ export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix( SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \ file://fix-configure.patch;patch=1 \ - http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/libs/evas/m4/ac_expand_dir.m4?rev=1.1 \ - http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/libs/evas/m4/ac_path_generic.m4?rev=1.2 \ - http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/libs/evas/m4/pkg.m4?rev=1.2" + cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/evas/m4;date=20050926" S = "${WORKDIR}/evas-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas" @@ -23,9 +21,8 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas" EXTRA_OECONF = "<override me>" do_configure_prepend() { - install -D "${WORKDIR}/ac_expand_dir.m4?rev=1.1" "${S}/m4/ac_expand_dir.m4" - mv "${WORKDIR}/ac_path_generic.m4?rev=1.2" "${S}/m4/ac_path_generic.m4" - mv "${WORKDIR}/pkg.m4?rev=1.2" "${S}/m4/pkg.m4" + install -d "${S}/m4" + install "${WORKDIR}/m4/"*.m4 "${S}/m4" aclocal -I m4 } |