diff options
| author | Zhai Edwin <edwin.zhai@intel.com> | 2011-10-09 16:17:29 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-14 12:53:32 +0100 |
| commit | 971f593cd2454449f0997c948396107ebf85da41 (patch) | |
| tree | 73788798c5f992e50771718b40351f05a08f8a9d | |
| parent | e08e44da5be348a1ec065ed29a07dbc31ae1035d (diff) | |
| download | openembedded-core-971f593cd2454449f0997c948396107ebf85da41.tar.gz openembedded-core-971f593cd2454449f0997c948396107ebf85da41.tar.bz2 openembedded-core-971f593cd2454449f0997c948396107ebf85da41.zip | |
libfm: Upgrade to 0.1.16
Remove obsolete use_deprecate_func.patch, and add configure_fix.patch to update
configure.ac
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
| -rw-r--r-- | meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch | 13 | ||||
| -rw-r--r-- | meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch | 19 | ||||
| -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 79fc9ce3e4..0000000000 --- a/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch +++ /dev/null @@ -1,13 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -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.16/configure_fix.patch b/meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch new file mode 100644 index 0000000000..351e6e71aa --- /dev/null +++ b/meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch @@ -0,0 +1,19 @@ +Update configure.ac after docs removed in 0.1.16 + +Upstream-Status: Pending + +Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> +Index: libfm-0.1.16/configure.ac +=================================================================== +--- libfm-0.1.16.orig/configure.ac 2011-10-10 15:13:21.000000000 +0800 ++++ libfm-0.1.16/configure.ac 2011-10-10 15:13:30.000000000 +0800 +@@ -153,9 +153,6 @@ + data/Makefile + data/ui/Makefile + po/Makefile.in +- docs/Makefile +- docs/reference/Makefile +- docs/reference/libfm/Makefile + libfm.pc + libfm-gtk.pc + ]) diff --git a/meta/recipes-support/libfm/libfm_0.1.14.bb b/meta/recipes-support/libfm/libfm_0.1.16.bb index 38f1d7322d..293937f5e5 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 \ SECTION = "x11/libs" DEPENDS = "gtk+ menu-cache intltool-native" -PR = "r3" +PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \ - file://use_deprecate_func.patch" + file://configure_fix.patch" -SRC_URI[md5sum] = "d55e51dced6bb9ef46665243b079761f" -SRC_URI[sha256sum] = "e97bf3f9ed4f33b9f0be73e67d360b89337cccf816361faacd8422722269806b" +SRC_URI[md5sum] = "c09bce415ff6dc2dd835e28aeddeabe3" +SRC_URI[sha256sum] = "ed49365319b941757c155b3790a2adf73f5072227c578d9bcba7329c6f9fcd3b" inherit autotools pkgconfig |