[oe] [PATCH 30/31] florence: update 0.6.3

[Andreas Müller]

On Wed, Sep 6, 2017 at 9:23 PM, Mark Hatle <mark.hatle at windriver.com> wrote:
> From: Andreas Müller <schnitzeltony at googlemail.com>
>
> * patches were either leftovers or do not match the code
> * DESCRIPTION -> shortened SUMMARY
>
> Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
>
> Added gtk+3 dependency and resolved conflicts
>
> Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
> ---
>  .../florence/files/fix-no-atspi-compile.patch      | 30 ----------------------
>  .../recipes-support/florence/florence_0.5.4.bb     | 20 ---------------
>  .../recipes-support/florence/florence_0.6.3.bb     | 19 ++++++++++++++
>  3 files changed, 19 insertions(+), 50 deletions(-)
>  delete mode 100644 meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch
>  delete mode 100644 meta-gnome/recipes-support/florence/florence_0.5.4.bb
>  create mode 100644 meta-gnome/recipes-support/florence/florence_0.6.3.bb
>
> 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.5.4.bb
> deleted file mode 100644
> index 8ce85c9..0000000
> --- a/meta-gnome/recipes-support/florence/florence_0.5.4.bb
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -DESCRIPTION = "Florence is a virtual keyboard (also called on-screen-keyboard), which allows the user to input text through a touchscreen."
> -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.
> -
> -LICENSE = "GPLv2"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
> -
> -PR = "r1"
> -
> -DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf gconf-native 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"
> -
> -inherit gettext autotools gconf pkgconfig
> -
> -EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet --without-xrecord"
> diff --git a/meta-gnome/recipes-support/florence/florence_0.6.3.bb b/meta-gnome/recipes-support/florence/florence_0.6.3.bb
> new file mode 100644
> index 0000000..b9b7d0c
> --- /dev/null
> +++ b/meta-gnome/recipes-support/florence/florence_0.6.3.bb
> @@ -0,0 +1,19 @@
> +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.
> +
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
> +
> +DEPENDS = "gtk+3 libxml2 libglade librsvg libxtst gconf gconf-native cairo intltool-native gnome-doc-utils libnotify gstreamer1.0"
> +
> +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"
> --
> 1.8.3.1
>
> --
There were certain reasons this was not accepted. Are these obsolete these days?

Andreas