From c8c1654ba5b2de124676512e0fb4e30a5fd588fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 19 Oct 2021 23:10:27 +0200 Subject: [PATCH] midori: remove MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It really makes me sad since midori was the first browser seen on embedded device and performing acceptable. It is dead for a while now but was still usable. Now with webkikgtk 2.34.0 there was an API change so it's time to say farewell. Signed-off-by: Andreas Müller --- ...-cross-g-ir-compiler-but-g-ir-compil.patch | 32 ---------- recipes-browser/midori/midori_git.bb | 61 ------------------- .../packagegroups/meta-retro-world.bb | 2 - 3 files changed, 95 deletions(-) delete mode 100644 recipes-browser/midori/midori/0001-Do-no-search-for-cross-g-ir-compiler-but-g-ir-compil.patch delete mode 100644 recipes-browser/midori/midori_git.bb diff --git a/recipes-browser/midori/midori/0001-Do-no-search-for-cross-g-ir-compiler-but-g-ir-compil.patch b/recipes-browser/midori/midori/0001-Do-no-search-for-cross-g-ir-compiler-but-g-ir-compil.patch deleted file mode 100644 index d82a1f5..0000000 --- a/recipes-browser/midori/midori/0001-Do-no-search-for-cross-g-ir-compiler-but-g-ir-compil.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ccf4abdd7b2e521e0665186e620a606277682597 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 18 Feb 2020 00:07:24 +0100 -Subject: [PATCH] Do no search for cross g-ir-compiler but - g-ir-compiler-wrapper -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller ---- - core/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index c4982de9..80fdd309 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -66,7 +66,7 @@ set_target_properties("${LIBCORE}" PROPERTIES - VERSION ${LIBCORE_VERSION} - ) - --find_program (GIR_COMPILER_BIN g-ir-compiler) -+find_program (GIR_COMPILER_BIN g-ir-compiler-wrapper) - add_custom_target(${LIBCORE_GIR}.typelib ALL - COMMAND ${GIR_COMPILER_BIN} ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.gir - --output ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.typelib --- -2.21.0 - diff --git a/recipes-browser/midori/midori_git.bb b/recipes-browser/midori/midori_git.bb deleted file mode 100644 index aa73996..0000000 --- a/recipes-browser/midori/midori_git.bb +++ /dev/null @@ -1,61 +0,0 @@ -SUMMARY = "A lightweight web browser" -HOMEPAGE = "https://www.midori-browser.org/" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" - -DEPENDS = " \ - intltool-native \ - gcr \ - webkitgtk \ - json-glib \ - libarchive \ - libsoup-2.4 \ - libpeas \ - sqlite \ -" - -inherit cmake pkgconfig gtk-icon-cache gettext vala python3native features_check gobject-introspection mime-xdg - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -# Midori requires gobject-introspection to build. Check below is not the whole -# story: There are some extra machine-specific disable entries in webkitgtk -# recipe and there is nothing we can do to check here... -python () { - if d.getVar('GI_DATA_ENABLED') != 'True': - raise bb.parse.SkipRecipe('Midori needs gobject-introspection but it is either disabled or machine does not support it!' ) -} - -SRC_URI = " \ - git://github.com/midori-browser/core.git \ - file://0001-Do-no-search-for-cross-g-ir-compiler-but-g-ir-compil.patch \ -" -SRCREV = "f6b3b1e030db7eb2de7faf73ec4ccc18949b668d" -PV = "9.0" -S = "${WORKDIR}/git" - -EXTRA_OECMAKE = " \ - -DCMAKE_INSTALL_PREFIX=${prefix} \ - -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -" - -do_configure:prepend() { - export VALAC=${STAGING_BINDIR_NATIVE}/valac -} - -RRECOMMENDS:${PN} += " \ - glib-networking ca-certificates \ - adwaita-icon-theme \ -" - -# No project but oe packs gstreamer plugins that fine as we do. Cannot say -# which plugins are # really necessary so use gstreamer1.0-plugins-*-meta. -# These are necessary to make video streaming work - see [1] -# [1] https://github.com/midori-browser/core/issues/329 -RRECOMMENDS:${PN} += " \ - gstreamer1.0-plugins-base-meta \ - gstreamer1.0-plugins-good-meta \ - gstreamer1.0-libav \ -" - -FILES:${PN} += "${datadir}/metainfo" diff --git a/recipes-support/packagegroups/meta-retro-world.bb b/recipes-support/packagegroups/meta-retro-world.bb index d447366..471b4bc 100644 --- a/recipes-support/packagegroups/meta-retro-world.bb +++ b/recipes-support/packagegroups/meta-retro-world.bb @@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup RDEPENDS:${PN} = " \ - midori \ - \ dosbox dosbox-staging dosbox-x \ mame \ stella \