midori: remove the recipe and replace references to midori with epiphany
(From OE-Core rev: b7e14c77ffb3d994d59ddc076d7e0263f39546c1) (From OE-Core rev: f1c9a0d486e18dd8b2b1da9525f7b53616572112) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
e552b25530
commit
8fcb01cd85
|
@ -28,11 +28,6 @@ RDEPENDS_packagegroup-self-hosted = "\
|
|||
packagegroup-self-hosted-host-tools \
|
||||
"
|
||||
|
||||
# midori depends on webkit-gtk which could not build for mips64
|
||||
MIDORI = "midori"
|
||||
MIDORI_mips64 = ""
|
||||
MIDORI_mips64n32 = ""
|
||||
|
||||
RDEPENDS_packagegroup-self-hosted-host-tools = "\
|
||||
connman \
|
||||
connman-plugin-ethernet \
|
||||
|
@ -198,7 +193,7 @@ RDEPENDS_packagegroup-self-hosted-graphics = "\
|
|||
python-pygtk \
|
||||
gtk-theme-clearlooks \
|
||||
xdg-utils \
|
||||
${MIDORI} \
|
||||
epiphany \
|
||||
leafpad \
|
||||
pcmanfm \
|
||||
vte \
|
||||
|
|
|
@ -18,10 +18,10 @@ if [ ! -d /home/builder/.local/share/applications ]; then
|
|||
#register folders to open with PCManFM filemanager
|
||||
xdg-mime default pcmanfm.desktop inode/directory
|
||||
|
||||
#register html links and files with Midori
|
||||
xdg-mime default midori.desktop x-scheme-handler/http
|
||||
xdg-mime default midori.desktop x-scheme-handler/https
|
||||
xdg-mime default midori.desktop text/html
|
||||
#register html links and files with epiphany
|
||||
xdg-mime default epiphany.desktop x-scheme-handler/http
|
||||
xdg-mime default epiphany.desktop x-scheme-handler/https
|
||||
xdg-mime default epiphany.desktop text/html
|
||||
|
||||
#register text files with leafpad text editor
|
||||
xdg-mime default leafpad.desktop text/plain
|
||||
|
|
|
@ -1,29 +0,0 @@
|
|||
GLib 2.44 has a GListStore type which is GLib.ListStore in Vala, resulting in an ambigous type and compile failure.
|
||||
|
||||
Fix by using the full type name.
|
||||
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
diff --git a/extensions/history-list.vala b/extensions/history-list.vala
|
||||
index 3a864b1..f309c0c 100644
|
||||
--- a/extensions/history-list.vala
|
||||
+++ b/extensions/history-list.vala
|
||||
@@ -319,7 +319,7 @@ namespace HistoryList {
|
||||
}
|
||||
|
||||
private void create_widgets () {
|
||||
- ListStore model;
|
||||
+ Gtk.ListStore model;
|
||||
TreeIter iter;
|
||||
TreeIter? active_iter = null;
|
||||
|
||||
@@ -331,7 +331,7 @@ namespace HistoryList {
|
||||
|
||||
var tab_closing_behavior = this.hl_manager.get_integer ("TabClosingBehavior");
|
||||
|
||||
- model = new ListStore (2, typeof (string), typeof (int));
|
||||
+ model = new Gtk.ListStore (2, typeof (string), typeof (int));
|
||||
|
||||
model.append (out iter);
|
||||
model.set (iter, TabClosingBehaviorModel.TEXT, _("Do nothing"),
|
|
@ -1,31 +0,0 @@
|
|||
SUMMARY = "A lightweight web browser"
|
||||
HOMEPAGE = "http://midori-browser.org/"
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
|
||||
DEPENDS = "webkit-gtk libsoup-2.4 openssl python-native python-docutils-native librsvg-native libnotify libxscrnsaver"
|
||||
|
||||
SRC_URI = "https://launchpad.net/midori/trunk/0.5.8/+download/${BPN}-${PV}.tar.bz2;subdir=${BPN}-${PV} \
|
||||
file://liststore.patch"
|
||||
|
||||
SRC_URI[md5sum] = "b89e25e74199d705e74767499a415976"
|
||||
SRC_URI[sha256sum] = "af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381"
|
||||
|
||||
# midori depends on webkit-gtk, and webkit-gtk can NOT be built on
|
||||
# MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily.
|
||||
COMPATIBLE_HOST_mips64n32 = "null"
|
||||
|
||||
inherit gtk-icon-cache pkgconfig vala pythonnative cmake distro_features_check
|
||||
|
||||
# The webkit-gtk and libxscrnsaver requires x11 in DISTRO_FEATURES
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
EXTRA_OECMAKE = " \
|
||||
-DCMAKE_INSTALL_PREFIX=${prefix} \
|
||||
-DUSE_ZEITGEIST=0 \
|
||||
"
|
||||
|
||||
TARGET_CC_ARCH += "${LDFLAGS}"
|
||||
|
||||
RRECOMMENDS_${PN} += "glib-networking ca-certificates adwaita-icon-theme"
|
||||
|
||||
FILES_${PN} += "${datadir}/appdata"
|
|
@ -47,7 +47,7 @@ FILEMANAGER ?= "pcmanfm"
|
|||
FILEMANAGER_mips ?= ""
|
||||
|
||||
WEB ?= ""
|
||||
#WEB = "midori"
|
||||
#WEB = "epiphany"
|
||||
|
||||
SUMMARY_${PN}-apps = "Sato desktop - applications"
|
||||
RDEPENDS_${PN}-apps = "\
|
||||
|
|
Loading…
Reference in New Issue