summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-04-26 10:26:40 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-28 10:44:31 +0100
commit38fd4ce95957a8f4737e979d685b87027d32d291 (patch)
tree6232e8976b345cf7f191d07fe598d14a39d9e927 /meta
parent6d3de3f168ef39e19a6da21a40b1ce74b7d416c1 (diff)
downloadpoky-38fd4ce95957a8f4737e979d685b87027d32d291.tar.gz
libfm: Remove the flag of G_DISABLE_DEPRECATED
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. (From OE-Core rev: a401ad4c353eafc45dbd7b808386d195594adf65) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch11
-rw-r--r--meta/recipes-support/libfm/libfm_0.1.14.bb5
2 files changed, 14 insertions, 2 deletions
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
index 0000000000..fade1955e5
--- /dev/null
+++ b/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch
@@ -0,0 +1,11 @@
1diff -ruN libfm-0.1.14-orig//src/Makefile.am libfm-0.1.14/src/Makefile.am
2--- libfm-0.1.14-orig//src/Makefile.am 2011-04-26 10:01:44.297664993 +0800
3+++ libfm-0.1.14/src/Makefile.am 2011-04-26 10:02:10.637665004 +0800
4@@ -285,7 +285,6 @@
5 $(GIO_CFLAGS) \
6 -DGIO_MODULE_DIR=\"$(giomodulesdir)\" \
7 -DGVFS_LOCALEDIR=\""$(localedir)"\" \
8- -DG_DISABLE_DEPRECATED \
9 $(NULL)
10
11 libgiofm_la_LDFLAGS = \
diff --git a/meta/recipes-support/libfm/libfm_0.1.14.bb b/meta/recipes-support/libfm/libfm_0.1.14.bb
index c56ad331c1..5c7e95c024 100644
--- a/meta/recipes-support/libfm/libfm_0.1.14.bb
+++ b/meta/recipes-support/libfm/libfm_0.1.14.bb
@@ -10,9 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
10SECTION = "x11/libs" 10SECTION = "x11/libs"
11DEPENDS = "gtk+ menu-cache intltool" 11DEPENDS = "gtk+ menu-cache intltool"
12 12
13PR = "r2" 13PR = "r3"
14 14
15SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz" 15SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \
16 file://use_deprecate_func.patch"
16 17
17SRC_URI[md5sum] = "d55e51dced6bb9ef46665243b079761f" 18SRC_URI[md5sum] = "d55e51dced6bb9ef46665243b079761f"
18SRC_URI[sha256sum] = "e97bf3f9ed4f33b9f0be73e67d360b89337cccf816361faacd8422722269806b" 19SRC_URI[sha256sum] = "e97bf3f9ed4f33b9f0be73e67d360b89337cccf816361faacd8422722269806b"