diff options
| author | Adrian Dudau <adrian.dudau@enea.com> | 2013-12-12 13:38:32 +0100 |
|---|---|---|
| committer | Adrian Dudau <adrian.dudau@enea.com> | 2013-12-12 13:50:20 +0100 |
| commit | e2e6f6fe07049f33cb6348780fa975162752e421 (patch) | |
| tree | b1813295411235d1297a0ed642b1346b24fdfb12 /meta/recipes-support/libfm | |
| download | poky-e2e6f6fe07049f33cb6348780fa975162752e421.tar.gz | |
initial commit of Enea Linux 3.1
Migrated from the internal git server on the dora-enea branch
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-support/libfm')
| -rw-r--r-- | meta/recipes-support/libfm/libfm-1.1.0/fix-make-parallelism-issue.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-support/libfm/libfm_1.1.0.bb | 25 |
2 files changed, 56 insertions, 0 deletions
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 new file mode 100644 index 0000000000..5d39d1954d --- /dev/null +++ b/meta/recipes-support/libfm/libfm-1.1.0/fix-make-parallelism-issue.patch | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | Fix make parallelism issue | ||
| 2 | |||
| 3 | - remove pkginclude_HEADERS ( LIBFM_INCLUDES and LIBFM_GTK_INCLUDES | ||
| 4 | variables are empty) | ||
| 5 | - if we don't remove it then we will have a race condition between the code | ||
| 6 | that tries to symlink ${includedir}/libfm-1.0 to ${includedir}/libfm and the | ||
| 7 | am autogenerated code from the pkginclude_HEADERS definition which | ||
| 8 | tries to create pkgincludedir (${includedir}/libfm); | ||
| 9 | - if pkgincludedir is created before the symlink the symlink will be created | ||
| 10 | in the ${includedir}/libfm dir and it will have libfm-1.0 as name which is | ||
| 11 | wrong (we need the ${includedir}/libfm symlink for pcmanfm) | ||
| 12 | |||
| 13 | Upstream-Status: Pending | ||
| 14 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | ||
| 15 | |||
| 16 | Index: libfm-1.1.0/src/Makefile.am | ||
| 17 | =================================================================== | ||
| 18 | --- libfm-1.1.0.orig/src/Makefile.am | ||
| 19 | +++ libfm-1.1.0/src/Makefile.am | ||
| 20 | @@ -211,11 +211,6 @@ libfmgtkinclude_HEADERS = \ | ||
| 21 | gtk/fm-gtk-marshal.h \ | ||
| 22 | $(NULL) | ||
| 23 | |||
| 24 | -pkginclude_HEADERS = \ | ||
| 25 | - $(LIBFM_INCLUDES) \ | ||
| 26 | - $(LIBFM_GTK_INCLUDES) \ | ||
| 27 | - $(NULL) | ||
| 28 | - | ||
| 29 | EXTRA_LTLIBRARIES = libfm-gtk.la libfm-gtk3.la | ||
| 30 | |||
| 31 | 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 new file mode 100644 index 0000000000..23f132a49b --- /dev/null +++ b/meta/recipes-support/libfm/libfm_1.1.0.bb | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | DESCRIPTION = "Library for file management" | ||
| 2 | HOMEPAGE = "http://pcmanfm.sourceforge.net/" | ||
| 3 | BUGTRACKER = "" | ||
| 4 | |||
| 5 | LICENSE = "GPLv2 & GPLv2+" | ||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | ||
| 7 | file://src/fm.h;endline=22;md5=e64555171770a551e3b51cc06fc62f1a \ | ||
| 8 | file://src/base/fm-config.h;endline=23;md5=ad0fc418c3cf041eea35ddb3daf37f17" | ||
| 9 | |||
| 10 | SECTION = "x11/libs" | ||
| 11 | DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native libexif" | ||
| 12 | |||
| 13 | PR = "r0" | ||
| 14 | |||
| 15 | SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \ | ||
| 16 | file://fix-make-parallelism-issue.patch \ | ||
| 17 | " | ||
| 18 | |||
| 19 | SRC_URI[md5sum] = "a5bc8b8291cf810c659bfb3af378b5de" | ||
| 20 | SRC_URI[sha256sum] = "b9426e588670b53570b808c49abd1d103863614dd3622559b8c3ef1392fe0b3d" | ||
| 21 | |||
| 22 | inherit autotools pkgconfig | ||
| 23 | |||
| 24 | PACKAGES += "${PN}-mime" | ||
| 25 | FILES_${PN}-mime = "${datadir}/mime/" | ||
