From efdf1cb3bb715574ed9d55920b2ab52be34cd130 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 13 Dec 2012 11:35:29 +0100 Subject: florence: move to meta-gnome due to libnotify Signed-off-by: Marcin Juszkiewicz Signed-off-by: Martin Jansa --- .../florence/files/0001-Fix-glib-includes.patch | 33 ++++++++++++++++++++++ .../recipes-support/florence/florence_0.5.1.bb | 20 +++++++++++++ .../florence/files/0001-Fix-glib-includes.patch | 33 ---------------------- meta-oe/recipes-support/florence/florence_0.5.1.bb | 20 ------------- 4 files changed, 53 insertions(+), 53 deletions(-) create mode 100644 meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch create mode 100644 meta-gnome/recipes-support/florence/florence_0.5.1.bb delete mode 100644 meta-oe/recipes-support/florence/files/0001-Fix-glib-includes.patch delete mode 100644 meta-oe/recipes-support/florence/florence_0.5.1.bb 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 new file mode 100644 index 0000000000..06f10bdef1 --- /dev/null +++ b/meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch @@ -0,0 +1,33 @@ +From c8419ef05ff92ffa3de2e626eb6acd5d2df3baa1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +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 +--- + 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 +-#include +-#include +-#include ++#include + #include + #include + +-- +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.5.1.bb new file mode 100644 index 0000000000..56d8914651 --- /dev/null +++ b/meta-gnome/recipes-support/florence/florence_0.5.1.bb @@ -0,0 +1,20 @@ +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 cairo intltool-native gnome-doc-utils libnotify" + +SRC_URI = "http://switch.dl.sourceforge.net/project/florence/florence/0.5.1/florence-0.5.1.tar.bz2 \ + file://0001-Fix-glib-includes.patch" +SRC_URI[md5sum] = "56d12e5b47c100d9df172aa5ddc0f609" +SRC_URI[sha256sum] = "7b06ed84ef2b7b22d8d2cf0c7d013a05409bd82028240ac8719a68b192d5bc62" + +inherit gettext autotools gconf + +EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet" diff --git a/meta-oe/recipes-support/florence/files/0001-Fix-glib-includes.patch b/meta-oe/recipes-support/florence/files/0001-Fix-glib-includes.patch deleted file mode 100644 index 06f10bdef1..0000000000 --- a/meta-oe/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?= -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 ---- - 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 --#include --#include --#include -+#include - #include - #include - --- -1.7.6.5 - diff --git a/meta-oe/recipes-support/florence/florence_0.5.1.bb b/meta-oe/recipes-support/florence/florence_0.5.1.bb deleted file mode 100644 index 56d8914651..0000000000 --- a/meta-oe/recipes-support/florence/florence_0.5.1.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 cairo intltool-native gnome-doc-utils libnotify" - -SRC_URI = "http://switch.dl.sourceforge.net/project/florence/florence/0.5.1/florence-0.5.1.tar.bz2 \ - file://0001-Fix-glib-includes.patch" -SRC_URI[md5sum] = "56d12e5b47c100d9df172aa5ddc0f609" -SRC_URI[sha256sum] = "7b06ed84ef2b7b22d8d2cf0c7d013a05409bd82028240ac8719a68b192d5bc62" - -inherit gettext autotools gconf - -EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet" -- cgit v1.2.3-54-g00ecf