[OE-core] [PATCH 1/6] python-gst: remove obsolete Python gstreamer 0.10 bindings
From: Alexander Kanavin alex.kana...@gmail.com GStreamer 1.0 python bindings are gobject-introspection based, so until that is fixed, they will not be available. https://bugzilla.yoctoproject.org/show_bug.cgi?id=6294 Signed-off-by: Alexander Kanavin alex.kana...@gmail.com Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- .../python/python-gst/python-path.patch| 28 - meta/recipes-devtools/python/python-gst_0.10.22.bb | 29 -- 2 files changed, 57 deletions(-) delete mode 100644 meta/recipes-devtools/python/python-gst/python-path.patch delete mode 100644 meta/recipes-devtools/python/python-gst_0.10.22.bb diff --git a/meta/recipes-devtools/python/python-gst/python-path.patch b/meta/recipes-devtools/python/python-gst/python-path.patch deleted file mode 100644 index 21b5bbf..000 --- a/meta/recipes-devtools/python/python-gst/python-path.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status:Pending - -Index: gst-python-0.10.19/acinclude.m4 -=== gst-python-0.10.19.orig/acinclude.m4 2010-04-21 15:23:44.0 -0700 -+++ gst-python-0.10.19/acinclude.m42010-11-15 14:43:00.642994001 -0800 -@@ -43,6 +43,13 @@ - [AC_REQUIRE([AM_PATH_PYTHON]) - AC_MSG_CHECKING(for headers required to compile python extensions) - dnl deduce PYTHON_INCLUDES -+ -+AC_ARG_WITH(python-includes, -+ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) -+if test x$py_exec_prefix != x; then -+PYTHON_INCLUDES=-I${py_exec_prefix}/include/python${PYTHON_VERSION} -+py_prefix=${py_exec_prefix} -+else - py_prefix=`$PYTHON -c import sys; print sys.prefix` - py_exec_prefix=`$PYTHON -c import sys; print sys.exec_prefix` - if $PYTHON-config --help 2/dev/null; then -@@ -53,6 +60,7 @@ - PYTHON_INCLUDES=$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION} - fi - fi -+fi - AC_SUBST(PYTHON_INCLUDES) - dnl check if the headers exist: - save_CPPFLAGS=$CPPFLAGS diff --git a/meta/recipes-devtools/python/python-gst_0.10.22.bb b/meta/recipes-devtools/python/python-gst_0.10.22.bb deleted file mode 100644 index 2a5f2b3..000 --- a/meta/recipes-devtools/python/python-gst_0.10.22.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = Python bindings for the GStreamer multimedia framework -SECTION = devel/python -LICENSE = LGPLv2.1 -DEPENDS = gstreamer gst-plugins-base python-pygobject -RDEPENDS_${PN} += python-pygtk -PR = r2 - -SRC_URI = http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \ - file://python-path.patch - -SRC_URI[md5sum] = 937152fe896241f827689f4b53e79b22 -SRC_URI[sha256sum] = 8f26f519a5bccd770864317e098e5e307fc5ad1201eb96329634b6508b253178 -S = ${WORKDIR}/gst-python-${PV} - -LIC_FILES_CHKSUM = file://COPYING;md5=39ff67e932b7bdfa9b78bad67151690b - -inherit autotools distutils-base pkgconfig - -EXTRA_OECONF += --with-python-includes=${STAGING_INCDIR}/../ - -FILES_${PN} += ${datadir}/gst-python -FILES_${PN}-dev += ${datadir}/gst-python/0.10/defs -FILES_${PN}-dbg += ${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/ ${libdir}/gstreamer-0.10/.debug/ - -do_configure_prepend() { - if [ `find ${STAGING_LIBDIR} -name libpython*.so` ]; then - ln -sf ${STAGING_LIBDIR}/libpython*.so `find ${STAGING_LIBDIR} -name libpython*.a -exec dirname {} \;` - fi -} -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] webkitgtk: disable audio and video support
From: Alexander Kanavin alex.kana...@gmail.com This allows removal of gstreamer 0.10 dependency from webkit recipe https://bugzilla.yoctoproject.org/show_bug.cgi?id=6294 Signed-off-by: Alexander Kanavin alex.kana...@gmail.com Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb index 3f19c2d..e5447d2 100644 --- a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb +++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb @@ -14,7 +14,7 @@ ICU_LIB = icu ICU_LIB_powerpc = pango DEPENDS = zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ - gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB} + gtk+ flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB} DEPENDS += ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} SRC_URI = \ @@ -39,6 +39,9 @@ inherit autotools lib_package gtk-doc pkgconfig S = ${WORKDIR}/webkit-${PV}/ +# Disabled by default because it pulls in obsolete gstreamer 0.10 +WEBKIT_AUDIOVIDEO ?= --disable-video --disable-web-audio + EXTRA_OECONF = \ --enable-debug=no \ --enable-svg \ @@ -48,6 +51,7 @@ EXTRA_OECONF = \ --enable-link-prefetch \ --with-gtk=2.0 \ --disable-geolocation \ + ${WEBKIT_AUDIOVIDEO} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \ UNICODE_CFLAGS=-D_REENTRANT \ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] Remove unsupported GStreamer 0.10
These patches remove the unsupported GStreamer 0.10 framework from oe-core. GStreamer 0.10 will still be available from meta-oe, but is no longer recommended to use. Fixes: https://bugzilla.yoctoproject.org/show_bug.cgi?id=6294 Alexander Kanavin (6): python-gst: remove obsolete Python gstreamer 0.10 bindings clutter-gst: update to latest upstream version 3.0.4 qt4: remove Qt Mobility qt4: disable Phonon framework webkitgtk: disable audio and video support gstreamer: remove 0.10 recipes .../python/python-gst/python-path.patch| 28 - meta/recipes-devtools/python/python-gst_0.10.22.bb | 29 - .../clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch | 48 - .../clutter-gst-1.0-1.6.0/enable-tests.patch | 23 - meta/recipes-graphics/clutter/clutter-gst-1.0.inc | 18 - .../clutter/clutter-gst-1.0_1.6.0.bb |9 - ...mple-binary-needed-for-core-image-clutter.patch | 33 + .../clutter-gst-3.0-3.0.4/enable-tests.patch | 23 + meta/recipes-graphics/clutter/clutter-gst-3.0.inc | 18 + .../clutter/clutter-gst-3.0_3.0.4.bb |7 + .../packagegroups/packagegroup-core-clutter.bb |2 +- .../0001-aacdec-check-channel-count.patch | 34 - .../0001-alac-fix-nb_samples-order-case.patch | 30 - .../0001-alsdec-check-block-length.patch | 61 - ...ac3dec-Check-coding-mode-against-channels.patch | 37 - ...util-fix-signedness-in-sizeof-comparissio.patch | 40 - ...le-use-av_image_get_linesize-to-calculate.patch | 50 - ...c-parser-reset-indexes-on-realloc-failure.patch | 50 - ...a-Perform-pointer-advance-and-checks-befo.patch | 81 - .../0001-avcodec-smc-fix-off-by-1-error.patch | 32 - ...egtsenc-Check-data-array-size-in-mpegts_w.patch | 69 - .../0001-eamad-fix-out-of-array-accesses.patch | 29 - ...-error-concealment-initialize-block-index.patch | 29 - ...alment-Check-that-the-picture-is-not-in-a.patch | 37 - .../0001-ffserver-set-oformat.patch| 36 - ...t-ref-count-check-and-limit-fix-out-of-ar.patch | 29 - ...t-parameters-from-SPS-whenever-it-changes.patch | 145 - ...rror-concealment-when-SPS-and-slices-are-.patch | 33 - .../0001-h264_sei-Fix-infinite-loop.patch | 39 - ...01-huffyuvdec-Check-init_vlc-return-codes.patch | 87 - .../0001-huffyuvdec-Skip-len-0-cases.patch | 61 - ...f-compute-probe-buffer-size-more-reliably.patch | 45 - .../0001-mjpegdec-check-SE.patch | 32 - ...heck-RLE-size-before-copying.-Fix-out-of-.patch | 34 - ...er-dont-access-out-of-array-elements-at-t.patch | 44 - ...array-index-before-use-fix-out-of-array-a.patch | 30 - .../0001-qdm2dec-fix-buffer-overflow.patch | 58 - ...001-roqvideodec-check-dimensions-validity.patch | 36 - ...Check-that-the-last-indexes-are-within-th.patch | 32 - ...-vp3-Copy-all-3-frames-for-thread-updates.patch | 32 - ...-read-for-negative-tokens-and-memleaks-on.patch | 183 - ...o-check-chunk-sizes-before-reading-chunks.patch | 51 - ...egdec-check-bits-per-pixel-for-changes-si.patch | 68 - .../gst-ffmpeg-0.10.13/configure-fix.patch | 22 - .../gst-ffmpeg-CVE-2013-0855.patch | 100 - .../gst-ffmpeg-CVE-2013-3674.patch | 26 - .../gst-ffmpeg-0.10.13/h264_qpel_mmx.patch | 57 - .../gstreamer/gst-ffmpeg-0.10.13/libav-9.patch | 9304 .../gst-ffmpeg-0.10.13/libav_e500mc.patch | 21 - .../gstreamer/gst-ffmpeg-0.10.13/libav_e5500.patch | 19 - .../gstreamer/gst-ffmpeg-0.10.13/lower-rank.diff | 16 - .../gstreamer/gst-ffmpeg_0.10.13.bb| 90 - .../gstreamer/gst-fluendo-mp3_0.10.31.bb | 14 - .../gstreamer/gst-fluendo-mpegdemux_0.10.85.bb | 12 - meta/recipes-multimedia/gstreamer/gst-fluendo.inc | 14 - .../gstreamer/gst-meta-base_0.10.bb| 73 - .../gstreamer/gst-openmax/gcc_4.6.patch| 18 - .../gstreamer/gst-openmax/ptr-array.patch | 46 - .../gstreamer/gst-openmax_0.10.1.bb| 35 - .../gstreamer/gst-plugins-bad_0.10.23.bb | 50 - ...le-Fix-build-on-x86-if-emmintrin.h-is-ava.patch | 37 - .../configure.ac-fix-subparse-plugin.patch | 27 - .../gst-plugins-base-tremor.patch | 20 - .../gstreamer/gst-plugins-base_0.10.36.bb | 39 - ...-conditional-gl-framebuffer-undefined-use.patch | 35 - .../gstreamer/gst-plugins-gl_0.10.3.bb | 25 - ...ild-with-recent-kernels-the-v4l2_buffer-i.patch | 33 - ...define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch | 45 - .../0407-mulawdec-fix-integer-overrun.patch| 47 - .../gstreamer/gst-plugins-good_0.10.31.bb | 47 - .../gstreamer/gst-plugins-ugly_0.10.19.bb | 29 - meta/recipes-multimedia/gstreamer/gst-plugins.inc | 28 - ...ix-self-comparison-always-evaluates-to-tr.patch | 32 - .../gstreamer
[OE-core] [PATCH 2/6] clutter-gst: update to latest upstream version 3.0.4
From: Alexander Kanavin alex.kana...@gmail.com This also makes it GStreamer 1.0 compatible https://bugzilla.yoctoproject.org/show_bug.cgi?id=6294 Signed-off-by: Alexander Kanavin alex.kana...@gmail.com Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- .../clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch | 48 -- .../clutter-gst-1.0-1.6.0/enable-tests.patch | 23 --- meta/recipes-graphics/clutter/clutter-gst-1.0.inc | 18 .../clutter/clutter-gst-1.0_1.6.0.bb | 9 ...mple-binary-needed-for-core-image-clutter.patch | 33 +++ .../clutter-gst-3.0-3.0.4/enable-tests.patch | 23 +++ meta/recipes-graphics/clutter/clutter-gst-3.0.inc | 18 .../clutter/clutter-gst-3.0_3.0.4.bb | 7 .../packagegroups/packagegroup-core-clutter.bb | 2 +- 9 files changed, 82 insertions(+), 99 deletions(-) delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0.inc delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb create mode 100644 meta/recipes-graphics/clutter/clutter-gst-3.0-3.0.4/0001-Install-example-binary-needed-for-core-image-clutter.patch create mode 100644 meta/recipes-graphics/clutter/clutter-gst-3.0-3.0.4/enable-tests.patch create mode 100644 meta/recipes-graphics/clutter/clutter-gst-3.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.4.bb diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch b/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch deleted file mode 100644 index d009e44..000 --- a/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 1ae4c3e7b1e2c33892590f9ac7bf0e892a5bcbd5 Mon Sep 17 00:00:00 2001 -From: Tomas Frydrych to...@sleepfive.com -Date: Thu, 11 Oct 2012 08:53:03 +0100 -Subject: [PATCH] ClutterGstVideoSink: fix includes so we can build against - cogl-1.14 - -Cogl 1.14 exposes various GL types through the public API but it does not -pull in the GL type definitions through its public headers; specifically -compilation will fail due to undefined GL_TEXTURE_2D. So include the headers -the hard way. - -Upstream-Status: Submitted @ https://bugzilla.gnome.org/show_bug.cgi?id=700509 -Signed-off-by: Tomas Frydrych to...@sleepfive.com - clutter-gst/clutter-gst-video-sink.c | 17 + - 1 file changed, 17 insertions(+) - -diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c -index 9b4b53c..f092581 100644 a/clutter-gst/clutter-gst-video-sink.c -+++ b/clutter-gst/clutter-gst-video-sink.c -@@ -42,6 +42,23 @@ - #include config.h - #endif - -+/* -+ * cogl-1.14 exposes generic GL types in the API, but not the actual includes. -+ */ -+#include cogl/cogl.h -+ -+#ifdef COGL_HAS_GLES1 -+#include GLES/gl.h -+#include GLES/glext.h -+#elif COGL_HAS_GLES2 -+#include GLES2/gl2.h -+#include GLES2/gl2ext.h -+#elif COGL_HAS_GL -+#include GL/gl.h -+#else -+#error Unknown cogl configuration -+#endif -+ - #include clutter-gst-video-sink.h - #include clutter-gst-util.h - #include clutter-gst-private.h --- -1.7.10.4 - diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch b/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch deleted file mode 100644 index b3aec39..000 --- a/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch +++ /dev/null @@ -1,23 +0,0 @@ -Install example binary needed for core-image-clutter - -Signed-off-by: Zhai Edwin edwin.z...@intel.com - -Upstream-Status: Inappropriate [configuration] - -Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded, -commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 1.6 - -Signed-off-by: Tomas Frydrych to...@sleepfive.com - -Index: git/examples/Makefile.am -=== git.orig/examples/Makefile.am 2011-01-31 10:14:23.0 +0800 -+++ git/examples/Makefile.am 2011-01-31 10:14:34.0 +0800 -@@ -1,6 +1,6 @@ - NULL = # - --noinst_PROGRAMS = video-player video-sink video-sink-navigation -+bin_PROGRAMS = video-player video-sink video-sink-navigation - - INCLUDES = -I$(top_srcdir) \ - $(MAINTAINER_CFLAGS) \ diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0.inc b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc deleted file mode 100644 index bb05ede..000 --- a/meta/recipes-graphics/clutter/clutter-gst-1.0.inc +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = GStreamer integration library for Clutter -HOMEPAGE = http://www.clutter-project.org/; -LICENSE = LGPLv2+ - -inherit clutter - -SRC_URI += file://enable-tests.patch - -DEPENDS = gst
[OE-core] [PATCH 4/6] qt4: disable Phonon framework
From: Alexander Kanavin alex.kana...@gmail.com This allows removal of gstreamer 0.10 dependency from Qt4 recipe https://bugzilla.yoctoproject.org/show_bug.cgi?id=6294 Signed-off-by: Alexander Kanavin alex.kana...@gmail.com Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-qt/qt4/qt4.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 09f6d93..6d67994 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -1,6 +1,6 @@ inherit qmake_base -DEPENDS += qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff icu +DEPENDS += qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 sqlite3 tiff icu DEPENDS += ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} require qt4_arch.inc @@ -16,7 +16,7 @@ QT_GLFLAGS ?= QT_QT3SUPPORT ?= -qt3support QT_XML ?= -xmlpatterns QT_WEBKIT ?= -webkit -QT_PHONON ?= -phonon +QT_PHONON ?= -no-phonon QT_DBUS ?= -qdbus QT_MULTIMEDIA ?= ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)} -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/4] gst-ffmpeg: fix CVEs
On 05/19/2015 04:08 AM, Kai Kang wrote: Backport patches to fix CVEs: CVE-2014-7933, CVE-2014-9318 and CVE-2014-9603. Gstreamer 0.10 is moving to meta-multimedia, so you might want to hold this one off until it lands there. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] testapps: remove old gst-meta-audio/video dependencies
Unnecessary because gst-player already pulls in correct gstreamer packages anyway. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb index 4177c45..95b3988 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb @@ -46,8 +46,6 @@ RDEPENDS_${PN} = \ ${KEXECTOOLS} \ alsa-utils-amixer \ alsa-utils-aplay \ -gst-meta-video \ -gst-meta-audio \ ltp \ connman-tools \ connman-tests \ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 00/21] Update webkitgtk to latest stable upstream; replace midori with epiphany
This patch series updates webkitgtk to latest stable upstream release and replaces midori browser with epiphany. These patches should be applied on top of Jussi Kukkonen's gtk3 update to 3.16. Version 2 of the patchset fixes the commit messages and drops the patch intended for poky The following changes since commit fafb8fcc291dcda89a88f8b88d86b0f0195d182c: midori: Depend on Adwaita, not gnome-icon-theme (2015-06-11 16:04:33 +0300) are available in the git repository at: git://git.yoctoproject.org/poky-contrib akanavin/webkitgtk-update http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/webkitgtk-update Alexander Kanavin (21): classes/gnomebase: change tarball compression to xz harfbuzz: enable icu feature classes/cmake: add arch conversion routine jpeg: update to version 9a libnotify: update to version 0.7.6 giflib: add a recipe from meta-oe libyaml: add a recipe from meta-oe ruby: add a recipe from meta-ruby libsecret: add a recipe from meta-gnome libwebp: add a recipe from meta-oe webkitgtk: add a new recipe for version 2.8.3 p11-kit: add a recipe from meta-oe gcr: add a recipe from meta-gnome iso-codes: add a recipe from meta-oe libwnck3: add a recipe from meta-gnome gnome-desktop3: add a recipe from meta-gnome glib: add a warning suppression patch to glib gsettings-desktop-schemas: add a recipe from meta-gnome epiphany: add a recipe from meta-gnome webkit-gtk: remove the recipe for the obsolete version 1.8.3 midori: remove the recipe and replace references to midori with epiphany meta/classes/cmake.bbclass | 12 +- meta/classes/gnomebase.bbclass |2 +- meta/conf/distro/include/security_flags.inc|2 - ...warning-about-deprecated-paths-in-schemas.patch | 32 + meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb |1 + .../glib-networking/glib-networking_2.44.0.bb |2 - .../jpeg/jpeg-8d/debian-libjpeg7_7-1.diff | 1070 .../jpeg/jpeg-8d/fix_for_automake_1.12.1.patch | 44 - meta/recipes-core/jpeg/{jpeg_8d.bb = jpeg_9a.bb} | 28 +- .../packagegroups/packagegroup-self-hosted.bb | 10 +- meta/recipes-devtools/giflib/giflib_5.1.1.bb | 20 + meta/recipes-devtools/ruby/ruby.inc| 40 + meta/recipes-devtools/ruby/ruby/extmk.patch| 13 + meta/recipes-devtools/ruby/ruby_2.2.2.bb | 42 + meta/recipes-gnome/epiphany/epiphany_3.16.1.bb | 23 + meta/recipes-gnome/gcr/gcr_3.16.0.bb | 18 + .../gnome-desktop/gnome-desktop3_3.16.2.bb | 25 + meta/recipes-gnome/gnome/gnome-common_3.14.0.bb|2 - .../recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb |2 - meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb |1 + .../gsettings-desktop-schemas_3.16.1.bb| 13 + .../gtk-engines/gtk-engines_2.20.2.bb |1 + meta/recipes-gnome/json-glib/json-glib_1.0.4.bb|2 - meta/recipes-gnome/libglade/libglade_2.6.4.bb |1 + meta/recipes-gnome/libnotify/libnotify_0.6.0.bb| 21 - meta/recipes-gnome/libnotify/libnotify_0.7.6.bb| 12 + meta/recipes-gnome/librsvg/librsvg_2.40.9.bb |2 - meta/recipes-gnome/libsecret/libsecret_0.18.2.bb | 12 + meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb | 17 + .../builder/files/builder_hob_start.sh |8 +- meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb |2 +- meta/recipes-graphics/pango/pango_1.36.8.bb|2 - meta/recipes-multimedia/webp/libwebp_0.4.3.bb | 47 + meta/recipes-sato/midori/midori/liststore.patch| 29 - meta/recipes-sato/midori/midori_0.5.8.bb | 31 - .../packagegroups/packagegroup-core-x11-sato.bb|2 +- meta/recipes-sato/webkit/files/bison-2.6.patch | 558 -- meta/recipes-sato/webkit/files/no-gtkdoc.patch | 20 - meta/recipes-sato/webkit/files/nodolt.patch| 19 - .../webgit-gtk_fix_build_with_automake_1.12.patch | 62 -- ...bkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch | 26 - .../0001-Enable-mips64-build.patch | 69 -- .../webkit/webkit-gtk-1.8.3/aarch64.patch | 41 - .../obsolete_automake_macros.patch | 14 - meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb | 116 --- meta/recipes-sato/webkit/webkitgtk_2.8.3.bb| 58 ++ meta/recipes-support/atk/atk_2.16.0.bb |2 - meta/recipes-support/iso-codes/iso-codes_3.58.bb | 15 + meta/recipes-support/libcroco/libcroco_0.6.8.bb|2 - meta/recipes-support/libyaml/libyaml_0.1.6.bb | 20 + meta/recipes-support/p11-kit/p11-kit_0.22.1.bb | 18 + meta/recipes-support/vte/vte_0.28.2.bb |4 +- 52 files changed, 458 insertions(+), 2177 deletions(-) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch delete mode 100644
Re: [OE-core] [PATCH 05/22] Update libnotify to version 0.7.6
On 06/17/2015 05:59 PM, Jussi Kukkonen wrote: 0.6 is the last release that supports GTK+2 and changing this might annoy people who are avoiding GTK+3 and are using some of the recipes in meta-oe that depend on libnotify. I believe the GTK dependency is only there for tests: Modifying the build so it doesn't build tests and doesn't depend on GTK should not be difficult. There is no way to switch off tests building in libnotify, so dropping the gtk3 dependency means developing a custom source patch. I'd rather do that only if there are specific complaints. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 09/22] Add a recipe for libsecret
On 06/17/2015 06:05 PM, Andreas Müller wrote: I think I have seen this recipe somewhere.. A note would have been nice Yes, I'll add a note for recipes picked from meta-gnome. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 05/22] Update libnotify to version 0.7.6
On 06/18/2015 03:35 PM, Andreas Müller wrote: I think gtk3 is not the problem here it is the API change libnotify 0.6 - 0.7 which cannot (or only by ugly hacks) be installed parallel. Do we know what happens to meta-gnome/meta-xfce? The packages in meta-gnome that fail because of new libnotify are all five year old, unmaintained 2.32.something versions. Let's just accept that meta-gnome needs to get a massive update to 3.x, those who don't like gnome 3.x need to seek alternative desktops and move on. Regards, Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 07/21] libyaml: add a recipe from meta-oe
libyaml is a dependency of ruby Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-support/libyaml/libyaml_0.1.6.bb | 20 1 file changed, 20 insertions(+) create mode 100644 meta/recipes-support/libyaml/libyaml_0.1.6.bb diff --git a/meta/recipes-support/libyaml/libyaml_0.1.6.bb b/meta/recipes-support/libyaml/libyaml_0.1.6.bb new file mode 100644 index 000..8a624f7 --- /dev/null +++ b/meta/recipes-support/libyaml/libyaml_0.1.6.bb @@ -0,0 +1,20 @@ +SUMMARY = LibYAML is a YAML 1.1 parser and emitter written in C. +DESCRIPTION = LibYAML is a C library for parsing and emitting data in YAML 1.1, \ +a human-readable data serialization format. +HOMEPAGE = http://pyyaml.org/wiki/LibYAML; +SECTION = libs/devel + +LICENSE = MIT +LIC_FILES_CHKSUM = file://LICENSE;md5=6015f088759b10e0bc2bf64898d4ae17 + +SRC_URI = http://pyyaml.org/download/libyaml/yaml-${PV}.tar.gz \ + + +SRC_URI[md5sum] = 5fe00cda18ca5daeb43762b80c38e06e +SRC_URI[sha256sum] = 7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749 + +S = ${WORKDIR}/yaml-${PV} + +inherit autotools + +BBCLASSEXTEND = native -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 04/21] jpeg: update to version 9a
Previous webkit version was blocking this; latest webkit works fine. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- .../jpeg/jpeg-8d/debian-libjpeg7_7-1.diff | 1070 .../jpeg/jpeg-8d/fix_for_automake_1.12.1.patch | 44 - meta/recipes-core/jpeg/{jpeg_8d.bb = jpeg_9a.bb} | 28 +- 3 files changed, 4 insertions(+), 1138 deletions(-) delete mode 100644 meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff delete mode 100644 meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch rename meta/recipes-core/jpeg/{jpeg_8d.bb = jpeg_9a.bb} (55%) diff --git a/meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff b/meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff deleted file mode 100644 index 3b8fa69..000 --- a/meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff +++ /dev/null @@ -1,1070 +0,0 @@ -This is a well-known debian patch used by many Linux distribution, but not -accepted by upstream yet. -Upstream-Status: Pending - libjpeg7-7.orig/config.sub -+++ libjpeg7-7/config.sub -@@ -1,4 +1,10 @@ - #! /bin/sh -+# autotools-dev hack (ballo...@debian.org, Wed, 14 Nov 2001 10:13:10 +0100) -+if [ -x /usr/share/misc/config.sub ]; then -+ /usr/share/misc/config.sub $* -+ exit $? -+fi -+ - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 libjpeg7-7.orig/config.guess -+++ libjpeg7-7/config.guess -@@ -1,4 +1,10 @@ - #! /bin/sh -+# autotools-dev hack (ballo...@debian.org, Wed, 14 Nov 2001 10:13:10 +0100) -+if [ -x /usr/share/misc/config.guess ]; then -+ /usr/share/misc/config.guess $* -+ exit $? -+fi -+ - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 libjpeg7-7.orig/debian/libjpeg7-dev.files -+++ libjpeg7-7/debian/libjpeg7-dev.files -@@ -0,0 +1,4 @@ -+usr/include -+usr/lib/libjpeg.a -+usr/lib/libjpeg.la -+usr/lib/libjpeg.so libjpeg7-7.orig/debian/libjpeg-progs.README.Debian -+++ libjpeg7-7/debian/libjpeg-progs.README.Debian -@@ -0,0 +1,13 @@ -+libjpeg-progs for Debian -+ -+ -+This package contains programs for manipulating JPEG files: -+ cjpeg/djpeg: convert to/from the JPEG file format -+ rdjpgcom/wrjpgcom: read/write comments in JPEG files -+ jpegtran: lossless transformations of JPEG files -+ jpegexiforient/exifautotran: manipulate EXIF orientation tag -+ -+Thanks for using Debian! -+ -+-- -+Bill Allombert ballo...@debian.org Sun, 05 Jul 2009 15:18:59 +0200 libjpeg7-7.orig/debian/shlibs.local -+++ libjpeg7-7/debian/shlibs.local -@@ -0,0 +1 @@ -+libjpeg 7 libjpeg7 libjpeg7-7.orig/debian/rules -+++ libjpeg7-7/debian/rules -@@ -0,0 +1,71 @@ -+#!/usr/bin/make -f -+# Made with the aid of debmake, by Christoph Lameter, -+# based on the sample debian/rules file for GNU hello by Ian Jackson. -+ -+package=libjpeg -+ -+export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -+ -+export CFLAGS=-D_REENTRANT -g -Wall -+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -+CFLAGS += -O0 -+else -+CFLAGS += -O2 -+endif -+ -+#export DH_VERBOSE=1 -+ -+build: build-stamp -+build-stamp: -+ dh_testdir -+ ./configure --prefix=/usr --mandir=/usr/share/man \ -+ --enable-static --enable-shared \ -+ --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) -+ $(MAKE) -+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) -+ $(MAKE) check -+endif -+ $(MAKE) -C debian/extra -+ -+ touch build-stamp -+ -+clean: -+ dh_testdir -+ dh_testroot -+ -rm -f build-stamp -+ if [ -f Makefile ]; then $(MAKE) distclean; fi -+ $(MAKE) clean -C debian/extra -+ dh_clean -+ -+binary-indep: -+ -+binary-arch: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ $(MAKE) install DESTDIR=`pwd`/debian/tmp -+ $(MAKE) install -C debian/extra prefix=/usr DESTDIR=`pwd`/debian/tmp -+ # fix jconfig.h -+ rm debian/tmp/usr/include/jconfig.h -+ sed -e s/#\(undef\|define\) HAVE_\(LOCALE\|\(STD\(DEF\|LIB\)\)\)_H 1//g \ -+ jconfig.h debian/tmp/usr/include/jconfig.h -+ # separate out lib package -+ dh_movefiles -+ # Finish it off with debhelper -+ dh_installdocs README -+ dh_installexamples -+ dh_installchangelogs change.log -+ dh_strip --dbg-package=libjpeg7-dbg -+ dh_compress -+ dh_fixperms -+ dh_installdeb -+ dh_shlibdeps -l`pwd`/debian/libjpeg7/usr/lib -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+ -+.PHONY: clean binary-indep binary-arch binary build libjpeg7-7.orig/debian
[OE-core] [PATCHv2 05/21] libnotify: update to version 0.7.6
New webkit requires at least version 0.7 Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-gnome/libnotify/libnotify_0.6.0.bb | 21 - meta/recipes-gnome/libnotify/libnotify_0.7.6.bb | 12 2 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 meta/recipes-gnome/libnotify/libnotify_0.6.0.bb create mode 100644 meta/recipes-gnome/libnotify/libnotify_0.7.6.bb diff --git a/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb b/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb deleted file mode 100644 index e6ee89b..000 --- a/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = Library for sending desktop notifications to a notification daemon -SECTION = libs -LICENSE = LGPLv2.1 -LIC_FILES_CHKSUM = file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 - -PR = r1 - -DEPENDS = dbus gtk+ dbus-glib - -inherit gnomebase distro_features_check - -# Requires gdk/gdkx.h which is provided by gtk when x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = x11 - -SRC_URI[archive.md5sum] = 732c9d2cd5eb6a9069264a319d330516 -SRC_URI[archive.sha256sum] = 73b16a79bb2fed62dcf146b11c4405776cb96a09dce66379ca541da7dbd64210 - -do_configure_prepend() { -sed -i /GTK3/d ${S}/configure.ac -sed -i -e /test-gtk3/d -e 's/test-xy-stress \\/test-xy-stress/' ${S}/tests/Makefile.am -} diff --git a/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb b/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb new file mode 100644 index 000..5d7b4ce --- /dev/null +++ b/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb @@ -0,0 +1,12 @@ +SUMMARY = Library for sending desktop notifications to a notification daemon +SECTION = libs +LICENSE = LGPLv2.1 +LIC_FILES_CHKSUM = file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 + +DEPENDS = dbus gtk+3 dbus-glib + +inherit gnomebase distro_features_check gtk-doc + +SRC_URI[archive.md5sum] = a4997019d08f46f3bf57b78e6f795a59 +SRC_URI[archive.sha256sum] = 0ef61ca400d30e28217979bfa0e73a7406b19c32dd76150654ec5b2bdf47d837 + -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 02/21] harfbuzz: enable icu feature
This is required to build latest webkitgtk Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb index 2517ede..b3608c9 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb @@ -22,7 +22,7 @@ BBCLASSEXTEND = native EXTRA_OECONF = --with-glib --with-freetype --with-cairo --without-graphite2 -PACKAGECONFIG ??= +PACKAGECONFIG ??= icu PACKAGECONFIG[icu] = --with-icu,--without-icu,icu PACKAGES =+ ${PN}-icu ${PN}-icu-dbg ${PN}-icu-dev -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 03/21] classes/cmake: add arch conversion routine
cmake expects target architecture strings in the format of uname(2), which do not always match TARGET_ARCH (e.g. powerpc vs ppc). Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/classes/cmake.bbclass | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index 1ebb936..40115a0 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -27,12 +27,22 @@ OECMAKE_RPATH ?= OECMAKE_PERLNATIVE_DIR ??= OECMAKE_EXTRA_ROOT_PATH ?= +# CMake expects target architectures in the format of uname(2), +# which do not always match TARGET_ARCH, so all the necessary +# conversions should happen here. +def map_target_arch_to_uname_arch(target_arch): +if target_arch == powerpc: +return ppc +if target_arch == powerpc64: +return ppc64 +return target_arch + cmake_do_generate_toolchain_file() { cat ${WORKDIR}/toolchain.cmake EOF # CMake system name must be something like Linux. # This is important for cross-compiling. set( CMAKE_SYSTEM_NAME `echo ${TARGET_OS} | sed -e 's/^./\u/' -e 's/^\(Linux\).*/\1/'` ) -set( CMAKE_SYSTEM_PROCESSOR ${TARGET_ARCH} ) +set( CMAKE_SYSTEM_PROCESSOR ${@map_target_arch_to_uname_arch(d.getVar('TARGET_ARCH', True))} ) set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} ) set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} ) set( CMAKE_ASM_COMPILER ${OECMAKE_C_COMPILER} ) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 09/22] Add a recipe for libsecret
On 06/17/2015 09:54 PM, akuster808 wrote: it is in meta-openembedded/meta-gnome per layer index. So is this part of move from one layer another task? Move and version update. Every single recipe I've taken from meta-oe was out-of-date :( I take once accepted, the removal patches will be sent out? Yes; those patches are in fact ready, but held off to avoid confusion. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 20/21] webkit-gtk: remove the recipe for the obsolete version 1.8.3
webkitgtk 2.8.3 is provided instead and midori browser is replaced by epiphany in separate commits. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/conf/distro/include/security_flags.inc| 2 - meta/recipes-sato/webkit/files/bison-2.6.patch | 558 - meta/recipes-sato/webkit/files/no-gtkdoc.patch | 20 - meta/recipes-sato/webkit/files/nodolt.patch| 19 - .../webgit-gtk_fix_build_with_automake_1.12.patch | 62 --- ...bkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch | 26 - .../0001-Enable-mips64-build.patch | 69 --- .../webkit/webkit-gtk-1.8.3/aarch64.patch | 41 -- .../obsolete_automake_macros.patch | 14 - meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb | 116 - 10 files changed, 927 deletions(-) delete mode 100644 meta/recipes-sato/webkit/files/bison-2.6.patch delete mode 100644 meta/recipes-sato/webkit/files/no-gtkdoc.patch delete mode 100644 meta/recipes-sato/webkit/files/nodolt.patch delete mode 100644 meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch delete mode 100644 meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch delete mode 100644 meta/recipes-sato/webkit/webkit-gtk-1.8.3/0001-Enable-mips64-build.patch delete mode 100644 meta/recipes-sato/webkit/webkit-gtk-1.8.3/aarch64.patch delete mode 100644 meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch delete mode 100644 meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 9608c7f..367995c 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -16,7 +16,6 @@ SECURITY_CFLAGS_powerpc = -fstack-protector-all -D_FORTIFY_SOURCE=2 SECURITY_CFLAGS_pn-dbus_powerpc = SECURITY_CFLAGS_pn-dbus-ptest_powerpc = SECURITY_CFLAGS_pn-libmatchbox_powerpc = -SECURITY_CFLAGS_pn-webkit-gtk_powerpc = # arm specific security flag issues SECURITY_CFLAGS_pn-lttng-tools_arm = ${SECURITY_NO_PIE_CFLAGS} @@ -80,7 +79,6 @@ SECURITY_CFLAGS_pn-python-numpy = ${SECURITY_NO_PIE_CFLAGS} SECURITY_CFLAGS_pn-tcl = ${SECURITY_NO_PIE_CFLAGS} SECURITY_CFLAGS_pn-tiff = ${SECURITY_NO_PIE_CFLAGS} SECURITY_CFLAGS_pn-valgrind = ${SECURITY_NO_PIE_CFLAGS} -SECURITY_CFLAGS_pn-webkit-gtk = ${SECURITY_NO_PIE_CFLAGS} SECURITY_CFLAGS_pn-zlib = ${SECURITY_NO_PIE_CFLAGS} # These 2 have text relco errors with the pie options enabled diff --git a/meta/recipes-sato/webkit/files/bison-2.6.patch b/meta/recipes-sato/webkit/files/bison-2.6.patch deleted file mode 100644 index d4aa674..000 --- a/meta/recipes-sato/webkit/files/bison-2.6.patch +++ /dev/null @@ -1,558 +0,0 @@ -Upstream-Status: Backport -http://trac.webkit.org/changeset/124099 - -Subversion Revision: 123651 -diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y -index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644 a/Source/WebCore/css/CSSGrammar.y -+++ b/Source/WebCore/css/CSSGrammar.y -@@ -53,14 +53,13 @@ using namespace HTMLNames; - #define YYMAXDEPTH 1 - #define YYDEBUG 0 - --// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x --#define YYPARSE_PARAM parser --#define YYLEX_PARAM parser -- - %} - - %pure_parser - -+%parse-param { CSSParser* parser } -+%lex-param { CSSParser* parser } -+ - %union { - bool boolean; - char character; -@@ -89,7 +88,7 @@ using namespace HTMLNames; - - %{ - --static inline int cssyyerror(const char*) -+static inline int cssyyerror(void*, const char*) - { - return 1; - } -diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp -index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644 a/Source/WebCore/css/CSSParser.cpp -+++ b/Source/WebCore/css/CSSParser.cpp -@@ -114,7 +114,7 @@ - extern int cssyydebug; - #endif - --extern int cssyyparse(void* parser); -+extern int cssyyparse(WebCore::CSSParser*); - - using namespace std; - using namespace WTF; -diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y -index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644 a/Source/WebCore/xml/XPathGrammar.y -+++ b/Source/WebCore/xml/XPathGrammar.y -@@ -34,6 +34,7 @@ - #include XPathParser.h - #include XPathPath.h - #include XPathPredicate.h -+#include XPathStep.h - #include XPathVariableReference.h - #include wtf/FastMalloc.h - -@@ -44,8 +45,6 @@ - #define YYLTYPE_IS_TRIVIAL 1 - #define YYDEBUG 0 - #define YYMAXDEPTH 1 --#define YYPARSE_PARAM parserParameter --#define PARSER static_castParser*(parserParameter) - - using namespace WebCore; - using namespace XPath; -@@ -53,6 +52,7 @@ using namespace XPath; - %} - - %pure_parser -+%parse-param { WebCore
[OE-core] [PATCHv2 13/21] gcr: add a recipe from meta-gnome
gcr is a dependency of epiphany Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-gnome/gcr/gcr_3.16.0.bb | 18 ++ 1 file changed, 18 insertions(+) create mode 100644 meta/recipes-gnome/gcr/gcr_3.16.0.bb diff --git a/meta/recipes-gnome/gcr/gcr_3.16.0.bb b/meta/recipes-gnome/gcr/gcr_3.16.0.bb new file mode 100644 index 000..8b5b6e4 --- /dev/null +++ b/meta/recipes-gnome/gcr/gcr_3.16.0.bb @@ -0,0 +1,18 @@ +SUMMARY = A library for bits of crypto UI and parsing etc +HOMEPAGE = http://www.gnome.org/; +BUGTRACKER = https://bugzilla.gnome.org/; + +LICENSE = GPLv2 +LIC_FILES_CHKSUM = file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 + +DEPENDS = gtk+3 p11-kit glib-2.0 libgcrypt vala + +inherit autotools gnomebase gtk-icon-cache gtk-doc + +SRC_URI[archive.md5sum] = d5835680be0b6a838e02a528d5378d9c +SRC_URI[archive.sha256sum] = ecfe8df41cc88158364bb15addc670b11e539fe844742983629ba2323888d075 + +FILES_${PN} += \ +${datadir}/dbus-1 \ +${datadir}/gcr-3 \ + -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 12/21] p11-kit: add a recipe from meta-oe
p11-kit is a dependency of gcr (which is a dependency of epiphany) Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-support/p11-kit/p11-kit_0.22.1.bb | 18 ++ 1 file changed, 18 insertions(+) create mode 100644 meta/recipes-support/p11-kit/p11-kit_0.22.1.bb diff --git a/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb new file mode 100644 index 000..7ad9626e --- /dev/null +++ b/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb @@ -0,0 +1,18 @@ +SUMMARY = Provides a way to load and enumerate PKCS#11 modules +LICENSE = BSD +LIC_FILES_CHKSUM = file://COPYING;md5=02933887f609807fbb57aa4237d14a50 + +inherit autotools gettext pkgconfig + +DEPENDS = libtasn1 libffi + +SRC_URI = http://p11-glue.freedesktop.org/releases/${BP}.tar.gz; +SRC_URI[md5sum] = 4e9bea1106628ffb820bdad24a819fac +SRC_URI[sha256sum] = ef3a339fcf6aa0e32c8c23f79ba7191e57312be2bda8b24e6d121c2670539a5c + +FILES_${PN}-dev += \ +${libdir}/p11-kit-proxy.so \ +${libdir}/pkcs11/p11-kit-trust.so \ + +FILES_${PN}-dev += ${libdir}/pkcs11/*.la +FILES_${PN}-dbg += ${libdir}/pkcs11/.debug -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 14/21] iso-codes: add a recipe from meta-oe
iso-codes is a dependency of epiphany Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-support/iso-codes/iso-codes_3.58.bb | 15 +++ 1 file changed, 15 insertions(+) create mode 100644 meta/recipes-support/iso-codes/iso-codes_3.58.bb diff --git a/meta/recipes-support/iso-codes/iso-codes_3.58.bb b/meta/recipes-support/iso-codes/iso-codes_3.58.bb new file mode 100644 index 000..3df2ea9 --- /dev/null +++ b/meta/recipes-support/iso-codes/iso-codes_3.58.bb @@ -0,0 +1,15 @@ +SUMMARY = ISO language, territory, currency, script codes and their translations +LICENSE = LGPLv2.1 +LIC_FILES_CHKSUM = file://LICENSE;md5=fbc093901857fcd118f065f900982c24 + +SRC_URI = https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz; +SRC_URI[md5sum] = 34097a0085f0979e28f9db66ec274c5e +SRC_URI[sha256sum] = 86af5735dce6e4eff2b983e5d8aa9a3dea1b8db702333ff20be89e45f7f35a72 + +# inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which +# are inhibited by allarch +DEPENDS = gettext-native + +inherit autotools allarch + +FILES_${PN} += ${datadir}/xml/ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 21/21] midori: remove the recipe and replace references to midori with epiphany
Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- .../packagegroups/packagegroup-self-hosted.bb | 10 +++ .../builder/files/builder_hob_start.sh | 8 +++--- meta/recipes-sato/midori/midori/liststore.patch| 29 meta/recipes-sato/midori/midori_0.5.8.bb | 31 -- .../packagegroups/packagegroup-core-x11-sato.bb| 2 +- 5 files changed, 10 insertions(+), 70 deletions(-) delete mode 100644 meta/recipes-sato/midori/midori/liststore.patch delete mode 100644 meta/recipes-sato/midori/midori_0.5.8.bb diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 531f729..cd3bddd 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -28,10 +28,10 @@ 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 = +# epiphany depends on webkitgtk which could not build for mips64 +EPIPHANY = epiphany +EPIPHANY_mips64 = +EPIPHANY_mips64n32 = RDEPENDS_packagegroup-self-hosted-host-tools = \ connman \ @@ -199,7 +199,7 @@ RDEPENDS_packagegroup-self-hosted-graphics = \ python-pygtk \ gtk-theme-clearlooks \ xdg-utils \ -${MIDORI} \ +${EPIPHANY} \ leafpad \ pcmanfm \ vte \ diff --git a/meta/recipes-graphics/builder/files/builder_hob_start.sh b/meta/recipes-graphics/builder/files/builder_hob_start.sh index 65a68ee..b394b09 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 #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 diff --git a/meta/recipes-sato/midori/midori/liststore.patch b/meta/recipes-sato/midori/midori/liststore.patch deleted file mode 100644 index 4e5d666..000 --- a/meta/recipes-sato/midori/midori/liststore.patch +++ /dev/null @@ -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.bur...@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), 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 1c027fe4..000 --- a/meta/recipes-sato/midori/midori_0.5.8.bb +++ /dev/null @@ -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
[OE-core] [PATCHv2 11/21] webkitgtk: add a new recipe for version 2.8.3
Recipe for webkit-gtk 1.8.3 is removed in a separate commit Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-sato/webkit/webkitgtk_2.8.3.bb | 58 + 1 file changed, 58 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk_2.8.3.bb diff --git a/meta/recipes-sato/webkit/webkitgtk_2.8.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.8.3.bb new file mode 100644 index 000..2386a7c --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk_2.8.3.bb @@ -0,0 +1,58 @@ +SUMMARY = WebKit web rendering engine for the GTK+ platform +HOMEPAGE = http://www.webkitgtk.org/; +BUGTRACKER = http://bugs.webkit.org/; + +LICENSE = BSD LGPLv2+ +LIC_FILES_CHKSUM = file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ + file://Source/WebKit/LICENSE;md5=4646f90082c40bcf298c285f8bab0b12 \ + file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \ + file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \ + file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \ + + +SRC_URI = \ + http://www.webkitgtk.org/releases/${PN}-${PV}.tar.xz \ + +SRC_URI[md5sum] = 29b92a0aacc819d0e5e5df03895fb98e +SRC_URI[sha256sum] = b3de60c8676ed54bb3d6201c742bbd702ee176fdfef5ca06f2fc514783792f16 + +inherit cmake lib_package pkgconfig perlnative pythonnative + +DEPENDS = zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ + gtk+ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ + pango icu bison-native gnome-common gawk intltool-native libwebp \ + atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ + ruby-native libsecret libnotify gstreamer1.0-plugins-bad \ + +DEPENDS += ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} + +EXTRA_OECMAKE = \ + -DPORT=GTK \ + -DCMAKE_BUILD_TYPE=Release \ + -DENABLE_INTROSPECTION=False \ + -DENABLE_MINIBROWSER=True \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-DENABLE_WEBGL=True', '-DENABLE_WEBGL=False', d)} \ + + +# Javascript JIT is not supported on powerpc +# FIXME: This might be needed on powerpc64 as well, but can't be easily tested in poky. +EXTRA_OECMAKE_append_powerpc = -DENABLE_JIT=False + +# ARM JIT code does not build on ARMv5/6 anymore, apparently they test only on v7 onwards +EXTRA_OECMAKE_append_armv5 = -DENABLE_JIT=False +EXTRA_OECMAKE_append_armv6 = -DENABLE_JIT=False + +# binutils 2.25 has a bug on aarch64: +# https://sourceware.org/bugzilla/show_bug.cgi?id=18430 +EXTRA_OECMAKE_append_aarch64 = -DUSE_LD_GOLD=False + +# JIT not supported on MIPS either +EXTRA_OECMAKE_append_mips = -DENABLE_JIT=False + +# Note: does not currently build on mips64 due to incorrect type size assumptions +# Bug filed here: https://bugs.webkit.org/show_bug.cgi?id=146058 + +FILES_${PN} += ${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so +FILES_${PN}-dbg += ${libdir}/webkit2gtk-4.0/injected-bundle/.debug/libwebkit2gtkinjectedbundle.so +FILES_${PN}-dbg += ${libdir}/webkitgtk/webkit2gtk-4.0/.debug/* + -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe] State of bitbake world, Failed tasks 2015-06-19
On 06/22/2015 02:07 PM, Burton, Ross wrote: I've just filed a bug for this chunk, looks like we missed something when disabling GStreamer 0.10 in Qt. Not really; the recipes for qt-mobility were moved from oe-core to meta-oe as they were, without any modifications. This looks like a simple missing dependency issue, but I don't know why it wasn't reported earlier. Note that there are also missing dependencies for libxv and qt-creator, so it's not gstreamer-specific Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 05/22] Update libnotify to version 0.7.6
On 06/20/2015 12:41 AM, Andreas Müller wrote: Emotional part: I am sorry for my last email's style and I hope this does not cause lack of motivation on your side. This was definitely not an email that should have gone out this way. Thank you Andreas, I very much appreciate you saying this. Also my email had the wrong tone, a bit too blunt and provocative perhaps. Technical part: Although your patches break things I think _now_ that they point in the right direction. The old gnome stuff turns into a maintenance burden with every new tool/library introduced. As Martin pointed out: I have tried to update libnotify two years ago and stopped due to huge fallout. Now we expect same but the situation is different: We have stable releases of better quality than two years ago. If still interested in gnome 2 style user experience and not accepting gnome 3 one could work with releases (or implement/use alternatives Mate/Xfce..). I have looked at recent commit history for meta-gnome; my impression is that it only gets ad-hoc patching so that things still compile, and nobody is doing a systematic effort to keep things up to date and working. So the layer is effectively unmaintained and slowly bit rots. One note regarding gnome 3: I played around with gnome 3 long time ago but stopped messing around with gobject-introspection which looked mandatory for some packages. I think if we want to migrate meta-gnome to gnome 3 we should think of migrating meta-gir to meta-gnome. Yes; getting gobject-introspection to work and perhaps taking it into oe-core is something that we'd really like to do, so I plan to look at it when I have a bit of breathing space later this or next week. Regards, Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [poky] Automatic Upgrade Helper Announcement
On 06/25/2015 11:02 PM, Aníbal Limón wrote: I'm glad to announce the enabling of Automatic Upgrade Helper (a.k.a. AUH), the AUH is a service that provides recipe upgrades and will be run on weekly basis. If you are a maintainer (listed in [1]) you will receive AUH emails with Recipe upgrades when AUH detects that upgrade is needed. I'm currently doing a related activity - going through oe-core recipes in alphabetical order, and making sure that upstream version information for them is correct. I've found a few cases where the upstream check is performed on a stale directory (so the recipe is reported 'up to date' even though it's not), or the reported upstream version is totally bogus [1], or the upstream version is 'unknown' even though it can be retrieved with a correct entry in package_regex.inc. Expect patches to come this way soon. [1] http://recipes.yoctoproject.org/rrs/recipedetail/155/ Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Webkit-gtk will be updated to latest upstream; midori browser to be replaced with Epiphany
On 06/16/2015 04:27 PM, Andreas Müller wrote: Yes and midori is the only working browser in Yocto (I know): firefox crashes since very long time for illegal ARM instruction and chromium does not start at all. Latest epiphany will be provided as a replacement for midori. It works fine here in the core-image-sato under qemu. I can't promise it will work on ARM, but any ARM-specific issues are almost certainly in webkit's (or other web engine's) javascript JIT code and have nothing to do with the browser. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Webkit-gtk will be updated to latest upstream; midori browser to be replaced with Epiphany
On 06/16/2015 09:50 AM, Andreas Müller wrote: How about doing same as others do e.g fedora [1-2]: Keep two version of webkit-gtk based on same recent code: * gtk2/webkit1 * gtk3/webkit2 Before showing how, you need to explain why. Fedora has to package webkit1 because they have a lot of apps in the Gnome stack that still haven't been ported to webkit2. Oe-core on the other hand has only one such app: midori. Also, webkit1 has been deprecated for years, and there is no commitment from upstream to maintain the 2.4.x series which is the last that still has it in the source tree; they may cease to do it at any moment. So once again, why keep it in oe-core? Regards, Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe] Webkit-gtk will be updated to latest upstream; midori browser to be replaced with Epiphany
On 06/16/2015 04:37 PM, Alexander Kanavin wrote: Latest epiphany will be provided as a replacement for midori. It works fine here in the core-image-sato under qemu. I can't promise it will work on ARM, but any ARM-specific issues are almost certainly in webkit's (or other web engine's) javascript JIT code and have nothing to do with the browser. Oh, and with webkit it's trivial to disable JIT at compile time; in fact I have to do it for ARMv5 and ARMv6 because it has bitrotten for those architectures due to lack of upstream testing. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Webkit-gtk will be updated to latest upstream; midori browser to be replaced with Epiphany
Hello everyone, I've been looking into updating oe-core's aging web engine/browser combo, and want to give you a heads up about what's going to happen: 1) webkit-gtk engine will be updated to latest stable upstream release (2.8.3 which is providing Webkit2 API and is a Gtk3 port) 2) midori browser will be replaced with Epiphany browser from the Gnome project. The reason is that the latest release of midori still defaults to Webkit1 and gtk2, a new version of midori is in development, but is a major rewrite with no target release date and is far from ready at the moment (from looking at the list of open issues). The downside to this is extra bloat and dependencies, but I can't see any other way we can provide a modern client stack for the web. Having a browser is important nowadays for any kiosk-type device with a touchscreen, because that's how UIs are written. Regards, Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Webkit-gtk will be updated to latest upstream; midori browser to be replaced with Epiphany
On 06/15/2015 05:24 PM, Burton, Ross wrote: If you actually compare the build dependencies, you'll see that Midori and Epiphany are actually almost identical. We need to upgrade WebKit as the release we're shipping has known security flaws and is very old - and the community is rightly moaning about that. However Midori doesn't build with a recent WebKit... if you have an alternative solution then your thoughts are welcome. Also, Webkit2 itself ships with a tiny browser wrapper called MiniBrowser: http://blogs.igalia.com/carlosgc/2011/11/04/webkit2-gtk-minibrowser-ported-to-gtk-api/ That may be enough for many people's needs, and they can simply not include Epiphany into their images if it's too big and bloated or whatever. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/22] Enable icu feature in harfbuzz recipe
This is required to build latest webkitgtk Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb index 2517ede..b3608c9 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb @@ -22,7 +22,7 @@ BBCLASSEXTEND = native EXTRA_OECONF = --with-glib --with-freetype --with-cairo --without-graphite2 -PACKAGECONFIG ??= +PACKAGECONFIG ??= icu PACKAGECONFIG[icu] = --with-icu,--without-icu,icu PACKAGES =+ ${PN}-icu ${PN}-icu-dbg ${PN}-icu-dev -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/22] Add arch conversion routine to cmake.bbclass
cmake expects target architecture strings in the format of uname(2), which do not always match TARGET_ARCH (e.g. powerpc vs ppc). Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/classes/cmake.bbclass | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index 1ebb936..40115a0 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -27,12 +27,22 @@ OECMAKE_RPATH ?= OECMAKE_PERLNATIVE_DIR ??= OECMAKE_EXTRA_ROOT_PATH ?= +# CMake expects target architectures in the format of uname(2), +# which do not always match TARGET_ARCH, so all the necessary +# conversions should happen here. +def map_target_arch_to_uname_arch(target_arch): +if target_arch == powerpc: +return ppc +if target_arch == powerpc64: +return ppc64 +return target_arch + cmake_do_generate_toolchain_file() { cat ${WORKDIR}/toolchain.cmake EOF # CMake system name must be something like Linux. # This is important for cross-compiling. set( CMAKE_SYSTEM_NAME `echo ${TARGET_OS} | sed -e 's/^./\u/' -e 's/^\(Linux\).*/\1/'` ) -set( CMAKE_SYSTEM_PROCESSOR ${TARGET_ARCH} ) +set( CMAKE_SYSTEM_PROCESSOR ${@map_target_arch_to_uname_arch(d.getVar('TARGET_ARCH', True))} ) set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} ) set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} ) set( CMAKE_ASM_COMPILER ${OECMAKE_C_COMPILER} ) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/22] Add a recipe for giflib
This is a dependency of libwebp (which is a dependency of webkit) Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-devtools/giflib/giflib_5.1.1.bb | 20 1 file changed, 20 insertions(+) create mode 100644 meta/recipes-devtools/giflib/giflib_5.1.1.bb diff --git a/meta/recipes-devtools/giflib/giflib_5.1.1.bb b/meta/recipes-devtools/giflib/giflib_5.1.1.bb new file mode 100644 index 000..0553f57 --- /dev/null +++ b/meta/recipes-devtools/giflib/giflib_5.1.1.bb @@ -0,0 +1,20 @@ +SUMMARY = shared library for GIF images +SECTION = libs +LICENSE = MIT +LIC_FILES_CHKSUM = file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a +PR = r3 + +SRC_URI = ${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.bz2 + +inherit autotools + +PACKAGES += ${PN}-utils +FILES_${PN} = ${libdir}/libgif.so.* +FILES_${PN}-utils = ${bindir} + +BBCLASSEXTEND = native + +RDEPENDS_${PN}-utils = perl + +SRC_URI[md5sum] = 1c39333192712788c6568c78a949f13e +SRC_URI[sha256sum] = 391014aceb21c8b489dc7b0d0b6a917c4e32cc014ce2426d47ca376d02fe2ffc -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/22] Add a recipe for libyaml
libyaml is a dependency of ruby Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-support/libyaml/libyaml_0.1.6.bb | 20 1 file changed, 20 insertions(+) create mode 100644 meta/recipes-support/libyaml/libyaml_0.1.6.bb diff --git a/meta/recipes-support/libyaml/libyaml_0.1.6.bb b/meta/recipes-support/libyaml/libyaml_0.1.6.bb new file mode 100644 index 000..8a624f7 --- /dev/null +++ b/meta/recipes-support/libyaml/libyaml_0.1.6.bb @@ -0,0 +1,20 @@ +SUMMARY = LibYAML is a YAML 1.1 parser and emitter written in C. +DESCRIPTION = LibYAML is a C library for parsing and emitting data in YAML 1.1, \ +a human-readable data serialization format. +HOMEPAGE = http://pyyaml.org/wiki/LibYAML; +SECTION = libs/devel + +LICENSE = MIT +LIC_FILES_CHKSUM = file://LICENSE;md5=6015f088759b10e0bc2bf64898d4ae17 + +SRC_URI = http://pyyaml.org/download/libyaml/yaml-${PV}.tar.gz \ + + +SRC_URI[md5sum] = 5fe00cda18ca5daeb43762b80c38e06e +SRC_URI[sha256sum] = 7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749 + +S = ${WORKDIR}/yaml-${PV} + +inherit autotools + +BBCLASSEXTEND = native -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/22] Update libnotify to version 0.7.6
New webkit requires at least version 0.7 Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- .../libnotify/{libnotify_0.6.0.bb = libnotify_0.7.6.bb} | 8 1 file changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-gnome/libnotify/{libnotify_0.6.0.bb = libnotify_0.7.6.bb} (66%) diff --git a/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb b/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb similarity index 66% rename from meta/recipes-gnome/libnotify/libnotify_0.6.0.bb rename to meta/recipes-gnome/libnotify/libnotify_0.7.6.bb index e6ee89b..e9363e8 100644 --- a/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb +++ b/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb @@ -5,15 +5,15 @@ LIC_FILES_CHKSUM = file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 PR = r1 -DEPENDS = dbus gtk+ dbus-glib +DEPENDS = dbus gtk+3 dbus-glib -inherit gnomebase distro_features_check +inherit gnomebase distro_features_check gtk-doc # Requires gdk/gdkx.h which is provided by gtk when x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = x11 -SRC_URI[archive.md5sum] = 732c9d2cd5eb6a9069264a319d330516 -SRC_URI[archive.sha256sum] = 73b16a79bb2fed62dcf146b11c4405776cb96a09dce66379ca541da7dbd64210 +SRC_URI[archive.md5sum] = a4997019d08f46f3bf57b78e6f795a59 +SRC_URI[archive.sha256sum] = 0ef61ca400d30e28217979bfa0e73a7406b19c32dd76150654ec5b2bdf47d837 do_configure_prepend() { sed -i /GTK3/d ${S}/configure.ac -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/22] Update jpeg recipe to version 9a
Previous webkit version was blocking this; latest webkit works fine. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- .../jpeg/jpeg-8d/debian-libjpeg7_7-1.diff | 1070 .../jpeg/jpeg-8d/fix_for_automake_1.12.1.patch | 44 - meta/recipes-core/jpeg/{jpeg_8d.bb = jpeg_9a.bb} | 28 +- 3 files changed, 4 insertions(+), 1138 deletions(-) delete mode 100644 meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff delete mode 100644 meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch rename meta/recipes-core/jpeg/{jpeg_8d.bb = jpeg_9a.bb} (55%) diff --git a/meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff b/meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff deleted file mode 100644 index 3b8fa69..000 --- a/meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff +++ /dev/null @@ -1,1070 +0,0 @@ -This is a well-known debian patch used by many Linux distribution, but not -accepted by upstream yet. -Upstream-Status: Pending - libjpeg7-7.orig/config.sub -+++ libjpeg7-7/config.sub -@@ -1,4 +1,10 @@ - #! /bin/sh -+# autotools-dev hack (ballo...@debian.org, Wed, 14 Nov 2001 10:13:10 +0100) -+if [ -x /usr/share/misc/config.sub ]; then -+ /usr/share/misc/config.sub $* -+ exit $? -+fi -+ - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 libjpeg7-7.orig/config.guess -+++ libjpeg7-7/config.guess -@@ -1,4 +1,10 @@ - #! /bin/sh -+# autotools-dev hack (ballo...@debian.org, Wed, 14 Nov 2001 10:13:10 +0100) -+if [ -x /usr/share/misc/config.guess ]; then -+ /usr/share/misc/config.guess $* -+ exit $? -+fi -+ - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 libjpeg7-7.orig/debian/libjpeg7-dev.files -+++ libjpeg7-7/debian/libjpeg7-dev.files -@@ -0,0 +1,4 @@ -+usr/include -+usr/lib/libjpeg.a -+usr/lib/libjpeg.la -+usr/lib/libjpeg.so libjpeg7-7.orig/debian/libjpeg-progs.README.Debian -+++ libjpeg7-7/debian/libjpeg-progs.README.Debian -@@ -0,0 +1,13 @@ -+libjpeg-progs for Debian -+ -+ -+This package contains programs for manipulating JPEG files: -+ cjpeg/djpeg: convert to/from the JPEG file format -+ rdjpgcom/wrjpgcom: read/write comments in JPEG files -+ jpegtran: lossless transformations of JPEG files -+ jpegexiforient/exifautotran: manipulate EXIF orientation tag -+ -+Thanks for using Debian! -+ -+-- -+Bill Allombert ballo...@debian.org Sun, 05 Jul 2009 15:18:59 +0200 libjpeg7-7.orig/debian/shlibs.local -+++ libjpeg7-7/debian/shlibs.local -@@ -0,0 +1 @@ -+libjpeg 7 libjpeg7 libjpeg7-7.orig/debian/rules -+++ libjpeg7-7/debian/rules -@@ -0,0 +1,71 @@ -+#!/usr/bin/make -f -+# Made with the aid of debmake, by Christoph Lameter, -+# based on the sample debian/rules file for GNU hello by Ian Jackson. -+ -+package=libjpeg -+ -+export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -+ -+export CFLAGS=-D_REENTRANT -g -Wall -+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -+CFLAGS += -O0 -+else -+CFLAGS += -O2 -+endif -+ -+#export DH_VERBOSE=1 -+ -+build: build-stamp -+build-stamp: -+ dh_testdir -+ ./configure --prefix=/usr --mandir=/usr/share/man \ -+ --enable-static --enable-shared \ -+ --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) -+ $(MAKE) -+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) -+ $(MAKE) check -+endif -+ $(MAKE) -C debian/extra -+ -+ touch build-stamp -+ -+clean: -+ dh_testdir -+ dh_testroot -+ -rm -f build-stamp -+ if [ -f Makefile ]; then $(MAKE) distclean; fi -+ $(MAKE) clean -C debian/extra -+ dh_clean -+ -+binary-indep: -+ -+binary-arch: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ $(MAKE) install DESTDIR=`pwd`/debian/tmp -+ $(MAKE) install -C debian/extra prefix=/usr DESTDIR=`pwd`/debian/tmp -+ # fix jconfig.h -+ rm debian/tmp/usr/include/jconfig.h -+ sed -e s/#\(undef\|define\) HAVE_\(LOCALE\|\(STD\(DEF\|LIB\)\)\)_H 1//g \ -+ jconfig.h debian/tmp/usr/include/jconfig.h -+ # separate out lib package -+ dh_movefiles -+ # Finish it off with debhelper -+ dh_installdocs README -+ dh_installexamples -+ dh_installchangelogs change.log -+ dh_strip --dbg-package=libjpeg7-dbg -+ dh_compress -+ dh_fixperms -+ dh_installdeb -+ dh_shlibdeps -l`pwd`/debian/libjpeg7/usr/lib -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+ -+.PHONY: clean binary-indep binary-arch binary build libjpeg7-7.orig/debian
[OE-core] [PATCH 10/22] Add a recipe for libwebp
libwebp is a dependency of webkit Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-multimedia/webp/libwebp_0.4.3.bb | 47 +++ 1 file changed, 47 insertions(+) create mode 100644 meta/recipes-multimedia/webp/libwebp_0.4.3.bb diff --git a/meta/recipes-multimedia/webp/libwebp_0.4.3.bb b/meta/recipes-multimedia/webp/libwebp_0.4.3.bb new file mode 100644 index 000..3ab2e5b --- /dev/null +++ b/meta/recipes-multimedia/webp/libwebp_0.4.3.bb @@ -0,0 +1,47 @@ +SUMMARY = WebP is an image format designed for the Web +DESCRIPTION = WebP is a method of lossy and lossless compression that can be \ + used on a large variety of photographic, translucent and \ + graphical images found on the web. The degree of lossy \ + compression is adjustable so a user can choose the trade-off \ + between file size and image quality. WebP typically achieves \ + an average of 30% more compression than JPEG and JPEG 2000, \ + without loss of image quality. +HOMEPAGE = https://developers.google.com/speed/webp/; +SECTION = libs + +LICENSE = BSD +LIC_FILES_CHKSUM = file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb + +DEPENDS = giflib + +SRC_URI = http://downloads.webmproject.org/releases/webp/${BP}.tar.gz; +SRC_URI[md5sum] = 08813525eeeffe7e305b4cbfade8ae9b +SRC_URI[sha256sum] = efbe0d58fda936f2ed99d0b837ed7087d064d6838931f282c4618d2a3f7390c4 + +EXTRA_OECONF = \ +--disable-experimental \ +--disable-wic \ +--enable-libwebpmux \ +--enable-libwebpdemux \ +--enable-threading \ + + +inherit autotools lib_package + +PACKAGECONFIG ??= + +# libwebpdecoder is a subset of libwebp, don't build it unless requested +PACKAGECONFIG[decoder] = --enable-libwebpdecoder,--disable-libwebpdecoder + +# Apply for examples programs: cwebp and dwebp +PACKAGECONFIG[jpeg] = ,ac_cv_header_jpeglib_h=no,jpeg +PACKAGECONFIG[png] = ,ac_cv_header_png_h=no,libpng +PACKAGECONFIG[tiff] = ,ac_cv_header_tiffio_h=no,tiff + +# Apply only for example program vwebp +PACKAGECONFIG[gl] = ,,mesa-glut + +PACKAGES =+ ${PN}-gif2webp + +DESCRIPTION_${PN}-gif2webp = Simple tool to convert animated GIFs to WebP +FILES_${PN}-gif2webp = ${bindir}/gif2webp -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/22] Add a recipe for webkitgtk 2.8.3
Recipe for webkit-gtk 1.8.3 is removed in a separate commit Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-sato/webkit/webkitgtk_2.8.3.bb | 58 + 1 file changed, 58 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk_2.8.3.bb diff --git a/meta/recipes-sato/webkit/webkitgtk_2.8.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.8.3.bb new file mode 100644 index 000..2386a7c --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk_2.8.3.bb @@ -0,0 +1,58 @@ +SUMMARY = WebKit web rendering engine for the GTK+ platform +HOMEPAGE = http://www.webkitgtk.org/; +BUGTRACKER = http://bugs.webkit.org/; + +LICENSE = BSD LGPLv2+ +LIC_FILES_CHKSUM = file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ + file://Source/WebKit/LICENSE;md5=4646f90082c40bcf298c285f8bab0b12 \ + file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \ + file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \ + file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \ + + +SRC_URI = \ + http://www.webkitgtk.org/releases/${PN}-${PV}.tar.xz \ + +SRC_URI[md5sum] = 29b92a0aacc819d0e5e5df03895fb98e +SRC_URI[sha256sum] = b3de60c8676ed54bb3d6201c742bbd702ee176fdfef5ca06f2fc514783792f16 + +inherit cmake lib_package pkgconfig perlnative pythonnative + +DEPENDS = zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ + gtk+ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ + pango icu bison-native gnome-common gawk intltool-native libwebp \ + atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ + ruby-native libsecret libnotify gstreamer1.0-plugins-bad \ + +DEPENDS += ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} + +EXTRA_OECMAKE = \ + -DPORT=GTK \ + -DCMAKE_BUILD_TYPE=Release \ + -DENABLE_INTROSPECTION=False \ + -DENABLE_MINIBROWSER=True \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-DENABLE_WEBGL=True', '-DENABLE_WEBGL=False', d)} \ + + +# Javascript JIT is not supported on powerpc +# FIXME: This might be needed on powerpc64 as well, but can't be easily tested in poky. +EXTRA_OECMAKE_append_powerpc = -DENABLE_JIT=False + +# ARM JIT code does not build on ARMv5/6 anymore, apparently they test only on v7 onwards +EXTRA_OECMAKE_append_armv5 = -DENABLE_JIT=False +EXTRA_OECMAKE_append_armv6 = -DENABLE_JIT=False + +# binutils 2.25 has a bug on aarch64: +# https://sourceware.org/bugzilla/show_bug.cgi?id=18430 +EXTRA_OECMAKE_append_aarch64 = -DUSE_LD_GOLD=False + +# JIT not supported on MIPS either +EXTRA_OECMAKE_append_mips = -DENABLE_JIT=False + +# Note: does not currently build on mips64 due to incorrect type size assumptions +# Bug filed here: https://bugs.webkit.org/show_bug.cgi?id=146058 + +FILES_${PN} += ${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so +FILES_${PN}-dbg += ${libdir}/webkit2gtk-4.0/injected-bundle/.debug/libwebkit2gtkinjectedbundle.so +FILES_${PN}-dbg += ${libdir}/webkitgtk/webkit2gtk-4.0/.debug/* + -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 16/22] Add a recipe for gnome-desktop3
gnome-desktop3 is a dependency of epiphany Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- .../gnome-desktop/gnome-desktop3_3.16.2.bb | 25 ++ 1 file changed, 25 insertions(+) create mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb new file mode 100644 index 000..a0542c1 --- /dev/null +++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb @@ -0,0 +1,25 @@ +SUMMARY = GNOME library for reading .desktop files +SECTION = x11/gnome +LICENSE = GPLv2 LGPLv2 +LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ +file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 + +BPN = gnome-desktop + +inherit gnome pkgconfig +SRC_URI[archive.md5sum] = ab5bf4cc94ad63639f42adcc1542b1f0 +SRC_URI[archive.sha256sum] = 3a8f196b46eb9dbd3ba2afb8fb5fef6a8825539d449a02181311242e7bd0 + +DEPENDS += gsettings-desktop-schemas gconf libxrandr virtual/libx11 gtk+3 glib-2.0 gnome-doc-utils gnome-common startup-notification + +EXTRA_OECONF = --disable-desktop-docs + +do_configure_prepend () { +cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} +} + +PACKAGES =+ libgnome-desktop3 +FILES_libgnome-desktop3 = ${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml + +RRECOMMENDS_libgnome-desktop3 += gsettings-desktop-schemas + -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 20/22] Remove the recipe for the obsolete webkit-gtk 1.8.3
webkitgtk 2.8.3 is provided instead and midori browser is replaced by epiphany in separate commits. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/conf/distro/include/security_flags.inc| 2 - meta/recipes-sato/webkit/files/bison-2.6.patch | 558 - meta/recipes-sato/webkit/files/no-gtkdoc.patch | 20 - meta/recipes-sato/webkit/files/nodolt.patch| 19 - .../webgit-gtk_fix_build_with_automake_1.12.patch | 62 --- ...bkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch | 26 - .../0001-Enable-mips64-build.patch | 69 --- .../webkit/webkit-gtk-1.8.3/aarch64.patch | 41 -- .../obsolete_automake_macros.patch | 14 - meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb | 116 - 10 files changed, 927 deletions(-) delete mode 100644 meta/recipes-sato/webkit/files/bison-2.6.patch delete mode 100644 meta/recipes-sato/webkit/files/no-gtkdoc.patch delete mode 100644 meta/recipes-sato/webkit/files/nodolt.patch delete mode 100644 meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch delete mode 100644 meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch delete mode 100644 meta/recipes-sato/webkit/webkit-gtk-1.8.3/0001-Enable-mips64-build.patch delete mode 100644 meta/recipes-sato/webkit/webkit-gtk-1.8.3/aarch64.patch delete mode 100644 meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch delete mode 100644 meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 9608c7f..367995c 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -16,7 +16,6 @@ SECURITY_CFLAGS_powerpc = -fstack-protector-all -D_FORTIFY_SOURCE=2 SECURITY_CFLAGS_pn-dbus_powerpc = SECURITY_CFLAGS_pn-dbus-ptest_powerpc = SECURITY_CFLAGS_pn-libmatchbox_powerpc = -SECURITY_CFLAGS_pn-webkit-gtk_powerpc = # arm specific security flag issues SECURITY_CFLAGS_pn-lttng-tools_arm = ${SECURITY_NO_PIE_CFLAGS} @@ -80,7 +79,6 @@ SECURITY_CFLAGS_pn-python-numpy = ${SECURITY_NO_PIE_CFLAGS} SECURITY_CFLAGS_pn-tcl = ${SECURITY_NO_PIE_CFLAGS} SECURITY_CFLAGS_pn-tiff = ${SECURITY_NO_PIE_CFLAGS} SECURITY_CFLAGS_pn-valgrind = ${SECURITY_NO_PIE_CFLAGS} -SECURITY_CFLAGS_pn-webkit-gtk = ${SECURITY_NO_PIE_CFLAGS} SECURITY_CFLAGS_pn-zlib = ${SECURITY_NO_PIE_CFLAGS} # These 2 have text relco errors with the pie options enabled diff --git a/meta/recipes-sato/webkit/files/bison-2.6.patch b/meta/recipes-sato/webkit/files/bison-2.6.patch deleted file mode 100644 index d4aa674..000 --- a/meta/recipes-sato/webkit/files/bison-2.6.patch +++ /dev/null @@ -1,558 +0,0 @@ -Upstream-Status: Backport -http://trac.webkit.org/changeset/124099 - -Subversion Revision: 123651 -diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y -index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644 a/Source/WebCore/css/CSSGrammar.y -+++ b/Source/WebCore/css/CSSGrammar.y -@@ -53,14 +53,13 @@ using namespace HTMLNames; - #define YYMAXDEPTH 1 - #define YYDEBUG 0 - --// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x --#define YYPARSE_PARAM parser --#define YYLEX_PARAM parser -- - %} - - %pure_parser - -+%parse-param { CSSParser* parser } -+%lex-param { CSSParser* parser } -+ - %union { - bool boolean; - char character; -@@ -89,7 +88,7 @@ using namespace HTMLNames; - - %{ - --static inline int cssyyerror(const char*) -+static inline int cssyyerror(void*, const char*) - { - return 1; - } -diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp -index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644 a/Source/WebCore/css/CSSParser.cpp -+++ b/Source/WebCore/css/CSSParser.cpp -@@ -114,7 +114,7 @@ - extern int cssyydebug; - #endif - --extern int cssyyparse(void* parser); -+extern int cssyyparse(WebCore::CSSParser*); - - using namespace std; - using namespace WTF; -diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y -index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644 a/Source/WebCore/xml/XPathGrammar.y -+++ b/Source/WebCore/xml/XPathGrammar.y -@@ -34,6 +34,7 @@ - #include XPathParser.h - #include XPathPath.h - #include XPathPredicate.h -+#include XPathStep.h - #include XPathVariableReference.h - #include wtf/FastMalloc.h - -@@ -44,8 +45,6 @@ - #define YYLTYPE_IS_TRIVIAL 1 - #define YYDEBUG 0 - #define YYMAXDEPTH 1 --#define YYPARSE_PARAM parserParameter --#define PARSER static_castParser*(parserParameter) - - using namespace WebCore; - using namespace XPath; -@@ -53,6 +52,7 @@ using namespace XPath; - %} - - %pure_parser -+%parse-param { WebCore
[OE-core] [PATCH 17/22] Add a warning suppression patch to glib
Otherwise QA check will fail. Some schemas in gsettings-desktop-schemas (such as proxy and locale) are still using deprecated paths, as of 3.16.1. This causes warning messages, and meta/lib/oe/rootfs.py complaints about them. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- ...warning-about-deprecated-paths-in-schemas.patch | 32 ++ meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch new file mode 100644 index 000..54e830c --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch @@ -0,0 +1,32 @@ +From 41534253b6b61ed4769eb6a3966698a50ee73b71 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin alex.kana...@gmail.com +Date: Fri, 12 Jun 2015 17:08:46 +0300 +Subject: [PATCH] Remove the warning about deprecated paths in schemas + +Some schemas in gsettings-desktop-schemas (such as proxy and locale) +are still using deprecated paths, as of 3.16.1. This causes warning +messages, and meta/lib/oe/rootfs.py complaints about them. +--- + gio/glib-compile-schemas.c | 6 -- + 1 file changed, 6 deletions(-) + +diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c +index e42949b..ec79d7c 100644 +--- a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c +@@ -1202,12 +1202,6 @@ parse_state_start_schema (ParseState *state, + return; + } + +- if (path (g_str_has_prefix (path, /apps/) || +- g_str_has_prefix (path, /desktop/) || +- g_str_has_prefix (path, /system/))) +-g_printerr (warning: Schema '%s' has path '%s'. Paths starting with +-'/apps/', '/desktop/' or '/system/' are deprecated.\n, id, path); +- + state-schema_state = schema_state_new (path, gettext_domain, + extends, extends_name, list_of); + +-- +2.1.4 + diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb index 8eaccfb..1e3d36a 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb @@ -14,6 +14,7 @@ SRC_URI = ${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://uclibc.patch \ file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \ file://allow-run-media-sdX-drive-mount-if-username-root.patch \ + file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ SRC_URI_append_class-native = file://glib-gettextize-dir.patch -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 22/22] poky: update distro files related to webkitgtk update and epiphany addition
Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta-yocto/conf/distro/include/distro_alias.inc| 2 +- meta-yocto/conf/distro/include/maintainers.inc | 4 ++-- meta-yocto/conf/distro/include/package_regex.inc | 5 ++--- meta-yocto/conf/distro/include/poky-floating-revisions.inc | 1 - meta-yocto/conf/distro/include/recipe_color.inc| 1 - meta-yocto/conf/distro/include/upstream_tracking.inc | 2 -- 6 files changed, 5 insertions(+), 10 deletions(-) diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc index 0f8ed55..53386f3 100644 --- a/meta-yocto/conf/distro/include/distro_alias.inc +++ b/meta-yocto/conf/distro/include/distro_alias.inc @@ -473,7 +473,7 @@ DISTRO_PN_ALIAS_pn-v86d = Debian=v86d Ubuntu=v86d DISTRO_PN_ALIAS_pn-videoproto = Meego=xorg-x11-proto-videoproto DISTRO_PN_ALIAS_pn-waffle = OE-Core DISTRO_PN_ALIAS_pn-watchdog = Debian=watchdog Ubuntu=watchdog Mandriva=watchdog -DISTRO_PN_ALIAS_pn-webkit-gtk = Fedora=webkitgtk Ubuntu=libwebkit +DISTRO_PN_ALIAS_pn-webkitgtk = Fedora=webkitgtk Ubuntu=libwebkit DISTRO_PN_ALIAS_pn-web-webkit = OpenedHand DISTRO_PN_ALIAS_pn-weston = Fedora=weston OpenSuSE=weston DISTRO_PN_ALIAS_pn-weston-init = OE-Core diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/meta-yocto/conf/distro/include/maintainers.inc index fdeb7f7..aab66d8 100644 --- a/meta-yocto/conf/distro/include/maintainers.inc +++ b/meta-yocto/conf/distro/include/maintainers.inc @@ -156,6 +156,7 @@ RECIPE_MAINTAINER_pn-eglibc-scripts = Saul Wold s...@linux.intel.com RECIPE_MAINTAINER_pn-elfutils = Hongxu Jia hongxu@windriver.com RECIPE_MAINTAINER_pn-enchant = Cristian Iorga cristian.io...@intel.com RECIPE_MAINTAINER_pn-encodings = Ross Burton ross.bur...@intel.com +RECIPE_MAINTAINER_pn-epiphany = Alexander Kanavin alexander.kana...@intel.com RECIPE_MAINTAINER_pn-ethtool = Randy Witt randy.e.w...@linux.intel.com RECIPE_MAINTAINER_pn-expat = Paul Eggleton paul.eggle...@linux.intel.com RECIPE_MAINTAINER_pn-file = Robert Yang liezhi.y...@windriver.com @@ -444,7 +445,6 @@ RECIPE_MAINTAINER_pn-mesa-gl = Ross Burton ross.bur...@intel.com RECIPE_MAINTAINER_pn-meta-ide-support = Jessica Zhang jessica.zh...@intel.com RECIPE_MAINTAINER_pn-meta-toolchain-qte = Paul Eggleton paul.eggle...@linux.intel.com RECIPE_MAINTAINER_pn-meta-toolchain = Jessica Zhang jessica.zh...@intel.com -RECIPE_MAINTAINER_pn-midori = Alejandro Hernandez alejandro.hernan...@linux.intel.com RECIPE_MAINTAINER_pn-mingetty = Kai Kang kai.k...@windriver.com RECIPE_MAINTAINER_pn-minicom = Cristian Iorga cristian.io...@intel.com RECIPE_MAINTAINER_pn-mini-x-session = Saul Wold s...@linux.intel.com @@ -680,7 +680,7 @@ RECIPE_MAINTAINER_pn-vte = Ross Burton ross.bur...@intel.com RECIPE_MAINTAINER_pn-waffle = Ross Burton ross.bur...@intel.com RECIPE_MAINTAINER_pn-watchdog = Saul Wold s...@linux.intel.com RECIPE_MAINTAINER_pn-wayland = Ross Burton ross.bur...@intel.com -RECIPE_MAINTAINER_pn-webkit-gtk = Ross Burton ross.bur...@intel.com +RECIPE_MAINTAINER_pn-webkitgtk = Alexander Kanavin alexander.kana...@intel.com RECIPE_MAINTAINER_pn-web-webkit = Ross Burton ross.bur...@intel.com RECIPE_MAINTAINER_pn-weston = Ross Burton ross.bur...@intel.com RECIPE_MAINTAINER_pn-wget = Robert Yang liezhi.y...@windriver.com diff --git a/meta-yocto/conf/distro/include/package_regex.inc b/meta-yocto/conf/distro/include/package_regex.inc index 4aeae89..d36e116 100644 --- a/meta-yocto/conf/distro/include/package_regex.inc +++ b/meta-yocto/conf/distro/include/package_regex.inc @@ -21,9 +21,6 @@ COMMON_REGEX = (?Ppver(\d+[\.-_]*)+) REGEX_URI_pn-wireless-tools = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html; REGEX_pn-wireless-tools = wireless_tools\.(?Ppver(\d+)(\..*|))\.tar\.gz -REGEX_URI_pn-midori=http://midori-browser.org/download/source/; -REGEX_pn-midori=midori_(?Ppver((\d+[\.-_]*)+))_all_\.tar\.bz2 - REGEX_URI_pn-sqlite3=http://www.sqlite.org/; REGEX_pn-sqlite3=${COMMON_REGEX} @@ -157,3 +154,5 @@ REGEX_pn-gtk-engines = ${GNOME2_STABLE} REGEX_pn-glib-networking = ${GNOME_STABLE} REGEX_pn-librsvg = ${GNOME_STABLE} REGEX_pn-libsoup-2.4 = ${GNOME_STABLE} +REGEX_pn-epiphany = ${GNOME_STABLE} +REGEX_pn-webkitgtk = ${GNOME_STABLE} diff --git a/meta-yocto/conf/distro/include/poky-floating-revisions.inc b/meta-yocto/conf/distro/include/poky-floating-revisions.inc index 5b8c3a0..b11f2cd 100644 --- a/meta-yocto/conf/distro/include/poky-floating-revisions.inc +++ b/meta-yocto/conf/distro/include/poky-floating-revisions.inc @@ -41,7 +41,6 @@ SRCREV_pn-clutter ?= ${AUTOREV} SRCREV_pn-clutter-gst ?= ${AUTOREV} SRCREV_pn-gaku ?= ${AUTOREV} SRCREV_pn-gypsy ?= ${AUTOREV} -#SRCREV_pn-webkit-gtk ?= ${AUTOREV} SRCREV_pn-aaina ?= ${AUTOREV} SRCREV_pn-clutter-cairo ?= ${AUTOREV} SRCREV_pn-table ?= ${AUTOREV} diff --git a/meta-yocto/conf/distro/include/recipe_color.inc b/meta
[OE-core] [PATCH 21/22] Remove the midori recipe and replace references to midori with epiphany
Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- .../packagegroups/packagegroup-self-hosted.bb | 10 +++ .../builder/files/builder_hob_start.sh | 8 +++--- meta/recipes-sato/midori/midori/liststore.patch| 29 meta/recipes-sato/midori/midori_0.5.8.bb | 31 -- .../packagegroups/packagegroup-core-x11-sato.bb| 2 +- 5 files changed, 10 insertions(+), 70 deletions(-) delete mode 100644 meta/recipes-sato/midori/midori/liststore.patch delete mode 100644 meta/recipes-sato/midori/midori_0.5.8.bb diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 531f729..cd3bddd 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -28,10 +28,10 @@ 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 = +# epiphany depends on webkitgtk which could not build for mips64 +EPIPHANY = epiphany +EPIPHANY_mips64 = +EPIPHANY_mips64n32 = RDEPENDS_packagegroup-self-hosted-host-tools = \ connman \ @@ -199,7 +199,7 @@ RDEPENDS_packagegroup-self-hosted-graphics = \ python-pygtk \ gtk-theme-clearlooks \ xdg-utils \ -${MIDORI} \ +${EPIPHANY} \ leafpad \ pcmanfm \ vte \ diff --git a/meta/recipes-graphics/builder/files/builder_hob_start.sh b/meta/recipes-graphics/builder/files/builder_hob_start.sh index 65a68ee..b394b09 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 #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 diff --git a/meta/recipes-sato/midori/midori/liststore.patch b/meta/recipes-sato/midori/midori/liststore.patch deleted file mode 100644 index 4e5d666..000 --- a/meta/recipes-sato/midori/midori/liststore.patch +++ /dev/null @@ -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.bur...@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), 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 1c027fe4..000 --- a/meta/recipes-sato/midori/midori_0.5.8.bb +++ /dev/null @@ -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
[OE-core] [PATCH 08/22] Add a recipe for ruby
Ruby is required to build webkit. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-devtools/ruby/ruby.inc | 40 +++ meta/recipes-devtools/ruby/ruby/extmk.patch | 13 + meta/recipes-devtools/ruby/ruby_2.2.2.bb| 42 + 3 files changed, 95 insertions(+) create mode 100644 meta/recipes-devtools/ruby/ruby.inc create mode 100644 meta/recipes-devtools/ruby/ruby/extmk.patch create mode 100644 meta/recipes-devtools/ruby/ruby_2.2.2.bb diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc new file mode 100644 index 000..ba60191 --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby.inc @@ -0,0 +1,40 @@ +SUMMARY = An interpreter of object-oriented scripting language +DESCRIPTION = Ruby is an interpreted scripting language for quick \ +and easy object-oriented programming. It has many features to process \ +text files and to do system management tasks (as in Perl). \ +It is simple, straight-forward, and extensible. \ + +HOMEPAGE = http://www.ruby-lang.org/; +SECTION = devel/ruby +LICENSE = Ruby | BSD | GPLv2 +LIC_FILES_CHKSUM = \ +file://COPYING;md5=837b32593517ae48b9c3b5c87a5d288c \ +file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\ +file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\ +file://LEGAL;md5=c440adb575ba4e6e2344c2630b6a5584\ + + +DEPENDS = ruby-native zlib openssl tcl libyaml db gdbm readline +DEPENDS_class-native = libyaml-native + +SHRT_VER = ${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]} +SRC_URI = http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ + file://extmk.patch \ + + +S = ${WORKDIR}/ruby-${PV} + +inherit autotools + + +# This snippet lets compiled extensions which rely on external libraries, +# such as zlib, compile properly. If we don't do this, then when extmk.rb +# runs, it uses the native libraries instead of the target libraries, and so +# none of the linking operations succeed -- which makes extconf.rb think +# that the libraries aren't available and hence that the extension can't be +# built. + +do_configure_prepend() { +sed -i s#%%TARGET_CFLAGS%%#$TARGET_CFLAGS#; s#%%TARGET_LDFLAGS%%#$TARGET_LDFLAGS# ${S}/common.mk +rm -rf ${S}/ruby/ +} diff --git a/meta/recipes-devtools/ruby/ruby/extmk.patch b/meta/recipes-devtools/ruby/ruby/extmk.patch new file mode 100644 index 000..8b68450 --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/extmk.patch @@ -0,0 +1,13 @@ +diff -ru ruby-1.8.7-p248.orig/ext/extmk.rb ruby-1.8.7-p248/ext/extmk.rb +--- ruby-1.8.7-p248.orig/ext/extmk.rb 2009-12-24 03:01:58.0 -0600 ruby-1.8.7-p248/ext/extmk.rb 2010-02-12 15:55:27.370061558 -0600 +@@ -354,8 +354,8 @@ + $ruby = '$(topdir)/miniruby' + EXEEXT + end + $ruby -I'$(topdir)' ++$ruby -I'$(top_srcdir)/lib' + unless CROSS_COMPILING +- $ruby -I'$(top_srcdir)/lib' + $ruby -I'$(extout)/$(arch)' -I'$(extout)/common' if $extout + $ruby -I./- -I'$(top_srcdir)/ext' -rpurelib.rb + ENV[RUBYLIB] = - diff --git a/meta/recipes-devtools/ruby/ruby_2.2.2.bb b/meta/recipes-devtools/ruby/ruby_2.2.2.bb new file mode 100644 index 000..78c943c --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby_2.2.2.bb @@ -0,0 +1,42 @@ +require ruby.inc + +SRC_URI[md5sum] = 326e99ddc75381c7b50c85f7089f3260 +SRC_URI[sha256sum] = 5ffc0f317e429e6b29d4a98ac521c3ce65481bfd22a8cf845fa02a7b113d9b44 + +# it's unknown to configure script, but then passed to extconf.rb +# maybe it's not really needed as we're hardcoding the result with +# 0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch +UNKNOWN_CONFIGURE_WHITELIST += --enable-wide-getaddrinfo + +PACKAGECONFIG ??= +PACKAGECONFIG += ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} + +PACKAGECONFIG[valgrind] = --with-valgrind=yes, --with-valgrind=no, valgrind +PACKAGECONFIG[gpm] = --with-gmp=yes, --with-gmp=no, gmp +PACKAGECONFIG[ipv6] = ,--enable-wide-getaddrinfo, + +EXTRA_OECONF = \ +--disable-versioned-paths \ +--disable-rpath \ +--disable-dtrace \ +--enable-shared \ +--enable-load-relative \ + + +EXTRA_OEMAKE = \ +LIBRUBYARG='-lruby-static' \ + + +do_install() { +oe_runmake 'DESTDIR=${D}' install +} + +FILES_${PN} += ${datadir}/rubygems \ +${datadir}/ri + +FILES_${PN}-dbg += ${libdir}/ruby/*/.debug \ +${libdir}/ruby/*/*/.debug \ +${libdir}/ruby/*/*/*/.debug \ +${libdir}/ruby/*/*/*/*/.debug + +BBCLASSEXTEND = native -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 19/22] Add a recipe for epiphany
Epiphany is replacing midori as the browser in oe-core recipe set and poky distribution. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-gnome/epiphany/epiphany_3.16.1.bb | 23 +++ 1 file changed, 23 insertions(+) create mode 100644 meta/recipes-gnome/epiphany/epiphany_3.16.1.bb diff --git a/meta/recipes-gnome/epiphany/epiphany_3.16.1.bb b/meta/recipes-gnome/epiphany/epiphany_3.16.1.bb new file mode 100644 index 000..3f45706 --- /dev/null +++ b/meta/recipes-gnome/epiphany/epiphany_3.16.1.bb @@ -0,0 +1,23 @@ +SUMMARY = WebKit based web browser for GNOME +LICENSE = GPLv2+ +LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe + +DEPENDS = libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates avahi libnotify gcr libwnck3 \ + gsettings-desktop-schemas gnome-desktop3 + +inherit gnomebase gsettings +SRC_URI[archive.md5sum] = bf03453eac5701049c4ec82e1b0c8532 +SRC_URI[archive.sha256sum] = 4e59a13c299d1ce726871958e1925b42f93d8c73bf1bb0decf79749be00e9666 + +EXTRA_OECONF += --disable-nss --with-distributor-name=${DISTRO} + +do_configure_prepend() { +touch ${S}/gnome-doc-utils.make +sed -i -e s:help::g ${S}/Makefile.am +} + +FILES_${PN} += ${datadir}/appdata ${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers +FILES_${PN}-dbg += ${libdir}/${PN}/*/web-extensions/.debug/libephywebextension.so +RDEPENDS_${PN} = iso-codes +RRECOMMENDS_${PN} = ca-certificates + -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 18/22] Add a recipe gsettings-desktop-schemas
gsettings-desktop-schemas is a dependency of epiphany Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- .../gsettings-desktop-schemas_3.16.1.bb | 13 + 1 file changed, 13 insertions(+) create mode 100644 meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.16.1.bb diff --git a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.16.1.bb b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.16.1.bb new file mode 100644 index 000..f2f2c75 --- /dev/null +++ b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.16.1.bb @@ -0,0 +1,13 @@ +SUMMARY = GNOME desktop-wide GSettings schemas +HOMEPAGE = http://live.gnome.org/gsettings-desktop-schemas; +BUGTRACKER = https://bugzilla.gnome.org/; + +LICENSE = LGPLv2.1 +LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c + +DEPENDS = glib-2.0 intltool-native gobject-introspection-stub-native + +inherit gnomebase gsettings gettext + +SRC_URI[archive.md5sum] = baebbcf3c20591f98876e42fb0a3fd35 +SRC_URI[archive.sha256sum] = 74fe9fdad510c8afebeceb7ebafc581ef990b3afcc8c1e8b5d90b24b3461 -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 12/22] Add a recipe for p11-kit
p11-kit is a dependency of gcr (which is a dependency of epiphany) Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-support/p11-kit/p11-kit_0.22.1.bb | 18 ++ 1 file changed, 18 insertions(+) create mode 100644 meta/recipes-support/p11-kit/p11-kit_0.22.1.bb diff --git a/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb new file mode 100644 index 000..7ad9626e --- /dev/null +++ b/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb @@ -0,0 +1,18 @@ +SUMMARY = Provides a way to load and enumerate PKCS#11 modules +LICENSE = BSD +LIC_FILES_CHKSUM = file://COPYING;md5=02933887f609807fbb57aa4237d14a50 + +inherit autotools gettext pkgconfig + +DEPENDS = libtasn1 libffi + +SRC_URI = http://p11-glue.freedesktop.org/releases/${BP}.tar.gz; +SRC_URI[md5sum] = 4e9bea1106628ffb820bdad24a819fac +SRC_URI[sha256sum] = ef3a339fcf6aa0e32c8c23f79ba7191e57312be2bda8b24e6d121c2670539a5c + +FILES_${PN}-dev += \ +${libdir}/p11-kit-proxy.so \ +${libdir}/pkcs11/p11-kit-trust.so \ + +FILES_${PN}-dev += ${libdir}/pkcs11/*.la +FILES_${PN}-dbg += ${libdir}/pkcs11/.debug -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/22] Add a recipe for libsecret
libsecret is a dependency of webkit Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-gnome/libsecret/libsecret_0.18.2.bb | 12 1 file changed, 12 insertions(+) create mode 100644 meta/recipes-gnome/libsecret/libsecret_0.18.2.bb diff --git a/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb b/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb new file mode 100644 index 000..cebc83b --- /dev/null +++ b/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb @@ -0,0 +1,12 @@ +SUMMARY = libsecret is a library for storing and retrieving passwords and other secrets +LICENSE = LGPLv2.1 +LIC_FILES_CHKSUM = file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6 + +inherit gnomebase gtk-doc + +DEPENDS = glib-2.0 libgcrypt + +EXTRA_OECONF += --disable-manpages + +SRC_URI[archive.md5sum] = 23cdf8267d11a26f88f0dbec1e2022ad +SRC_URI[archive.sha256sum] = 12fd288b012e1b2b1b54d586cd4c6507885715534644b4534b7ef7d7079ba443 -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 13/22] Add a recipe for gcr
gcr is a dependency of epiphany Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-gnome/gcr/gcr_3.16.0.bb | 18 ++ 1 file changed, 18 insertions(+) create mode 100644 meta/recipes-gnome/gcr/gcr_3.16.0.bb diff --git a/meta/recipes-gnome/gcr/gcr_3.16.0.bb b/meta/recipes-gnome/gcr/gcr_3.16.0.bb new file mode 100644 index 000..8b5b6e4 --- /dev/null +++ b/meta/recipes-gnome/gcr/gcr_3.16.0.bb @@ -0,0 +1,18 @@ +SUMMARY = A library for bits of crypto UI and parsing etc +HOMEPAGE = http://www.gnome.org/; +BUGTRACKER = https://bugzilla.gnome.org/; + +LICENSE = GPLv2 +LIC_FILES_CHKSUM = file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 + +DEPENDS = gtk+3 p11-kit glib-2.0 libgcrypt vala + +inherit autotools gnomebase gtk-icon-cache gtk-doc + +SRC_URI[archive.md5sum] = d5835680be0b6a838e02a528d5378d9c +SRC_URI[archive.sha256sum] = ecfe8df41cc88158364bb15addc670b11e539fe844742983629ba2323888d075 + +FILES_${PN} += \ +${datadir}/dbus-1 \ +${datadir}/gcr-3 \ + -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 15/22] Add a recipe for libwnck3
libwnck is a dependency of epiphany Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb | 17 + 1 file changed, 17 insertions(+) create mode 100644 meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb diff --git a/meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb b/meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb new file mode 100644 index 000..6bc625a --- /dev/null +++ b/meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb @@ -0,0 +1,17 @@ +SUMMARY = Window navigation construction toolkit +LICENSE = LGPLv2 +LIC_FILES_CHKSUM = file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 + +BPN = libwnck + +SECTION = x11/libs +DEPENDS = gobject-introspection-stub gtk+3 gdk-pixbuf-native libxres + +PR = r1 + +PACKAGECONFIG ??= startup-notification +PACKAGECONFIG[startup-notification] = --enable-startup-notification,--disable-startup-notification,startup-notification + +inherit gnomebase +SRC_URI[archive.md5sum] = 4538672e0d775fadedf10abeb8020047 +SRC_URI[archive.sha256sum] = f5080076346609b4c36394b879f3a86b92ced3b90a37cb54c8e9a14f00e7921c -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 14/22] Add a recipe for iso-codes
iso-codes is a dependency of epiphany Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-support/iso-codes/iso-codes_3.58.bb | 15 +++ 1 file changed, 15 insertions(+) create mode 100644 meta/recipes-support/iso-codes/iso-codes_3.58.bb diff --git a/meta/recipes-support/iso-codes/iso-codes_3.58.bb b/meta/recipes-support/iso-codes/iso-codes_3.58.bb new file mode 100644 index 000..3df2ea9 --- /dev/null +++ b/meta/recipes-support/iso-codes/iso-codes_3.58.bb @@ -0,0 +1,15 @@ +SUMMARY = ISO language, territory, currency, script codes and their translations +LICENSE = LGPLv2.1 +LIC_FILES_CHKSUM = file://LICENSE;md5=fbc093901857fcd118f065f900982c24 + +SRC_URI = https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz; +SRC_URI[md5sum] = 34097a0085f0979e28f9db66ec274c5e +SRC_URI[sha256sum] = 86af5735dce6e4eff2b983e5d8aa9a3dea1b8db702333ff20be89e45f7f35a72 + +# inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which +# are inhibited by allarch +DEPENDS = gettext-native + +inherit autotools allarch + +FILES_${PN} += ${datadir}/xml/ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/22] Change tarball compression to xz for gnome recipes
Upstream, xz has been the only format for some time now, so let's make it the default and adjust recipes that package old stuff. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/classes/gnomebase.bbclass | 2 +- meta/recipes-core/glib-networking/glib-networking_2.44.0.bb | 2 -- meta/recipes-gnome/gnome/gnome-common_3.14.0.bb | 2 -- meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb | 2 -- meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb | 1 + meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb| 1 + meta/recipes-gnome/json-glib/json-glib_1.0.4.bb | 2 -- meta/recipes-gnome/libglade/libglade_2.6.4.bb | 1 + meta/recipes-gnome/librsvg/librsvg_2.40.9.bb| 2 -- meta/recipes-graphics/pango/pango_1.36.8.bb | 2 -- meta/recipes-support/atk/atk_2.16.0.bb | 2 -- meta/recipes-support/libcroco/libcroco_0.6.8.bb | 2 -- meta/recipes-support/vte/vte_0.28.2.bb | 4 ++-- 13 files changed, 6 insertions(+), 19 deletions(-) diff --git a/meta/classes/gnomebase.bbclass b/meta/classes/gnomebase.bbclass index 6ca13cb..e5c6776 100644 --- a/meta/classes/gnomebase.bbclass +++ b/meta/classes/gnomebase.bbclass @@ -1,7 +1,7 @@ def gnome_verdir(v): return oe.utils.trim_version(v, 2) -GNOME_COMPRESS_TYPE ?= bz2 +GNOME_COMPRESS_TYPE ?= xz SECTION ?= x11/gnome GNOMEBN ?= ${BPN} SRC_URI = ${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir(${PV})}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive diff --git a/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb index 848bf53..4f91b76 100644 --- a/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb +++ b/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb @@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 SECTION = libs DEPENDS = glib-2.0 intltool-native -GNOME_COMPRESS_TYPE = xz - SRC_URI[archive.md5sum] = 6989b20cf3b26dd5ae272e04a9acb0b3 SRC_URI[archive.sha256sum] = 8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346 diff --git a/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb b/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb index 1f9fe8b..80b7033 100644 --- a/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb +++ b/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb @@ -8,8 +8,6 @@ LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 SECTION = x11/gnome inherit gnomebase allarch -GNOME_COMPRESS_TYPE = xz - SRC_URI[archive.md5sum] = ba58c61d0d81b7c3ff8452c620513a9d SRC_URI[archive.sha256sum] = 4c00242f781bb441289f49dd80ed1d895d84de0c94bfc2c6818a104c9e39262c diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb index 321eb7f..78cc005 100644 --- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb +++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb @@ -2,8 +2,6 @@ require gnome-doc-utils.inc LIC_FILES_CHKSUM = file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343 -GNOME_COMPRESS_TYPE = xz - SRC_URI += file://xsltproc_nonet.patch \ file://use-usr-bin-env-for-python-in-xml2po.patch \ file://sysrooted-pkg-config.patch \ diff --git a/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb b/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb index 65b79f0..a31eb55 100644 --- a/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb +++ b/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb @@ -13,6 +13,7 @@ SRC_URI += file://pkgconfig.patch SRC_URI[archive.md5sum] = 541858188f80090d12a33b5a7c34d42c SRC_URI[archive.sha256sum] = 37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7 +GNOME_COMPRESS_TYPE=bz2 DEPENDS += shared-mime-info intltool-native RDEPENDS_${PN} = shared-mime-info diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb index 036aa27..c30454c 100644 --- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb +++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb @@ -32,6 +32,7 @@ CFLAGS_prepend = -DHAVE_ANIMATION RDEPENDS_${PN}-dev = inherit gnomebase +GNOME_COMPRESS_TYPE=bz2 python populate_packages_prepend() { engines_root = os.path.join(d.getVar('libdir', True), gtk-2.0/2.10.0/engines) diff --git a/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb b/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb index 4d2b613..c57c973 100644 --- a/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb +++ b/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb @@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 DEPENDS = glib-2.0 -GNOME_COMPRESS_TYPE = xz - SRC_URI[archive.md5sum
[OE-core] [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany
This patch series updates webkitgtk to latest stable upstream release and replaces midori browser with epiphany. These patches should be applied on top of Jussi Kukkonen's gtk3 update to 3.16. Alexander Kanavin (22): Change tarball compression to xz for gnome recipes Enable icu feature in harfbuzz recipe Add arch conversion routine to cmake.bbclass Update jpeg recipe to version 9a Update libnotify to version 0.7.6 Add a recipe for giflib Add a recipe for libyaml Add a recipe for ruby Add a recipe for libsecret Add a recipe for libwebp Add a recipe for webkitgtk 2.8.3 Add a recipe for p11-kit Add a recipe for gcr Add a recipe for iso-codes Add a recipe for libwnck3 Add a recipe for gnome-desktop3 Add a warning suppression patch to glib Add a recipe gsettings-desktop-schemas Add a recipe for epiphany Remove the recipe for the obsolete webkit-gtk 1.8.3 Remove the midori recipe and replace references to midori with epiphany poky: update distro files related to webkitgtk update and epiphany addition meta-yocto/conf/distro/include/distro_alias.inc|2 +- meta-yocto/conf/distro/include/maintainers.inc |4 +- meta-yocto/conf/distro/include/package_regex.inc |5 +- .../distro/include/poky-floating-revisions.inc |1 - meta-yocto/conf/distro/include/recipe_color.inc|1 - .../conf/distro/include/upstream_tracking.inc |2 - meta/classes/cmake.bbclass | 12 +- meta/classes/gnomebase.bbclass |2 +- meta/conf/distro/include/security_flags.inc|2 - ...warning-about-deprecated-paths-in-schemas.patch | 32 + meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb |1 + .../glib-networking/glib-networking_2.44.0.bb |2 - .../jpeg/jpeg-8d/debian-libjpeg7_7-1.diff | 1070 .../jpeg/jpeg-8d/fix_for_automake_1.12.1.patch | 44 - meta/recipes-core/jpeg/{jpeg_8d.bb = jpeg_9a.bb} | 28 +- .../packagegroups/packagegroup-self-hosted.bb | 10 +- meta/recipes-devtools/giflib/giflib_5.1.1.bb | 20 + meta/recipes-devtools/ruby/ruby.inc| 40 + meta/recipes-devtools/ruby/ruby/extmk.patch| 13 + meta/recipes-devtools/ruby/ruby_2.2.2.bb | 42 + meta/recipes-gnome/epiphany/epiphany_3.16.1.bb | 23 + meta/recipes-gnome/gcr/gcr_3.16.0.bb | 18 + .../gnome-desktop/gnome-desktop3_3.16.2.bb | 25 + meta/recipes-gnome/gnome/gnome-common_3.14.0.bb|2 - .../recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb |2 - meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb |1 + .../gsettings-desktop-schemas_3.16.1.bb| 13 + .../gtk-engines/gtk-engines_2.20.2.bb |1 + meta/recipes-gnome/json-glib/json-glib_1.0.4.bb|2 - meta/recipes-gnome/libglade/libglade_2.6.4.bb |1 + .../{libnotify_0.6.0.bb = libnotify_0.7.6.bb} |8 +- meta/recipes-gnome/librsvg/librsvg_2.40.9.bb |2 - meta/recipes-gnome/libsecret/libsecret_0.18.2.bb | 12 + meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb | 17 + .../builder/files/builder_hob_start.sh |8 +- meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb |2 +- meta/recipes-graphics/pango/pango_1.36.8.bb|2 - meta/recipes-multimedia/webp/libwebp_0.4.3.bb | 47 + meta/recipes-sato/midori/midori/liststore.patch| 29 - meta/recipes-sato/midori/midori_0.5.8.bb | 31 - .../packagegroups/packagegroup-core-x11-sato.bb|2 +- meta/recipes-sato/webkit/files/bison-2.6.patch | 558 -- meta/recipes-sato/webkit/files/no-gtkdoc.patch | 20 - meta/recipes-sato/webkit/files/nodolt.patch| 19 - .../webgit-gtk_fix_build_with_automake_1.12.patch | 62 -- ...bkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch | 26 - .../0001-Enable-mips64-build.patch | 69 -- .../webkit/webkit-gtk-1.8.3/aarch64.patch | 41 - .../obsolete_automake_macros.patch | 14 - meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb | 116 --- meta/recipes-sato/webkit/webkitgtk_2.8.3.bb| 58 ++ meta/recipes-support/atk/atk_2.16.0.bb |2 - meta/recipes-support/iso-codes/iso-codes_3.58.bb | 15 + meta/recipes-support/libcroco/libcroco_0.6.8.bb|2 - meta/recipes-support/libyaml/libyaml_0.1.6.bb | 20 + meta/recipes-support/p11-kit/p11-kit_0.22.1.bb | 18 + meta/recipes-support/vte/vte_0.28.2.bb |4 +- 57 files changed, 455 insertions(+), 2170 deletions(-) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch delete mode 100644 meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff delete mode 100644 meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch rename meta/recipes-core/jpeg/{jpeg_8d.bb = jpeg_9a.bb} (55%) create mode
Re: [OE-core] [PATCH v2 6/6] midori: Depend on Adwaita, not gnome-icon-theme
On 06/12/2015 04:11 PM, Jussi Kukkonen wrote: -RRECOMMENDS_${PN} += glib-networking ca-certificates gnome-icon-theme +RRECOMMENDS_${PN} += glib-networking ca-certificates adwaita-icon-theme This should probably be moved to gtk+ recipes or gnome class; if most(all?) gtk+ applications need those icons, then they shouldn't have to list them in their own recipes. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] qt4: unconditionally disable gstreamer 0.10 support in qt webkit
Previously it was auto-detected in a broken way, which was causing build errors for qt-mobility. Qt4 build will fail if some gstreamer 0.10 packages are available at build time, but not all. It will not fail if none of the packages are available or if all of them are available. We can't guarantee either, hence this patch. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-qt/qt4/qt4.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 6d67994..2175fc0 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -25,6 +25,7 @@ QT_CONFIG_FLAGS += -release -no-cups -reduce-relocations \ -system-libjpeg -system-libpng -system-libtiff -system-zlib \ -no-pch -stl -glib -icu \ -no-rpath -silent \ + -D USE_QTMULTIMEDIA=1 \ ${QT_DBUS} \ ${QT_QT3SUPPORT} \ ${QT_WEBKIT} \ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/5] qt4: fix CVE issues
On 05/28/2015 04:26 AM, Kai Kang wrote: Backport patches to fix qt4 CVE issues: * CVE-2015-1858 * CVE-2015-1859 * CVE-2015-1860 Qt 4.8.7 is out and (I presume) it has all of those fixes. Why not update to that version instead? Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe] State of bitbake world, Failed tasks 2015-05-27
On 05/28/2015 01:04 PM, Paul Eggleton wrote: This seems to be related to gstreamer 0.10 removal; though it's QtWebkit that's failing rather than Phonon: | cd WebKit/qt/tests/ /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/bin/qmake2 -after INCPATH+=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86/usr/include/freetype2 LIBS+=-L/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86/usr/lib /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/qt4-x11-free/4.8.6-r0/qt-everywhere-opensource-src-4.8.6/src/3rdparty/webkit/Source/WebKit/qt/tests/tests.pro -spec /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/qt4-x11-free/4.8.6-r0/qt-everywhere-opensource-src-4.8.6/mkspecs/linux-g++ -after INCPATH+=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86/usr/include/freetype2 LIBS+=-L/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86/usr/lib -o Makefile.WebKit | WARNING: (internal):1: Variable INCPATH is deprecated; use INCLUDEPATH instead. | WARNING: (internal):3: Variable INCPATH is deprecated; use INCLUDEPATH instead. | WARNING: (internal):1: Variable INCPATH is deprecated; use INCLUDEPATH instead. | WARNING: (internal):3: Variable INCPATH is deprecated; use INCLUDEPATH instead. | WARNING: (internal):1: Variable INCPATH is deprecated; use INCLUDEPATH instead. | WARNING: (internal):3: Variable INCPATH is deprecated; use INCLUDEPATH instead. | WARNING: (internal):1: Variable INCPATH is deprecated; use INCLUDEPATH instead. | WARNING: (internal):3: Variable INCPATH is deprecated; use INCLUDEPATH instead. | WARNING: (internal):1: Variable INCPATH is deprecated; use INCLUDEPATH instead. | WARNING: (internal):3: Variable INCPATH is deprecated; use INCLUDEPATH instead. | Project ERROR: Package gstreamer-app-0.10 not found | make[1]: *** [WebCore/Makefile.WebKit] Error 2 | make[1]: *** Waiting for unfinished jobs | Project ERROR: Package gstreamer-app-0.10 not found | make[1]: *** [WebKit/qt/Makefile.WebKit.QtWebKit] Error 2 | make[1]: Leaving directory `/home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/qt4-x11-free/4.8.6-r0/qt-everywhere-opensource-src-4.8.6/src/3rdparty/webkit/Source' | make: *** [sub-webkit-make_default-ordered] Error 2 | ERROR: oe_runmake failed | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_compile (log file is located at /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/qt4-x11-free/4.8.6-r0/temp/log.do_compile.14903) Alex, can you take a look at this? I already did; it should be fixed by this patch: http://lists.openembedded.org/pipermail/openembedded-core/2015-May/105413.html Regards, Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] midori: fix build with GLib 2.44
On 05/19/2015 10:40 PM, Ross Burton wrote: GLib 2.44 introduced a GListStore type which is ambiguous with GtkListStore when using wildcard using statements. Use the full type name to fix builds. Midori is already at 0.5.10 upstream; if it's compatible with the webkit currently in oe-core, maybe it's better to update to the latest version? When the new webkit patches are ready, I'll definitely pull in the latest midori as well. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/7] distcc: update SRC_URI to not use Google Code
Google Code is shutting down soon and distcc has moved to github. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-devtools/distcc/distcc_3.1.bb | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/distcc/distcc_3.1.bb b/meta/recipes-devtools/distcc/distcc_3.1.bb index e4b9313..8ea3cac 100644 --- a/meta/recipes-devtools/distcc/distcc_3.1.bb +++ b/meta/recipes-devtools/distcc/distcc_3.1.bb @@ -17,16 +17,14 @@ PACKAGECONFIG[popt] = --without-included-popt,--with-included-popt,popt RRECOMMENDS_${PN} = avahi-daemon -SRC_URI = http://distcc.googlecode.com/files/${BPN}-${PV}.tar.bz2 \ +SRC_URI = git://github.com/distcc/distcc.git \ file://separatebuilddir.patch \ file://0001-zeroconf-Include-fcntl.h.patch \ file://default \ file://distccmon-gnome.desktop \ file://distcc \ file://distcc.service - -SRC_URI[md5sum] = a1a9d3853df7133669fffec2a9aab9f3 -SRC_URI[sha256sum] = f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89 +SRCREV = 9a172d3d20042754a30c0cd9a5d63fd1a8120c31 inherit autotools pkgconfig update-rc.d useradd systemd -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/7] gptfdisk: update to 1.0.0
Also, use tarballs instead of git for fetching source code. git repository does not have version tags, so upstream version check cannot be performed. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- .../recipes-devtools/fdisk/{gptfdisk_git.bb = gptfdisk_1.0.0.bb} | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) rename meta/recipes-devtools/fdisk/{gptfdisk_git.bb = gptfdisk_1.0.0.bb} (75%) diff --git a/meta/recipes-devtools/fdisk/gptfdisk_git.bb b/meta/recipes-devtools/fdisk/gptfdisk_1.0.0.bb similarity index 75% rename from meta/recipes-devtools/fdisk/gptfdisk_git.bb rename to meta/recipes-devtools/fdisk/gptfdisk_1.0.0.bb index 477c1d9..f4b0e32 100644 --- a/meta/recipes-devtools/fdisk/gptfdisk_git.bb +++ b/meta/recipes-devtools/fdisk/gptfdisk_1.0.0.bb @@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 DEPENDS = util-linux popt ncurses -PV = 0.8.10+git${SRCPV} -SRCREV = a920398fa393f9d6301b32b191bc01e086ab8bc8 -SRC_URI = git://git.code.sf.net/p/gptfdisk/code - -S = ${WORKDIR}/git +SRC_URI = ${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz +SRC_URI[md5sum] = 2061f917af084215898d4fea04d8388f +SRC_URI[sha256sum] = 5b66956743a799fc0471cdb032665c1391e82f9c5b3f1d7d726d29fe2ba01d6c do_install() { install -d ${D}${sbindir} -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/7] stress: update checksums to match upstream tarball
COPYING checksum has changed because the previous upstream tarball (taken from Fedora) had GPLv3 in it, but author's tarball has GPLv2. Otherwise the tarballs are identical Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-extended/stress/stress_1.0.4.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/stress/stress_1.0.4.bb b/meta/recipes-extended/stress/stress_1.0.4.bb index df96fc0..00d9940 100644 --- a/meta/recipes-extended/stress/stress_1.0.4.bb +++ b/meta/recipes-extended/stress/stress_1.0.4.bb @@ -2,13 +2,13 @@ DESCRIPTION = Deliberately simple workload generator for POSIX systems. It \ imposes a configurable amount of CPU, memory, I/O, and disk stress on the system. HOMEPAGE = http://people.seas.harvard.edu/~apw/stress/; LICENSE = GPLv2 -LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 +LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 SRC_URI = http://people.seas.harvard.edu/~apw/stress/stress-${PV}.tar.gz \ file://texinfo.patch \ -SRC_URI[md5sum] = a607afa695a511765b40993a64c6e2f4 -SRC_URI[sha256sum] = 369c997f65e8426ae8b318d4fdc8e6f07a311cfa77cc4b25dace465c582163c0 +SRC_URI[md5sum] = 890a4236dd1656792f3ef9a190cf99ef +SRC_URI[sha256sum] = 057e4fc2a7706411e1014bf172e4f94b63a12f18412378fca8684ca92408825b inherit autotools -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/7] oprofile: reorder SRC_URI lines to fix upstream version check
The source tarball should be listed first. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-kernel/oprofile/oprofile.inc | 3 ++- meta/recipes-kernel/oprofile/oprofile_1.0.0.bb | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/oprofile/oprofile.inc b/meta/recipes-kernel/oprofile/oprofile.inc index 49e6b16..6b393bc 100644 --- a/meta/recipes-kernel/oprofile/oprofile.inc +++ b/meta/recipes-kernel/oprofile/oprofile.inc @@ -18,7 +18,8 @@ FILES_${PN} = ${bindir} ${libdir}/${BPN}/lib*${SOLIBS} ${datadir}/${BPN} FILES_${PN}-dev += ${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la FILES_${PN}-staticdev += ${libdir}/${BPN}/lib*.a -SRC_URI = file://filemode-fix.patch \ +SRC_URI = ${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ + file://filemode-fix.patch \ file://acinclude.m4 \ file://automake-foreign.patch \ file://oprofile-cross-compile-tests.patch \ diff --git a/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb b/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb index f4a34b3..b44b5c5 100644 --- a/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb +++ b/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb @@ -3,8 +3,6 @@ require oprofile.inc DEPENDS += virtual/kernel DEPENDS_append_powerpc64 = libpfm4 -SRC_URI += ${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz - SRC_URI[md5sum] = ba0b340e5c421a93959776c836ed35b3 SRC_URI[sha256sum] = 847110b4ecdcf8c8353cd38f94c1b704aad4bfcd9453e38b88d112cfb7e3c45a -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/7] xf86-video-omapfb: switch SRC_URI to debian git repo
The previous upstream is no longer available. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb index 4ad2538..e649270 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb @@ -13,7 +13,7 @@ SRCREV = 28c006c94e57ea71df11ec4fff79d7ffcfc4860f PR = ${INC_PR}.7 PV = 0.1.1+gitr${SRCPV} -SRC_URI = git://git.pingu.fi/xf86-video-omapfb;protocol=http \ +SRC_URI = git://anonscm.debian.org/collab-maint/xf86-video-omapfb.git \ file://0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch \ file://0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch \ file://0003-force-plain-mode.patch \ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/7] fotowall: update SRC_URI to use github instead of qt-apps.org
GitHub is where upstream development is happening, so we are more likely to find out about new releases from there Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-qt/qt-apps/fotowall_0.9.bb | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9.bb b/meta/recipes-qt/qt-apps/fotowall_0.9.bb index 48dcc02..e92e862 100644 --- a/meta/recipes-qt/qt-apps/fotowall_0.9.bb +++ b/meta/recipes-qt/qt-apps/fotowall_0.9.bb @@ -10,13 +10,11 @@ SECTION = x11/apps PR = r4 -SRC_URI = http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2 \ +SRCREV = 06d5a4142c599604d9a9fd64727b6945eb8cd3da +SRC_URI = git://github.com/enricoros/fotowall.git \ file://ExportWizard-depends-on-ui_wizard.patch \ -SRC_URI[md5sum] = 142ef697332e0777c6d22c5bc96cc438 -SRC_URI[sha256sum] = e4d0c005d2cb1d7c09438bfc3098eadebc08946e4fbc0655b7fc8b046de3810d - S = ${WORKDIR}/Fotowall-${PV} inherit qt4x11 -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/7] More recipe reporting fixes
This patchset contains more recipe reporting fixes, some of which are based on the review comments to the previous patchset (which got partially merged into master). Please see specific commits for details. The following changes since commit a8b723498c9a7106210db140452886894494b4d6: bitbake: cooker: Resolve file monitoring race issues when using memres bitbake (2015-08-03 07:36:25 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib akanavin/recipe-reporting-fixes http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/recipe-reporting-fixes Alexander Kanavin (7): fotowall: update SRC_URI to use github instead of qt-apps.org distcc: update SRC_URI to not use Google Code gptfdisk: update to 1.0.0 oprofile: reorder SRC_URI lines to fix upstream version check xf86-video-omapfb: switch SRC_URI to debian git repo stress: update checksums to match upstream tarball recipeutils.py: allow all characters in regexes used to parse version strings meta/lib/oe/recipeutils.py| 4 ++-- meta/recipes-devtools/distcc/distcc_3.1.bb| 6 ++ .../recipes-devtools/fdisk/{gptfdisk_git.bb = gptfdisk_1.0.0.bb} | 8 +++- meta/recipes-extended/stress/stress_1.0.4.bb | 6 +++--- meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb| 2 +- meta/recipes-kernel/oprofile/oprofile.inc | 3 ++- meta/recipes-kernel/oprofile/oprofile_1.0.0.bb| 2 -- meta/recipes-qt/qt-apps/fotowall_0.9.bb | 6 ++ 8 files changed, 15 insertions(+), 22 deletions(-) rename meta/recipes-devtools/fdisk/{gptfdisk_git.bb = gptfdisk_1.0.0.bb} (75%) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/7] recipeutils.py: allow all characters in regexes used to parse version strings
Previously only numeric characters were matches and anything else was discarded, so 4.0-rc3, 2005e, 1.0.2a and similar versions got truncated. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/lib/oe/recipeutils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index 9d45b42..cd74213 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py @@ -638,7 +638,7 @@ def get_recipe_pv_without_srcpv(pv, uri_type): sfx = '' if uri_type == 'git': -git_regex = re.compile((?Ppfx(v|))(?Pver((\d+[\.\-_]*)+))(?Psfx(\+|)(git|)(r|)(AUTOINC|)(\+|))(?Prev.*)) +git_regex = re.compile((?Ppfxv?)(?Pver[^\+]*)((?Psfx\+(git)?r?(AUTOINC\+))(?Prev.*))?) m = git_regex.match(pv) if m: @@ -646,7 +646,7 @@ def get_recipe_pv_without_srcpv(pv, uri_type): pfx = m.group('pfx') sfx = m.group('sfx') else: -regex = re.compile((?Ppfx(v|r|))(?Pver((\d+[\.\-_]*)+))) +regex = re.compile((?Ppfx(v|r)?)(?Pver.*)) m = regex.match(pv) if m: pv = m.group('ver') -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 15/22] libwnck3: add a recipe from meta-gnome
On 08/14/2015 02:04 PM, Andreas Müller wrote: +PR = r1 ^ Please skip Thanks, I also dropped unnecessary PRs from other recipes involved in the patchset. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 21/22] midori: remove the recipe and replace references to midori with epiphany
On 08/15/2015 07:59 AM, Randy MacLeod wrote: -# midori depends on webkit-gtk which could not build for mips64 -MIDORI = midori -MIDORI_mips64 = -MIDORI_mips64n32 = +# epiphany depends on webkitgtk which could not build for mips64 +EPIPHANY = epiphany +EPIPHANY_mips64 = +EPIPHANY_mips64n32 = Mips64 support using the newer webkitgtk may be better. Wenzong please check on that once this code is in master-next and reply here. Latest Webkit (2.8.5) actually does build for MIPS64 (where 2.8.4 failed), but I couldn't find a way to test the n32 variant using poky - any suggestions? I'll drop the above lines for now. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 15/22] libwnck3: add a recipe from meta-gnome
On 08/14/2015 05:12 PM, Khem Raj wrote: send a patch to remove it from meta-gnome as well. I will send it when the above patchset shows up on oe-core master, to avoid confusion. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 5/5] rpm: update to 5.4.15
On 08/16/2015 04:10 PM, Richard Purdie wrote: Not sure what this was tested with but a simple bitbake core-image-minimal breaks after this (and the db) change with licensing failures. The autobuilder exploded with failures like: https://autobuilder.yoctoproject.org/main/builders/build-appliance/builds/430/steps/BuildImages_1/logs/stdio which are due to the installed manifest file listing installed packages being empty. I tested by running 'bitbake world' (which completed fine), but I wasn't aware that 'world' doesn't include any images (why not?). I'll investigate what is happening. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] meta-gplv2? [Was Re: parted_1.8.6.bb: add parted that not GPLv3]
On 08/18/2015 10:54 AM, Martin Jansa wrote: Now we see a lot of upgrades in oe-core which are done by people just because package upgrade report says it's possible and the upgrade is tested mostly by autobuilder (which doesn't exersize any extra layers and runtime-test coverage is very low) - so in the end many of these good to have upgrades are breaking some other components which aren't upgraded so often or breaking/changing runtime behavior and only couple months later someone who is actually using them will report that. The alternative isn't great either. Older, out-of-date software tends to require more effort to backport security fixes and prevent bitrot (maybe as much effort as would be spent simply updating it to latest versions). Or if no one does the backporting then you have an insecure software stack. Then, when gigantic, must-have updates happen, they take forever to prepare, review, (rebase, update, review)* and merge, they're met with more resistance, and cause even more breakage and pain in the other layers than if the same thing would have been achieved via small, incremental updates. Test automation is being worked on, so when that is in place, then rolling, small updates approach will be clearly superior. Regards, Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 21/22] midori: remove the recipe and replace references to midori with epiphany
Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- .../packagegroups/packagegroup-self-hosted.bb | 7 + .../builder/files/builder_hob_start.sh | 8 +++--- meta/recipes-sato/midori/midori/liststore.patch| 29 meta/recipes-sato/midori/midori_0.5.8.bb | 31 -- .../packagegroups/packagegroup-core-x11-sato.bb| 2 +- 5 files changed, 6 insertions(+), 71 deletions(-) delete mode 100644 meta/recipes-sato/midori/midori/liststore.patch delete mode 100644 meta/recipes-sato/midori/midori_0.5.8.bb diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 7d5a41a..d38be26 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 = \ 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 \ diff --git a/meta/recipes-graphics/builder/files/builder_hob_start.sh b/meta/recipes-graphics/builder/files/builder_hob_start.sh index 65a68ee..b394b09 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 #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 diff --git a/meta/recipes-sato/midori/midori/liststore.patch b/meta/recipes-sato/midori/midori/liststore.patch deleted file mode 100644 index 4e5d666..000 --- a/meta/recipes-sato/midori/midori/liststore.patch +++ /dev/null @@ -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.bur...@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), 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 1c027fe4..000 --- a/meta/recipes-sato/midori/midori_0.5.8.bb +++ /dev/null @@ -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
[OE-core] [PATCH 09/22] libsecret: add a recipe from meta-gnome
libsecret is a dependency of webkit Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-gnome/libsecret/libsecret_0.18.2.bb | 12 1 file changed, 12 insertions(+) create mode 100644 meta/recipes-gnome/libsecret/libsecret_0.18.2.bb diff --git a/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb b/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb new file mode 100644 index 000..cebc83b --- /dev/null +++ b/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb @@ -0,0 +1,12 @@ +SUMMARY = libsecret is a library for storing and retrieving passwords and other secrets +LICENSE = LGPLv2.1 +LIC_FILES_CHKSUM = file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6 + +inherit gnomebase gtk-doc + +DEPENDS = glib-2.0 libgcrypt + +EXTRA_OECONF += --disable-manpages + +SRC_URI[archive.md5sum] = 23cdf8267d11a26f88f0dbec1e2022ad +SRC_URI[archive.sha256sum] = 12fd288b012e1b2b1b54d586cd4c6507885715534644b4534b7ef7d7079ba443 -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 18/22] gsettings-desktop-schemas: add a recipe from meta-gnome
gsettings-desktop-schemas is a dependency of epiphany Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- .../gsettings-desktop-schemas_3.16.1.bb | 13 + 1 file changed, 13 insertions(+) create mode 100644 meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.16.1.bb diff --git a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.16.1.bb b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.16.1.bb new file mode 100644 index 000..f2f2c75 --- /dev/null +++ b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.16.1.bb @@ -0,0 +1,13 @@ +SUMMARY = GNOME desktop-wide GSettings schemas +HOMEPAGE = http://live.gnome.org/gsettings-desktop-schemas; +BUGTRACKER = https://bugzilla.gnome.org/; + +LICENSE = LGPLv2.1 +LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c + +DEPENDS = glib-2.0 intltool-native gobject-introspection-stub-native + +inherit gnomebase gsettings gettext + +SRC_URI[archive.md5sum] = baebbcf3c20591f98876e42fb0a3fd35 +SRC_URI[archive.sha256sum] = 74fe9fdad510c8afebeceb7ebafc581ef990b3afcc8c1e8b5d90b24b3461 -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 22/22] distro: update include files related to webkitgtk and epiphany addition
This commit fixes recipe metadata in distro_alias, package_regex and upstream_tracking includes. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/conf/distro/include/distro_alias.inc | 2 +- meta/conf/distro/include/package_regex.inc | 8 +--- meta/conf/distro/include/upstream_tracking.inc | 2 -- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index ec8570d..bd3da9c 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -472,7 +472,7 @@ DISTRO_PN_ALIAS_pn-v86d = Debian=v86d Ubuntu=v86d DISTRO_PN_ALIAS_pn-videoproto = Meego=xorg-x11-proto-videoproto DISTRO_PN_ALIAS_pn-waffle = OE-Core DISTRO_PN_ALIAS_pn-watchdog = Debian=watchdog Ubuntu=watchdog Mandriva=watchdog -DISTRO_PN_ALIAS_pn-webkit-gtk = Fedora=webkitgtk Ubuntu=libwebkit +DISTRO_PN_ALIAS_pn-webkitgtk = Fedora=webkitgtk Ubuntu=libwebkit DISTRO_PN_ALIAS_pn-web-webkit = OpenedHand DISTRO_PN_ALIAS_pn-weston = Fedora=weston OpenSuSE=weston DISTRO_PN_ALIAS_pn-weston-init = OE-Core diff --git a/meta/conf/distro/include/package_regex.inc b/meta/conf/distro/include/package_regex.inc index 0c29ade..d844a47 100644 --- a/meta/conf/distro/include/package_regex.inc +++ b/meta/conf/distro/include/package_regex.inc @@ -25,9 +25,6 @@ COMMON_REGEX = (?Ppver(\d+[\.\-_]*)+) REGEX_URI_pn-wireless-tools = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html; REGEX_pn-wireless-tools = wireless_tools\.(?Ppver(\d+)(\..*|))\.tar\.gz -REGEX_URI_pn-midori=http://midori-browser.org/download/source/; -REGEX_pn-midori=midori_(?Ppver((\d+[\.\-_]*)+))_all_\.tar\.bz2 - REGEX_URI_pn-sqlite3=http://www.sqlite.org/; REGEX_pn-sqlite3=releaselog/${COMMON_REGEX}.html @@ -94,6 +91,7 @@ REGEX_URI_pn-python-smartpm=https://launchpad.net/smart/trunk/; REGEX_URI_pn-lsof = ftp://sunsite.ualberta.ca/pub/Mirror/lsof/; REGEX_URI_pn-pbzip2 = http://compression.ca/pbzip2/; REGEX_URI_pn-quicky = http://qt-apps.org/content/download.php?content=80325id=1tan=10417482; +REGEX_URI_pn-libwebp = http://downloads.webmproject.org/releases/webp/index.html; # The engine tries to use directory versioning but is a false-positive REGEX_URI_pn-intltool = https://launchpad.net/intltool/trunk/; @@ -227,6 +225,10 @@ REGEX_pn-clutter-gtk-1.0 = ${GNOME_STABLE} REGEX_pn-clutter-gst-3.0 = ${GNOME_STABLE} REGEX_pn-cogl-1.0 = ${GNOME_STABLE} REGEX_pn-adwaita-icon-theme = ${GNOME_STABLE} +REGEX_pn-epiphany = ${GNOME_STABLE} +REGEX_pn-webkitgtk = ${GNOME_STABLE} +REGEX_pn-p11-kit = ${GNOME_STABLE} +REGEX_pn-gnome-desktop3 = ${GNOME_STABLE} # not GNOME related but uses same even-minor-release-is-stable logic REGEX_pn-dbus = ${GNOME_STABLE} diff --git a/meta/conf/distro/include/upstream_tracking.inc b/meta/conf/distro/include/upstream_tracking.inc index 996d9e0..a9b33f1 100644 --- a/meta/conf/distro/include/upstream_tracking.inc +++ b/meta/conf/distro/include/upstream_tracking.inc @@ -31,8 +31,6 @@ CHECK_DATE_pn-unfs3 = Jun 10, 2015 RECIPE_NO_UPDATE_REASON_pn-base-passwd = Version 3.5.38 requires cdebconf for update-passwd utility RECIPE_NO_UPDATE_REASON_pn-chkconfig = Version 1.5 requires selinux RECIPE_NO_UPDATE_REASON_pn-createrepo = Versions after 0.9.* use YUM, so we hold at 0.4.11 -RECIPE_NO_UPDATE_REASON_pn-jpeg = webkit-gtk 1.8.3 doesn't work with jpeg 9 RECIPE_NO_UPDATE_REASON_pn-liberation-fonts = 2.x depends on fontforge package, which is not yet provided in oe-core RECIPE_NO_UPDATE_REASON_pn-pkgconfig = removes glib-conf, adds circular depends RECIPE_NO_UPDATE_REASON_pn-python-pygobject = Newer versions of python-pygobject depend on gobject-introspection which doesn't cross-compile -RECIPE_NO_UPDATE_REASON_pn-webkit-gtk = = 1.10.2 needs ruby -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 14/22] iso-codes: add a recipe from meta-oe
iso-codes is a dependency of epiphany Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-support/iso-codes/iso-codes_3.58.bb | 15 +++ 1 file changed, 15 insertions(+) create mode 100644 meta/recipes-support/iso-codes/iso-codes_3.58.bb diff --git a/meta/recipes-support/iso-codes/iso-codes_3.58.bb b/meta/recipes-support/iso-codes/iso-codes_3.58.bb new file mode 100644 index 000..07be69b --- /dev/null +++ b/meta/recipes-support/iso-codes/iso-codes_3.58.bb @@ -0,0 +1,15 @@ +SUMMARY = ISO language, territory, currency, script codes and their translations +LICENSE = LGPLv2.1 +LIC_FILES_CHKSUM = file://LICENSE;md5=fbc093901857fcd118f065f900982c24 + +SRC_URI = https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz; +SRC_URI[md5sum] = 34097a0085f0979e28f9db66ec274c5e +SRC_URI[sha256sum] = 86af5735dce6e4eff2b983e5d8aa9a3dea1b8db702333ff20be89e45f7f35a72 + +# inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which +# are inhibited by allarch +DEPENDS = gettext-native + +inherit autotools + +FILES_${PN} += ${datadir}/xml/ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 13/22] gcr: add a recipe from meta-gnome
gcr is a dependency of epiphany Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-gnome/gcr/gcr_3.16.0.bb | 18 ++ 1 file changed, 18 insertions(+) create mode 100644 meta/recipes-gnome/gcr/gcr_3.16.0.bb diff --git a/meta/recipes-gnome/gcr/gcr_3.16.0.bb b/meta/recipes-gnome/gcr/gcr_3.16.0.bb new file mode 100644 index 000..8b5b6e4 --- /dev/null +++ b/meta/recipes-gnome/gcr/gcr_3.16.0.bb @@ -0,0 +1,18 @@ +SUMMARY = A library for bits of crypto UI and parsing etc +HOMEPAGE = http://www.gnome.org/; +BUGTRACKER = https://bugzilla.gnome.org/; + +LICENSE = GPLv2 +LIC_FILES_CHKSUM = file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 + +DEPENDS = gtk+3 p11-kit glib-2.0 libgcrypt vala + +inherit autotools gnomebase gtk-icon-cache gtk-doc + +SRC_URI[archive.md5sum] = d5835680be0b6a838e02a528d5378d9c +SRC_URI[archive.sha256sum] = ecfe8df41cc88158364bb15addc670b11e539fe844742983629ba2323888d075 + +FILES_${PN} += \ +${datadir}/dbus-1 \ +${datadir}/gcr-3 \ + -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 17/22] glib: add a warning suppression patch to glib
Otherwise QA check will fail. Some schemas in gsettings-desktop-schemas (such as proxy and locale) are still using deprecated paths, as of 3.16.1. This causes warning messages, and meta/lib/oe/rootfs.py complaints about them. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- ...warning-about-deprecated-paths-in-schemas.patch | 32 ++ meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch new file mode 100644 index 000..54e830c --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch @@ -0,0 +1,32 @@ +From 41534253b6b61ed4769eb6a3966698a50ee73b71 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin alex.kana...@gmail.com +Date: Fri, 12 Jun 2015 17:08:46 +0300 +Subject: [PATCH] Remove the warning about deprecated paths in schemas + +Some schemas in gsettings-desktop-schemas (such as proxy and locale) +are still using deprecated paths, as of 3.16.1. This causes warning +messages, and meta/lib/oe/rootfs.py complaints about them. +--- + gio/glib-compile-schemas.c | 6 -- + 1 file changed, 6 deletions(-) + +diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c +index e42949b..ec79d7c 100644 +--- a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c +@@ -1202,12 +1202,6 @@ parse_state_start_schema (ParseState *state, + return; + } + +- if (path (g_str_has_prefix (path, /apps/) || +- g_str_has_prefix (path, /desktop/) || +- g_str_has_prefix (path, /system/))) +-g_printerr (warning: Schema '%s' has path '%s'. Paths starting with +-'/apps/', '/desktop/' or '/system/' are deprecated.\n, id, path); +- + state-schema_state = schema_state_new (path, gettext_domain, + extends, extends_name, list_of); + +-- +2.1.4 + diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb index 8eaccfb..1e3d36a 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb @@ -14,6 +14,7 @@ SRC_URI = ${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://uclibc.patch \ file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \ file://allow-run-media-sdX-drive-mount-if-username-root.patch \ + file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ SRC_URI_append_class-native = file://glib-gettextize-dir.patch -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/22] libwebp: add a recipe from meta-oe
libwebp is a dependency of webkit Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-multimedia/webp/libwebp_0.4.3.bb | 47 +++ 1 file changed, 47 insertions(+) create mode 100644 meta/recipes-multimedia/webp/libwebp_0.4.3.bb diff --git a/meta/recipes-multimedia/webp/libwebp_0.4.3.bb b/meta/recipes-multimedia/webp/libwebp_0.4.3.bb new file mode 100644 index 000..3ab2e5b --- /dev/null +++ b/meta/recipes-multimedia/webp/libwebp_0.4.3.bb @@ -0,0 +1,47 @@ +SUMMARY = WebP is an image format designed for the Web +DESCRIPTION = WebP is a method of lossy and lossless compression that can be \ + used on a large variety of photographic, translucent and \ + graphical images found on the web. The degree of lossy \ + compression is adjustable so a user can choose the trade-off \ + between file size and image quality. WebP typically achieves \ + an average of 30% more compression than JPEG and JPEG 2000, \ + without loss of image quality. +HOMEPAGE = https://developers.google.com/speed/webp/; +SECTION = libs + +LICENSE = BSD +LIC_FILES_CHKSUM = file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb + +DEPENDS = giflib + +SRC_URI = http://downloads.webmproject.org/releases/webp/${BP}.tar.gz; +SRC_URI[md5sum] = 08813525eeeffe7e305b4cbfade8ae9b +SRC_URI[sha256sum] = efbe0d58fda936f2ed99d0b837ed7087d064d6838931f282c4618d2a3f7390c4 + +EXTRA_OECONF = \ +--disable-experimental \ +--disable-wic \ +--enable-libwebpmux \ +--enable-libwebpdemux \ +--enable-threading \ + + +inherit autotools lib_package + +PACKAGECONFIG ??= + +# libwebpdecoder is a subset of libwebp, don't build it unless requested +PACKAGECONFIG[decoder] = --enable-libwebpdecoder,--disable-libwebpdecoder + +# Apply for examples programs: cwebp and dwebp +PACKAGECONFIG[jpeg] = ,ac_cv_header_jpeglib_h=no,jpeg +PACKAGECONFIG[png] = ,ac_cv_header_png_h=no,libpng +PACKAGECONFIG[tiff] = ,ac_cv_header_tiffio_h=no,tiff + +# Apply only for example program vwebp +PACKAGECONFIG[gl] = ,,mesa-glut + +PACKAGES =+ ${PN}-gif2webp + +DESCRIPTION_${PN}-gif2webp = Simple tool to convert animated GIFs to WebP +FILES_${PN}-gif2webp = ${bindir}/gif2webp -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 16/22] gnome-desktop3: add a recipe from meta-gnome
gnome-desktop3 is a dependency of epiphany Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- .../gnome-desktop/gnome-desktop3_3.16.2.bb | 21 + 1 file changed, 21 insertions(+) create mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb new file mode 100644 index 000..1f2f06c --- /dev/null +++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb @@ -0,0 +1,21 @@ +SUMMARY = GNOME library for reading .desktop files +SECTION = x11/gnome +LICENSE = GPLv2 LGPLv2 +LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ +file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 + +BPN = gnome-desktop + +inherit gnome pkgconfig +SRC_URI[archive.md5sum] = ab5bf4cc94ad63639f42adcc1542b1f0 +SRC_URI[archive.sha256sum] = 3a8f196b46eb9dbd3ba2afb8fb5fef6a8825539d449a02181311242e7bd0 + +DEPENDS += gsettings-desktop-schemas gconf libxrandr virtual/libx11 gtk+3 glib-2.0 gnome-doc-utils gnome-common startup-notification iso-codes + +EXTRA_OECONF = --disable-desktop-docs + +PACKAGES =+ libgnome-desktop3 +FILES_libgnome-desktop3 = ${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml + +RRECOMMENDS_libgnome-desktop3 += gsettings-desktop-schemas + -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/22] libyaml: add a recipe from meta-oe
libyaml is a dependency of ruby Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- .../libyaml/files/libyaml-CVE-2014-9130.patch | 32 ++ meta/recipes-support/libyaml/libyaml_0.1.6.bb | 21 ++ 2 files changed, 53 insertions(+) create mode 100644 meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch create mode 100644 meta/recipes-support/libyaml/libyaml_0.1.6.bb diff --git a/meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch b/meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch new file mode 100644 index 000..3c4a00e --- /dev/null +++ b/meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch @@ -0,0 +1,32 @@ +# HG changeset patch +# User Kirill Simonov x...@resolvent.net +# Date 1417197312 21600 +# Node ID 2b9156756423e967cfd09a61d125d883fca6f4f2 +# Parent 053f53a381ff6adbbc93a31ab7fdee06a16c8a33 +Removed invalid simple key assertion (thank to Jonathan Gray). + +The patch comes from + +https://bitbucket.org/xi/libyaml/commits/2b9156756423e967cfd09a61d125d883fca6f4f2 + +Upstream-Status: Backport + +Signed-off-by: Yue Tao yue@windriver.com + +diff -r 053f53a381ff -r 2b9156756423 src/scanner.c +--- a/src/scanner.cWed Mar 26 13:55:54 2014 -0500 b/src/scanner.cFri Nov 28 11:55:12 2014 -0600 +@@ -1106,13 +1106,6 @@ + parser-indent == (ptrdiff_t)parser-mark.column); + + /* +- * A simple key is required only when it is the first token in the current +- * line. Therefore it is always allowed. But we add a check anyway. +- */ +- +-assert(parser-simple_key_allowed || !required);/* Impossible. */ +- +-/* + * If the current position may start a simple key, save it. + */ + diff --git a/meta/recipes-support/libyaml/libyaml_0.1.6.bb b/meta/recipes-support/libyaml/libyaml_0.1.6.bb new file mode 100644 index 000..b015577 --- /dev/null +++ b/meta/recipes-support/libyaml/libyaml_0.1.6.bb @@ -0,0 +1,21 @@ +SUMMARY = LibYAML is a YAML 1.1 parser and emitter written in C. +DESCRIPTION = LibYAML is a C library for parsing and emitting data in YAML 1.1, \ +a human-readable data serialization format. +HOMEPAGE = http://pyyaml.org/wiki/LibYAML; +SECTION = libs/devel + +LICENSE = MIT +LIC_FILES_CHKSUM = file://LICENSE;md5=6015f088759b10e0bc2bf64898d4ae17 + +SRC_URI = http://pyyaml.org/download/libyaml/yaml-${PV}.tar.gz \ + file://libyaml-CVE-2014-9130.patch \ + + +SRC_URI[md5sum] = 5fe00cda18ca5daeb43762b80c38e06e +SRC_URI[sha256sum] = 7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749 + +S = ${WORKDIR}/yaml-${PV} + +inherit autotools + +BBCLASSEXTEND = native -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 15/22] libwnck3: add a recipe from meta-gnome
libwnck is a dependency of epiphany Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb | 15 +++ 1 file changed, 15 insertions(+) create mode 100644 meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb diff --git a/meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb b/meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb new file mode 100644 index 000..d0f5175 --- /dev/null +++ b/meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb @@ -0,0 +1,15 @@ +SUMMARY = Window navigation construction toolkit +LICENSE = LGPLv2 +LIC_FILES_CHKSUM = file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 + +BPN = libwnck + +SECTION = x11/libs +DEPENDS = gobject-introspection-stub gtk+3 gdk-pixbuf-native libxres + +PACKAGECONFIG ??= startup-notification +PACKAGECONFIG[startup-notification] = --enable-startup-notification,--disable-startup-notification,startup-notification + +inherit gnomebase +SRC_URI[archive.md5sum] = 4538672e0d775fadedf10abeb8020047 +SRC_URI[archive.sha256sum] = f5080076346609b4c36394b879f3a86b92ced3b90a37cb54c8e9a14f00e7921c -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/22] webkitgtk: add a new recipe for latest upstream version
Recipe for the obsolete webkit-gtk 1.8.3 is removed in a separate commit Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-sato/webkit/webkitgtk_2.8.5.bb | 56 + 1 file changed, 56 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk_2.8.5.bb diff --git a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb new file mode 100644 index 000..f3e719e --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb @@ -0,0 +1,56 @@ +SUMMARY = WebKit web rendering engine for the GTK+ platform +HOMEPAGE = http://www.webkitgtk.org/; +BUGTRACKER = http://bugs.webkit.org/; + +LICENSE = BSD LGPLv2+ +LIC_FILES_CHKSUM = file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ + file://Source/WebKit/LICENSE;md5=4646f90082c40bcf298c285f8bab0b12 \ + file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \ + file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \ + file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \ + + +SRC_URI = \ + http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ + +SRC_URI[md5sum] = df79991848a5096d3a75289ebce547ae +SRC_URI[sha256sum] = 3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20 + +inherit cmake lib_package pkgconfig perlnative pythonnative + +DEPENDS = zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ + gtk+ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ + pango icu bison-native gnome-common gawk intltool-native libwebp \ + atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ + ruby-native libsecret libnotify gstreamer1.0-plugins-bad \ + +DEPENDS += ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} + +EXTRA_OECMAKE = \ + -DPORT=GTK \ + -DCMAKE_BUILD_TYPE=Release \ + -DENABLE_INTROSPECTION=False \ + -DENABLE_MINIBROWSER=True \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-DENABLE_WEBGL=True', '-DENABLE_WEBGL=False', d)} \ + + +# Javascript JIT is not supported on powerpc +EXTRA_OECMAKE_append_powerpc = -DENABLE_JIT=False +EXTRA_OECMAKE_append_powerpc64 = -DENABLE_JIT=False + +# ARM JIT code does not build on ARMv5/6 anymore, apparently they test only on v7 onwards +EXTRA_OECMAKE_append_armv5 = -DENABLE_JIT=False +EXTRA_OECMAKE_append_armv6 = -DENABLE_JIT=False + +# binutils 2.25.1 has a bug on aarch64: +# https://sourceware.org/bugzilla/show_bug.cgi?id=18430 +EXTRA_OECMAKE_append_aarch64 = -DUSE_LD_GOLD=False + +# JIT not supported on MIPS either +EXTRA_OECMAKE_append_mips = -DENABLE_JIT=False +EXTRA_OECMAKE_append_mips64 = -DENABLE_JIT=False + +FILES_${PN} += ${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so +FILES_${PN}-dbg += ${libdir}/webkit2gtk-4.0/injected-bundle/.debug/libwebkit2gtkinjectedbundle.so +FILES_${PN}-dbg += ${libdir}/webkitgtk/webkit2gtk-4.0/.debug/* + -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 12/22] p11-kit: add a recipe from meta-oe
p11-kit is a dependency of gcr (which is a dependency of epiphany) Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-support/p11-kit/p11-kit_0.22.1.bb | 18 ++ 1 file changed, 18 insertions(+) create mode 100644 meta/recipes-support/p11-kit/p11-kit_0.22.1.bb diff --git a/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb new file mode 100644 index 000..7ad9626e --- /dev/null +++ b/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb @@ -0,0 +1,18 @@ +SUMMARY = Provides a way to load and enumerate PKCS#11 modules +LICENSE = BSD +LIC_FILES_CHKSUM = file://COPYING;md5=02933887f609807fbb57aa4237d14a50 + +inherit autotools gettext pkgconfig + +DEPENDS = libtasn1 libffi + +SRC_URI = http://p11-glue.freedesktop.org/releases/${BP}.tar.gz; +SRC_URI[md5sum] = 4e9bea1106628ffb820bdad24a819fac +SRC_URI[sha256sum] = ef3a339fcf6aa0e32c8c23f79ba7191e57312be2bda8b24e6d121c2670539a5c + +FILES_${PN}-dev += \ +${libdir}/p11-kit-proxy.so \ +${libdir}/pkcs11/p11-kit-trust.so \ + +FILES_${PN}-dev += ${libdir}/pkcs11/*.la +FILES_${PN}-dbg += ${libdir}/pkcs11/.debug -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/22] ruby: add a recipe from meta-ruby
Ruby is required to build webkit. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-devtools/ruby/ruby.inc | 40 +++ meta/recipes-devtools/ruby/ruby/extmk.patch | 13 + meta/recipes-devtools/ruby/ruby_2.2.2.bb| 42 + 3 files changed, 95 insertions(+) create mode 100644 meta/recipes-devtools/ruby/ruby.inc create mode 100644 meta/recipes-devtools/ruby/ruby/extmk.patch create mode 100644 meta/recipes-devtools/ruby/ruby_2.2.2.bb diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc new file mode 100644 index 000..ba60191 --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby.inc @@ -0,0 +1,40 @@ +SUMMARY = An interpreter of object-oriented scripting language +DESCRIPTION = Ruby is an interpreted scripting language for quick \ +and easy object-oriented programming. It has many features to process \ +text files and to do system management tasks (as in Perl). \ +It is simple, straight-forward, and extensible. \ + +HOMEPAGE = http://www.ruby-lang.org/; +SECTION = devel/ruby +LICENSE = Ruby | BSD | GPLv2 +LIC_FILES_CHKSUM = \ +file://COPYING;md5=837b32593517ae48b9c3b5c87a5d288c \ +file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\ +file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\ +file://LEGAL;md5=c440adb575ba4e6e2344c2630b6a5584\ + + +DEPENDS = ruby-native zlib openssl tcl libyaml db gdbm readline +DEPENDS_class-native = libyaml-native + +SHRT_VER = ${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]} +SRC_URI = http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ + file://extmk.patch \ + + +S = ${WORKDIR}/ruby-${PV} + +inherit autotools + + +# This snippet lets compiled extensions which rely on external libraries, +# such as zlib, compile properly. If we don't do this, then when extmk.rb +# runs, it uses the native libraries instead of the target libraries, and so +# none of the linking operations succeed -- which makes extconf.rb think +# that the libraries aren't available and hence that the extension can't be +# built. + +do_configure_prepend() { +sed -i s#%%TARGET_CFLAGS%%#$TARGET_CFLAGS#; s#%%TARGET_LDFLAGS%%#$TARGET_LDFLAGS# ${S}/common.mk +rm -rf ${S}/ruby/ +} diff --git a/meta/recipes-devtools/ruby/ruby/extmk.patch b/meta/recipes-devtools/ruby/ruby/extmk.patch new file mode 100644 index 000..8b68450 --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/extmk.patch @@ -0,0 +1,13 @@ +diff -ru ruby-1.8.7-p248.orig/ext/extmk.rb ruby-1.8.7-p248/ext/extmk.rb +--- ruby-1.8.7-p248.orig/ext/extmk.rb 2009-12-24 03:01:58.0 -0600 ruby-1.8.7-p248/ext/extmk.rb 2010-02-12 15:55:27.370061558 -0600 +@@ -354,8 +354,8 @@ + $ruby = '$(topdir)/miniruby' + EXEEXT + end + $ruby -I'$(topdir)' ++$ruby -I'$(top_srcdir)/lib' + unless CROSS_COMPILING +- $ruby -I'$(top_srcdir)/lib' + $ruby -I'$(extout)/$(arch)' -I'$(extout)/common' if $extout + $ruby -I./- -I'$(top_srcdir)/ext' -rpurelib.rb + ENV[RUBYLIB] = - diff --git a/meta/recipes-devtools/ruby/ruby_2.2.2.bb b/meta/recipes-devtools/ruby/ruby_2.2.2.bb new file mode 100644 index 000..78c943c --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby_2.2.2.bb @@ -0,0 +1,42 @@ +require ruby.inc + +SRC_URI[md5sum] = 326e99ddc75381c7b50c85f7089f3260 +SRC_URI[sha256sum] = 5ffc0f317e429e6b29d4a98ac521c3ce65481bfd22a8cf845fa02a7b113d9b44 + +# it's unknown to configure script, but then passed to extconf.rb +# maybe it's not really needed as we're hardcoding the result with +# 0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch +UNKNOWN_CONFIGURE_WHITELIST += --enable-wide-getaddrinfo + +PACKAGECONFIG ??= +PACKAGECONFIG += ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} + +PACKAGECONFIG[valgrind] = --with-valgrind=yes, --with-valgrind=no, valgrind +PACKAGECONFIG[gpm] = --with-gmp=yes, --with-gmp=no, gmp +PACKAGECONFIG[ipv6] = ,--enable-wide-getaddrinfo, + +EXTRA_OECONF = \ +--disable-versioned-paths \ +--disable-rpath \ +--disable-dtrace \ +--enable-shared \ +--enable-load-relative \ + + +EXTRA_OEMAKE = \ +LIBRUBYARG='-lruby-static' \ + + +do_install() { +oe_runmake 'DESTDIR=${D}' install +} + +FILES_${PN} += ${datadir}/rubygems \ +${datadir}/ri + +FILES_${PN}-dbg += ${libdir}/ruby/*/.debug \ +${libdir}/ruby/*/*/.debug \ +${libdir}/ruby/*/*/*/.debug \ +${libdir}/ruby/*/*/*/*/.debug + +BBCLASSEXTEND = native -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/22] harfbuzz: enable icu feature
This is required to build latest webkitgtk Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-graphics/harfbuzz/harfbuzz_1.0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.0.1.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_1.0.1.bb index a199126..87c30be 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.0.1.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_1.0.1.bb @@ -22,7 +22,7 @@ BBCLASSEXTEND = native EXTRA_OECONF = --with-glib --with-freetype --with-cairo --without-graphite2 -PACKAGECONFIG ??= +PACKAGECONFIG ??= icu PACKAGECONFIG[icu] = --with-icu,--without-icu,icu PACKAGES =+ ${PN}-icu ${PN}-icu-dbg ${PN}-icu-dev -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/22] classes/cmake: add arch conversion routine
cmake expects target architecture strings in the format of uname(2), which do not always match TARGET_ARCH (e.g. powerpc vs ppc). Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/classes/cmake.bbclass | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index c174246..ae3cc02 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -30,12 +30,22 @@ OECMAKE_EXTRA_ROOT_PATH ?= OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = ONLY OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM_class-native = BOTH +# CMake expects target architectures in the format of uname(2), +# which do not always match TARGET_ARCH, so all the necessary +# conversions should happen here. +def map_target_arch_to_uname_arch(target_arch): +if target_arch == powerpc: +return ppc +if target_arch == powerpc64: +return ppc64 +return target_arch + cmake_do_generate_toolchain_file() { cat ${WORKDIR}/toolchain.cmake EOF # CMake system name must be something like Linux. # This is important for cross-compiling. set( CMAKE_SYSTEM_NAME `echo ${TARGET_OS} | sed -e 's/^./\u/' -e 's/^\(Linux\).*/\1/'` ) -set( CMAKE_SYSTEM_PROCESSOR ${TARGET_ARCH} ) +set( CMAKE_SYSTEM_PROCESSOR ${@map_target_arch_to_uname_arch(d.getVar('TARGET_ARCH', True))} ) set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} ) set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} ) set( CMAKE_ASM_COMPILER ${OECMAKE_C_COMPILER} ) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/22] giflib: add a recipe from meta-oe
This is a dependency of libwebp (which is a dependency of webkit) Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-devtools/giflib/giflib_5.1.1.bb | 19 +++ 1 file changed, 19 insertions(+) create mode 100644 meta/recipes-devtools/giflib/giflib_5.1.1.bb diff --git a/meta/recipes-devtools/giflib/giflib_5.1.1.bb b/meta/recipes-devtools/giflib/giflib_5.1.1.bb new file mode 100644 index 000..f1facac --- /dev/null +++ b/meta/recipes-devtools/giflib/giflib_5.1.1.bb @@ -0,0 +1,19 @@ +SUMMARY = shared library for GIF images +SECTION = libs +LICENSE = MIT +LIC_FILES_CHKSUM = file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a + +SRC_URI = ${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.bz2 + +inherit autotools + +PACKAGES += ${PN}-utils +FILES_${PN} = ${libdir}/libgif.so.* +FILES_${PN}-utils = ${bindir} + +BBCLASSEXTEND = native + +RDEPENDS_${PN}-utils = perl + +SRC_URI[md5sum] = 1c39333192712788c6568c78a949f13e +SRC_URI[sha256sum] = 391014aceb21c8b489dc7b0d0b6a917c4e32cc014ce2426d47ca376d02fe2ffc -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany
The changes in this version are: - remove a few unnecessary PR lines from recipes - allow building webkit/epiphany for mips64, since the latest upstream has fixed mips64 builds - tested building for mips64-n32 using multilib feature, fixed some recipe issues that were found - add a CVE fix to libyaml so that libyaml recipe is in sync with meta-oe - tested webkit build for powerpc64 The following changes since commit c348fa50186fb0796bc7b793c4b8d710419f2a0d: bitbake: toaster: move code from setup_lv_tests to setUp (2015-08-17 14:41:45 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib akanavin/webkitgtk-update http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/webkitgtk-update Alexander Kanavin (22): classes/gnomebase: change tarball compression to xz harfbuzz: enable icu feature classes/cmake: add arch conversion routine jpeg: update to version 9a libnotify: update to version 0.7.6 giflib: add a recipe from meta-oe libyaml: add a recipe from meta-oe ruby: add a recipe from meta-ruby libsecret: add a recipe from meta-gnome libwebp: add a recipe from meta-oe webkitgtk: add a new recipe for latest upstream version p11-kit: add a recipe from meta-oe gcr: add a recipe from meta-gnome iso-codes: add a recipe from meta-oe libwnck3: add a recipe from meta-gnome gnome-desktop3: add a recipe from meta-gnome glib: add a warning suppression patch to glib gsettings-desktop-schemas: add a recipe from meta-gnome epiphany: add a recipe from meta-gnome webkit-gtk: remove the recipe for the obsolete version 1.8.3 midori: remove the recipe and replace references to midori with epiphany distro: update include files related to webkitgtk and epiphany addition meta/classes/cmake.bbclass | 12 +- meta/classes/gnomebase.bbclass |2 +- meta/conf/distro/include/distro_alias.inc |2 +- meta/conf/distro/include/package_regex.inc |8 +- meta/conf/distro/include/security_flags.inc|2 - meta/conf/distro/include/upstream_tracking.inc |2 - ...warning-about-deprecated-paths-in-schemas.patch | 32 + meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb |1 + .../glib-networking/glib-networking_2.44.0.bb |2 - .../jpeg/jpeg-8d/debian-libjpeg7_7-1.diff | 1070 .../jpeg/jpeg-8d/fix_for_automake_1.12.1.patch | 44 - meta/recipes-core/jpeg/{jpeg_8d.bb = jpeg_9a.bb} | 32 +- .../packagegroups/packagegroup-self-hosted.bb |7 +- meta/recipes-devtools/giflib/giflib_5.1.1.bb | 19 + meta/recipes-devtools/ruby/ruby.inc| 40 + meta/recipes-devtools/ruby/ruby/extmk.patch| 13 + meta/recipes-devtools/ruby/ruby_2.2.2.bb | 42 + meta/recipes-gnome/epiphany/epiphany_3.16.3.bb | 24 + .../0001-yelp.m4-drop-the-check-for-itstool.patch | 33 + meta/recipes-gnome/gcr/gcr_3.16.0.bb | 18 + .../gnome-desktop/gnome-desktop3_3.16.2.bb | 21 + meta/recipes-gnome/gnome/gnome-common_3.14.0.bb|2 - .../recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb |2 - meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb |1 + .../gsettings-desktop-schemas_3.16.1.bb| 13 + .../gtk-engines/gtk-engines_2.20.2.bb |1 + meta/recipes-gnome/json-glib/json-glib_1.0.4.bb|2 - meta/recipes-gnome/libglade/libglade_2.6.4.bb |1 + meta/recipes-gnome/libnotify/libnotify_0.6.0.bb| 21 - meta/recipes-gnome/libnotify/libnotify_0.7.6.bb| 12 + meta/recipes-gnome/librsvg/librsvg_2.40.10.bb |2 - meta/recipes-gnome/libsecret/libsecret_0.18.2.bb | 12 + meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb | 15 + .../builder/files/builder_hob_start.sh |8 +- meta/recipes-graphics/harfbuzz/harfbuzz_1.0.1.bb |2 +- meta/recipes-graphics/pango/pango_1.36.8.bb|2 - meta/recipes-multimedia/webp/libwebp_0.4.3.bb | 47 + meta/recipes-sato/midori/midori/liststore.patch| 29 - meta/recipes-sato/midori/midori_0.5.8.bb | 31 - .../packagegroups/packagegroup-core-x11-sato.bb|2 +- meta/recipes-sato/webkit/files/bison-2.6.patch | 558 -- meta/recipes-sato/webkit/files/no-gtkdoc.patch | 20 - meta/recipes-sato/webkit/files/nodolt.patch| 19 - .../webgit-gtk_fix_build_with_automake_1.12.patch | 62 -- ...bkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch | 26 - .../0001-Enable-mips64-build.patch | 69 -- .../webkit/webkit-gtk-1.8.3/aarch64.patch | 41 - .../obsolete_automake_macros.patch | 14 - meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb | 116 --- meta/recipes-sato/webkit/webkitgtk_2.8.5.bb| 56 + meta/recipes-support/atk/atk_2.16.0.bb |2 - meta/recipes-support/iso-codes/iso
[OE-core] [PATCH 01/22] classes/gnomebase: change tarball compression to xz
Upstream, xz has been the only format for some time now, so let's make it the default and adjust recipes that package old stuff. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/classes/gnomebase.bbclass | 2 +- meta/recipes-core/glib-networking/glib-networking_2.44.0.bb | 2 -- meta/recipes-gnome/gnome/gnome-common_3.14.0.bb | 2 -- meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb | 2 -- meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb | 1 + meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb| 1 + meta/recipes-gnome/json-glib/json-glib_1.0.4.bb | 2 -- meta/recipes-gnome/libglade/libglade_2.6.4.bb | 1 + meta/recipes-gnome/librsvg/librsvg_2.40.10.bb | 2 -- meta/recipes-graphics/pango/pango_1.36.8.bb | 2 -- meta/recipes-support/atk/atk_2.16.0.bb | 2 -- meta/recipes-support/libcroco/libcroco_0.6.8.bb | 2 -- meta/recipes-support/vte/vte_0.28.2.bb | 4 ++-- 13 files changed, 6 insertions(+), 19 deletions(-) diff --git a/meta/classes/gnomebase.bbclass b/meta/classes/gnomebase.bbclass index 6ca13cb..e5c6776 100644 --- a/meta/classes/gnomebase.bbclass +++ b/meta/classes/gnomebase.bbclass @@ -1,7 +1,7 @@ def gnome_verdir(v): return oe.utils.trim_version(v, 2) -GNOME_COMPRESS_TYPE ?= bz2 +GNOME_COMPRESS_TYPE ?= xz SECTION ?= x11/gnome GNOMEBN ?= ${BPN} SRC_URI = ${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir(${PV})}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive diff --git a/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb index 848bf53..4f91b76 100644 --- a/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb +++ b/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb @@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 SECTION = libs DEPENDS = glib-2.0 intltool-native -GNOME_COMPRESS_TYPE = xz - SRC_URI[archive.md5sum] = 6989b20cf3b26dd5ae272e04a9acb0b3 SRC_URI[archive.sha256sum] = 8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346 diff --git a/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb b/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb index 1f9fe8b..80b7033 100644 --- a/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb +++ b/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb @@ -8,8 +8,6 @@ LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 SECTION = x11/gnome inherit gnomebase allarch -GNOME_COMPRESS_TYPE = xz - SRC_URI[archive.md5sum] = ba58c61d0d81b7c3ff8452c620513a9d SRC_URI[archive.sha256sum] = 4c00242f781bb441289f49dd80ed1d895d84de0c94bfc2c6818a104c9e39262c diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb index 321eb7f..78cc005 100644 --- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb +++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb @@ -2,8 +2,6 @@ require gnome-doc-utils.inc LIC_FILES_CHKSUM = file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343 -GNOME_COMPRESS_TYPE = xz - SRC_URI += file://xsltproc_nonet.patch \ file://use-usr-bin-env-for-python-in-xml2po.patch \ file://sysrooted-pkg-config.patch \ diff --git a/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb b/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb index 65b79f0..a31eb55 100644 --- a/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb +++ b/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb @@ -13,6 +13,7 @@ SRC_URI += file://pkgconfig.patch SRC_URI[archive.md5sum] = 541858188f80090d12a33b5a7c34d42c SRC_URI[archive.sha256sum] = 37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7 +GNOME_COMPRESS_TYPE=bz2 DEPENDS += shared-mime-info intltool-native RDEPENDS_${PN} = shared-mime-info diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb index 036aa27..c30454c 100644 --- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb +++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb @@ -32,6 +32,7 @@ CFLAGS_prepend = -DHAVE_ANIMATION RDEPENDS_${PN}-dev = inherit gnomebase +GNOME_COMPRESS_TYPE=bz2 python populate_packages_prepend() { engines_root = os.path.join(d.getVar('libdir', True), gtk-2.0/2.10.0/engines) diff --git a/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb b/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb index 4d2b613..c57c973 100644 --- a/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb +++ b/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb @@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 DEPENDS = glib-2.0 -GNOME_COMPRESS_TYPE = xz - SRC_URI[archive.md5sum
[OE-core] [PATCH 04/22] jpeg: update to version 9a
Previous webkit version was blocking this; latest webkit works fine. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- .../jpeg/jpeg-8d/debian-libjpeg7_7-1.diff | 1070 .../jpeg/jpeg-8d/fix_for_automake_1.12.1.patch | 44 - meta/recipes-core/jpeg/{jpeg_8d.bb = jpeg_9a.bb} | 32 +- 3 files changed, 5 insertions(+), 1141 deletions(-) delete mode 100644 meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff delete mode 100644 meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch rename meta/recipes-core/jpeg/{jpeg_8d.bb = jpeg_9a.bb} (53%) diff --git a/meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff b/meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff deleted file mode 100644 index 3b8fa69..000 --- a/meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff +++ /dev/null @@ -1,1070 +0,0 @@ -This is a well-known debian patch used by many Linux distribution, but not -accepted by upstream yet. -Upstream-Status: Pending - libjpeg7-7.orig/config.sub -+++ libjpeg7-7/config.sub -@@ -1,4 +1,10 @@ - #! /bin/sh -+# autotools-dev hack (ballo...@debian.org, Wed, 14 Nov 2001 10:13:10 +0100) -+if [ -x /usr/share/misc/config.sub ]; then -+ /usr/share/misc/config.sub $* -+ exit $? -+fi -+ - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 libjpeg7-7.orig/config.guess -+++ libjpeg7-7/config.guess -@@ -1,4 +1,10 @@ - #! /bin/sh -+# autotools-dev hack (ballo...@debian.org, Wed, 14 Nov 2001 10:13:10 +0100) -+if [ -x /usr/share/misc/config.guess ]; then -+ /usr/share/misc/config.guess $* -+ exit $? -+fi -+ - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 libjpeg7-7.orig/debian/libjpeg7-dev.files -+++ libjpeg7-7/debian/libjpeg7-dev.files -@@ -0,0 +1,4 @@ -+usr/include -+usr/lib/libjpeg.a -+usr/lib/libjpeg.la -+usr/lib/libjpeg.so libjpeg7-7.orig/debian/libjpeg-progs.README.Debian -+++ libjpeg7-7/debian/libjpeg-progs.README.Debian -@@ -0,0 +1,13 @@ -+libjpeg-progs for Debian -+ -+ -+This package contains programs for manipulating JPEG files: -+ cjpeg/djpeg: convert to/from the JPEG file format -+ rdjpgcom/wrjpgcom: read/write comments in JPEG files -+ jpegtran: lossless transformations of JPEG files -+ jpegexiforient/exifautotran: manipulate EXIF orientation tag -+ -+Thanks for using Debian! -+ -+-- -+Bill Allombert ballo...@debian.org Sun, 05 Jul 2009 15:18:59 +0200 libjpeg7-7.orig/debian/shlibs.local -+++ libjpeg7-7/debian/shlibs.local -@@ -0,0 +1 @@ -+libjpeg 7 libjpeg7 libjpeg7-7.orig/debian/rules -+++ libjpeg7-7/debian/rules -@@ -0,0 +1,71 @@ -+#!/usr/bin/make -f -+# Made with the aid of debmake, by Christoph Lameter, -+# based on the sample debian/rules file for GNU hello by Ian Jackson. -+ -+package=libjpeg -+ -+export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -+ -+export CFLAGS=-D_REENTRANT -g -Wall -+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -+CFLAGS += -O0 -+else -+CFLAGS += -O2 -+endif -+ -+#export DH_VERBOSE=1 -+ -+build: build-stamp -+build-stamp: -+ dh_testdir -+ ./configure --prefix=/usr --mandir=/usr/share/man \ -+ --enable-static --enable-shared \ -+ --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) -+ $(MAKE) -+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) -+ $(MAKE) check -+endif -+ $(MAKE) -C debian/extra -+ -+ touch build-stamp -+ -+clean: -+ dh_testdir -+ dh_testroot -+ -rm -f build-stamp -+ if [ -f Makefile ]; then $(MAKE) distclean; fi -+ $(MAKE) clean -C debian/extra -+ dh_clean -+ -+binary-indep: -+ -+binary-arch: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ $(MAKE) install DESTDIR=`pwd`/debian/tmp -+ $(MAKE) install -C debian/extra prefix=/usr DESTDIR=`pwd`/debian/tmp -+ # fix jconfig.h -+ rm debian/tmp/usr/include/jconfig.h -+ sed -e s/#\(undef\|define\) HAVE_\(LOCALE\|\(STD\(DEF\|LIB\)\)\)_H 1//g \ -+ jconfig.h debian/tmp/usr/include/jconfig.h -+ # separate out lib package -+ dh_movefiles -+ # Finish it off with debhelper -+ dh_installdocs README -+ dh_installexamples -+ dh_installchangelogs change.log -+ dh_strip --dbg-package=libjpeg7-dbg -+ dh_compress -+ dh_fixperms -+ dh_installdeb -+ dh_shlibdeps -l`pwd`/debian/libjpeg7/usr/lib -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+ -+.PHONY: clean binary-indep binary-arch binary build libjpeg7-7.orig/debian
[OE-core] [PATCH 05/22] libnotify: update to version 0.7.6
New webkit requires at least version 0.7 Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-gnome/libnotify/libnotify_0.6.0.bb | 21 - meta/recipes-gnome/libnotify/libnotify_0.7.6.bb | 12 2 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 meta/recipes-gnome/libnotify/libnotify_0.6.0.bb create mode 100644 meta/recipes-gnome/libnotify/libnotify_0.7.6.bb diff --git a/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb b/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb deleted file mode 100644 index e6ee89b..000 --- a/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = Library for sending desktop notifications to a notification daemon -SECTION = libs -LICENSE = LGPLv2.1 -LIC_FILES_CHKSUM = file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 - -PR = r1 - -DEPENDS = dbus gtk+ dbus-glib - -inherit gnomebase distro_features_check - -# Requires gdk/gdkx.h which is provided by gtk when x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = x11 - -SRC_URI[archive.md5sum] = 732c9d2cd5eb6a9069264a319d330516 -SRC_URI[archive.sha256sum] = 73b16a79bb2fed62dcf146b11c4405776cb96a09dce66379ca541da7dbd64210 - -do_configure_prepend() { -sed -i /GTK3/d ${S}/configure.ac -sed -i -e /test-gtk3/d -e 's/test-xy-stress \\/test-xy-stress/' ${S}/tests/Makefile.am -} diff --git a/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb b/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb new file mode 100644 index 000..5d7b4ce --- /dev/null +++ b/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb @@ -0,0 +1,12 @@ +SUMMARY = Library for sending desktop notifications to a notification daemon +SECTION = libs +LICENSE = LGPLv2.1 +LIC_FILES_CHKSUM = file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 + +DEPENDS = dbus gtk+3 dbus-glib + +inherit gnomebase distro_features_check gtk-doc + +SRC_URI[archive.md5sum] = a4997019d08f46f3bf57b78e6f795a59 +SRC_URI[archive.sha256sum] = 0ef61ca400d30e28217979bfa0e73a7406b19c32dd76150654ec5b2bdf47d837 + -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 19/22] epiphany: add a recipe from meta-gnome
Epiphany is replacing midori as the browser in oe-core recipe set and poky distribution. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-gnome/epiphany/epiphany_3.16.3.bb | 24 .../0001-yelp.m4-drop-the-check-for-itstool.patch | 33 ++ 2 files changed, 57 insertions(+) create mode 100644 meta/recipes-gnome/epiphany/epiphany_3.16.3.bb create mode 100644 meta/recipes-gnome/epiphany/files/0001-yelp.m4-drop-the-check-for-itstool.patch diff --git a/meta/recipes-gnome/epiphany/epiphany_3.16.3.bb b/meta/recipes-gnome/epiphany/epiphany_3.16.3.bb new file mode 100644 index 000..2681ab5 --- /dev/null +++ b/meta/recipes-gnome/epiphany/epiphany_3.16.3.bb @@ -0,0 +1,24 @@ +SUMMARY = WebKit based web browser for GNOME +LICENSE = GPLv2+ +LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe + +DEPENDS = libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates avahi libnotify gcr libwnck3 \ + gsettings-desktop-schemas gnome-desktop3 + +inherit gnomebase gsettings +SRC_URI += file://0001-yelp.m4-drop-the-check-for-itstool.patch +SRC_URI[archive.md5sum] = 3296af4532b8019775f4b40d21a341ae +SRC_URI[archive.sha256sum] = d527f1770779ec22d955aeb13b148a846a26144e433ff0480c981af80e2390b1 + +EXTRA_OECONF += --disable-nss --with-distributor-name=${DISTRO} + +do_configure_prepend() { +touch ${S}/gnome-doc-utils.make +sed -i -e s:help::g ${S}/Makefile.am +} + +FILES_${PN} += ${datadir}/appdata ${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers +FILES_${PN}-dbg += ${libdir}/epiphany/*/web-extensions/.debug/libephywebextension.so +RDEPENDS_${PN} = iso-codes +RRECOMMENDS_${PN} = ca-certificates + diff --git a/meta/recipes-gnome/epiphany/files/0001-yelp.m4-drop-the-check-for-itstool.patch b/meta/recipes-gnome/epiphany/files/0001-yelp.m4-drop-the-check-for-itstool.patch new file mode 100644 index 000..2585d7f --- /dev/null +++ b/meta/recipes-gnome/epiphany/files/0001-yelp.m4-drop-the-check-for-itstool.patch @@ -0,0 +1,33 @@ +From 30f03a256efe375a4d5c3a24bf4168ebf380e3ab Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin alex.kana...@gmail.com +Date: Thu, 30 Jul 2015 15:13:23 +0300 +Subject: [PATCH] yelp.m4: drop the check for itstool + +It isn't used for anything during build, so there's no need to provide +it as a recipe. + +Upstream-Status: Inappropriate [tarball-specific issue] +--- + m4/yelp.m4 | 6 -- + 1 file changed, 6 deletions(-) + +diff --git a/m4/yelp.m4 b/m4/yelp.m4 +index 5db847f..1b6ede4 100644 +--- a/m4/yelp.m4 b/m4/yelp.m4 +@@ -27,12 +27,6 @@ AC_ARG_WITH([help-dir], + HELP_DIR=$with_help_dir + AC_SUBST(HELP_DIR) + +-AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command]) +-AC_CHECK_PROG([ITSTOOL], [itstool], [itstool]) +-if test x$ITSTOOL = x; then +- AC_MSG_ERROR([itstool not found]) +-fi +- + AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command]) + AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint]) + if test x$XMLLINT = x; then +-- +2.1.4 + -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 20/22] webkit-gtk: remove the recipe for the obsolete version 1.8.3
webkitgtk 2.8.3 is provided instead and midori browser is replaced by epiphany in separate commits. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/conf/distro/include/security_flags.inc| 2 - meta/recipes-sato/webkit/files/bison-2.6.patch | 558 - meta/recipes-sato/webkit/files/no-gtkdoc.patch | 20 - meta/recipes-sato/webkit/files/nodolt.patch| 19 - .../webgit-gtk_fix_build_with_automake_1.12.patch | 62 --- ...bkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch | 26 - .../0001-Enable-mips64-build.patch | 69 --- .../webkit/webkit-gtk-1.8.3/aarch64.patch | 41 -- .../obsolete_automake_macros.patch | 14 - meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb | 116 - 10 files changed, 927 deletions(-) delete mode 100644 meta/recipes-sato/webkit/files/bison-2.6.patch delete mode 100644 meta/recipes-sato/webkit/files/no-gtkdoc.patch delete mode 100644 meta/recipes-sato/webkit/files/nodolt.patch delete mode 100644 meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch delete mode 100644 meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch delete mode 100644 meta/recipes-sato/webkit/webkit-gtk-1.8.3/0001-Enable-mips64-build.patch delete mode 100644 meta/recipes-sato/webkit/webkit-gtk-1.8.3/aarch64.patch delete mode 100644 meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch delete mode 100644 meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index ff600fa..14ac0bf 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -21,7 +21,6 @@ SECURITY_CFLAGS_powerpc = -fstack-protector-all ${lcl_maybe_fortify} SECURITY_CFLAGS_pn-dbus_powerpc = SECURITY_CFLAGS_pn-dbus-ptest_powerpc = SECURITY_CFLAGS_pn-libmatchbox_powerpc = -SECURITY_CFLAGS_pn-webkit-gtk_powerpc = # arm specific security flag issues SECURITY_CFLAGS_pn-lttng-tools_arm = ${SECURITY_NO_PIE_CFLAGS} @@ -86,7 +85,6 @@ SECURITY_CFLAGS_pn-python3 = ${SECURITY_NO_PIE_CFLAGS} SECURITY_CFLAGS_pn-tcl = ${SECURITY_NO_PIE_CFLAGS} SECURITY_CFLAGS_pn-tiff = ${SECURITY_NO_PIE_CFLAGS} SECURITY_CFLAGS_pn-valgrind = ${SECURITY_NO_PIE_CFLAGS} -SECURITY_CFLAGS_pn-webkit-gtk = ${SECURITY_NO_PIE_CFLAGS} SECURITY_CFLAGS_pn-zlib = ${SECURITY_NO_PIE_CFLAGS} # These 2 have text relco errors with the pie options enabled diff --git a/meta/recipes-sato/webkit/files/bison-2.6.patch b/meta/recipes-sato/webkit/files/bison-2.6.patch deleted file mode 100644 index d4aa674..000 --- a/meta/recipes-sato/webkit/files/bison-2.6.patch +++ /dev/null @@ -1,558 +0,0 @@ -Upstream-Status: Backport -http://trac.webkit.org/changeset/124099 - -Subversion Revision: 123651 -diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y -index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644 a/Source/WebCore/css/CSSGrammar.y -+++ b/Source/WebCore/css/CSSGrammar.y -@@ -53,14 +53,13 @@ using namespace HTMLNames; - #define YYMAXDEPTH 1 - #define YYDEBUG 0 - --// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x --#define YYPARSE_PARAM parser --#define YYLEX_PARAM parser -- - %} - - %pure_parser - -+%parse-param { CSSParser* parser } -+%lex-param { CSSParser* parser } -+ - %union { - bool boolean; - char character; -@@ -89,7 +88,7 @@ using namespace HTMLNames; - - %{ - --static inline int cssyyerror(const char*) -+static inline int cssyyerror(void*, const char*) - { - return 1; - } -diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp -index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644 a/Source/WebCore/css/CSSParser.cpp -+++ b/Source/WebCore/css/CSSParser.cpp -@@ -114,7 +114,7 @@ - extern int cssyydebug; - #endif - --extern int cssyyparse(void* parser); -+extern int cssyyparse(WebCore::CSSParser*); - - using namespace std; - using namespace WTF; -diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y -index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644 a/Source/WebCore/xml/XPathGrammar.y -+++ b/Source/WebCore/xml/XPathGrammar.y -@@ -34,6 +34,7 @@ - #include XPathParser.h - #include XPathPath.h - #include XPathPredicate.h -+#include XPathStep.h - #include XPathVariableReference.h - #include wtf/FastMalloc.h - -@@ -44,8 +45,6 @@ - #define YYLTYPE_IS_TRIVIAL 1 - #define YYDEBUG 0 - #define YYMAXDEPTH 1 --#define YYPARSE_PARAM parserParameter --#define PARSER static_castParser*(parserParameter) - - using namespace WebCore; - using namespace XPath; -@@ -53,6 +52,7 @@ using namespace XPath; - %} - - %pure_parser -+%parse-param { WebCore::XPath
Re: [OE-core] [PATCH V2] systemd: Upgrade 219 - 224
This will help anyone who will make changes to this recipe in the future and will need to find out why certain things were done in the past. yeah, I have added pointers to commits instead. Thanks, it looks much better now! Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/5] btrfs-tools: 4.1.1 - 4.1.2
Is there no PV change here? Thanks, I updated in the repo. -PV = 4.1.1+git${SRCPV} +PV = 4.1.2+git${SRCPV} You can also rename the recipe to btrfs-tools_4.1.2.bb and remove the PV altogether. The above form is only needed if you're taking something from git that is not a pristine tagged release (i.e. when it is a tagged commit+additional commits). Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 5/5] rpm: update to 5.4.15
The autobuilder exploded with failures like: https://autobuilder.yoctoproject.org/main/builders/build-appliance/builds/430/steps/BuildImages_1/logs/stdio which are due to the installed manifest file listing installed packages being empty. After spending some time with this issue I have to give up (for now). Rpm seems to install the packages without any errors, but the database of what is installed isn't updated correctly (rootfs/var/lib/rpm/Packages is empty, but there are also __db.00N files in the same directory which weren't there when the previous rpm version was in use). Then when rpm is later asked to provide a list of installed packages, it returns nothing and image build breaks down. If there are any rpm specialists around, feel free to pick it up: https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates-rpm-db-incomplete Regards, Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] systemd: Upgrade 219 - 224
MIT licence was unused and dropped in source itself commit 8f1e0c5f38cdf7e401ab4d2bb93ad816d08e7715 Author: Kay Sievers k...@vrfy.org Date: Tue Apr 21 19:21:56 2015 +0200 delete unused LICENSE.MIT libudev API documentation has been converted from gtkdoc into man pages. see commit 2375607039517c88df51ef16ddbb624ec1c10654 Author: Kay Sievers k...@vrfy.org Date: Wed Jun 3 00:09:23 2015 +0200 remove gudev and gtk-doc The library moved to: https://git.gnome.org/browse/libgudev/ package newly added xorg information commit 1401ec2d34bcde406ced531a72dc46ebaf332594 Author: Kay Sievers k...@vrfy.org Date: Fri Jan 9 21:23:48 2015 +0100 push xorg information to the systemd --user instance There are many reasons, for me its overlay support for systemd-nspawn, networkd has got many new features that is now usable w.r.t. IP forwarding, vxlan etc. and it has many bug fixed in those 2000 odd commits since 219 Change-Id: I998e652382950a3c74c4839f3767ef8bef23d88f Signed-off-by: Khem Raj raj.k...@gmail.com My apologies, but this is a really poor commit log message. Please write complete English sentences that make it clear *what* was changed by you and *why*, with attribution when work has been copied from elsewhere. Don't just copy-paste snippets from your email response to Ross. This will help anyone who will make changes to this recipe in the future and will need to find out why certain things were done in the past. Regards, Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 21/22] midori: remove the recipe and replace references to midori with epiphany
On 08/17/2015 06:48 PM, Khem Raj wrote: Mips64 support using the newer webkitgtk may be better. Wenzong please check on that once this code is in master-next and reply here. Latest Webkit (2.8.5) actually does build for MIPS64 (where 2.8.4 failed), but I couldn't find a way to test the n32 variant using poky - any suggestions? may be you can use multilib on same mips64 configuration and build libn32-epiphany ? Thanks, I'll also try to see if powerpc64 build can be tested the same way, because it was not, for the same reason (poky has a configuration for ppc, but not ppc64). Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core