From 4f12442b752626ad5f9711cbb1344720fdb3f47e Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 7 Jan 2015 23:29:55 +0100 Subject: libfm: update to 1.2.3 split out libfm-extra as a seperate recipe to break a circular dependency with newer menu-cache recipe. This obsoletes ignore_automake_warnings.patch. This obsoletes fix-make-parallelism-issue.patch. https://github.com/lxde/libfm/commit/24c8eab43cb5b79ca917d67a2c5924aca34c80c9 The library part of libfm has its license changed by the authors to LGPL: http://git.lxde.org/gitweb/?p=lxde/libfm.git;a=commit;h=e0d250aeb40f26ceead82d4b4c7af3b58ab34930 Signed-off-by: Max Krummenacher Signed-off-by: Richard Purdie --- .../libfm-1.1.2.2/fix-make-parallelism-issue.patch | 31 ------------------- .../libfm-1.1.2.2/ignore_automake_warnings.patch | 14 --------- meta/recipes-support/libfm/libfm-extra_1.2.3.bb | 21 +++++++++++++ meta/recipes-support/libfm/libfm_1.1.2.2.bb | 25 --------------- meta/recipes-support/libfm/libfm_1.2.3.bb | 36 ++++++++++++++++++++++ 5 files changed, 57 insertions(+), 70 deletions(-) delete mode 100644 meta/recipes-support/libfm/libfm-1.1.2.2/fix-make-parallelism-issue.patch delete mode 100644 meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch create mode 100644 meta/recipes-support/libfm/libfm-extra_1.2.3.bb delete mode 100644 meta/recipes-support/libfm/libfm_1.1.2.2.bb create mode 100644 meta/recipes-support/libfm/libfm_1.2.3.bb (limited to 'meta/recipes-support/libfm') diff --git a/meta/recipes-support/libfm/libfm-1.1.2.2/fix-make-parallelism-issue.patch b/meta/recipes-support/libfm/libfm-1.1.2.2/fix-make-parallelism-issue.patch deleted file mode 100644 index 5d39d1954d..0000000000 --- a/meta/recipes-support/libfm/libfm-1.1.2.2/fix-make-parallelism-issue.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix make parallelism issue - -- remove pkginclude_HEADERS ( LIBFM_INCLUDES and LIBFM_GTK_INCLUDES -variables are empty) -- if we don't remove it then we will have a race condition between the code -that tries to symlink ${includedir}/libfm-1.0 to ${includedir}/libfm and the -am autogenerated code from the pkginclude_HEADERS definition which -tries to create pkgincludedir (${includedir}/libfm); -- if pkgincludedir is created before the symlink the symlink will be created -in the ${includedir}/libfm dir and it will have libfm-1.0 as name which is -wrong (we need the ${includedir}/libfm symlink for pcmanfm) - -Upstream-Status: Pending -Signed-off-by: Constantin Musca - -Index: libfm-1.1.0/src/Makefile.am -=================================================================== ---- libfm-1.1.0.orig/src/Makefile.am -+++ libfm-1.1.0/src/Makefile.am -@@ -211,11 +211,6 @@ libfmgtkinclude_HEADERS = \ - gtk/fm-gtk-marshal.h \ - $(NULL) - --pkginclude_HEADERS = \ -- $(LIBFM_INCLUDES) \ -- $(LIBFM_GTK_INCLUDES) \ -- $(NULL) -- - EXTRA_LTLIBRARIES = libfm-gtk.la libfm-gtk3.la - - lib_LTLIBRARIES = libfm.la @LIBFM_GTK_LTLIBRARIES@ diff --git a/meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch b/meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch deleted file mode 100644 index 58a2f09d66..0000000000 --- a/meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Marko Lindqvist -diff -Nurd libfm-1.1.2.2/configure.ac libfm-1.1.2.2/configure.ac ---- libfm-1.1.2.2/configure.ac 2013-08-22 23:16:09.000000000 +0300 -+++ libfm-1.1.2.2/configure.ac 2013-10-25 01:35:18.110323079 +0300 -@@ -3,7 +3,7 @@ - - AC_PREREQ([2.63]) - AC_INIT([libfm], [1.1.2.2], [http://pcmanfm.sourceforge.net/]) --AM_INIT_AUTOMAKE([-Wall -Werror foreign]) -+AM_INIT_AUTOMAKE([-Wall foreign]) - AC_CONFIG_MACRO_DIR(m4) - AC_CONFIG_HEADERS([config.h]) diff --git a/meta/recipes-support/libfm/libfm-extra_1.2.3.bb b/meta/recipes-support/libfm/libfm-extra_1.2.3.bb new file mode 100644 index 0000000000..8bdb12c301 --- /dev/null +++ b/meta/recipes-support/libfm/libfm-extra_1.2.3.bb @@ -0,0 +1,21 @@ +SUMMARY = "Library for file management" +HOMEPAGE = "http://pcmanfm.sourceforge.net/" + +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://src/fm-extra.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007" + +SECTION = "x11/libs" +DEPENDS = "glib-2.0 intltool-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz" + +SRC_URI[md5sum] = "3ff38200701658f7e80e25ed395d92dd" +SRC_URI[sha256sum] = "c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344e1fbf9" + +S = "${WORKDIR}/libfm-${PV}" + +EXTRA_OECONF = "--with-extra-only --with-gtk=no" + +inherit autotools-brokensep pkgconfig gtk-doc + +do_configure[dirs] =+ "${S}/m4" diff --git a/meta/recipes-support/libfm/libfm_1.1.2.2.bb b/meta/recipes-support/libfm/libfm_1.1.2.2.bb deleted file mode 100644 index 10f31d9911..0000000000 --- a/meta/recipes-support/libfm/libfm_1.1.2.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Library for file management" -HOMEPAGE = "http://pcmanfm.sourceforge.net/" - -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 = "glib-2.0 pango gtk+ menu-cache intltool-native libexif" - -SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \ - file://fix-make-parallelism-issue.patch \ - file://ignore_automake_warnings.patch \ - " - -SRC_URI[md5sum] = "ea3d09b23ef4c37cb84ae57ea16b8f08" -SRC_URI[sha256sum] = "158e2b6974350d2dab15932b496bb4d448553e60bbf7cdfe4d6e9bd99d19d682" - -inherit autotools-brokensep pkgconfig gtk-doc - -do_configure[dirs] =+ "${S}/m4" - -PACKAGES += "${PN}-mime" -FILES_${PN}-mime = "${datadir}/mime/" diff --git a/meta/recipes-support/libfm/libfm_1.2.3.bb b/meta/recipes-support/libfm/libfm_1.2.3.bb new file mode 100644 index 0000000000..856364a60a --- /dev/null +++ b/meta/recipes-support/libfm/libfm_1.2.3.bb @@ -0,0 +1,36 @@ +SUMMARY = "Library for file management" +HOMEPAGE = "http://pcmanfm.sourceforge.net/" + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://src/fm.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007 \ + file://src/base/fm-config.h;beginline=10;endline=23;md5=ef1f84da64b3c01cca447212f7ef6007 \ + file://src/fm-gtk.h;beginline=6;endline=19;md5=646baa4955c04fe768f2ca27b92ac8dd" + + +SECTION = "x11/libs" +DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native libexif libfm-extra" + +SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz" + +SRC_URI[md5sum] = "3ff38200701658f7e80e25ed395d92dd" +SRC_URI[sha256sum] = "c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344e1fbf9" + +inherit autotools-brokensep pkgconfig gtk-doc + +do_configure[dirs] =+ "${S}/m4" + +PACKAGES += "${PN}-mime" +FILES_${PN}-mime = "${datadir}/mime/" +FILES_${PN}-dbg += "${libdir}/libfm/modules/.debug" + +do_install_append () { + # remove files which are part of libfm-extra + rm -f ${D}${includedir}/libfm-1.0/fm-xml-file.h + rm -f ${D}${includedir}/libfm-1.0/fm-version.h + rm -f ${D}${includedir}/libfm-1.0/fm-extra.h + rm -f ${D}${libdir}/pkgconfig/libfm-extra.pc + rm -f ${D}${libdir}/libfm-extra.so* + rm -f ${D}${libdir}/libfm-extra.a + rm -f ${D}${libdir}/libfm-extra.la +} -- cgit 1.2.3-korg