[PATCH 00/15] Package upgrades

[PATCH 00/15] Package upgrades

[Constantin Musca]

This represents another set of package upgrades tested using core-image-sato
on all architectures.
The following changes since commit 90c0eb29f0b41e4ac2d3d17ebad7295c2ebdc02a:

  rootfs_rpm.bbclass: remove debug code (2012-12-19 21:43:55 +0000)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib cmuscax/pus
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=cmuscax/pus

Constantin Musca (15):
  ethtool: upgrade to 3.7
  freetype: upgrade to 2.4.11
  gnome-doc-utils: upgrade to 0.20.10
  gsettings-desktop-schemas: add recipe
  gthumb: remove recipe
  json-glib: upgrade to 0.15.2
  libcroco: upgrade to 0.6.8
  libfm: upgrade to 1.1.0
  libsoup-2.4: upgrade to 2.40.2
  libuser: upgrade to 0.58
  matchbox-panel-2: fix PV
  menu-cache: upgrade to 0.4.1
  metacity: upgrade to 2.34.13
  pcmanfm: upgrade to 1.1.0
  shared-mime-info: upgrade to 1.0

 .../ethtool/{ethtool_3.6.bb => ethtool_3.7.bb}     |   4 +-
 .../libuser/{libuser_0.57.1.bb => libuser_0.58.bb} |  12 +-
 .../gnome-doc-utils/sysrooted-pkg-config.patch     |  12 +-
 .../use-usr-bin-env-for-python-in-xml2po.patch     |  25 ++--
 .../gnome/gnome-doc-utils/xsltproc_nonet.patch     |  57 ++++----
 ...-utils_0.20.6.bb => gnome-doc-utils_0.20.10.bb} |  10 +-
 .../gnome/gsettings-desktop-schemas_3.7.3.bb       |  15 ++
 .../gnome/metacity/crosscompile.patch              |  62 --------
 .../metacity/remove-yelp-help-rules-var.patch      |  28 ++++
 .../{metacity_2.30.3.bb => metacity_2.34.13.bb}    |  14 +-
 meta/recipes-gnome/gthumb/files/parallel.patch     | 158 ---------------------
 meta/recipes-gnome/gthumb/gthumb_2.12.4.bb         |  27 ----
 .../{json-glib_0.14.2.bb => json-glib_0.15.2.bb}   |   8 +-
 .../no-hardcode.patch                              |   0
 .../{freetype_2.4.10.bb => freetype_2.4.11.bb}     |   4 +-
 .../{menu-cache_0.3.3.bb => menu-cache_0.4.1.bb}   |   6 +-
 .../matchbox-panel-2/matchbox-panel-2_git.bb       |   4 +-
 .../packagegroups/packagegroup-core-x11-sato.bb    |   1 -
 .../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 +-
 meta/recipes-support/libcroco/files/croco.patch    |  15 --
 .../files/libcroco_fix_for_automake-1.12.patch     |  22 ---
 .../{libcroco_0.6.3.bb => libcroco_0.6.8.bb}       |  11 +-
 .../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 +-
 ...libsoup-2.4_2.38.1.bb => libsoup-2.4_2.40.2.bb} |   6 +-
 .../shared-mime-info/parallelmake.patch            |  11 +-
 ...d-mime-info_0.91.bb => shared-mime-info_1.0.bb} |   6 +-
 31 files changed, 188 insertions(+), 558 deletions(-)
 rename meta/recipes-extended/ethtool/{ethtool_3.6.bb => ethtool_3.7.bb} (79%)
 rename meta/recipes-extended/libuser/{libuser_0.57.1.bb => libuser_0.58.bb} (65%)
 rename meta/recipes-gnome/gnome/{gnome-doc-utils_0.20.6.bb => gnome-doc-utils_0.20.10.bb} (51%)
 create mode 100644 meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb
 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%)
 delete mode 100644 meta/recipes-gnome/gthumb/files/parallel.patch
 delete mode 100644 meta/recipes-gnome/gthumb/gthumb_2.12.4.bb
 rename meta/recipes-gnome/json-glib/{json-glib_0.14.2.bb => json-glib_0.15.2.bb} (74%)
 rename meta/recipes-graphics/freetype/{freetype-2.4.10 => freetype-2.4.11}/no-hardcode.patch (100%)
 rename meta/recipes-graphics/freetype/{freetype_2.4.10.bb => freetype_2.4.11.bb} (91%)
 rename meta/recipes-graphics/menu-cache/{menu-cache_0.3.3.bb => menu-cache_0.4.1.bb} (77%)
 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%)
 delete mode 100644 meta/recipes-support/libcroco/files/croco.patch
 delete mode 100644 meta/recipes-support/libcroco/files/libcroco_fix_for_automake-1.12.patch
 rename meta/recipes-support/libcroco/{libcroco_0.6.3.bb => libcroco_0.6.8.bb} (57%)
 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%)
 rename meta/recipes-support/libsoup/{libsoup-2.4_2.38.1.bb => libsoup-2.4_2.40.2.bb} (81%)
 rename meta/recipes-support/shared-mime-info/{shared-mime-info_0.91.bb => shared-mime-info_1.0.bb} (41%)

-- 
1.7.11.7

[PATCH 01/15] ethtool: upgrade to 3.7

[Constantin Musca]

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 meta/recipes-extended/ethtool/{ethtool_3.6.bb => ethtool_3.7.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/ethtool/{ethtool_3.6.bb => ethtool_3.7.bb} (79%)

diff --git a/meta/recipes-extended/ethtool/ethtool_3.6.bb b/meta/recipes-extended/ethtool/ethtool_3.7.bb
similarity index 79%
rename from meta/recipes-extended/ethtool/ethtool_3.6.bb
rename to meta/recipes-extended/ethtool/ethtool_3.7.bb
index 576fca5..ad417fd 100644
--- a/meta/recipes-extended/ethtool/ethtool_3.6.bb
+++ b/meta/recipes-extended/ethtool/ethtool_3.7.bb
@@ -9,7 +9,7 @@ PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "1f4fb25590d26cb622bf3bf03413cfac"
-SRC_URI[sha256sum] = "a0305779bc35893cf4683a9cbc47bbd1d726a142ce2b34384ae3d87fa8e44891"
+SRC_URI[md5sum] = "dc4bfea23c9d966638284dded4306f61"
+SRC_URI[sha256sum] = "8ff82984ced622ef6be300972ce208f48cdc80e81e06f433ad68c45a3e073ddf"
 
 inherit autotools
-- 
1.7.11.7

[PATCH 02/15] freetype: upgrade to 2.4.11

[Constantin Musca]

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 .../freetype/{freetype-2.4.10 => freetype-2.4.11}/no-hardcode.patch   | 0
 .../freetype/{freetype_2.4.10.bb => freetype_2.4.11.bb}               | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/freetype/{freetype-2.4.10 => freetype-2.4.11}/no-hardcode.patch (100%)
 rename meta/recipes-graphics/freetype/{freetype_2.4.10.bb => freetype_2.4.11.bb} (91%)

diff --git a/meta/recipes-graphics/freetype/freetype-2.4.10/no-hardcode.patch b/meta/recipes-graphics/freetype/freetype-2.4.11/no-hardcode.patch
similarity index 100%
rename from meta/recipes-graphics/freetype/freetype-2.4.10/no-hardcode.patch
rename to meta/recipes-graphics/freetype/freetype-2.4.11/no-hardcode.patch
diff --git a/meta/recipes-graphics/freetype/freetype_2.4.10.bb b/meta/recipes-graphics/freetype/freetype_2.4.11.bb
similarity index 91%
rename from meta/recipes-graphics/freetype/freetype_2.4.10.bb
rename to meta/recipes-graphics/freetype/freetype_2.4.11.bb
index 9365475..8e8d273 100644
--- a/meta/recipes-graphics/freetype/freetype_2.4.10.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.4.11.bb
@@ -18,8 +18,8 @@ PR = "r0"
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
            file://no-hardcode.patch"
 
-SRC_URI[md5sum] = "13286702e9390a91661f980608adaff1"
-SRC_URI[sha256sum] = "0c8e242c33c45928de560d7d595db06feb41d1b22167e37260ceabe72f9e992f"
+SRC_URI[md5sum] = "b93435488942486c8d0ca22e8f768034"
+SRC_URI[sha256sum] = "ef9d0bcb64647d9e5125dc7534d7ca371c98310fec87677c410f397f71ffbe3f"
 
 S = "${WORKDIR}/freetype-${PV}"
 
-- 
1.7.11.7

[PATCH 03/15] gnome-doc-utils: upgrade to 0.20.10

[Constantin Musca]

sysrooted-pkg-config.patch: adapt to the new version
use-usr-bin-env-for-python-in-xml2po.patch: adapt to the new version
xsltproc_nonet.patch: adapt to the new version

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 .../gnome-doc-utils/sysrooted-pkg-config.patch     | 12 ++---
 .../use-usr-bin-env-for-python-in-xml2po.patch     | 25 +++++-----
 .../gnome/gnome-doc-utils/xsltproc_nonet.patch     | 57 ++++++++++------------
 ...-utils_0.20.6.bb => gnome-doc-utils_0.20.10.bb} | 10 ++--
 4 files changed, 48 insertions(+), 56 deletions(-)
 rename meta/recipes-gnome/gnome/{gnome-doc-utils_0.20.6.bb => gnome-doc-utils_0.20.10.bb} (51%)

diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
index e17e8b4..416d698 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
@@ -9,26 +9,24 @@ This should work ok with non sysrooted builds too since in those cases PKG_CONFI
 will be empty
 
 Upstream-Status: Pending
-
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
 
-Index: gnome-doc-utils-0.20.6/tools/gnome-doc-utils.make
+Index: gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
 ===================================================================
---- gnome-doc-utils-0.20.6.orig/tools/gnome-doc-utils.make	2011-09-23 22:22:26.000000000 -0700
-+++ gnome-doc-utils-0.20.6/tools/gnome-doc-utils.make	2011-09-23 22:30:03.479787196 -0700
-@@ -133,12 +133,12 @@ _DOC_ABS_SRCDIR = @abs_srcdir@
+--- gnome-doc-utils-0.20.10.orig/tools/gnome-doc-utils.make
++++ gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
+@@ -133,11 +133,11 @@ _DOC_ABS_SRCDIR = @abs_srcdir@
  _xml2po ?= `which xml2po`
  _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
  
 -_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
 -_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
--_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
 -_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
 -_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
 -_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
 +_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
 +_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
-+_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
 +_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
 +_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
 +_ids ?= ${PKG_CONFIG_SYSROOT_DIR}$(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
index a285ad2..0e196c0 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
@@ -1,30 +1,27 @@
-Upstream-Status="Inappropriate [Would break behavior on Windows]"
-
 We can't use #!/full/path/to/python -u as this can be longer than shebang
 allows for.  In order to be appropraite for upstream more work would be
 needed to make sure that the main xml2po code doesn't rely on python
 being invoked with -u (force stdin/out/err to be used raw).
----
- xml2po/xml2po/Makefile.am  |    1 -
- xml2po/xml2po/xml2po.py.in |    2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
 
-Index: gnome-doc-utils-0.20.6/xml2po/xml2po/Makefile.am
+Upstream-Status: Inappropriate [Would break behavior on Windows]
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
+
+Index: gnome-doc-utils-0.20.10/xml2po/xml2po/Makefile.am
 ===================================================================
---- gnome-doc-utils-0.20.6.orig/xml2po/xml2po/Makefile.am
-+++ gnome-doc-utils-0.20.6/xml2po/xml2po/Makefile.am
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/Makefile.am
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/Makefile.am
 @@ -7,7 +7,6 @@ CLEANFILES = xml2po
  
  xml2po: xml2po.py.in
- 	sed -e "s/^VERSION =.*/VERSION = \"@VERSION@\"/" \
+ 	$(AM_V_GEN)sed -e "s/^VERSION =.*/VERSION = \"@VERSION@\"/" \
 -	    -e "s+^#!.*python.*+#!$(PYTHON)+" \
  	  < $(srcdir)/xml2po.py.in > xml2po
- 	chmod +x xml2po
+ 	$(AM_V_at)chmod +x xml2po
  
-Index: gnome-doc-utils-0.20.6/xml2po/xml2po/xml2po.py.in
+Index: gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in
 ===================================================================
---- gnome-doc-utils-0.20.6.orig/xml2po/xml2po/xml2po.py.in
-+++ gnome-doc-utils-0.20.6/xml2po/xml2po/xml2po.py.in
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python -u
 +#!/usr/bin/env python
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
index 44d18e7..9346494 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
@@ -2,16 +2,17 @@ This adds the -nonet option to xsltproc invocations, which fixes
 compile errors when building the gnome-doc-utils docs.
 
 Upstream-Status: Inappropriate [configuration]
-
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
 
-diff -urN gnome-doc-utils-0.20.5.orig//doc/xslt/Makefile.am gnome-doc-utils-0.20.5/doc/xslt/Makefile.am
---- gnome-doc-utils-0.20.5.orig//doc/xslt/Makefile.am	2011-03-22 06:56:17.000000000 -0700
-+++ gnome-doc-utils-0.20.5/doc/xslt/Makefile.am	2011-05-09 09:35:04.946138220 -0700
-@@ -21,14 +21,14 @@
+Index: gnome-doc-utils-0.20.10/doc/xslt/Makefile.am
+===================================================================
+--- gnome-doc-utils-0.20.10.orig/doc/xslt/Makefile.am
++++ gnome-doc-utils-0.20.10/doc/xslt/Makefile.am
+@@ -21,14 +21,14 @@ all: $(xsldoc_docs) $(xsldoc_xmls)
  
  $(xsldoc_docs): $(xsldoc_xsls) xsldoc.awk xsldoc-fill.xsl
- 	$(GDU_AWK) -f "$(srcdir)/xsldoc.awk" "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
+ 	$(AM_V_GEN)$(GDU_AWK) -f "$(srcdir)/xsldoc.awk" "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
 -	| xsltproc -o "$@" \
 +	| xsltproc -nonet -o "$@" \
  	--stringparam basename "$(basename $(notdir $@))" \
@@ -20,12 +21,12 @@ diff -urN gnome-doc-utils-0.20.5.orig//doc/xslt/Makefile.am gnome-doc-utils-0.20
  
  $(xsldoc_xmls): xsldoc-docbook.xsl
  $(xsldoc_xmls): C/%.xml : C/%.xsldoc
--	xsltproc -o "$@" \
-+	xsltproc -nonet -o "$@" \
+-	$(AM_V_GEN)xsltproc -o "$@" \
++	$(AM_V_GEN)xsltproc -nonet -o "$@" \
  	--stringparam basename "$(basename $(notdir $@))" \
  	--stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
  	"$(srcdir)/xsldoc-docbook.xsl" "$<"
-@@ -62,7 +62,7 @@
+@@ -62,7 +62,7 @@ gnome-doc-xslt-check-includes:
  gnome-doc-xslt-check-xsldoc: $(xsldoc_docs)
  	@echo "Running xsldoc checks";
  	@(echo "<xsldoc>"; cat $(xsldoc_docs); echo "</xsldoc>") \
@@ -34,17 +35,11 @@ diff -urN gnome-doc-utils-0.20.5.orig//doc/xslt/Makefile.am gnome-doc-utils-0.20
  
  .PHONY: clean-xsldoc
  clean-local: clean_xsldoc
-@@ -75,4 +75,4 @@
- DOC_MODULE = gnome-doc-xslt
- DOC_INCLUDES = legal.xml translating.xml $(patsubst %,%.xml,$(xsldoc_base))
- 
--DOC_LINGUAS = de
-\ No newline at end of file
-+DOC_LINGUAS = de
-diff -urN gnome-doc-utils-0.20.5.orig//tools/gnome-doc-utils.make gnome-doc-utils-0.20.5/tools/gnome-doc-utils.make
---- gnome-doc-utils-0.20.5.orig//tools/gnome-doc-utils.make	2011-03-22 06:56:17.000000000 -0700
-+++ gnome-doc-utils-0.20.5/tools/gnome-doc-utils.make	2011-05-09 09:34:03.278985782 -0700
-@@ -37,7 +37,7 @@
+Index: gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
+===================================================================
+--- gnome-doc-utils-0.20.10.orig/tools/gnome-doc-utils.make
++++ gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
+@@ -37,7 +37,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS);
  	list='$(DOC_H_DOCS)'; for doc in $$list; do \
  	  xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
  	  if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
@@ -53,7 +48,7 @@ diff -urN gnome-doc-utils-0.20.5.orig//tools/gnome-doc-utils.make gnome-doc-util
  	done | sort | uniq \
  	  | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \
  	  | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp
-@@ -50,7 +50,7 @@
+@@ -50,7 +50,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS);
  	  docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \
  	    | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \
  	  echo $$xmlpath; \
@@ -62,25 +57,25 @@ diff -urN gnome-doc-utils-0.20.5.orig//tools/gnome-doc-utils.make gnome-doc-util
  	  for id in $$ids; do \
  	    echo '#define HELP_'`echo $$docid`'_'`echo $$id \
  	      | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \
-@@ -180,7 +180,7 @@
+@@ -197,7 +197,7 @@ $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %
  	  echo "The file '$(_skcontentslist)' does not exist." >&2;		\
  	  echo "Please check your ScrollKeeper installation." >&2;		\
  	  exit 1; }
--	xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
-+	xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
+-	$(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
++	$(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
  
  ## @ _DOC_OMF_HTML
  ## The OMF files for HTML output
-@@ -195,7 +195,7 @@
+@@ -212,7 +212,7 @@ if ENABLE_SK
  	  echo "Please check your ScrollKeeper installation." >&2;		\
  	  exit 1; }
  endif
--	xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
-+	xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
+-	$(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
++	$(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
  
  ## @ _DOC_OMF_ALL
  ## All OMF output files to be built
-@@ -250,7 +250,7 @@
+@@ -267,7 +267,7 @@ _DOC_C_FIGURES = $(if $(DOC_FIGURES),
  ## All HTML documentation in the C locale
  # FIXME: probably have to shell escape to determine the file names
  _DOC_C_HTML = $(foreach f,						\
@@ -89,12 +84,12 @@ diff -urN gnome-doc-utils-0.20.5.orig//tools/gnome-doc-utils.make gnome-doc-util
  	  --stringparam db.chunk.basename "$(DOC_MODULE)"		\
  	  $(_chunks) "C/$(DOC_MODULE).xml"),				\
  	C/$(f).xhtml)
-@@ -379,7 +379,7 @@
+@@ -393,7 +393,7 @@ _DOC_HTML_ALL = $(if $(filter html HTML,
  _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
  
  $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
--	xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
-+	xsltproc -nonet -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
+-	$(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
++	$(GDU_V_DB2HTM)xsltproc -nonet -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
  
  
  ################################################################################
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
similarity index 51%
rename from meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
rename to meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
index e93f584..bde7b89 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
@@ -1,12 +1,14 @@
 require gnome-doc-utils.inc
 LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
 		    file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343"
-PR = "r8"
+PR = "r0"
+
+GNOME_COMPRESS_TYPE = "xz"
 
 SRC_URI += "file://xsltproc_nonet.patch \
-	    file://use-usr-bin-env-for-python-in-xml2po.patch \
+            file://use-usr-bin-env-for-python-in-xml2po.patch \
             file://sysrooted-pkg-config.patch \
            "
 
-SRC_URI[archive.md5sum] = "8f6e05071599bc073007830ea0a68391"
-SRC_URI[archive.sha256sum] = "091486e370480bf45349ad09dac799211092a02938b26a0d68206172cb6cebbf"
+SRC_URI[archive.md5sum] = "3c64ad7bacd617b04999e4a168afaac5"
+SRC_URI[archive.sha256sum] = "cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6"
-- 
1.7.11.7

[PATCH 04/15] gsettings-desktop-schemas: add recipe

[Constantin Musca]

- this is needed by metacity 2.34.13

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 .../gnome/gsettings-desktop-schemas_3.7.3.bb              | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb

diff --git a/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb b/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb
new file mode 100644
index 0000000..720858a
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "A collection of GSettings schemas for settings shared by various components of a desktop"
+HOMEPAGE = "http://live.gnome.org/gsettings-desktop-schemas"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+DEPENDS = "glib-2.0"
+
+inherit gnome pkgconfig autotools gettext
+
+GNOME_COMPRESS_TYPE = "xz"
+
+SRC_URI[archive.md5sum] = "6dbede8f6112b7e0dd4864e979b91771"
+SRC_URI[archive.sha256sum] = "1da53e1b960f08ce4b0d472e6f339b7beaf19a7889c15911775abf4efe2ec760"
-- 
1.7.11.7

[PATCH 05/15] gthumb: remove recipe

[Constantin Musca]

Part of the sato trimming process

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 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

diff --git a/meta/recipes-gnome/gthumb/files/parallel.patch b/meta/recipes-gnome/gthumb/files/parallel.patch
deleted file mode 100644
index 20ce5c5..0000000
--- a/meta/recipes-gnome/gthumb/files/parallel.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From 34969cde1dcb7740b4a7c3b6e3d04d481e5980b5 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-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    |   10 ++++------
- extensions/importer/Makefile.am      |   10 ++++------
- extensions/pixbuf_savers/Makefile.am |   10 ++++------
- gthumb/Makefile.am                   |   10 ++++------
- 4 files changed, 16 insertions(+), 24 deletions(-)
-
-diff --git a/extensions/file_tools/Makefile.am b/extensions/file_tools/Makefile.am
-index 7785eff..d70a8a5 100644
---- a/extensions/file_tools/Makefile.am
-+++ b/extensions/file_tools/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 b/extensions/importer/Makefile.am
-index 29e7f2c..07c1eba 100644
---- a/extensions/importer/Makefile.am
-+++ b/extensions/importer/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 b/extensions/pixbuf_savers/Makefile.am
-index bfe9f34..4764c32 100644
---- a/extensions/pixbuf_savers/Makefile.am
-+++ b/extensions/pixbuf_savers/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 b/gthumb/Makefile.am
-index e9e385e..2f14e03 100644
---- a/gthumb/Makefile.am
-+++ b/gthumb/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
-
diff --git a/meta/recipes-gnome/gthumb/gthumb_2.12.4.bb b/meta/recipes-gnome/gthumb/gthumb_2.12.4.bb
deleted file mode 100644
index 0414386..0000000
--- a/meta/recipes-gnome/gthumb/gthumb_2.12.4.bb
+++ /dev/null
@@ -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/"
-
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index f2997a7..057be24 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -53,7 +53,6 @@ WEB ?= ""
 
 SUMMARY_${PN}-apps = "Sato desktop - applications"
 RDEPENDS_${PN}-apps = "\
-    gthumb \
     leafpad \
     gaku \
     x11vnc \
-- 
1.7.11.7

Re: [PATCH 05/15] gthumb: remove recipe

[Ross Burton]

Just in case people think Constantin has gone remove mad :) 

Signed-off-by: Ross Burton <ross.burton@intel.com> 


On Monday, 24 December 2012 at 08:34, Constantin Musca wrote:

> Part of the sato trimming process
> 
> Signed-off-by: Constantin Musca <constantinx.musca@intel.com (mailto:constantinx.musca@intel.com)>
> ---
> 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
> 
> diff --git a/meta/recipes-gnome/gthumb/files/parallel.patch b/meta/recipes-gnome/gthumb/files/parallel.patch
> deleted file mode 100644
> index 20ce5c5..0000000
> --- a/meta/recipes-gnome/gthumb/files/parallel.patch
> +++ /dev/null
> @@ -1,158 +0,0 @@
> -From 34969cde1dcb7740b4a7c3b6e3d04d481e5980b5 Mon Sep 17 00:00:00 2001
> -From: Ross Burton <ross.burton@intel.com (mailto:ross.burton@intel.com)>
> -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
> -
> diff --git a/meta/recipes-gnome/gthumb/gthumb_2.12.4.bb b/meta/recipes-gnome/gthumb/gthumb_2.12.4.bb
> deleted file mode 100644
> index 0414386..0000000
> --- a/meta/recipes-gnome/gthumb/gthumb_2.12.4.bb
> +++ /dev/null
> @@ -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/"
> -
> diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
> index f2997a7..057be24 100644
> --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
> +++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
> @@ -53,7 +53,6 @@ WEB ?= ""
> 
> SUMMARY_${PN}-apps = "Sato desktop - applications"
> RDEPENDS_${PN}-apps = "\
> - gthumb \
> leafpad \
> gaku \
> x11vnc \
> -- 
> 1.7.11.7
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org (mailto:Openembedded-core@lists.openembedded.org)
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[PATCH 06/15] json-glib: upgrade to 0.15.2

[Constantin Musca]

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 .../json-glib/{json-glib_0.14.2.bb => json-glib_0.15.2.bb}        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
 rename meta/recipes-gnome/json-glib/{json-glib_0.14.2.bb => json-glib_0.15.2.bb} (74%)

diff --git a/meta/recipes-gnome/json-glib/json-glib_0.14.2.bb b/meta/recipes-gnome/json-glib/json-glib_0.15.2.bb
similarity index 74%
rename from meta/recipes-gnome/json-glib/json-glib_0.14.2.bb
rename to meta/recipes-gnome/json-glib/json-glib_0.15.2.bb
index a4cbd51..2307f76 100644
--- a/meta/recipes-gnome/json-glib/json-glib_0.14.2.bb
+++ b/meta/recipes-gnome/json-glib/json-glib_0.15.2.bb
@@ -8,12 +8,14 @@ HOMEPAGE = "http://live.gnome.org/JsonGlib"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
 
-PR = "r2"
+PR = "r0"
 
 DEPENDS = "glib-2.0"
 
-SRC_URI[archive.md5sum] = "5716a181a2b85268f53a1fb0c8024c4a"
-SRC_URI[archive.sha256sum] = "b62cb148ae49d30d8ad807912ba3c7cf189459e2d75233620aae411cf8ea6c04"
+GNOME_COMPRESS_TYPE = "xz"
+
+SRC_URI[archive.md5sum] = "494332526f87956d05f32a9b12f3f286"
+SRC_URI[archive.sha256sum] = "f090cd94acc85989e033d72028fa70863d05092ae5bba6b454e70c132b24cdde"
 
 inherit gnome gettext
 
-- 
1.7.11.7

[PATCH 07/15] libcroco: upgrade to 0.6.8

[Constantin Musca]

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

croco.patch: removed
    - it doesn't apply anymore
    - not needed anymore

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

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 meta/recipes-support/libcroco/files/croco.patch    | 15 ---------------
 .../files/libcroco_fix_for_automake-1.12.patch     | 22 ----------------------
 .../{libcroco_0.6.3.bb => libcroco_0.6.8.bb}       | 11 +++++------
 3 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 100644 meta/recipes-support/libcroco/files/croco.patch
 delete mode 100644 meta/recipes-support/libcroco/files/libcroco_fix_for_automake-1.12.patch
 rename meta/recipes-support/libcroco/{libcroco_0.6.3.bb => libcroco_0.6.8.bb} (57%)

diff --git a/meta/recipes-support/libcroco/files/croco.patch b/meta/recipes-support/libcroco/files/croco.patch
deleted file mode 100644
index 88bdb09..0000000
--- a/meta/recipes-support/libcroco/files/croco.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---- opie/configure.in.old	2006-05-19 20:57:30.000000000 +0100
-+++ opie/configure.in	2006-05-19 20:57:56.000000000 +0100
-@@ -131,8 +131,8 @@
- dnl Define the CROCO_LIBS and CROCO_CFLAGS variables. These will be used
- dnl by client application to know where to find croco include files and libs.
- dnl
--CROCO_LIBS="-L${libdir} -lcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION"
--CROCO_CFLAGS="-I${includedir}/libcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION"
-+CROCO_LIBS='-L${libdir}'" -lcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION"
-+CROCO_CFLAGS='-I${includedir}'"/libcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION"
- 
- AC_SUBST(LIBXML2_LIBS)
- AC_SUBST(LIBXML2_CFLAGS)
diff --git a/meta/recipes-support/libcroco/files/libcroco_fix_for_automake-1.12.patch b/meta/recipes-support/libcroco/files/libcroco_fix_for_automake-1.12.patch
deleted file mode 100644
index 9dcf7b0..0000000
--- a/meta/recipes-support/libcroco/files/libcroco_fix_for_automake-1.12.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Pending
-
-This patch fixes following kind of issues with automake 1.12
-
-| configure.in:51: error: automatic de-ANSI-fication support has been removed
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-2012/05/03
-
-Index: libcroco-0.6.3/configure.in
-===================================================================
---- libcroco-0.6.3.orig/configure.in
-+++ libcroco-0.6.3/configure.in
-@@ -47,8 +47,6 @@ AC_PROG_CC
- AC_PROG_INSTALL
- AC_PROG_CPP
- 
--dnl Make sure we have an ANSI compiler
--AM_C_PROTOTYPES
- test "x$U" != "x" && AC_MSG_ERROR(Compiler not ANSI compliant)
- 
- dnl Checks for libraries.
diff --git a/meta/recipes-support/libcroco/libcroco_0.6.3.bb b/meta/recipes-support/libcroco/libcroco_0.6.8.bb
similarity index 57%
rename from meta/recipes-support/libcroco/libcroco_0.6.3.bb
rename to meta/recipes-support/libcroco/libcroco_0.6.8.bb
index d9ff8de..6f5995f 100644
--- a/meta/recipes-support/libcroco/libcroco_0.6.3.bb
+++ b/meta/recipes-support/libcroco/libcroco_0.6.8.bb
@@ -4,17 +4,16 @@ BUGTRACKER = "https://bugzilla.gnome.org/"
 
 LICENSE = "LGPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
-                    file://src/cr-rgb.c;endline=25;md5=1df8189094ba7bbed953225785032826 \
+                    file://src/cr-rgb.c;endline=25;md5=cbb4f64cc46ee9fcf602d3b0836cee56 \
                     file://tests/cr-test-utils.c;endline=21;md5=2382c27934cae1d3792fcb17a6142c4e"
 
 SECTION = "x11/utils"
 DEPENDS = "glib-2.0 libxml2 zlib"
-PR = "r3"
+PR = "r0"
 
 inherit autotools pkgconfig gnome
 
-SRC_URI_append = " file://croco.patch;apply=yes \
-                  file://libcroco_fix_for_automake-1.12.patch "
+GNOME_COMPRESS_TYPE = "xz"
 
-SRC_URI[archive.md5sum] = "e1e93eeff4367c896f3959af34ba20eb"
-SRC_URI[archive.sha256sum] = "746192d979263c74094d41e5ff0e19900b3d81eb2bd42c27c1c320dd94008034"
+SRC_URI[archive.md5sum] = "767e73c4174f75b99695d4530fd9bb80"
+SRC_URI[archive.sha256sum] = "ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570"
-- 
1.7.11.7

Re: [PATCH 07/15] libcroco: upgrade to 0.6.8

[Ross Burton]

On Monday, 24 December 2012 at 08:34, Constantin Musca wrote:
> 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

Re: [PATCH 07/15] libcroco: upgrade to 0.6.8

[Constantin Musca]

On 12/24/2012 11:13 AM, Ross Burton wrote:
> On Monday, 24 December 2012 at 08:34, Constantin Musca wrote:
>> 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
Done. I have sent a patch which changes the endline variable in order to 
checksum only the license part.

Cheers,
Constantin

[PATCH 08/15] libfm: upgrade to 1.1.0

[Constantin Musca]

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 <constantinx.musca@intel.com>
---
 .../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%)

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 3efb4dd..0000000
--- a/meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch
+++ /dev/null
@@ -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 <nitin.a.kamble@intel.com>
-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 $@
diff --git a/meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch b/meta/recipes-support/libfm/libfm-1.1.0/configure_fix.patch
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
diff --git a/meta/recipes-support/libfm/libfm-1.1.0/fix-includedir-ln.patch b/meta/recipes-support/libfm/libfm-1.1.0/fix-includedir-ln.patch
new file mode 100644
index 0000000..3f06278
--- /dev/null
+++ b/meta/recipes-support/libfm/libfm-1.1.0/fix-includedir-ln.patch
@@ -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 <constantinx.musca@intel.com>
+
+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 $? > $@.tmp && mv $@.tmp $@
+ 
+-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
++++ 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@ $(DESTDIR)$(includedir)/@PACKAGE@
+ 
+ uninstall-local:
+ 	@if test -L "$(DESTDIR)$(includedir)/@PACKAGE@"; then \
diff --git a/meta/recipes-support/libfm/libfm_0.1.17.bb b/meta/recipes-support/libfm/libfm_1.1.0.bb
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
--- 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 \
 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
 
-- 
1.7.11.7

Re: [PATCH 08/15] libfm: upgrade to 1.1.0

[Saul Wold]

On 12/24/2012 12:34 AM, Constantin Musca wrote:
> 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 <constantinx.musca@intel.com>
> ---
>   .../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.

>   .../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!

>   .../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%)
>
> 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 3efb4dd..0000000
> --- a/meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch
> +++ /dev/null
> @@ -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 <nitin.a.kamble@intel.com>
> -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 $@
> diff --git a/meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch b/meta/recipes-support/libfm/libfm-1.1.0/configure_fix.patch
> 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
> diff --git a/meta/recipes-support/libfm/libfm-1.1.0/fix-includedir-ln.patch b/meta/recipes-support/libfm/libfm-1.1.0/fix-includedir-ln.patch
> new file mode 100644
> index 0000000..3f06278
> --- /dev/null
> +++ b/meta/recipes-support/libfm/libfm-1.1.0/fix-includedir-ln.patch
> @@ -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 <constantinx.musca@intel.com>
> +
> +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 $? > $@.tmp && mv $@.tmp $@
> +
> +-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
> ++++ 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@ $(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.


> + uninstall-local:
> + 	@if test -L "$(DESTDIR)$(includedir)/@PACKAGE@"; then \
> diff --git a/meta/recipes-support/libfm/libfm_0.1.17.bb b/meta/recipes-support/libfm/libfm_1.1.0.bb
> 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
> --- 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 \
>   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
>
>

Re: [PATCH 08/15] libfm: upgrade to 1.1.0

[Constantin Musca]

On 12/26/2012 08:18 PM, Saul Wold wrote:
> On 12/24/2012 12:34 AM, Constantin Musca wrote:
>> 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 <constantinx.musca@intel.com>
>> ---
>>   .../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.
>
>> .../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!
>
>>   .../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%)
>>
>> 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 3efb4dd..0000000
>> --- 
>> a/meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch
>> +++ /dev/null
>> @@ -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 <nitin.a.kamble@intel.com>
>> -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 $@
>> diff --git 
>> a/meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch 
>> b/meta/recipes-support/libfm/libfm-1.1.0/configure_fix.patch
>> 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
>> diff --git 
>> a/meta/recipes-support/libfm/libfm-1.1.0/fix-includedir-ln.patch 
>> b/meta/recipes-support/libfm/libfm-1.1.0/fix-includedir-ln.patch
>> new file mode 100644
>> index 0000000..3f06278
>> --- /dev/null
>> +++ b/meta/recipes-support/libfm/libfm-1.1.0/fix-includedir-ln.patch
>> @@ -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 <constantinx.musca@intel.com>
>> +
>> +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 $? > $@.tmp && mv 
>> $@.tmp $@
>> +
>> +-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
>> ++++ 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@ 
>> $(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.
>
>
>> + uninstall-local:
>> +     @if test -L "$(DESTDIR)$(includedir)/@PACKAGE@"; then \
>> diff --git a/meta/recipes-support/libfm/libfm_0.1.17.bb 
>> b/meta/recipes-support/libfm/libfm_1.1.0.bb
>> 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
>> --- 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 \
>>   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
>>
>>
I managed to reproduce the problem after several builds. The libfm dir 
is created before the link is made and that's why the link is incorrect. 
I have sent patch v2 which fixes the problem by creating a relative 
symbolic link after do_install.

Cheers,
Constantin

[PATCH 09/15] libsoup-2.4: upgrade to 2.40.2

[Constantin Musca]

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 .../libsoup/{libsoup-2.4_2.38.1.bb => libsoup-2.4_2.40.2.bb}        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-support/libsoup/{libsoup-2.4_2.38.1.bb => libsoup-2.4_2.40.2.bb} (81%)

diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.38.1.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb
similarity index 81%
rename from meta/recipes-support/libsoup/libsoup-2.4_2.38.1.bb
rename to meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb
index 4a4d59a..9274f8c 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.38.1.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb
@@ -5,7 +5,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
-PR = "r2"
+PR = "r0"
 
 SECTION = "x11/gnome/libs"
 
@@ -14,8 +14,8 @@ DEPENDS = "glib-2.0 gnutls libxml2 libproxy sqlite3 libgnome-keyring"
 SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "d13fb4968acea24c26b83268a308f580"
-SRC_URI[sha256sum] = "71b8923fc7a5fef9abc5420f7f3d666fdb589f43a8c50892d584d58b3c513f9a"
+SRC_URI[md5sum] = "211ec6b733d4de33056b56838c88436e"
+SRC_URI[sha256sum] = "32e81220f53abb1f5bbe7d8b0717119df70667fc48e2342d82209ed1593e71dc"
 
 S = "${WORKDIR}/libsoup-${PV}"
 
-- 
1.7.11.7

[PATCH 10/15] libuser: upgrade to 0.58

[Constantin Musca]

License checksum modification due to:
    COPYING: Free Software Fondation address change
    lib/user.h: Free Software Fondation address change
    samples/testuser.c: Free Software Fondation address change

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 .../libuser/{libuser_0.57.1.bb => libuser_0.58.bb}           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
 rename meta/recipes-extended/libuser/{libuser_0.57.1.bb => libuser_0.58.bb} (65%)

diff --git a/meta/recipes-extended/libuser/libuser_0.57.1.bb b/meta/recipes-extended/libuser/libuser_0.58.bb
similarity index 65%
rename from meta/recipes-extended/libuser/libuser_0.57.1.bb
rename to meta/recipes-extended/libuser/libuser_0.58.bb
index 105bacf..fbd3dd5 100644
--- a/meta/recipes-extended/libuser/libuser_0.57.1.bb
+++ b/meta/recipes-extended/libuser/libuser_0.58.bb
@@ -5,17 +5,17 @@ HOMEPAGE = "https://fedorahosted.org/libuser/"
 BUGTRACKER = "https://fedorahosted.org/libuser/newticket"
 
 LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
-                    file://lib/user.h;endline=19;md5=9bc141f2e0d3e8b97ecdc945b2ed1ec7 \
-                    file://samples/testuser.c;endline=19;md5=61e8c05bd37ce1cba5590071f6e17500"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+                    file://lib/user.h;endline=19;md5=76b301f63c39fa992062395efbdc9558 \
+                    file://samples/testuser.c;endline=19;md5=3b87fa660fa3f4a6bb31d624afe30ba1"
 
 SECTION = "base"
 
 SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "be82c6941264d0b4bd04f95fb342ec7d"
-SRC_URI[sha256sum] = "a61289867581fa715354a3fafe09c3e481173ce0a2dcb33b04588b6ac13cead5"
-PR = "r3"
+SRC_URI[md5sum] = "1fc3ef3f3a3955b2d78562ff4daed793"
+SRC_URI[sha256sum] = "12a0c09d016d80687e04227a00a89e3c056d3b48bfa2444a9028e6474d8e1dbd"
+PR = "r0"
 
 DEPENDS = "popt libpam glib-2.0 xz-native docbook-utils-native linuxdoc-tools-native python"
 
-- 
1.7.11.7

[PATCH 11/15] matchbox-panel-2: fix PV

[Constantin Musca]

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
index 9678713..dbe1fad 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
@@ -12,8 +12,8 @@ DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
 DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
 
 SRCREV = "cdf7a22716b87468f10573f622d5c7a58a684e35"
-PV = "0.0+git${SRCPV}"
-PR = "r6"
+PV = "2.0+git${SRCPV}"
+PR = "r0"
 
 RPROVIDES_${PN} = "matchbox-panel"
 RREPLACES_${PN} = "matchbox-panel"
-- 
1.7.11.7

[PATCH 12/15] menu-cache: upgrade to 0.4.1

[Constantin Musca]

License checksum change due to:
    libmenu-cache/menu-cache.h: code (not license) change

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 .../menu-cache/{menu-cache_0.3.3.bb => menu-cache_0.4.1.bb}         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/menu-cache/{menu-cache_0.3.3.bb => menu-cache_0.4.1.bb} (77%)

diff --git a/meta/recipes-graphics/menu-cache/menu-cache_0.3.3.bb b/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb
similarity index 77%
rename from meta/recipes-graphics/menu-cache/menu-cache_0.3.3.bb
rename to meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb
index 894da48..d0c5340 100644
--- a/meta/recipes-graphics/menu-cache/menu-cache_0.3.3.bb
+++ b/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb
@@ -5,7 +5,7 @@ BUGTRACKER = ""
 
 LICENSE = "GPLv2 & GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://libmenu-cache/menu-cache.h;endline=29;md5=21625ca49a07e7c381027c63eff769dc \
+                    file://libmenu-cache/menu-cache.h;endline=29;md5=26571532593adb17a37eac396260532c \
                     file://menu-cache-daemon/menu-cached.c;endline=22;md5=fcecb7d315c57ef804103fa9cdab7111"
 
 SECTION = "x11/libs"
@@ -13,8 +13,8 @@ DEPENDS = "glib-2.0 zlib"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "a14b0b162cd64d56c16bf6af16f3a47f"
-SRC_URI[sha256sum] = "07241c1f5f371b426d3b0a6e571a86184ec6256bdd7ead7a4da866cd10f25955"
+SRC_URI[md5sum] = "20fed982f5d8e6ec8a56a5b48894ecf0"
+SRC_URI[sha256sum] = "4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e"
 
 PR = "r0"
 
-- 
1.7.11.7

[PATCH 13/15] metacity: upgrade to 2.34.13

[Constantin Musca]

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 <constantinx.musca@intel.com>
---
 .../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%)

diff --git a/meta/recipes-gnome/gnome/metacity/crosscompile.patch b/meta/recipes-gnome/gnome/metacity/crosscompile.patch
deleted file mode 100644
index 7a1942a..0000000
--- a/meta/recipes-gnome/gnome/metacity/crosscompile.patch
+++ /dev/null
@@ -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 <edwin.zhai@intel.com>
-
-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
-+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: schema_bindings ${srcdir}/metacity.schemas.in.in
- 	@echo Generating keybinding schemas... ${srcdir}/metacity.schemas.in.in
- 	${builddir}/schema_bindings ${srcdir}/metacity.schemas.in.in ${builddir}/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)
diff --git a/meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch b/meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch
new file mode 100644
index 0000000..1970e9a
--- /dev/null
+++ b/meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch
@@ -0,0 +1,28 @@
+Remove unused variable (YELP_HELP_RULES)
+
+Upstream-Status: Pending
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
+
+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 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.
diff --git a/meta/recipes-gnome/gnome/metacity_2.30.3.bb b/meta/recipes-gnome/gnome/metacity_2.34.13.bb
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
--- a/meta/recipes-gnome/gnome/metacity_2.30.3.bb
+++ b/meta/recipes-gnome/gnome/metacity_2.34.13.bb
@@ -4,14 +4,16 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90"
 
-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
 
-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"
@@ -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
 }
-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"
 
-- 
1.7.11.7

Re: [PATCH 13/15] metacity: upgrade to 2.34.13

[Ross Burton]

(CCing oe-devel for their opinion)

Is anyone actually using metacity?  Nothing in oe-core uses it so maybe we should move it to meta-gnome, or just drop it if meta-gnome wants to push on towards Gnome 3? 

Ross 


On Monday, 24 December 2012 at 08:34, Constantin Musca wrote:

> 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 <constantinx.musca@intel.com (mailto:constantinx.musca@intel.com)>
> ---
> .../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%)
> 
> diff --git a/meta/recipes-gnome/gnome/metacity/crosscompile.patch b/meta/recipes-gnome/gnome/metacity/crosscompile.patch
> deleted file mode 100644
> index 7a1942a..0000000
> --- a/meta/recipes-gnome/gnome/metacity/crosscompile.patch
> +++ /dev/null
> @@ -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 <edwin.zhai@intel.com (mailto:edwin.zhai@intel.com)>
> -
> -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)
> diff --git a/meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch b/meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch
> new file mode 100644
> index 0000000..1970e9a
> --- /dev/null
> +++ b/meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch
> @@ -0,0 +1,28 @@
> +Remove unused variable (YELP_HELP_RULES)
> +
> +Upstream-Status: Pending
> +Signed-off-by: Constantin Musca <constantinx.musca@intel.com (mailto:constantinx.musca@intel.com)>
> +
> +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.
> diff --git a/meta/recipes-gnome/gnome/metacity_2.30.3.bb b/meta/recipes-gnome/gnome/metacity_2.34.13.bb
> 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
> --- a/meta/recipes-gnome/gnome/metacity_2.30.3.bb
> +++ b/meta/recipes-gnome/gnome/metacity_2.34.13.bb
> @@ -4,14 +4,16 @@ LICENSE = "GPLv2+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90"
> 
> -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
> 
> -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"
> @@ -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"
> 
> -- 
> 1.7.11.7
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org (mailto:Openembedded-core@lists.openembedded.org)
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 13/15] metacity: upgrade to 2.34.13

[Ross Burton]

(CCing oe-devel for their opinion)

Is anyone actually using metacity?  Nothing in oe-core uses it so maybe we should move it to meta-gnome, or just drop it if meta-gnome wants to push on towards Gnome 3? 

Ross 


On Monday, 24 December 2012 at 08:34, Constantin Musca wrote:

> 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 <constantinx.musca@intel.com (mailto:constantinx.musca@intel.com)>
> ---
> .../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%)
> 
> diff --git a/meta/recipes-gnome/gnome/metacity/crosscompile.patch b/meta/recipes-gnome/gnome/metacity/crosscompile.patch
> deleted file mode 100644
> index 7a1942a..0000000
> --- a/meta/recipes-gnome/gnome/metacity/crosscompile.patch
> +++ /dev/null
> @@ -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 <edwin.zhai@intel.com (mailto:edwin.zhai@intel.com)>
> -
> -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)
> diff --git a/meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch b/meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch
> new file mode 100644
> index 0000000..1970e9a
> --- /dev/null
> +++ b/meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch
> @@ -0,0 +1,28 @@
> +Remove unused variable (YELP_HELP_RULES)
> +
> +Upstream-Status: Pending
> +Signed-off-by: Constantin Musca <constantinx.musca@intel.com (mailto:constantinx.musca@intel.com)>
> +
> +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.
> diff --git a/meta/recipes-gnome/gnome/metacity_2.30.3.bb b/meta/recipes-gnome/gnome/metacity_2.34.13.bb
> 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
> --- a/meta/recipes-gnome/gnome/metacity_2.30.3.bb
> +++ b/meta/recipes-gnome/gnome/metacity_2.34.13.bb
> @@ -4,14 +4,16 @@ LICENSE = "GPLv2+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90"
> 
> -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
> 
> -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"
> @@ -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"
> 
> -- 
> 1.7.11.7
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org (mailto:Openembedded-core@lists.openembedded.org)
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[PATCH 14/15] pcmanfm: upgrade to 1.1.0

[Constantin Musca]

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 <constantinx.musca@intel.com>
---
 .../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%)

diff --git a/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch b/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
deleted file mode 100644
index 88b154e..0000000
--- a/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
+++ /dev/null
@@ -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 <edwin.zhai@intel.com>
-
-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));
- }
- 
- 
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
deleted file mode 100644
index 1ad0ff5..0000000
--- a/meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch
+++ /dev/null
@@ -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 <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_1.1.0.bb
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
--- a/meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb
+++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.1.0.bb
@@ -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
 
-- 
1.7.11.7

Re: [PATCH 14/15] pcmanfm: upgrade to 1.1.0

[Saul Wold]

On 12/24/2012 12:34 AM, Constantin Musca wrote:
> 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 <constantinx.musca@intel.com>
> ---
>   .../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%)
>

Seems to be an issue with this when I built it for ARM:
> 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/
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-pref.o `test -f 'pref.c' || echo './'`pref.c
> 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/
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)
> 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)


I will dig a little later this morning.

Sau!


> diff --git a/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch b/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
> deleted file mode 100644
> index 88b154e..0000000
> --- a/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
> +++ /dev/null
> @@ -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 <edwin.zhai@intel.com>
> -
> -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));
> - }
> -
> -
> 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
> deleted file mode 100644
> index 1ad0ff5..0000000
> --- a/meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch
> +++ /dev/null
> @@ -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 <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_1.1.0.bb
> 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
> --- a/meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb
> +++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.1.0.bb
> @@ -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
>
>

[PATCH 15/15] shared-mime-info: upgrade to 1.0

[Constantin Musca]

parallelmake.patch: adapt to the new version

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 .../shared-mime-info/shared-mime-info/parallelmake.patch      | 11 ++++++-----
 .../{shared-mime-info_0.91.bb => shared-mime-info_1.0.bb}     |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)
 rename meta/recipes-support/shared-mime-info/{shared-mime-info_0.91.bb => shared-mime-info_1.0.bb} (41%)

diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
index 8b6f9e5..82ab1d2 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
@@ -9,23 +9,24 @@ dependencies and stop itself racing itself.
 RP 10/10/2011
 
 Upstream-Status: Pending
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
 
-Index: shared-mime-info-0.91/Makefile.am
+Index: shared-mime-info-1.0/Makefile.am
 ===================================================================
---- shared-mime-info-0.91.orig/Makefile.am	2011-10-10 21:47:19.834173921 +0100
-+++ shared-mime-info-0.91/Makefile.am	2011-10-10 21:45:57.000000000 +0100
+--- shared-mime-info-1.0.orig/Makefile.am
++++ shared-mime-info-1.0/Makefile.am
 @@ -1,5 +1,3 @@
 -SUBDIRS=. po
 -
  INCLUDES = $(ALL_CFLAGS)
  
  packagesdir = $(datadir)/mime/packages
-@@ -70,8 +68,7 @@
+@@ -72,8 +70,7 @@ uninstall-hook:
  
  all: check create-pot
  
 -create-pot:
--	$(MAKE) -C po shared-mime-info.pot
+-	$(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot
 +create-pot: po
  
  check: create-pot freedesktop.org.xml update-mime-database check-translations
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_1.0.bb
similarity index 41%
rename from meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
rename to meta/recipes-support/shared-mime-info/shared-mime-info_1.0.bb
index 910cb7f..d9b7b51 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_1.0.bb
@@ -1,8 +1,8 @@
 require shared-mime-info.inc
-PR = "r4"
+PR = "r0"
 
-SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
-SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
+SRC_URI[md5sum] = "901b7977dbb2b71d12d30d4d8fb97028"
+SRC_URI[sha256sum] = "d2e830e5aae213dd906e64495e9618cc4ef40d7b249e0971a190b04d5802ae8f"
 
 SRC_URI =+ "file://parallelmake.patch \
 	    file://install-data-hook.patch"
-- 
1.7.11.7