From 47f803a9cc6a7b43f10775172e6bc89632af322e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 25 Oct 2013 10:39:23 +0300 Subject: libfm: upgrade to upstream version 1.1.2.2 Signed-off-by: Marko Lindqvist Signed-off-by: Richard Purdie --- .../libfm-1.1.0/fix-make-parallelism-issue.patch | 31 ---------------------- .../libfm-1.1.2.2/fix-make-parallelism-issue.patch | 31 ++++++++++++++++++++++ meta/recipes-support/libfm/libfm_1.1.0.bb | 25 ----------------- meta/recipes-support/libfm/libfm_1.1.2.2.bb | 23 ++++++++++++++++ 4 files changed, 54 insertions(+), 56 deletions(-) delete mode 100644 meta/recipes-support/libfm/libfm-1.1.0/fix-make-parallelism-issue.patch create 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.0.bb create mode 100644 meta/recipes-support/libfm/libfm_1.1.2.2.bb (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/libfm/libfm-1.1.0/fix-make-parallelism-issue.patch b/meta/recipes-support/libfm/libfm-1.1.0/fix-make-parallelism-issue.patch deleted file mode 100644 index 5d39d1954d..0000000000 --- a/meta/recipes-support/libfm/libfm-1.1.0/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/fix-make-parallelism-issue.patch b/meta/recipes-support/libfm/libfm-1.1.2.2/fix-make-parallelism-issue.patch new file mode 100644 index 0000000000..5d39d1954d --- /dev/null +++ b/meta/recipes-support/libfm/libfm-1.1.2.2/fix-make-parallelism-issue.patch @@ -0,0 +1,31 @@ +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.0.bb b/meta/recipes-support/libfm/libfm_1.1.0.bb deleted file mode 100644 index 23f132a49b..0000000000 --- a/meta/recipes-support/libfm/libfm_1.1.0.bb +++ /dev/null @@ -1,25 +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 = "glib-2.0 pango gtk+ menu-cache intltool-native libexif" - -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \ - file://fix-make-parallelism-issue.patch \ - " - -SRC_URI[md5sum] = "a5bc8b8291cf810c659bfb3af378b5de" -SRC_URI[sha256sum] = "b9426e588670b53570b808c49abd1d103863614dd3622559b8c3ef1392fe0b3d" - -inherit autotools pkgconfig - -PACKAGES += "${PN}-mime" -FILES_${PN}-mime = "${datadir}/mime/" diff --git a/meta/recipes-support/libfm/libfm_1.1.2.2.bb b/meta/recipes-support/libfm/libfm_1.1.2.2.bb new file mode 100644 index 0000000000..1146d16503 --- /dev/null +++ b/meta/recipes-support/libfm/libfm_1.1.2.2.bb @@ -0,0 +1,23 @@ +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 = "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 \ + " + +SRC_URI[md5sum] = "ea3d09b23ef4c37cb84ae57ea16b8f08" +SRC_URI[sha256sum] = "158e2b6974350d2dab15932b496bb4d448553e60bbf7cdfe4d6e9bd99d19d682" + +inherit autotools pkgconfig + +PACKAGES += "${PN}-mime" +FILES_${PN}-mime = "${datadir}/mime/" -- cgit 1.2.3-korg