[OE-core] [PATCH 1/2] libfm: Upgrade to 1.2.1
Marius Avram
marius.avram at intel.com
Wed Aug 27 11:12:08 UTC 2014
Removed patch fix-make-parallelism-issue.patch which doesn't
seem to be needed anymore, as the build works with multiple threads.
Changed patch for current structure of configure.ac file.
Signed-off-by: Marius Avram <marius.avram at intel.com>
---
.../libfm-1.1.2.2/fix-make-parallelism-issue.patch | 31 --------------------
.../libfm-1.1.2.2/ignore_automake_warnings.patch | 14 ---------
.../libfm-1.2.1/ignore_automake_warnings.patch | 16 ++++++++++
.../libfm/{libfm_1.1.2.2.bb => libfm_1.2.1.bb} | 11 +++----
4 files changed, 22 insertions(+), 50 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-1.2.1/ignore_automake_warnings.patch
rename meta/recipes-support/libfm/{libfm_1.1.2.2.bb => libfm_1.2.1.bb} (61%)
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 5d39d19..0000000
--- 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 <constantinx.musca at intel.com>
-
-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 58a2f09..0000000
--- 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 <cazfi74 at gmail.com>
-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-1.2.1/ignore_automake_warnings.patch b/meta/recipes-support/libfm/libfm-1.2.1/ignore_automake_warnings.patch
new file mode 100644
index 0000000..4808b20
--- /dev/null
+++ b/meta/recipes-support/libfm/libfm-1.2.1/ignore_automake_warnings.patch
@@ -0,0 +1,16 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Marius Avram <marius.avram at intel.com>
+Index: libfm-1.2.1/configure.ac
+===================================================================
+--- libfm-1.2.1.orig/configure.ac 2014-07-02 22:42:04.000000000 +0300
++++ libfm-1.2.1/configure.ac 2014-08-19 15:34:38.218364810 +0300
+@@ -3,7 +3,7 @@
+
+ AC_PREREQ([2.63])
+ AC_INIT([libfm], [1.2.1], [http://pcmanfm.sourceforge.net/])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects no-dist-gzip dist-xz -Wno-portability])
++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects no-dist-gzip dist-xz -Wno-portability])
+ AC_CONFIG_MACRO_DIR(m4)
+ AC_CONFIG_HEADERS([config.h])
+
diff --git a/meta/recipes-support/libfm/libfm_1.1.2.2.bb b/meta/recipes-support/libfm/libfm_1.2.1.bb
similarity index 61%
rename from meta/recipes-support/libfm/libfm_1.1.2.2.bb
rename to meta/recipes-support/libfm/libfm_1.2.1.bb
index 10f31d9..0b736d9 100644
--- a/meta/recipes-support/libfm/libfm_1.1.2.2.bb
+++ b/meta/recipes-support/libfm/libfm_1.2.1.bb
@@ -4,18 +4,17 @@ 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"
+ file://src/base/fm-config.h;endline=23;md5=71596f90de8d83df26974967cd6b6730"
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 = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \
file://ignore_automake_warnings.patch \
"
-SRC_URI[md5sum] = "ea3d09b23ef4c37cb84ae57ea16b8f08"
-SRC_URI[sha256sum] = "158e2b6974350d2dab15932b496bb4d448553e60bbf7cdfe4d6e9bd99d19d682"
+SRC_URI[md5sum] = "9b4790594c2c80f440ce3238c5774d23"
+SRC_URI[sha256sum] = "15b33e9ebe18f745c74cb847605a53b0b5892572f8dcc940a8aecbaee07fdd06"
inherit autotools-brokensep pkgconfig gtk-doc
@@ -23,3 +22,5 @@ do_configure[dirs] =+ "${S}/m4"
PACKAGES += "${PN}-mime"
FILES_${PN}-mime = "${datadir}/mime/"
+
+FILES_${PN}-dbg += "${libdir}/libfm/modules/.debug"
--
1.7.9.5
More information about the Openembedded-core
mailing list