summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-10-09 08:17:29 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-14 12:18:18 (GMT)
commite227eb8abee607073b52829500172a4111e2e98c (patch)
tree1f8f39daa9f36e5eedf0da4ba910940d9aeb10a2 /meta
parent839f699e6607ea4b0209ab5bd9f42ca2ebf0d51e (diff)
downloadpoky-e227eb8abee607073b52829500172a4111e2e98c.tar.gz
libfm: Upgrade to 0.1.16
Remove obsolete use_deprecate_func.patch, and add configure_fix.patch to update configure.ac (From OE-Core rev: 971f593cd2454449f0997c948396107ebf85da41) Signed-off-by: Zhai Edwin <edwin.zhai@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.patch13
-rw-r--r--meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch19
-rw-r--r--meta/recipes-support/libfm/libfm_0.1.16.bb (renamed from meta/recipes-support/libfm/libfm_0.1.14.bb)8
3 files changed, 23 insertions, 17 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
deleted file mode 100644
index 79fc9ce..0000000
--- a/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff -ruN libfm-0.1.14-orig//src/Makefile.am libfm-0.1.14/src/Makefile.am
4--- libfm-0.1.14-orig//src/Makefile.am 2011-04-26 10:01:44.297664993 +0800
5+++ libfm-0.1.14/src/Makefile.am 2011-04-26 10:02:10.637665004 +0800
6@@ -285,7 +285,6 @@
7 $(GIO_CFLAGS) \
8 -DGIO_MODULE_DIR=\"$(giomodulesdir)\" \
9 -DGVFS_LOCALEDIR=\""$(localedir)"\" \
10- -DG_DISABLE_DEPRECATED \
11 $(NULL)
12
13 libgiofm_la_LDFLAGS = \
diff --git a/meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch b/meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch
new file mode 100644
index 0000000..351e6e7
--- /dev/null
+++ b/meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch
@@ -0,0 +1,19 @@
1Update configure.ac after docs removed in 0.1.16
2
3Upstream-Status: Pending
4
5Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
6Index: libfm-0.1.16/configure.ac
7===================================================================
8--- libfm-0.1.16.orig/configure.ac 2011-10-10 15:13:21.000000000 +0800
9+++ libfm-0.1.16/configure.ac 2011-10-10 15:13:30.000000000 +0800
10@@ -153,9 +153,6 @@
11 data/Makefile
12 data/ui/Makefile
13 po/Makefile.in
14- docs/Makefile
15- docs/reference/Makefile
16- docs/reference/libfm/Makefile
17 libfm.pc
18 libfm-gtk.pc
19 ])
diff --git a/meta/recipes-support/libfm/libfm_0.1.14.bb b/meta/recipes-support/libfm/libfm_0.1.16.bb
index 38f1d73..293937f 100644
--- a/meta/recipes-support/libfm/libfm_0.1.14.bb
+++ b/meta/recipes-support/libfm/libfm_0.1.16.bb
@@ -10,12 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
10SECTION = "x11/libs" 10SECTION = "x11/libs"
11DEPENDS = "gtk+ menu-cache intltool-native" 11DEPENDS = "gtk+ menu-cache intltool-native"
12 12
13PR = "r3" 13PR = "r0"
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 file://configure_fix.patch"
17 17
18SRC_URI[md5sum] = "d55e51dced6bb9ef46665243b079761f" 18SRC_URI[md5sum] = "c09bce415ff6dc2dd835e28aeddeabe3"
19SRC_URI[sha256sum] = "e97bf3f9ed4f33b9f0be73e67d360b89337cccf816361faacd8422722269806b" 19SRC_URI[sha256sum] = "ed49365319b941757c155b3790a2adf73f5072227c578d9bcba7329c6f9fcd3b"
20 20
21inherit autotools pkgconfig 21inherit autotools pkgconfig