Patchwork [04/19] pcmanfm: fix build with automake 1.12.x

login
register
mail settings
Submitter Nitin A Kamble
Date July 10, 2012, 4:02 p.m.
Message ID <828428172f740c090b01d852ba0c44d91f4d08ad.1341935782.git.nitin.a.kamble@intel.com>
Download mbox | patch
Permalink /patch/31677/
State New
Headers show

Comments

Nitin A Kamble - July 10, 2012, 4:02 p.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

Added a patch:
  pcmanfm_fix_for_automake_1.12.patch

More information in the patch header.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../files/pcmanfm_fix_for_automake_1.12.patch      |   35 ++++++++++++++++++++
 meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb        |    5 ++-
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch

Patch

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 0000000..1ad0ff5
--- /dev/null
+++ b/meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch
@@ -0,0 +1,35 @@ 
+Upstream-Status: Pending
+
+Fix these errors:
+| automake: warnings are treated as errors
+| data/ui/Makefile.am:18: warning: '%'-style pattern rules are a GNU make extension
+| src/Makefile.am:10: warning: compiling 'pcmanfm.c' with per-target flags requires 'AM_PROG_CC_C_O' in 'configure.ac'
+| autoreconf: automake failed with exit status: 1
+| ERROR: autoreconf execution failed.
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@Intel.com>
+2012/07/09
+
+Index: pcmanfm-0.9.10/configure.ac
+===================================================================
+--- pcmanfm-0.9.10.orig/configure.ac
++++ pcmanfm-0.9.10/configure.ac
+@@ -13,6 +13,7 @@ AC_PROG_CC
+ AM_PROG_LIBTOOL
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
++AM_PROG_CC_C_O
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+Index: pcmanfm-0.9.10/data/ui/Makefile.am
+===================================================================
+--- pcmanfm-0.9.10.orig/data/ui/Makefile.am
++++ pcmanfm-0.9.10/data/ui/Makefile.am
+@@ -15,6 +15,6 @@ EXTRA_DIST = \
+ 	$(NULL)
+ 
+ # Purge GtkBuilder UI files
+-%.ui: %.glade
++.glade.ui:
+ 	cp $< $@
+ #	$(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 545367a..576b4ba 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"
 DEPENDS = "gtk+ startup-notification libfm"
 DEPENDS_append_poky = " libowl"
 
-PR = "r0"
+PR = "r1"
 
 COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|mips.*|powerpc.*|sh.*)-(linux|freebsd.*)'
 
@@ -20,7 +20,8 @@  SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
 	   file://gnome-fs-regular.png \
 	   file://gnome-mime-text-plain.png \
 	   file://emblem-symbolic-link.png \
-	   file://cross-compile-fix.patch" 
+	   file://cross-compile-fix.patch \
+           file://pcmanfm_fix_for_automake_1.12.patch" 
 
 SRC_URI_append_poky = " file://owl-window-menu.patch"