From e227eb8abee607073b52829500172a4111e2e98c Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Sun, 9 Oct 2011 16:17:29 +0800 Subject: 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 Signed-off-by: Richard Purdie --- .../libfm/libfm-0.1.14/use_deprecate_func.patch | 13 ------------- .../libfm/libfm-0.1.16/configure_fix.patch | 19 +++++++++++++++++++ meta/recipes-support/libfm/libfm_0.1.14.bb | 21 --------------------- meta/recipes-support/libfm/libfm_0.1.16.bb | 21 +++++++++++++++++++++ 4 files changed, 40 insertions(+), 34 deletions(-) delete mode 100644 meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch create mode 100644 meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch delete mode 100644 meta/recipes-support/libfm/libfm_0.1.14.bb create mode 100644 meta/recipes-support/libfm/libfm_0.1.16.bb (limited to 'meta/recipes-support/libfm') 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 +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.14.bb deleted file mode 100644 index 38f1d7322d..0000000000 --- a/meta/recipes-support/libfm/libfm_0.1.14.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Library for file management" -HOMEPAGE = "http://pcmanfm.sourceforge.net/" -BUGTRACKER = "" - -LICENSE = "GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://src/fm.h;endline=22;md5=e64555171770a551e3b51cc06fc62f1a \ - file://src/base/fm-config.h;endline=23;md5=ad0fc418c3cf041eea35ddb3daf37f17" - -SECTION = "x11/libs" -DEPENDS = "gtk+ menu-cache intltool-native" - -PR = "r3" - -SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \ - file://use_deprecate_func.patch" - -SRC_URI[md5sum] = "d55e51dced6bb9ef46665243b079761f" -SRC_URI[sha256sum] = "e97bf3f9ed4f33b9f0be73e67d360b89337cccf816361faacd8422722269806b" - -inherit autotools pkgconfig diff --git a/meta/recipes-support/libfm/libfm_0.1.16.bb b/meta/recipes-support/libfm/libfm_0.1.16.bb new file mode 100644 index 0000000000..293937f5e5 --- /dev/null +++ b/meta/recipes-support/libfm/libfm_0.1.16.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Library for file management" +HOMEPAGE = "http://pcmanfm.sourceforge.net/" +BUGTRACKER = "" + +LICENSE = "GPLv2 & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://src/fm.h;endline=22;md5=e64555171770a551e3b51cc06fc62f1a \ + file://src/base/fm-config.h;endline=23;md5=ad0fc418c3cf041eea35ddb3daf37f17" + +SECTION = "x11/libs" +DEPENDS = "gtk+ menu-cache intltool-native" + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \ + file://configure_fix.patch" + +SRC_URI[md5sum] = "c09bce415ff6dc2dd835e28aeddeabe3" +SRC_URI[sha256sum] = "ed49365319b941757c155b3790a2adf73f5072227c578d9bcba7329c6f9fcd3b" + +inherit autotools pkgconfig -- cgit v1.2.3-54-g00ecf