diff options
| -rw-r--r-- | meta/conf/distro/include/seperatebuilddir.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-sato/web/web-webkit_git.bb | 29 |
3 files changed, 1 insertions, 31 deletions
diff --git a/meta/conf/distro/include/seperatebuilddir.inc b/meta/conf/distro/include/seperatebuilddir.inc index bd98f8f634..5bd0ab44f4 100644 --- a/meta/conf/distro/include/seperatebuilddir.inc +++ b/meta/conf/distro/include/seperatebuilddir.inc | |||
| @@ -694,7 +694,6 @@ B_pn-wayland = "${SEPB}" | |||
| 694 | B_pn-wayland-native = "${SEPB}" | 694 | B_pn-wayland-native = "${SEPB}" |
| 695 | # Not even going there | 695 | # Not even going there |
| 696 | #B_pn-webkit-gtk = "${SEPB}" | 696 | #B_pn-webkit-gtk = "${SEPB}" |
| 697 | B_pn-web-webkit = "${SEPB}" | ||
| 698 | B_pn-weston = "${SEPB}" | 697 | B_pn-weston = "${SEPB}" |
| 699 | B_pn-wget = "${SEPB}" | 698 | B_pn-wget = "${SEPB}" |
| 700 | B_pn-which = "${SEPB}" | 699 | B_pn-which = "${SEPB}" |
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb index a7fee55646..4ec5e8961c 100644 --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | |||
| @@ -49,7 +49,7 @@ FILEMANAGER ?= "pcmanfm" | |||
| 49 | FILEMANAGER_mips ?= "" | 49 | FILEMANAGER_mips ?= "" |
| 50 | 50 | ||
| 51 | WEB ?= "" | 51 | WEB ?= "" |
| 52 | #WEB = "web-webkit" | 52 | #WEB = "midori" |
| 53 | 53 | ||
| 54 | SUMMARY_${PN}-apps = "Sato desktop - applications" | 54 | SUMMARY_${PN}-apps = "Sato desktop - applications" |
| 55 | RDEPENDS_${PN}-apps = "\ | 55 | RDEPENDS_${PN}-apps = "\ |
diff --git a/meta/recipes-sato/web/web-webkit_git.bb b/meta/recipes-sato/web/web-webkit_git.bb deleted file mode 100644 index f32304eec4..0000000000 --- a/meta/recipes-sato/web/web-webkit_git.bb +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | DESCRIPTION = "Multi-platform web browsing application." | ||
| 2 | HOMEPAGE = "http://o-hand.com/" | ||
| 3 | BUGTRACKER = "http://bugzilla.openedhand.com/" | ||
| 4 | |||
| 5 | LICENSE = "LGPLv2.1" | ||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" | ||
| 7 | |||
| 8 | SECTION = "x11" | ||
| 9 | DEPENDS = "glib-2.0 gtk+ webkit-gtk libowl" | ||
| 10 | |||
| 11 | # To access https web pages | ||
| 12 | RRECOMMENDS_${PN} += "glib-networking" | ||
| 13 | |||
| 14 | SRCREV = "b0676c190f876cbdb1df202fbcec42f212374503" | ||
| 15 | PV = "0.1+git${SRCPV}" | ||
| 16 | PR = "r2" | ||
| 17 | |||
| 18 | SRC_URI = "git://git.yoctoproject.org/${BPN}" | ||
| 19 | |||
| 20 | S = "${WORKDIR}/git" | ||
| 21 | |||
| 22 | EXTRA_OECONF = "--enable-libowl" | ||
| 23 | |||
| 24 | # web-webkit could NOT be built on MIPS64 with 64 bits userspace | ||
| 25 | COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32" | ||
| 26 | |||
| 27 | inherit autotools pkgconfig | ||
| 28 | |||
| 29 | FILES_${PN} += "${datadir}/web2" | ||
