[oe] [PATCH 2/8] florence: update to 0.6.3

[Martin Jansa]

On Tue, May 24, 2016 at 02:56:55PM +0300, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
> ---
>  .../florence/files/0001-Fix-glib-includes.patch    | 33 ----------------------
>  .../{florence_0.5.1.bb => florence_0.6.3.bb}       | 10 +++----
>  2 files changed, 5 insertions(+), 38 deletions(-)
>  delete mode 100644 meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch
>  rename meta-gnome/recipes-support/florence/{florence_0.5.1.bb => florence_0.6.3.bb} (71%)
> 
> diff --git a/meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch b/meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch
> deleted file mode 100644
> index 83e598e..0000000
> --- a/meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -From c8419ef05ff92ffa3de2e626eb6acd5d2df3baa1 Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at googlemail.com>
> -Date: Tue, 15 May 2012 13:40:05 +0200
> -Subject: [PATCH] Fix glib includes
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -Upstream-Status: unknown
> -
> -Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
> ----
> - src/trace.c |    5 +----
> - 1 files changed, 1 insertions(+), 4 deletions(-)
> -
> -diff --git a/src/trace.c b/src/trace.c
> -index 5ea5c13..774c56d 100644
> ---- a/src/trace.c
> -+++ b/src/trace.c
> -@@ -21,10 +21,7 @@
> - 
> - #include "trace.h"
> - #include "system.h"
> --#include <glib/gprintf.h>
> --#include <glib/gutils.h>
> --#include <glib/gslist.h>
> --#include <glib/gstrfuncs.h>
> -+#include <glib.h>
> - #include <stdio.h>
> - #include <stdarg.h>
> - 
> --- 
> -1.7.6.5
> -
> diff --git a/meta-gnome/recipes-support/florence/florence_0.5.1.bb b/meta-gnome/recipes-support/florence/florence_0.6.3.bb
> similarity index 71%
> rename from meta-gnome/recipes-support/florence/florence_0.5.1.bb
> rename to meta-gnome/recipes-support/florence/florence_0.6.3.bb
> index 71014f0..a8600a4 100644
> --- a/meta-gnome/recipes-support/florence/florence_0.5.1.bb
> +++ b/meta-gnome/recipes-support/florence/florence_0.6.3.bb
> @@ -8,13 +8,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
>  
>  PR = "r1"
>  
> -DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo intltool-native gnome-doc-utils libnotify"
> +DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo intltool-native gnome-doc-utils libnotify gstreamer1.0"

Does it depend on gtk3 or this commit message wasn't correct?


commit 5adc7db356071e22219d652e11911b98d9f8bf6e
Author: Stefan Agner <stefan.agner at toradex.com>
Date:   Tue May 24 13:43:11 2016 -0700

    florence: move to latest GTK2 version 0.5.4

It also doesn't apply because of this, so please confirm and resend.

>  SRC_URI = "${SOURCEFORGE_MIRROR}/florence/florence/${PV}/florence-${PV}.tar.bz2 \
> -           file://0001-Fix-glib-includes.patch"
> -SRC_URI[md5sum] = "56d12e5b47c100d9df172aa5ddc0f609"
> -SRC_URI[sha256sum] = "7b06ed84ef2b7b22d8d2cf0c7d013a05409bd82028240ac8719a68b192d5bc62"
> +          "
> +SRC_URI[md5sum] = "8775051d7352f75dec5a86dc9964e8e0"
> +SRC_URI[sha256sum] = "422992fd07d285be73cce721a203e22cee21320d69b0fda1579ce62944c5091e"
>  
> -inherit gettext autotools gconf pkgconfig
> +inherit gettext autotools gconf pkgconfig gsettings
>  
>  EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet"
> -- 
> 2.8.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20160602/dc6351aa/attachment-0002.sig>