summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-07-09 04:25:00 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:54:03 +0100
commit33ec0e115c5c2e3c86d9389b6cb9e92811385b8f (patch)
tree449aaed693498d208cb62d87278d46fdeaa1f0df /meta/recipes-sato
parentcd3fcdd4c18ba75944615fb4f2eed4e77828a2a2 (diff)
downloadpoky-33ec0e115c5c2e3c86d9389b6cb9e92811385b8f.tar.gz
pcmanfm: fix build with automake 1.12.x
Added a patch: pcmanfm_fix_for_automake_1.12.patch More information in the patch header. (From OE-Core rev: fee7861dcaef40ab86888a12fc2550d03463f98a) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch35
-rw-r--r--meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb5
2 files changed, 38 insertions, 2 deletions
diff --git a/meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch b/meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch
new file mode 100644
index 0000000000..1ad0ff5d13
--- /dev/null
+++ b/meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch
@@ -0,0 +1,35 @@
1Upstream-Status: Pending
2
3Fix these errors:
4| automake: warnings are treated as errors
5| data/ui/Makefile.am:18: warning: '%'-style pattern rules are a GNU make extension
6| src/Makefile.am:10: warning: compiling 'pcmanfm.c' with per-target flags requires 'AM_PROG_CC_C_O' in 'configure.ac'
7| autoreconf: automake failed with exit status: 1
8| ERROR: autoreconf execution failed.
9Signed-Off-By: Nitin A Kamble <nitin.a.kamble@Intel.com>
102012/07/09
11
12Index: pcmanfm-0.9.10/configure.ac
13===================================================================
14--- pcmanfm-0.9.10.orig/configure.ac
15+++ pcmanfm-0.9.10/configure.ac
16@@ -13,6 +13,7 @@ AC_PROG_CC
17 AM_PROG_LIBTOOL
18 AM_PROG_CC_STDC
19 AC_HEADER_STDC
20+AM_PROG_CC_C_O
21
22 # Checks for header files.
23 AC_HEADER_STDC
24Index: pcmanfm-0.9.10/data/ui/Makefile.am
25===================================================================
26--- pcmanfm-0.9.10.orig/data/ui/Makefile.am
27+++ pcmanfm-0.9.10/data/ui/Makefile.am
28@@ -15,6 +15,6 @@ EXTRA_DIST = \
29 $(NULL)
30
31 # Purge GtkBuilder UI files
32-%.ui: %.glade
33+.glade.ui:
34 cp $< $@
35 # $(top_builddir)/src/xml-purge $@
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb b/meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb
index 545367a943..576b4baa43 100644
--- a/meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb
+++ b/meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb
@@ -11,7 +11,7 @@ SECTION = "x11"
11DEPENDS = "gtk+ startup-notification libfm" 11DEPENDS = "gtk+ startup-notification libfm"
12DEPENDS_append_poky = " libowl" 12DEPENDS_append_poky = " libowl"
13 13
14PR = "r0" 14PR = "r1"
15 15
16COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|mips.*|powerpc.*|sh.*)-(linux|freebsd.*)' 16COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|mips.*|powerpc.*|sh.*)-(linux|freebsd.*)'
17 17
@@ -20,7 +20,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
20 file://gnome-fs-regular.png \ 20 file://gnome-fs-regular.png \
21 file://gnome-mime-text-plain.png \ 21 file://gnome-mime-text-plain.png \
22 file://emblem-symbolic-link.png \ 22 file://emblem-symbolic-link.png \
23 file://cross-compile-fix.patch" 23 file://cross-compile-fix.patch \
24 file://pcmanfm_fix_for_automake_1.12.patch"
24 25
25SRC_URI_append_poky = " file://owl-window-menu.patch" 26SRC_URI_append_poky = " file://owl-window-menu.patch"
26 27