Patchwork [15/52] libfm: Remove the flag of G_DISABLE_DEPRECATED

login
register
mail settings
Submitter Saul Wold
Date April 27, 2011, 7:29 a.m.
Message ID <a121b9715e7b16118830ce9c44d776bb4b628eb5.1303889119.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/2925/
State New, archived
Headers show

Comments

Saul Wold - April 27, 2011, 7:29 a.m.
From: Dongxiao Xu <dongxiao.xu@intel.com>

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>
---
 .../libfm/libfm-0.1.14/use_deprecate_func.patch    |   11 +++++++++++
 meta/recipes-support/libfm/libfm_0.1.14.bb         |    5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch

Patch

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 0000000..fade195
--- /dev/null
+++ b/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch
@@ -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 = 	\
diff --git a/meta/recipes-support/libfm/libfm_0.1.14.bb b/meta/recipes-support/libfm/libfm_0.1.14.bb
index c56ad33..5c7e95c 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 \
 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"