summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libfm
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/libfm')
-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_0.1.17.bb6
2 files changed, 52 insertions, 2 deletions
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
new file mode 100644
index 0000000000..3efb4ddd6c
--- /dev/null
+++ b/meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch
@@ -0,0 +1,48 @@
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_0.1.17.bb b/meta/recipes-support/libfm/libfm_0.1.17.bb
index e3fd2de9bf..1bd885023b 100644
--- a/meta/recipes-support/libfm/libfm_0.1.17.bb
+++ b/meta/recipes-support/libfm/libfm_0.1.17.bb
@@ -10,9 +10,11 @@ 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 = "r3" 13PR = "r4"
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 \
17 "
16 18
17SRC_URI[md5sum] = "a97e03d973e6ac727f28d0934d6c9ad5" 19SRC_URI[md5sum] = "a97e03d973e6ac727f28d0934d6c9ad5"
18SRC_URI[sha256sum] = "1740681cff4cd4c5a2eaa9805d8898269cfb6a49a0bda0acb242def15bc7131b" 20SRC_URI[sha256sum] = "1740681cff4cd4c5a2eaa9805d8898269cfb6a49a0bda0acb242def15bc7131b"