Skip to contentSkip to conversation

epiphany: remove the recipe due to its move to oe-core

PATCH New Alexander Kanavin 1 participant 2 messages Sep 15, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 epiphany: remove the recipe due to its move to oe-core

---
 .../recipes-gnome/epiphany/epiphany_2.30.6.bb       | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/epiphany/epiphany_2.30.6.bb
meta-gnome/recipes-gnome/epiphany/epiphany_2.30.6.bb deleted +0 -21
deleted file mode 100644
index 9e1a0dc..0000000
@@ -1,21 +0,0 @@
-SUMMARY = "GNOME default webbrowser"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-
-DEPENDS = "gnome-doc-utils libsoup-2.4 webkit-gtk gtk+ gconf iso-codes startup-notification ca-certificates libgnome-keyring avahi libnotify"
-
-inherit gnome
-SRC_URI[archive.md5sum] = "0c566b3ffd428d2135e3c8cb65352d64"
-SRC_URI[archive.sha256sum] = "278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc"
-
-EXTRA_OECONF += " --disable-nss --with-distributor-name=${DISTRO} --without-ca-file"
-
-do_configure_prepend() {
-    touch ${S}/gnome-doc-utils.make
-    sed -i -e s:help::g ${S}/Makefile.am
-}
-
-FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1"
-RDEPENDS_${PN} = "iso-codes"
-RRECOMMENDS_${PN} = "ca-certificates"
-
Signature · 1 line
2.1.4
#1 lore raw

PATCH 2/2 gimp: disable webkit dependency in the recipe

gimp (optionally) depends on a very old version of webkit-gtk (1.6.x) for browsing help, and oe-core no longer provides that version.

---
 meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb +1 -3
index 7d52cf1..efeb575 100644
@@ -9,9 +9,6 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)}"
 
 inherit gnome gtk-doc
 
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[helpbrowser] = "--with-webkit, --without-webkit, webkit-gtk"
-
 SRC_URI = " \
     http://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \
     file://0001-configure-ac-do-not-check-for-freetype-config.patch \
@@ -20,6 +17,7 @@ SRC_URI[md5sum] = "233c948203383fa078434cc3f8f925cb"
 SRC_URI[sha256sum] = "d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d"
 
 EXTRA_OECONF = "--disable-python \
+                --without-webkit \
                 --without-wmf"
 
 do_configure_append() {
Signature · 1 line
2.1.4