diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-11-08 11:07:58 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-11-08 11:07:58 +0000 |
| commit | 1f7343079a1b56e623aba7fdf63946f3dae979e3 (patch) | |
| tree | 062776d2316111ee5c72fa1b9de7deb01cdca153 /packages/gnome | |
| parent | 47007ab845cf3ff4c9038412df673853e5bde900 (diff) | |
| parent | a44ab8fc112a3ded9e4bf4d379243b399e2505a9 (diff) | |
merge of '689e57bae9a2678694a0233e81f710e4878928f4'
and 'c2e1d9a66fe20e02ea4226aaff7de2ccde79ffba'
Diffstat (limited to 'packages/gnome')
| -rw-r--r-- | packages/gnome/epiphany_2.19.6.bb | 14 | ||||
| -rw-r--r-- | packages/gnome/epiphany_svn.bb | 21 | ||||
| -rw-r--r-- | packages/gnome/gnome-common_2.18.0.bb | 2 | ||||
| -rw-r--r-- | packages/gnome/gnome-common_2.20.0.bb | 2 |
4 files changed, 23 insertions, 16 deletions
diff --git a/packages/gnome/epiphany_2.19.6.bb b/packages/gnome/epiphany_2.19.6.bb deleted file mode 100644 index 570f8ba4f5..0000000000 --- a/packages/gnome/epiphany_2.19.6.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "GNOME default webbrowser" -DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes libstartup-notification" -RDEPENDS = "gnome-vfs-plugin-http" - -PR = "r1" - -inherit gnome - -EXTRA_OECONF = "--with-engine=webkit" - - -FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1" - - diff --git a/packages/gnome/epiphany_svn.bb b/packages/gnome/epiphany_svn.bb new file mode 100644 index 0000000000..97fd82b653 --- /dev/null +++ b/packages/gnome/epiphany_svn.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "GNOME default webbrowser" +DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification" +RDEPENDS = "gnome-vfs-plugin-http" + +PV = "2.20.1+svnr${SRCREV}" +PR = "r0" + +inherit gnome + +SRC_URI = "svn://svn.gnome.org/svn/epiphany;module=trunk;proto=http" +S = "${WORKDIR}/trunk" + +EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}" + +do_configure_prepend() { + touch ${S}/gnome-doc-utils.make +} + +FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1" + + diff --git a/packages/gnome/gnome-common_2.18.0.bb b/packages/gnome/gnome-common_2.18.0.bb index 2991db81c7..41c25b69c2 100644 --- a/packages/gnome/gnome-common_2.18.0.bb +++ b/packages/gnome/gnome-common_2.18.0.bb @@ -19,7 +19,7 @@ do_stage () { rm -rf ${STAGE_TEMP} mkdir -p ${STAGE_TEMP} make DESTDIR="${STAGE_TEMP}" install - cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin + cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_BINDIR_NATIVE} install -d ${STAGING_DATADIR}/gnome-common install -d ${STAGING_DATADIR}/aclocal cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DATADIR}/gnome-common diff --git a/packages/gnome/gnome-common_2.20.0.bb b/packages/gnome/gnome-common_2.20.0.bb index 2991db81c7..41c25b69c2 100644 --- a/packages/gnome/gnome-common_2.20.0.bb +++ b/packages/gnome/gnome-common_2.20.0.bb @@ -19,7 +19,7 @@ do_stage () { rm -rf ${STAGE_TEMP} mkdir -p ${STAGE_TEMP} make DESTDIR="${STAGE_TEMP}" install - cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin + cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_BINDIR_NATIVE} install -d ${STAGING_DATADIR}/gnome-common install -d ${STAGING_DATADIR}/aclocal cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DATADIR}/gnome-common |