]> code.ossystems Code Review - openembedded-core.git/commitdiff
libfm: Remove the flag of G_DISABLE_DEPRECATED
authorDongxiao Xu <dongxiao.xu@intel.com>
Tue, 26 Apr 2011 02:26:40 +0000 (10:26 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 28 Apr 2011 08:52:25 +0000 (09:52 +0100)
Latest glib-2.0 changes some macros and function definitions to be
deprecated. However libfm still uses them. Therefore the flag
G_DISABLE_DEPRECATED should be removed in libfm's Makefile.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch [new file with mode: 0644]
meta/recipes-support/libfm/libfm_0.1.14.bb

diff --git a/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch b/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch
new file mode 100644 (file)
index 0000000..fade195
--- /dev/null
@@ -0,0 +1,11 @@
+diff -ruN libfm-0.1.14-orig//src/Makefile.am libfm-0.1.14/src/Makefile.am
+--- libfm-0.1.14-orig//src/Makefile.am 2011-04-26 10:01:44.297664993 +0800
++++ libfm-0.1.14/src/Makefile.am       2011-04-26 10:02:10.637665004 +0800
+@@ -285,7 +285,6 @@
+       $(GIO_CFLAGS) \
+       -DGIO_MODULE_DIR=\"$(giomodulesdir)\"   \
+       -DGVFS_LOCALEDIR=\""$(localedir)"\"     \
+-      -DG_DISABLE_DEPRECATED \
+       $(NULL)
+ libgiofm_la_LDFLAGS =         \
index c56ad331c1058288d1f61cd410f00f3f492ce65e..5c7e95c0244f34f8d9ccf23f4334ffef940b0fda 100644 (file)
@@ -10,9 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 SECTION = "x11/libs"
 DEPENDS = "gtk+ menu-cache intltool"
 
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \
+           file://use_deprecate_func.patch"
 
 SRC_URI[md5sum] = "d55e51dced6bb9ef46665243b079761f"
 SRC_URI[sha256sum] = "e97bf3f9ed4f33b9f0be73e67d360b89337cccf816361faacd8422722269806b"