summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-self-hosted.bb7
-rw-r--r--meta/recipes-graphics/builder/files/builder_hob_start.sh8
-rw-r--r--meta/recipes-sato/midori/midori/liststore.patch29
-rw-r--r--meta/recipes-sato/midori/midori_0.5.8.bb31
-rw-r--r--meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb2
5 files changed, 6 insertions, 71 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 7d5a41adfc..d38be264cc 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -28,11 +28,6 @@ RDEPENDS_packagegroup-self-hosted = "\
28 packagegroup-self-hosted-host-tools \ 28 packagegroup-self-hosted-host-tools \
29 " 29 "
30 30
31# midori depends on webkit-gtk which could not build for mips64
32MIDORI = "midori"
33MIDORI_mips64 = ""
34MIDORI_mips64n32 = ""
35
36RDEPENDS_packagegroup-self-hosted-host-tools = "\ 31RDEPENDS_packagegroup-self-hosted-host-tools = "\
37 connman \ 32 connman \
38 connman-plugin-ethernet \ 33 connman-plugin-ethernet \
@@ -198,7 +193,7 @@ RDEPENDS_packagegroup-self-hosted-graphics = "\
198 python-pygtk \ 193 python-pygtk \
199 gtk-theme-clearlooks \ 194 gtk-theme-clearlooks \
200 xdg-utils \ 195 xdg-utils \
201 ${MIDORI} \ 196 epiphany \
202 leafpad \ 197 leafpad \
203 pcmanfm \ 198 pcmanfm \
204 vte \ 199 vte \
diff --git a/meta/recipes-graphics/builder/files/builder_hob_start.sh b/meta/recipes-graphics/builder/files/builder_hob_start.sh
index 65a68eec42..b394b0905e 100644
--- a/meta/recipes-graphics/builder/files/builder_hob_start.sh
+++ b/meta/recipes-graphics/builder/files/builder_hob_start.sh
@@ -18,10 +18,10 @@ if [ ! -d /home/builder/.local/share/applications ]; then
18 #register folders to open with PCManFM filemanager 18 #register folders to open with PCManFM filemanager
19 xdg-mime default pcmanfm.desktop inode/directory 19 xdg-mime default pcmanfm.desktop inode/directory
20 20
21 #register html links and files with Midori 21 #register html links and files with epiphany
22 xdg-mime default midori.desktop x-scheme-handler/http 22 xdg-mime default epiphany.desktop x-scheme-handler/http
23 xdg-mime default midori.desktop x-scheme-handler/https 23 xdg-mime default epiphany.desktop x-scheme-handler/https
24 xdg-mime default midori.desktop text/html 24 xdg-mime default epiphany.desktop text/html
25 25
26 #register text files with leafpad text editor 26 #register text files with leafpad text editor
27 xdg-mime default leafpad.desktop text/plain 27 xdg-mime default leafpad.desktop text/plain
diff --git a/meta/recipes-sato/midori/midori/liststore.patch b/meta/recipes-sato/midori/midori/liststore.patch
deleted file mode 100644
index 4e5d666afd..0000000000
--- a/meta/recipes-sato/midori/midori/liststore.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1GLib 2.44 has a GListStore type which is GLib.ListStore in Vala, resulting in an ambigous type and compile failure.
2
3Fix by using the full type name.
4
5Upstream-Status: Backport
6Signed-off-by: Ross Burton <ross.burton@intel.com>
7
8diff --git a/extensions/history-list.vala b/extensions/history-list.vala
9index 3a864b1..f309c0c 100644
10--- a/extensions/history-list.vala
11+++ b/extensions/history-list.vala
12@@ -319,7 +319,7 @@ namespace HistoryList {
13 }
14
15 private void create_widgets () {
16- ListStore model;
17+ Gtk.ListStore model;
18 TreeIter iter;
19 TreeIter? active_iter = null;
20
21@@ -331,7 +331,7 @@ namespace HistoryList {
22
23 var tab_closing_behavior = this.hl_manager.get_integer ("TabClosingBehavior");
24
25- model = new ListStore (2, typeof (string), typeof (int));
26+ model = new Gtk.ListStore (2, typeof (string), typeof (int));
27
28 model.append (out iter);
29 model.set (iter, TabClosingBehaviorModel.TEXT, _("Do nothing"),
diff --git a/meta/recipes-sato/midori/midori_0.5.8.bb b/meta/recipes-sato/midori/midori_0.5.8.bb
deleted file mode 100644
index 1c027fe452..0000000000
--- a/meta/recipes-sato/midori/midori_0.5.8.bb
+++ /dev/null
@@ -1,31 +0,0 @@
1SUMMARY = "A lightweight web browser"
2HOMEPAGE = "http://midori-browser.org/"
3LICENSE = "LGPLv2.1"
4LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
5DEPENDS = "webkit-gtk libsoup-2.4 openssl python-native python-docutils-native librsvg-native libnotify libxscrnsaver"
6
7SRC_URI = "https://launchpad.net/midori/trunk/0.5.8/+download/${BPN}-${PV}.tar.bz2;subdir=${BPN}-${PV} \
8 file://liststore.patch"
9
10SRC_URI[md5sum] = "b89e25e74199d705e74767499a415976"
11SRC_URI[sha256sum] = "af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381"
12
13# midori depends on webkit-gtk, and webkit-gtk can NOT be built on
14# MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily.
15COMPATIBLE_HOST_mips64n32 = "null"
16
17inherit gtk-icon-cache pkgconfig vala pythonnative cmake distro_features_check
18
19# The webkit-gtk and libxscrnsaver requires x11 in DISTRO_FEATURES
20REQUIRED_DISTRO_FEATURES = "x11"
21
22EXTRA_OECMAKE = " \
23 -DCMAKE_INSTALL_PREFIX=${prefix} \
24 -DUSE_ZEITGEIST=0 \
25"
26
27TARGET_CC_ARCH += "${LDFLAGS}"
28
29RRECOMMENDS_${PN} += "glib-networking ca-certificates adwaita-icon-theme"
30
31FILES_${PN} += "${datadir}/appdata"
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index e0b1f51601..6679db8aca 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -47,7 +47,7 @@ FILEMANAGER ?= "pcmanfm"
47FILEMANAGER_mips ?= "" 47FILEMANAGER_mips ?= ""
48 48
49WEB ?= "" 49WEB ?= ""
50#WEB = "midori" 50#WEB = "epiphany"
51 51
52SUMMARY_${PN}-apps = "Sato desktop - applications" 52SUMMARY_${PN}-apps = "Sato desktop - applications"
53RDEPENDS_${PN}-apps = "\ 53RDEPENDS_${PN}-apps = "\