CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

florence: move to latest GTK2 version 0.5.4

Browse Source 
The latest GTK2 version is 0.5.4, which contains several bug fixes.
Noteable, it fixes an issue where the SVG keys have not been displayed
with recent versions of its dependencies.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Stefan Agner 2016-05-24 13:43:11 -07:00 committed by Martin Jansa
parent 5cc904be9d
commit 5adc7db356
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch Normal file
View File

@ -0,0 +1,30 @@
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)
{

12
meta-gnome/recipes-support/florence/florence_0.5.1.bb → meta-gnome/recipes-support/florence/florence_0.5.4.bb
View File

@ -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 gstreamer"
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 = "${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"
EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet --without-xrecord"