Package upgrades

Part of the sato trimming process

Signed-off-by Constantin Musca <[email protected] (mailto:[email protected])>

---
meta/recipes-gnome/gthumb/files/parallel.patch | 158 --------------------- meta/recipes-gnome/gthumb/gthumb_2.12.4.bb | 27 ---- .../packagegroups/packagegroup-core-x11-sato.bb | 1 -

3 files changed, 186 deletions(-)

delete mode 100644 meta/recipes-gnome/gthumb/files/parallel.patch delete mode 100644 meta/recipes-gnome/gthumb/gthumb_2.12.4.bb

meta/recipes-gnome/gthumb/files/parallel.patch deleted +0 -158

deleted file mode 100644
index 20ce5c5..0000000
@@ -1,158 +0,0 @@
-From 34969cde1dcb7740b4a7c3b6e3d04d481e5980b5 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected] (mailto:[email protected])>
-Date: Tue, 31 Jul 2012 17:26:27 +0100
-Subject: [PATCH] build: Fix parallel build problems with enum generation
-
-This is a backport from a patch against master.
-
-Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=680925]
----
- extensions/file_tools/Makefile.am (http://Makefile.am) | 10 ++++------
- extensions/importer/Makefile.am (http://Makefile.am) | 10 ++++------
- extensions/pixbuf_savers/Makefile.am (http://Makefile.am) | 10 ++++------
- gthumb/Makefile.am (http://Makefile.am) | 10 ++++------
- 4 files changed, 16 insertions(+), 24 deletions(-)
-
-diff --git a/extensions/file_tools/Makefile.am (http://Makefile.am) b/extensions/file_tools/Makefile.am (http://Makefile.am)
-index 7785eff..d70a8a5 100644
---- a/extensions/file_tools/Makefile.am (http://Makefile.am)
-+++ b/extensions/file_tools/Makefile.am (http://Makefile.am)
-@@ -24,17 +24,16 @@ HEADER_FILES = \
- gth-file-tool-undo.h \
- preferences.h
- 
--enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS)
-+enum-types.h: $(HEADER_FILES)
- $(AM_V_GEN)( $(GLIB_MKENUMS) \
- --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
- --fprod "/* enumerations from \"@filename@\" */\n" \
- --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
- --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \
- $^> xgen-$(@F) \
-- && (cmp -s xgen-$(@F) enum-types.h || cp xgen-$(@F) enum-types.h ) \
-- && rm -f xgen-$(@F) )
-+ && mv -f xgen-$(@F) enum-types.h )
- 
--enum-types.c: $(HEADER_FILES) enum-types.h
-+enum-types.c: $(HEADER_FILES)
- $(AM_V_GEN)( $(GLIB_MKENUMS) \
- --fhead "#include <glib-object.h>\n" \
- --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \
-@@ -42,8 +41,7 @@ enum-types.c: $(HEADER_FILES) enum-types.h
- --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
- $^> xgen-$(@F) \
-- && (cmp -s xgen-$(@F) enum-types.c || cp xgen-$(@F) enum-types.c ) \
-- && rm -f xgen-$(@F) )
-+ && mv -f xgen-$(@F) enum-types.c )
- 
- libfile_tools_la_SOURCES = \
- $(ENUM_TYPES) \
-diff --git a/extensions/importer/Makefile.am (http://Makefile.am) b/extensions/importer/Makefile.am (http://Makefile.am)
-index 29e7f2c..07c1eba 100644
---- a/extensions/importer/Makefile.am (http://Makefile.am)
-+++ b/extensions/importer/Makefile.am (http://Makefile.am)
-@@ -14,17 +14,16 @@ HEADER_FILES = \
- preferences.h \
- utils.h
- 
--gth-import-enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS)
-+gth-import-enum-types.h: $(HEADER_FILES)
- $(AM_V_GEN)( $(GLIB_MKENUMS) \
- --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
- --fprod "/* enumerations from \"@filename@\" */\n" \
- --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
- --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \
- $^> xgen-$(@F) \
-- && (cmp -s xgen-$(@F) gth-import-enum-types.h || cp xgen-$(@F) gth-import-enum-types.h ) \
-- && rm -f xgen-$(@F) )
-+ && mv -f xgen-$(@F) gth-import-enum-types.h )
- 
--gth-import-enum-types.c: $(HEADER_FILES) gth-import-enum-types.h
-+gth-import-enum-types.c: $(HEADER_FILES)
- $(AM_V_GEN)( $(GLIB_MKENUMS) \
- --fhead "#include <glib-object.h>\n" \
- --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \
-@@ -32,8 +31,7 @@ gth-import-enum-types.c: $(HEADER_FILES) gth-import-enum-types.h
- --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
- $^> xgen-$(@F) \
-- && (cmp -s xgen-$(@F) gth-import-enum-types.c || cp xgen-$(@F) gth-import-enum-types.c ) \
-- && rm -f xgen-$(@F) )
-+ && mv -f xgen-$(@F) gth-import-enum-types.c )
- 
- libimporter_la_SOURCES = \
- $(ENUM_TYPES) \
-diff --git a/extensions/pixbuf_savers/Makefile.am (http://Makefile.am) b/extensions/pixbuf_savers/Makefile.am (http://Makefile.am)
-index bfe9f34..4764c32 100644
---- a/extensions/pixbuf_savers/Makefile.am (http://Makefile.am)
-+++ b/extensions/pixbuf_savers/Makefile.am (http://Makefile.am)
-@@ -10,17 +10,16 @@ ENUM_TYPES = \
- HEADER_FILES = \
- preferences.h
- 
--enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS)
-+enum-types.h: $(HEADER_FILES)
- $(AM_V_GEN)( $(GLIB_MKENUMS) \
- --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
- --fprod "/* enumerations from \"@filename@\" */\n" \
- --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
- --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \
- $^> xgen-$(@F) \
-- && (cmp -s xgen-$(@F) enum-types.h || cp xgen-$(@F) enum-types.h ) \
-- && rm -f xgen-$(@F) )
-+ && mv -f xgen-$(@F) enum-types.h )
- 
--enum-types.c: $(HEADER_FILES) enum-types.h
-+enum-types.c: $(HEADER_FILES)
- $(AM_V_GEN)( $(GLIB_MKENUMS) \
- --fhead "#include <glib-object.h>\n" \
- --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \
-@@ -28,8 +27,7 @@ enum-types.c: $(HEADER_FILES) enum-types.h
- --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
- $^> xgen-$(@F) \
-- && (cmp -s xgen-$(@F) enum-types.c || cp xgen-$(@F) enum-types.c ) \
-- && rm -f xgen-$(@F) )
-+ && mv -f xgen-$(@F) enum-types.c )
- 
- libpixbuf_savers_la_SOURCES = \
- $(ENUM_TYPES) \
-diff --git a/gthumb/Makefile.am (http://Makefile.am) b/gthumb/Makefile.am (http://Makefile.am)
-index e9e385e..2f14e03 100644
---- a/gthumb/Makefile.am (http://Makefile.am)
-+++ b/gthumb/Makefile.am (http://Makefile.am)
-@@ -296,17 +296,16 @@ gthumb_CFLAGS = \
- -DGTHUMB_EXTENSIONS_DIR=\"$(extensions_dir)\" \
- $(NULL)
- 
--gth-enum-types.h: $(PUBLIC_HEADER_FILES) $(GLIB_MKENUMS)
-+gth-enum-types.h: $(PUBLIC_HEADER_FILES)
- $(AM_V_GEN)( $(GLIB_MKENUMS) \
- --fhead "#ifndef GTH_ENUM_TYPES_H\n#define GTH_ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
- --fprod "/* enumerations from \"@filename@\" */\n" \
- --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
- --ftail "G_END_DECLS\n\n#endif /* GTH_ENUM_TYPES_H */" \
- $^> xgen-$(@F) \
-- && (cmp -s xgen-$(@F) gth-enum-types.h || cp xgen-$(@F) gth-enum-types.h ) \
-- && rm -f xgen-$(@F) )
-+ && mv -f xgen-$(@F) gth-enum-types.h )
- 
--gth-enum-types.c: $(PUBLIC_HEADER_FILES) gth-enum-types.h
-+gth-enum-types.c: $(PUBLIC_HEADER_FILES)
- $(AM_V_GEN)( $(GLIB_MKENUMS) \
- --fhead "#include <glib-object.h>\n" \
- --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \
-@@ -314,8 +313,7 @@ gth-enum-types.c: $(PUBLIC_HEADER_FILES) gth-enum-types.h
- --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
- $^> xgen-$(@F) \
-- && (cmp -s xgen-$(@F) gth-enum-types.c || cp xgen-$(@F) gth-enum-types.c ) \
-- && rm -f xgen-$(@F) )
-+ && mv -f xgen-$(@F) gth-enum-types.c )
- 
- gth-marshal.h: gth-marshal.list $(GLIB_GENMARSHAL)
- $(AM_V_GEN)( $(GLIB_GENMARSHAL) $(srcdir)/gth-marshal.list --header --prefix=gth_marshal > $@ )
--- 
-1.7.10.4
-

meta/recipes-gnome/gthumb/gthumb_2.12.4.bb deleted +0 -27

deleted file mode 100644
index 0414386..0000000
@@ -1,27 +0,0 @@
-DESCRIPTION = "gThumb is an image viewer and browser for the GNOME Desktop"
-SECTION = "x11/gnome"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf libpng gstreamer jpeg tiff gst-plugins-base"
-
-PR = "r4"
-
-EXTRA_OECONF = "--disable-gnome-keyring --disable-libsoup --disable-exiv2 --disable-clutter"
-
-inherit gnome pkgconfig
-
-SRC_URI[archive.md5sum] = "97fc13221b0c5d80c27a2e25a3a3ac6f"
-SRC_URI[archive.sha256sum] = "cf809695230ab8892a078be454a42ade865754c72ec1da7c3d74d4310de54f1d"
-
-SRC_URI += "file://parallel.patch"
-
-do_install_append () {
- rm ${D}${libdir}/${BPN}/extensions/*.a
-}
-
-FILES_${PN} += "${datadir}/icons"
-FILES_${PN} += "${libdir}/${BPN}/extensions/*.so \
- ${libdir}/${BPN}/extensions/*.extension"
-FILES_${PN}-dev += "${libdir}/${BPN}/extensions/*.la"
-FILES_${PN}-dbg += "${libdir}/${BPN}/extensions/.debug/"
-

meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +0 -0

index f2997a7..057be24 100644
@@ -53,7 +53,6 @@ WEB ?= ""
 

SUMMARY_${PN}-apps = "Sato desktop - applications" RDEPENDS_${PN}-apps = "\
- gthumb \
leafpad \
gaku \
x11vnc \

Signature · 7 lines

1.7.11.7


_______________________________________________
Openembedded-core mailing list
[email protected] (mailto:[email protected])
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

License checksum modification due to:
src/cr-rgb.c: code (not license) change

crosscompile.patch: removed
- schema_bindings binary not generated anymore

remove-yelp-help-rules-var.patch: added
- YELP_HELP_RULES var is not used

[Other changes]
- the 2.34.13 version requires the gsettings-desktop-schemas (add it to DEPENDS)

Signed-off-by Constantin Musca <[email protected] (mailto:[email protected])>

---
.../gnome/metacity/crosscompile.patch | 62 ---------------------- .../metacity/remove-yelp-help-rules-var.patch | 28 ++++++++++ .../{metacity_2.30.3.bb => metacity_2.34.13.bb} | 14 ++---

3 files changed, 35 insertions(+), 69 deletions(-)

delete mode 100644 meta/recipes-gnome/gnome/metacity/crosscompile.patch create mode 100644 meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch rename meta/recipes-gnome/gnome/{metacity_2.30.3.bb => metacity_2.34.13.bb} (56%)

meta/recipes-gnome/gnome/metacity/crosscompile.patch deleted +0 -62

deleted file mode 100644
index 7a1942a..0000000
@@ -1,62 +0,0 @@
-This patch is revised version from openembed. It build host native binary
-rather than target binary in cross-compile environment.
-
-Signed-off-by: Zhai Edwin <[email protected] (mailto:[email protected])>
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Index: metacity-2.30.3/src/Makefile.am
-===================================================================
---- metacity-2.30.3.orig/src/Makefile.am 2010-09-05 00:09:52.000000000 +0800
-+++ metacity-2.30.3/src/Makefile.am 2010-12-31 11:15:31.000000000 +0800
-@@ -134,11 +134,9 @@
- metacity_theme_viewer_SOURCES= \
- ui/theme-viewer.c
- 
--schema_bindings_SOURCES = \
-- core/schema-bindings.c \
-- metacity.schemas.in.in (http://metacity.schemas.in.in)
-+schema_bindings:
-+ @CC_FOR_BUILD@ core/schema-bindings.c -I./include -I../ @CFLAGS_FOR_BUILD@ @LDFLAGS_FOR_BUILD@ -o schema_bindings
- 
--schema_bindings_LDADD = @METACITY_LIBS@
- metacity.schemas.in (http://metacity.schemas.in): schema_bindings ${srcdir}/metacity.schemas.in.in (http://metacity.schemas.in.in)
- @echo Generating keybinding schemas... ${srcdir}/metacity.schemas.in.in (http://metacity.schemas.in.in)
- ${builddir}/schema_bindings ${srcdir}/metacity.schemas.in.in (http://metacity.schemas.in.in) ${builddir}/metacity.schemas.in (http://metacity.schemas.in)
-Index: metacity-2.30.3/configure.in
-===================================================================
---- metacity-2.30.3.orig/configure.in 2010-09-22 22:14:06.000000000 +0800
-+++ metacity-2.30.3/configure.in 2010-12-31 11:15:31.000000000 +0800
-@@ -31,6 +31,32 @@
- AC_LIBTOOL_WIN32_DLL
- AM_PROG_LIBTOOL
- 
-+if test x"$CC_FOR_BUILD" = x; then
-+ if test x"$cross_compiling" = xyes; then
-+ AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
-+ else
-+ CC_FOR_BUILD="$CC"
-+ fi
-+fi
-+AC_SUBST([CC_FOR_BUILD])
-+if test x"$CFLAGS_FOR_BUILD" = x; then
-+ if test x"$cross_compiling" = xyes; then
-+ echo boo!
-+ else
-+ CFLAGS_FOR_BUILD="$CFLAGS"
-+ fi
-+fi
-+AC_SUBST([CFLAGS_FOR_BUILD])
-+if test x"$LDFLAGS_FOR_BUILD" = x; then
-+ if test x"$cross_compiling" = xyes; then
-+ echo boo!
-+ else
-+ LDFLAGS_FOR_BUILD="$LDFLAGS"
-+ fi
-+fi
-+AC_SUBST([LDFLAGS_FOR_BUILD])
-+
-+
- #### Integer sizes 
- 
- AC_CHECK_SIZEOF(char)

meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch new file +28 -0

new file mode 100644
index 0000000..1970e9a
@@ -0,0 +1,28 @@
+Remove unused variable (YELP_HELP_RULES)
+
+Upstream-Status: Pending
+Signed-off-by: Constantin Musca <[email protected] (mailto:[email protected])>
+
+Index: metacity-2.34.13/doc/creating_themes/Makefile.am
+===================================================================
+--- metacity-2.34.13.orig/doc/creating_themes/Makefile.am
++++ metacity-2.34.13/doc/creating_themes/Makefile.am
+@@ -1,6 +1,5 @@
+ ### This part of Makefile.am (http://Makefile.am) can be customized by you.
+ 
+-@YELP_HELP_RULES@
+ 
+ # The name of the directory in /usr/share/gnome/help/, 
+ # and the name of the main .xml file:
+Index: metacity-2.34.13/doc/creating_themes/Makefile.in
+===================================================================
+--- metacity-2.34.13.orig/doc/creating_themes/Makefile.in
++++ metacity-2.34.13/doc/creating_themes/Makefile.in
+@@ -455,7 +455,6 @@ uninstall-am:
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ 
+ 
+-@YELP_HELP_RULES@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.

meta/recipes-gnome/gnome/metacity_2.34.13.bb renamed from meta/recipes-gnome/gnome/metacity_2.30.3.bb +0 -0

similarity index 56%
rename from meta/recipes-gnome/gnome/metacity_2.30.3.bb
rename to meta/recipes-gnome/gnome/metacity_2.34.13.bb
index 5b996d2..3605201 100644
@@ -4,14 +4,16 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \

file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90"

meta/recipes-gnome/gnome/metacity_2.34.13.bb renamed from meta/recipes-gnome/gnome/metacity_2.30.3.bb +2 -2

-DEPENDS = "startup-notification gtk+ gconf gdk-pixbuf-native libcanberra gnome-doc-utils"
-PR = "r5"
+DEPENDS = "gsettings-desktop-schemas startup-notification gtk+ gconf gdk-pixbuf-native libcanberra gnome-doc-utils"
+PR = "r0"

inherit gnome update-alternatives

meta/recipes-gnome/gnome/metacity_2.34.13.bb renamed from meta/recipes-gnome/gnome/metacity_2.30.3.bb +5 -3

-SRC_URI += "file://crosscompile.patch"
-SRC_URI[archive.md5sum] = "553784f376d96b902e19ff437cd5b339"
-SRC_URI[archive.sha256sum] = "08f887018fa5e447cf184d03bae3fe2c05fdb7583bed6768e3b4d66392fc18dd"
+GNOME_COMPRESS_TYPE = "xz"
+
+SRC_URI += "file://remove-yelp-help-rules-var.patch"
+SRC_URI[archive.md5sum] = "6d89b71672d4fa49fc87f83d610d0ef6"
+SRC_URI[archive.sha256sum] = "8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075"

ALTERNATIVE_${PN} = "x-window-manager" ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/metacity"

meta/recipes-gnome/gnome/metacity_2.34.13.bb renamed from meta/recipes-gnome/gnome/metacity_2.30.3.bb +0 -2

@@ -23,8 +25,6 @@ EXTRA_OECONF += "--disable-verbose \
 do_configure_prepend() {
 sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in (http://configure.in)
 }
-CFLAGS_FOR_BUILD += "-I${STAGING_LIBDIR_NATIVE}/glib-2.0/include -I${STAGING_INCDIR_NATIVE}/glib-2.0 -I${STAGING_INCDIR_NATIVE}/glib-2.0/include -I${STAGING_INCDIR_NATIVE}"
-LDFLAGS_FOR_BUILD += "-L${STAGING_LIBDIR_NATIVE} -lglib-2.0"
 

FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome"

Signature · 7 lines

1.7.11.7


_______________________________________________
Openembedded-core mailing list
[email protected] (mailto:[email protected])
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Quoted 2 lines · Constantin Musca

License checksum modification due to:
src/cr-rgb.c: code (not license) change

Can the checksum be moved to another file, or changed so that it only checksums the license itself?

Ross

pcmanfm_fix_for_automake_1.12.patch: removed
- problem not reprodicible anymore

owl-window-menu.patch: removed
- not needed anymore

Signed-off-by Constantin Musca <[email protected]>

---
  .../pcmanfm/files/owl-window-menu.patch            | 81 ----------------------
  .../files/pcmanfm_fix_for_automake_1.12.patch      | 35 ----------
  .../{pcmanfm_0.9.10.bb => pcmanfm_1.1.0.bb}        | 11 ++-
  3 files changed, 4 insertions(+), 123 deletions(-)

delete mode 100644 meta/recipes-sato/pcmanfm/files/owl-window-menu.patch delete mode 100644 meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch rename meta/recipes-sato/pcmanfm/{pcmanfm_0.9.10.bb => pcmanfm_1.1.0.bb} (76%)

arm-poky-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork --sysroot=/intel/builds/world/tmp/sysroots/qemuarm -DHAVE_CONFIG_H -I. -I.. -DPACKAGE_DATA_DIR=\""/usr/share/pcmanfm"\" -DPACKAGE_UI_DIR=\""/usr/share/pcmanfm/ui"\" -DPACKAGE_LOCALE_DIR=\""/usr/share/locale"\" -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -pthread -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/glib-2.0 -I/intel/builds/world/tmp/sysroots/qemuarm/usr/lib/glib-2.0/include -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/gio-unix-2.0/ -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/pango-1.0 -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/gtk-2.0 -I/intel/builds/world/tmp/sysroots/qemuarm/usr/lib/gtk-2.0/include -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/atk-1.0 -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/cairo -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/gdk-pixbuf-2.0 -I/intel/builds/world/

arm-poky-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork --sysroot=/intel/builds/world/tmp/sysroots/qemuarm -DHAVE_CONFIG_H -I. -I.. -DPACKAGE_DATA_DIR=\""/usr/share/pcmanfm"\" -DPACKAGE_UI_DIR=\""/usr/share/pcmanfm/ui"\" -DPACKAGE_LOCALE_DIR=\""/usr/share/locale"\" -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -pthread -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/glib-2.0 -I/intel/builds/world/tmp/sysroots/qemuarm/usr/lib/glib-2.0/include -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/gio-unix-2.0/ -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/pango-1.0 -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/gtk-2.0 -I/intel/builds/world/tmp/sysroots/qemuarm/usr/lib/gtk-2.0/include -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/atk-1.0 -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/cairo -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/gdk-pixbuf-2.0 -I/intel/builds/world/

tab-page.c:24:26: fatal error: libfm/fm-gtk.h: No such file or directory
compilation terminated.
app-config.c:26:26: fatal error: libfm/fm-gtk.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-app-config.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[2]: *** [pcmanfm-tab-page.o] Error 1
pref.c:26:22: fatal error: libfm/fm.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-pref.o] Error 1
volume-manager.c:27:26: fatal error: libfm/fm-gtk.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-volume-manager.o] Error 1
In file included from utils.c:22:0:
utils.h:26:26: fatal error: libfm/fm-gtk.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-utils.o] Error 1
In file included from desktop.c:27:0:
desktop.h:27:26: fatal error: libfm/fm-gtk.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-desktop.o] Error 1
In file included from main-win.c:34:0:
pcmanfm.h:26:22: fatal error: libfm/fm.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-main-win.o] Error 1
pcmanfm.c:39:26: fatal error: libfm/fm-gtk.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-pcmanfm.o] Error 1
make[2]: Leaving directory `/intel/builds/world/tmp/work/armv5te-poky-linux-gnueabi/pcmanfm/1.1.0-r0/pcmanfm-1.1.0/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/intel/builds/world/tmp/work/armv5te-poky-linux-gnueabi/pcmanfm/1.1.0-r0/pcmanfm-1.1.0'
make: *** [all] Error 2
ERROR: oe_runmake failed
ERROR: Function failed: do_compile (see /intel/builds/world/tmp/work/armv5te-poky-linux-gnueabi/pcmanfm/1.1.0-r0/temp/log.do_compile.5430 for further information) sgw@yujin:/intel/builds/world$
d/tmp/sysroots/qemuarm/usr/include/atk-1.0 -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/cairo -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/gdk-pixbuf-2.0 -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/pixman-1 -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/freetype2 -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/libpng15 -DG_DISABLE_CAST_CHECKS -Wall -Werror-implicit-function-declaration -O2 -pipe -g -feliminate-unused-debug-types -c -o pcmanfm-utils.o test -f 'utils.c' || echo './'utils.c
tab-page.c:24:26: fatal error: libfm/fm-gtk.h: No such file or directory
compilation terminated.
app-config.c:26:26: fatal error: libfm/fm-gtk.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-app-config.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[2]: *** [pcmanfm-tab-page.o] Error 1
pref.c:26:22: fatal error: libfm/fm.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-pref.o] Error 1
volume-manager.c:27:26: fatal error: libfm/fm-gtk.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-volume-manager.o] Error 1
In file included from utils.c:22:0:
utils.h:26:26: fatal error: libfm/fm-gtk.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-utils.o] Error 1
In file included from desktop.c:27:0:
desktop.h:27:26: fatal error: libfm/fm-gtk.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-desktop.o] Error 1
In file included from main-win.c:34:0:
pcmanfm.h:26:22: fatal error: libfm/fm.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-main-win.o] Error 1
pcmanfm.c:39:26: fatal error: libfm/fm-gtk.h: No such file or directory

compilation terminated.
make[2]: *** [pcmanfm-pcmanfm.o] Error 1
make[2]: Leaving directory `/intel/builds/world/tmp/work/armv5te-poky-linux-gnueabi/pcmanfm/1.1.0-r0/pcmanfm-1.1.0/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/intel/builds/world/tmp/work/armv5te-poky-linux-gnueabi/pcmanfm/1.1.0-r0/pcmanfm-1.1.0'
make: *** [all] Error 2
ERROR: oe_runmake failed
ERROR: Function failed: do_compile (see /intel/builds/world/tmp/work/armv5te-poky-linux-gnueabi/pcmanfm/1.1.0-r0/temp/log.do_compile.5430 for further information)

meta/recipes-sato/pcmanfm/files/owl-window-menu.patch deleted +0 -81

deleted file mode 100644
index 88b154e..0000000
@@ -1,81 +0,0 @@
-0.9.7 use a new menu bar from gtk_ui_manager, so need a translation here to
-enable owl menu
-
-Signed-off-by: Zhai Edwin <[email protected]>
-
-Upstream-Status: Inappropriate [enable feature]
-
-Index: pcmanfm-0.9.9/configure.ac
-===================================================================
---- pcmanfm-0.9.9.orig/configure.ac	2011-08-10 05:28:31.000000000 +0800
-+++ pcmanfm-0.9.9/configure.ac	2011-10-10 15:47:33.000000000 +0800
-@@ -70,6 +70,8 @@
-
- gtk_modules="gtk+-2.0 >= 2.16.0"
- PKG_CHECK_MODULES(GTK, [$gtk_modules])
-+OWL_LIBS="-lowl"
-+GTK_LIBS="$GTK_LIBS $OWL_LIBS"
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
-
-Index: pcmanfm-0.9.9/src/main-win.c
-===================================================================
---- pcmanfm-0.9.9.orig/src/main-win.c	2011-08-10 05:28:32.000000000 +0800
-+++ pcmanfm-0.9.9/src/main-win.c	2011-10-10 15:50:48.000000000 +0800
-@@ -37,6 +37,8 @@
- #include "pref.h"
- #include "tab-page.h"
-
-+#include "libowl/owlwindowmenu.h"
-+
- static void fm_main_win_finalize              (GObject *object);
- G_DEFINE_TYPE(FmMainWin, fm_main_win, GTK_TYPE_WINDOW);
-
-@@ -400,9 +402,27 @@
-     }
- }
-
-+/* Transfer gtk_ui_manager menubar to gtk menubar */
-+static GtkWidget * ui_menubar_to_menu(GtkWidget *menubar)
-+{
-+    GtkWidget *main_menu;
-+    GList *iter;
-+
-+    main_menu = gtk_menu_new();
-+
-+    for ( iter = gtk_container_get_children(GTK_CONTAINER(menubar));
-+          iter;
-+          iter = g_list_next(iter) )
-+    {
-+        GtkWidget *menu = GTK_WIDGET(iter->data);
-+        gtk_widget_reparent(menu, main_menu);
-+    }
-+    return main_menu;
-+}
-+
- static void fm_main_win_init(FmMainWin *win)
- {
--    GtkWidget *vbox, *menubar, *toolitem, *btn;
-+    GtkWidget *vbox, *menubar, *owl_menubar, *toolitem, *btn;
-     GtkUIManager* ui;
-     GtkActionGroup* act_grp;
-     GtkAction* act;
-@@ -456,7 +476,6 @@
-     win->popup = gtk_ui_manager_get_widget(ui, "/popup");
-     gtk_menu_attach_to_widget(GTK_WIDGET(win->popup), win, NULL);
-
--    gtk_box_pack_start( (GtkBox*)vbox, menubar, FALSE, TRUE, 0 );
-     gtk_box_pack_start( (GtkBox*)vbox, win->toolbar, FALSE, TRUE, 0 );
-
-     /* load bookmarks menu */
-@@ -517,6 +536,10 @@
-
-     gtk_container_add( (GtkContainer*)win, vbox );
-     gtk_widget_show_all(vbox);
-+
-+    owl_menubar = ui_menubar_to_menu(menubar);
-+    gtk_widget_show_all(owl_menubar);
-+    owl_set_window_menu(GTK_WINDOW(win), GTK_MENU(owl_menubar));
- }
-
-

meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch deleted +0 -35

deleted file mode 100644
index 1ad0ff5..0000000
@@ -1,35 +0,0 @@
-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 <[email protected]>
-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 $@

meta/recipes-sato/pcmanfm/pcmanfm_1.1.0.bb renamed from meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb +4 -7

similarity index 76%
rename from meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb
rename to meta/recipes-sato/pcmanfm/pcmanfm_1.1.0.bb
index 1780764..bcfc9db 100644
@@ -11,7 +11,7 @@ SECTION = "x11"
  DEPENDS = "gtk+ startup-notification libfm"
  DEPENDS_append_poky = " libowl"
 
-PR = "r1"
+PR = "r0"
 
  COMPATIBLE_HOST = '(x86_64.*|i.86.*|aarch64.*|arm.*|mips.*|powerpc.*|sh.*)-(linux|freebsd.*)'
 

@@ -20,13 +20,10 @@ 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://pcmanfm_fix_for_automake_1.12.patch"
+	   file://cross-compile-fix.patch"
 
-SRC_URI_append_poky = " file://owl-window-menu.patch"
-
-SRC_URI[md5sum] = "d34a3530a6c5dcd674d23021d71c3e95"
-SRC_URI[sha256sum] = "f133c6f207f719d1fc69fe8bc07b2de6883c6937ffa87448df42e3b1a30e0298"
+SRC_URI[md5sum] = "af0cff78690e658f3c06ceabf27bc71a"
+SRC_URI[sha256sum] = "1f6301f330ad648f3322708ec6c0f680a8695a9453932fe19653bab6731e5582"
 
  inherit autotools pkgconfig
 

fix-includedir-ln.patch: added
- fix infinite link recursion by specifying the absolute path
- fix make parallelism issues

libfm_fix_for_automake-1.12.patch: removed
- problem not reprodicible anymore

Signed-off-by Constantin Musca <[email protected]>

---
  .../libfm-0.1.17/libfm_fix_for_automake-1.12.patch | 48 ----------------------
  .../configure_fix.patch                            |  0

  .../libfm/libfm-1.1.0/fix-includedir-ln.patch      | 45 ++++++++++++++++++++

  .../libfm/{libfm_0.1.17.bb => libfm_1.1.0.bb}      |  8 ++--
  4 files changed, 49 insertions(+), 52 deletions(-)

delete mode 100644 meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch rename meta/recipes-support/libfm/{libfm-0.1.17 => libfm-1.1.0}/configure_fix.patch (100%) create mode 100644 meta/recipes-support/libfm/libfm-1.1.0/fix-includedir-ln.patch rename meta/recipes-support/libfm/{libfm_0.1.17.bb => libfm_1.1.0.bb} (75%)

meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch deleted +0 -48

deleted file mode 100644
index 3efb4dd..0000000
@@ -1,48 +0,0 @@
-Upstream-Status: Pending
-
-This patch fixes following kind of issues with automake 1.12
-| automake: warnings are treated as errors
-| data/ui/Makefile.am:21: warning: '%'-style pattern rules are a GNU make extension
-...
-| /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
-| /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'
-...
-| src/Makefile.am:21: warning: compiling 'glib-compat.c' with per-target flags requires 'AM_PROG_CC_C_O' in 'configure.ac'
-
-Signed-Off-By: Nitin A Kamble <[email protected]>
-2012/05/03
-
-Index: libfm-0.1.17/configure.ac
-===================================================================
---- libfm-0.1.17.orig/configure.ac
-+++ libfm-0.1.17/configure.ac
-@@ -4,11 +4,17 @@
- AC_PREREQ([2.63])
- AC_INIT([libfm], [0.1.17], [http://pcmanfm.sorceforge.net/])
- AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-+
-+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
-+m4_pattern_allow([AM_PROG_AR])
-+AM_PROG_AR
-+
- AC_CONFIG_MACRO_DIR(m4)
- AC_CONFIG_HEADERS([config.h])
-
- # Checks for programs.
- AC_PROG_CC
-+AM_PROG_CC_C_O
- AM_PROG_LIBTOOL
-
- # Checks for libraries.
-Index: libfm-0.1.17/data/ui/Makefile.am
-===================================================================
---- libfm-0.1.17.orig/data/ui/Makefile.am
-+++ libfm-0.1.17/data/ui/Makefile.am
-@@ -18,6 +18,6 @@ EXTRA_DIST = \
- 	$(NULL)
-
- # Purge GtkBuilder UI files
--%.ui: %.glade
-+.glade.ui:
- 	cp $< $@
- 	$(top_builddir)/src/xml-purge $@

meta/recipes-support/libfm/libfm-1.1.0/configure_fix.patch renamed from meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch +0 -0

similarity index 100%
rename from meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch
rename to meta/recipes-support/libfm/libfm-1.1.0/configure_fix.patch

meta/recipes-support/libfm/libfm-1.1.0/fix-includedir-ln.patch new file +33 -0

new file mode 100644
index 0000000..3f06278
@@ -0,0 +1,45 @@
+Fix infinite link recursion by specifying the absolute path
+Fix make parallelism issues
+
+Upstream-Status: Pending
+Signed-off-by: Constantin Musca <[email protected]>
+
+Index: libfm-1.1.0/src/Makefile.in
+===================================================================
+--- libfm-1.1.0.orig/src/Makefile.in
++++ libfm-1.1.0/src/Makefile.in
+@@ -2523,8 +2523,6 @@ info: info-recursive
+ info-am:
+
+ install-data-am: install-data-local install-giomodulesLTLIBRARIES \
+-	install-libfmgtkincludeHEADERS install-libfmincludeHEADERS \
+-	install-pkgincludeHEADERS
+
+ install-dvi: install-dvi-recursive
+
+@@ -2617,7 +2615,9 @@ gtk/fm-gtk-marshal.h: gtk/fm-gtk-marshal
+ gtk/fm-gtk-marshal.c: gtk/fm-gtk-marshal.list
+ 	glib-genmarshal --body --prefix=fm_marshal $? > [email protected] && mv [email protected] $@
+
+-install-data-local:
++install-data-local: install-libfmgtkincludeHEADERS install-libfmincludeHEADERS \
++	install-pkgincludeHEADERS
++
+ 	@if test -e "$(DESTDIR)$(includedir)/@PACKAGE@"; then \
+ 		echo rm -rf "$(DESTDIR)$(includedir)/@PACKAGE@"; \
+ 		rm -rf "$(DESTDIR)$(includedir)/@PACKAGE@"; \
+Index: libfm-1.1.0/src/Makefile.am
+===================================================================
+--- libfm-1.1.0.orig/src/Makefile.am

meta/recipes-support/libfm/libfm-1.1.0/fix-includedir-ln.patch new file +2 -0

+ uninstall-local:
+ 	@if test -L "$(DESTDIR)$(includedir)/@PACKAGE@"; then \

meta/recipes-support/libfm/libfm_1.1.0.bb renamed from meta/recipes-support/libfm/libfm_0.1.17.bb +4 -4

similarity index 75%
rename from meta/recipes-support/libfm/libfm_0.1.17.bb
rename to meta/recipes-support/libfm/libfm_1.1.0.bb
index 2cac361..7282871 100644
@@ -10,14 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
  SECTION = "x11/libs"
  DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native"
 
-PR = "r4"
+PR = "r0"
 
  SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \
-           file://libfm_fix_for_automake-1.12.patch \
+           file://fix-includedir-ln.patch \
             "
 
-SRC_URI[md5sum] = "a97e03d973e6ac727f28d0934d6c9ad5"
-SRC_URI[sha256sum] = "1740681cff4cd4c5a2eaa9805d8898269cfb6a49a0bda0acb242def15bc7131b"
+SRC_URI[md5sum] = "a5bc8b8291cf810c659bfb3af378b5de"
+SRC_URI[sha256sum] = "b9426e588670b53570b808c49abd1d103863614dd3622559b8c3ef1392fe0b3d"
 
  inherit autotools pkgconfig
 

Quoted 4 lines · Constantin Musca

fix-includedir-ln.patch: added
- fix infinite link recursion by specifying the absolute path
- fix make parallelism issues

Quoted 8 lines

libfm_fix_for_automake-1.12.patch: removed
- problem not reprodicible anymore

Signed-off-by Constantin Musca <[email protected]>

---
  .../libfm-0.1.17/libfm_fix_for_automake-1.12.patch | 48 
----------------------
  .../configure_fix.patch                            |  0

If this patch is not being used any more, then it should be removed.

Quoted 2 lines

.../libfm/libfm-1.1.0/fix-includedir-ln.patch | 45
++++++++++++++++++++

What is the intent of this, it seems to be part of the cause of the pcmanfm failure.

See below

Sau!

Quoted 126 lines

  .../libfm/{libfm_0.1.17.bb => libfm_1.1.0.bb}      |  8 ++--
  4 files changed, 49 insertions(+), 52 deletions(-)

delete mode 100644
meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch
rename meta/recipes-support/libfm/{libfm-0.1.17 =>
libfm-1.1.0}/configure_fix.patch (100%)
create mode 100644
meta/recipes-support/libfm/libfm-1.1.0/fix-includedir-ln.patch
rename meta/recipes-support/libfm/{libfm_0.1.17.bb =>
libfm_1.1.0.bb} (75%)

meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch +0 -0

deleted file mode 100644
index 3efb4dd..0000000
---
a/meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch +++ /dev/null

meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch +0 -5

@@ -1,48 +0,0 @@
-Upstream-Status: Pending
-
-This patch fixes following kind of issues with automake 1.12
-| automake: warnings are treated as errors
-| data/ui/Makefile.am:21: warning: '%'-style pattern rules are a GNU 

make extension
-...
-|
/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 -|
/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'
-...
-| src/Makefile.am:21: warning: compiling 'glib-compat.c' with
per-target flags requires 'AM_PROG_CC_C_O' in 'configure.ac'

meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch +0 -14

-
-Signed-Off-By: Nitin A Kamble <[email protected]>
-2012/05/03
-
-Index: libfm-0.1.17/configure.ac
-===================================================================
---- libfm-0.1.17.orig/configure.ac
-+++ libfm-0.1.17/configure.ac
-@@ -4,11 +4,17 @@
- AC_PREREQ([2.63])
- AC_INIT([libfm], [0.1.17], [http://pcmanfm.sorceforge.net/])
- AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-+
-+# automake 1.12 seems to require this, but automake 1.11 doesn't 

recognize it
-+m4_pattern_allow([AM_PROG_AR])
-+AM_PROG_AR
-+
- AC_CONFIG_MACRO_DIR(m4)
- AC_CONFIG_HEADERS([config.h])

meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch +0 -19

-
- # Checks for programs.
- AC_PROG_CC
-+AM_PROG_CC_C_O
- AM_PROG_LIBTOOL
-
- # Checks for libraries.
-Index: libfm-0.1.17/data/ui/Makefile.am
-===================================================================
---- libfm-0.1.17.orig/data/ui/Makefile.am
-+++ libfm-0.1.17/data/ui/Makefile.am
-@@ -18,6 +18,6 @@ EXTRA_DIST = \
-     $(NULL)
-
- # Purge GtkBuilder UI files
--%.ui: %.glade
-+.glade.ui:
-     cp $< $@
-     $(top_builddir)/src/xml-purge $@

meta/recipes-support/libfm/libfm-1.1.0/configure_fix.patch renamed from meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch +0 -0

similarity index 100%
rename from meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch
rename to meta/recipes-support/libfm/libfm-1.1.0/configure_fix.patch

meta/recipes-support/libfm/libfm-1.1.0/fix-includedir-ln.patch new file +22 -0

new file mode 100644
index 0000000..3f06278
@@ -0,0 +1,45 @@
+Fix infinite link recursion by specifying the absolute path
+Fix make parallelism issues
+
+Upstream-Status: Pending
+Signed-off-by: Constantin Musca <[email protected]>
+
+Index: libfm-1.1.0/src/Makefile.in
+===================================================================
+--- libfm-1.1.0.orig/src/Makefile.in
++++ libfm-1.1.0/src/Makefile.in
+@@ -2523,8 +2523,6 @@ info: info-recursive
+ info-am:
+
+ install-data-am: install-data-local install-giomodulesLTLIBRARIES \
+-    install-libfmgtkincludeHEADERS install-libfmincludeHEADERS \
+-    install-pkgincludeHEADERS
+
+ install-dvi: install-dvi-recursive
+
+@@ -2617,7 +2615,9 @@ gtk/fm-gtk-marshal.h: gtk/fm-gtk-marshal
+ gtk/fm-gtk-marshal.c: gtk/fm-gtk-marshal.list
+     glib-genmarshal --body --prefix=fm_marshal $? > [email protected] && mv 

[email protected] $@
+
+-install-data-local:
++install-data-local: install-libfmgtkincludeHEADERS install-libfmincludeHEADERS \
++ install-pkgincludeHEADERS
++

meta/recipes-support/libfm/libfm-1.1.0/fix-includedir-ln.patch new file +15 -0

+     @if test -e "$(DESTDIR)$(includedir)/@PACKAGE@"; then \
+         echo rm -rf "$(DESTDIR)$(includedir)/@PACKAGE@"; \
+         rm -rf "$(DESTDIR)$(includedir)/@PACKAGE@"; \
+Index: libfm-1.1.0/src/Makefile.am
+===================================================================
+--- libfm-1.1.0.orig/src/Makefile.am
++++ libfm-1.1.0/src/Makefile.am
+@@ -453,8 +453,8 @@ install-data-local:
+         echo rm -rf "$(DESTDIR)$(includedir)/@PACKAGE@"; \
+         rm -rf "$(DESTDIR)$(includedir)/@PACKAGE@"; \
+     fi
+-    test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+-    @LN_S@ @PACKAGE@-@FMLIBVER@ "$(DESTDIR)$(includedir)/@PACKAGE@"
++    rm -rf $(DESTDIR)$(includedir)/@PACKAGE@
++    @LN_S@ $(DESTDIR)$(includedir)/@PACKAGE@-@FMLIBVER@ 

Quoted 2 lines

$(DESTDIR)$(includedir)/@PACKAGE@
+

this does not look right and I think produces the following:

tmp/sysroots/qemuarm/usr/include/libfm:
total 4
lrwxrwxrwx 1 sgw sgw 98 Dec 25 22:55 libfm-1.0 -> /intel/builds/world/tmp/work/armv5te-poky-linux-gnueabi/libfm/1.1.0-r0/image/usr/include/libfm-1.0

Notice linking back into the image dir, that's not correct.

Quoted 29 lines

+ uninstall-local:

meta/recipes-support/libfm/libfm-1.1.0/fix-includedir-ln.patch new file +1 -0

+     @if test -L "$(DESTDIR)$(includedir)/@PACKAGE@"; then \

meta/recipes-support/libfm/libfm_1.1.0.bb renamed from meta/recipes-support/libfm/libfm_0.1.17.bb +2 -4

similarity index 75%
rename from meta/recipes-support/libfm/libfm_0.1.17.bb
rename to meta/recipes-support/libfm/libfm_1.1.0.bb
index 2cac361..7282871 100644
@@ -10,14 +10,14 @@ LIC_FILES_CHKSUM = 
 "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
  SECTION = "x11/libs"
  DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native"
 
-PR = "r4"
+PR = "r0"
 
  SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \
-           file://libfm_fix_for_automake-1.12.patch \
+           file://fix-includedir-ln.patch \
             "
 
-SRC_URI[md5sum] = "a97e03d973e6ac727f28d0934d6c9ad5"
-SRC_URI[sha256sum] = 

"1740681cff4cd4c5a2eaa9805d8898269cfb6a49a0bda0acb242def15bc7131b"

meta/recipes-support/libfm/libfm_1.1.0.bb renamed from meta/recipes-support/libfm/libfm_0.1.17.bb +2 -0

+SRC_URI[md5sum] = "a5bc8b8291cf810c659bfb3af378b5de"
+SRC_URI[sha256sum] = 

"b9426e588670b53570b808c49abd1d103863614dd3622559b8c3ef1392fe0b3d"

Quoted 3 lines

inherit autotools pkgconfig