summaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2016-10-07 11:19:23 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-09-13 11:13:20 +0200
commitd4a0faf98e991228c5dc551872cade0b85c8ac6f (patch)
tree75d996cfcb371c0182da57e0e0cd6def87e04931 /meta-gnome
parenta827e09338a8d4b65d2d24d06b11b614e4a4bf07 (diff)
downloadmeta-openembedded-d4a0faf98e991228c5dc551872cade0b85c8ac6f.tar.gz
florence: update 0.6.3
* patches were either leftovers or do not match the code * DESCRIPTION -> shortened SUMMARY Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Added gtk+3 dependency and resolved conflicts Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch30
-rw-r--r--meta-gnome/recipes-support/florence/florence_0.5.4.bb20
-rw-r--r--meta-gnome/recipes-support/florence/florence_0.6.3.bb19
3 files changed, 19 insertions, 50 deletions
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 0bb5dee80..000000000
--- a/meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1diff --git a/src/florence.c b/src/florence.c
2index b27c31b..feadefe 100644
3--- a/src/florence.c
4+++ b/src/florence.c
5@@ -44,12 +44,6 @@
6 /* exit signal */
7 static int flo_exit=FALSE;
8
9-#ifdef ENABLE_AT_SPI2
10-void flo_check_show (struct florence *florence, AtspiAccessible *obj);
11-#else
12-void flo_check_show (struct florence *florence, Accessible *obj);
13-#endif
14-
15 /* Called on destroy event (systray quit or close window) */
16 void flo_destroy (void)
17 {
18@@ -61,6 +55,12 @@ void flo_destroy (void)
19 }
20
21 #ifdef AT_SPI
22+#ifdef ENABLE_AT_SPI2
23+void flo_check_show (struct florence *florence, AtspiAccessible *obj);
24+#else
25+void flo_check_show (struct florence *florence, Accessible *obj);
26+#endif
27+
28 /* Called to destroy the icon */
29 void flo_icon_destroy (GtkWidget *widget, gpointer user_data)
30 {
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 8ce85c967..000000000
--- a/meta-gnome/recipes-support/florence/florence_0.5.4.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1DESCRIPTION = "Florence is a virtual keyboard (also called on-screen-keyboard), which allows the user to input text through a touchscreen."
2HOMEPAGE = "http://florence.sourceforge.net/english.html"
3
4#NOTICE: If florence can't find its gconf settings, you need to start florence with --config for one time and save the configuration once.
5
6LICENSE = "GPLv2"
7LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
8
9PR = "r1"
10
11DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf gconf-native cairo intltool-native gnome-doc-utils libnotify gstreamer"
12
13SRC_URI = "${SOURCEFORGE_MIRROR}/florence/florence/${PV}-gtk2/florence-${PV}.tar.bz2 \
14 file://fix-no-atspi-compile.patch"
15SRC_URI[md5sum] = "8d5c2367a28485bfcf577650b0badab7"
16SRC_URI[sha256sum] = "26d33aa20d5fbf34ceeded4c41cb922d2988b6082e33d9acc46dd7bfe56d31a1"
17
18inherit gettext autotools gconf pkgconfig
19
20EXTRA_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 000000000..b9b7d0cb1
--- /dev/null
+++ b/meta-gnome/recipes-support/florence/florence_0.6.3.bb
@@ -0,0 +1,19 @@
1SUMMARY = "Florence is a virtual keyboard for touch screens"
2HOMEPAGE = "http://florence.sourceforge.net/english.html"
3
4#NOTICE: If florence can't find its gconf settings, you need to start florence with --config for one time and save the configuration once.
5
6LICENSE = "GPLv2"
7LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
8
9DEPENDS = "gtk+3 libxml2 libglade librsvg libxtst gconf gconf-native cairo intltool-native gnome-doc-utils libnotify gstreamer1.0"
10
11SRC_URI = "${SOURCEFORGE_MIRROR}/project/${PN}/${PN}/${PV}/${PN}-${PV}.tar.bz2"
12SRC_URI[md5sum] = "8775051d7352f75dec5a86dc9964e8e0"
13SRC_URI[sha256sum] = "422992fd07d285be73cce721a203e22cee21320d69b0fda1579ce62944c5091e"
14
15inherit gettext autotools gconf pkgconfig
16
17EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet --without-xrecord"
18
19FILES_${PN} += "${datadir}/glib-2.0/schemas"