Resent, this time from the correct account. Hi
Am Freitag, den 07.10.2016, 11:19 +0200 schrieb Andreas Müller: > * patches were either leftovers or do not match the code > * DESCRIPTION -> shortened SUMMARY 0.5.x requires gtk 2 and gstreamer 0.10 while 0.6.x requires gtk 3 and gstreamer 1.0. Would be nice to see this in the commit message. I guess gtk+3 also needs do go into DEPENDS, see below. Maybe the move from gtk 2 to 3 would even justify to add a new recipe florence3 while keeping the existing one? In this initial attempt to go to 0.6.3 Alexander added 'gsettings' to inherit, probably to address the #NOTICE in the recipe. https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/ msg47990.html > Signed-off-by: Andreas Müller <schnitzelt...@googlemail.com> > --- > .../florence/files/0001-Fix-glib-includes.patch | 33 ------------ > ---------- > .../florence/files/fix-no-atspi-compile.patch | 30 ------------ > -------- > .../{florence_0.5.4.bb => florence_0.6.3.bb} | 15 +++++----- > 3 files changed, 7 insertions(+), 71 deletions(-) > delete mode 100644 meta-gnome/recipes-support/florence/files/0001 > -Fix-glib-includes.patch > delete mode 100644 meta-gnome/recipes-support/florence/files/fix-no > -atspi-compile.patch > rename meta-gnome/recipes-support/florence/{florence_0.5.4.bb => > florence_0.6.3.bb} (51%) > > 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?= < > schnitzelt...@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 <schnitzelt...@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/files/fix-no-atspi > -compile.patch b/meta-gnome/recipes-support/florence/files/fix-no > -atspi-compile.patch > deleted file mode 100644 > index 0bb5dee..0000000 > --- a/meta-gnome/recipes-support/florence/files/fix-no-atspi > -compile.patch > +++ /dev/null > @@ -1,30 +0,0 @@ > -diff --git a/src/florence.c b/src/florence.c > -index b27c31b..feadefe 100644 > ---- a/src/florence.c > -+++ b/src/florence.c > -@@ -44,12 +44,6 @@ > - /* exit signal */ > - static int flo_exit=FALSE; > - > --#ifdef ENABLE_AT_SPI2 > --void flo_check_show (struct florence *florence, AtspiAccessible > *obj); > --#else > --void flo_check_show (struct florence *florence, Accessible *obj); > --#endif > -- > - /* Called on destroy event (systray quit or close window) */ > - void flo_destroy (void) > - { > -@@ -61,6 +55,12 @@ void flo_destroy (void) > - } > - > - #ifdef AT_SPI > -+#ifdef ENABLE_AT_SPI2 > -+void flo_check_show (struct florence *florence, AtspiAccessible > *obj); > -+#else > -+void flo_check_show (struct florence *florence, Accessible *obj); > -+#endif > -+ > - /* Called to destroy the icon */ > - void flo_icon_destroy (GtkWidget *widget, gpointer user_data) > - { > diff --git a/meta-gnome/recipes-support/florence/florence_0.5.4.bb > b/meta-gnome/recipes-support/florence/florence_0.6.3.bb > similarity index 51% > rename from meta-gnome/recipes-support/florence/florence_0.5.4.bb > rename to meta-gnome/recipes-support/florence/florence_0.6.3.bb > index dfdb6bd..4c08b9f 100644 > --- a/meta-gnome/recipes-support/florence/florence_0.5.4.bb > +++ b/meta-gnome/recipes-support/florence/florence_0.6.3.bb > @@ -1,4 +1,4 @@ > -DESCRIPTION = "Florence is a virtual keyboard (also called on-screen > -keyboard), which allows the user to input text through a > touchscreen." > +SUMMARY = "Florence is a virtual keyboard for touch screens" > HOMEPAGE = "http://florence.sourceforge.net/english.html" > > #NOTICE: If florence can't find its gconf settings, you need to > start florence with --config for one time and save the configuration > once. > @@ -6,15 +6,14 @@ HOMEPAGE = " > http://florence.sourceforge.net/english.html" > LICENSE = "GPLv2" > LIC_FILES_CHKSUM = > "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" > > -PR = "r1" > +DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo > intltool-native gnome-doc-utils libnotify gstreamer1.0" I guess on needs gtk+3 here now? > > -DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo > intltool-native gnome-doc-utils libnotify gstreamer" > - > -SRC_URI = "${SOURCEFORGE_MIRROR}/florence/florence/${PV} > -gtk2/florence-${PV}.tar.bz2 \ > - file://fix-no-atspi-compile.patch" > -SRC_URI[md5sum] = "8d5c2367a28485bfcf577650b0badab7" > -SRC_URI[sha256sum] = > "26d33aa20d5fbf34ceeded4c41cb922d2988b6082e33d9acc46dd7bfe56d31a1" > +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${PN}/${PN}/${PV}/${PN} > -${PV}.tar.bz2" > +SRC_URI[md5sum] = "8775051d7352f75dec5a86dc9964e8e0" > +SRC_URI[sha256sum] = > "422992fd07d285be73cce721a203e22cee21320d69b0fda1579ce62944c5091e" > > inherit gettext autotools gconf pkgconfig > > EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at > -spi --without-panelapplet --without-xrecord" > + > +FILES_${PN} += "${datadir}/glib-2.0/schemas" -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel