summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-12-28 13:24:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-07 11:09:39 +0000
commitf6f5382afabfd789d0bad9be16a52c59959f238a (patch)
tree4dfd19eb2743a4e2ce06716710c5be72d1e585d8 /meta
parentf6da046ac861379cbb7ab41f327c7ba5966af6c6 (diff)
downloadpoky-f6f5382afabfd789d0bad9be16a52c59959f238a.tar.gz
libfm: upgrade to 1.1.0
libfm_fix_for_automake-1.12.patch: removed - problem not reprodicible anymore configure_fix.patch: removed - not used fix-make-parallelism-issue.patch: added - assures that the ${includedir}/libfm symlink is created (From OE-Core rev: 013d96a601bfb9cc8a2ad51f456e0201666d7bc3) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch19
-rw-r--r--meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch48
-rw-r--r--meta/recipes-support/libfm/libfm-1.1.0/fix-make-parallelism-issue.patch31
-rw-r--r--meta/recipes-support/libfm/libfm_1.1.0.bb (renamed from meta/recipes-support/libfm/libfm_0.1.17.bb)8
4 files changed, 35 insertions, 71 deletions
diff --git a/meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch b/meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch
deleted file mode 100644
index 351e6e71aa..0000000000
--- a/meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Update configure.ac after docs removed in 0.1.16
2
3Upstream-Status: Pending
4
5Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
6Index: libfm-0.1.16/configure.ac
7===================================================================
8--- libfm-0.1.16.orig/configure.ac 2011-10-10 15:13:21.000000000 +0800
9+++ libfm-0.1.16/configure.ac 2011-10-10 15:13:30.000000000 +0800
10@@ -153,9 +153,6 @@
11 data/Makefile
12 data/ui/Makefile
13 po/Makefile.in
14- docs/Makefile
15- docs/reference/Makefile
16- docs/reference/libfm/Makefile
17 libfm.pc
18 libfm-gtk.pc
19 ])
diff --git a/meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch b/meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch
deleted file mode 100644
index 3efb4ddd6c..0000000000
--- a/meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1Upstream-Status: Pending
2
3This patch fixes following kind of issues with automake 1.12
4| automake: warnings are treated as errors
5| data/ui/Makefile.am:21: warning: '%'-style pattern rules are a GNU make extension
6...
7| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libfm-gtk.la': linking libtool libraries using a non-POSIX
8| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
9...
10| src/Makefile.am:21: warning: compiling 'glib-compat.c' with per-target flags requires 'AM_PROG_CC_C_O' in 'configure.ac'
11
12Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
132012/05/03
14
15Index: libfm-0.1.17/configure.ac
16===================================================================
17--- libfm-0.1.17.orig/configure.ac
18+++ libfm-0.1.17/configure.ac
19@@ -4,11 +4,17 @@
20 AC_PREREQ([2.63])
21 AC_INIT([libfm], [0.1.17], [http://pcmanfm.sorceforge.net/])
22 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
23+
24+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
25+m4_pattern_allow([AM_PROG_AR])
26+AM_PROG_AR
27+
28 AC_CONFIG_MACRO_DIR(m4)
29 AC_CONFIG_HEADERS([config.h])
30
31 # Checks for programs.
32 AC_PROG_CC
33+AM_PROG_CC_C_O
34 AM_PROG_LIBTOOL
35
36 # Checks for libraries.
37Index: libfm-0.1.17/data/ui/Makefile.am
38===================================================================
39--- libfm-0.1.17.orig/data/ui/Makefile.am
40+++ libfm-0.1.17/data/ui/Makefile.am
41@@ -18,6 +18,6 @@ EXTRA_DIST = \
42 $(NULL)
43
44 # Purge GtkBuilder UI files
45-%.ui: %.glade
46+.glade.ui:
47 cp $< $@
48 $(top_builddir)/src/xml-purge $@
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 @@
1Fix make parallelism issue
2
3- remove pkginclude_HEADERS ( LIBFM_INCLUDES and LIBFM_GTK_INCLUDES
4variables are empty)
5- if we don't remove it then we will have a race condition between the code
6that tries to symlink ${includedir}/libfm-1.0 to ${includedir}/libfm and the
7am autogenerated code from the pkginclude_HEADERS definition which
8tries to create pkgincludedir (${includedir}/libfm);
9- if pkgincludedir is created before the symlink the symlink will be created
10in the ${includedir}/libfm dir and it will have libfm-1.0 as name which is
11wrong (we need the ${includedir}/libfm symlink for pcmanfm)
12
13Upstream-Status: Pending
14Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
15
16Index: 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_0.1.17.bb b/meta/recipes-support/libfm/libfm_1.1.0.bb
index 2cac361e43..87f22548cf 100644
--- a/meta/recipes-support/libfm/libfm_0.1.17.bb
+++ b/meta/recipes-support/libfm/libfm_1.1.0.bb
@@ -10,14 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
10SECTION = "x11/libs" 10SECTION = "x11/libs"
11DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native" 11DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native"
12 12
13PR = "r4" 13PR = "r0"
14 14
15SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \ 15SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \
16 file://libfm_fix_for_automake-1.12.patch \ 16 file://fix-make-parallelism-issue.patch \
17 " 17 "
18 18
19SRC_URI[md5sum] = "a97e03d973e6ac727f28d0934d6c9ad5" 19SRC_URI[md5sum] = "a5bc8b8291cf810c659bfb3af378b5de"
20SRC_URI[sha256sum] = "1740681cff4cd4c5a2eaa9805d8898269cfb6a49a0bda0acb242def15bc7131b" 20SRC_URI[sha256sum] = "b9426e588670b53570b808c49abd1d103863614dd3622559b8c3ef1392fe0b3d"
21 21
22inherit autotools pkgconfig 22inherit autotools pkgconfig
23 23