From ba93c0faba5f4b5418ecc99da5e04d2ce0642875 Mon Sep 17 00:00:00 2001 From: Valentin Popa Date: Mon, 28 Oct 2013 14:37:27 +0200 Subject: [PATCH] pcmanfm: upgraded to 1.1.2 Removed cross-compile-fix.patch; pcmanfm doesn't use xml-purge anymore. Tested on core-image-sato (qemuarm & qemux86). Signed-off-by: Valentin Popa Signed-off-by: Richard Purdie --- .../pcmanfm/files/cross-compile-fix.patch | 18 ------------------ .../{pcmanfm_1.1.0.bb => pcmanfm_1.1.2.bb} | 5 ++--- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch rename meta/recipes-sato/pcmanfm/{pcmanfm_1.1.0.bb => pcmanfm_1.1.2.bb} (85%) diff --git a/meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch b/meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch deleted file mode 100644 index 0118081abf..0000000000 --- a/meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch +++ /dev/null @@ -1,18 +0,0 @@ -pcmanfm need a binary xml-purge(from its own source code) to optimize size of -data file, which cause build error on cross-compile environment. Simplely -remove it to work aound this issue. - -Signed-off-by: Zhai Edwin - -Upstream-Status: Inappropriate [embedded specific] - -Index: pcmanfm-0.9.7/data/ui/Makefile.am -=================================================================== ---- pcmanfm-0.9.7.orig/data/ui/Makefile.am 2010-07-29 15:10:18.000000000 +0800 -+++ pcmanfm-0.9.7/data/ui/Makefile.am 2010-07-29 15:11:24.000000000 +0800 -@@ -21,4 +21,4 @@ - # Purge GtkBuilder UI files - %.ui: %.glade - cp $< $@ -- $(top_builddir)/src/xml-purge $@ -+# $(top_builddir)/src/xml-purge $@ diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.1.0.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.1.2.bb similarity index 85% rename from meta/recipes-sato/pcmanfm/pcmanfm_1.1.0.bb rename to meta/recipes-sato/pcmanfm/pcmanfm_1.1.2.bb index 9a038fe79c..2be4a56205 100644 --- a/meta/recipes-sato/pcmanfm/pcmanfm_1.1.0.bb +++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.1.2.bb @@ -20,11 +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://no-desktop.patch" -SRC_URI[md5sum] = "af0cff78690e658f3c06ceabf27bc71a" -SRC_URI[sha256sum] = "1f6301f330ad648f3322708ec6c0f680a8695a9453932fe19653bab6731e5582" +SRC_URI[md5sum] = "41104699e653ff2b0a9a9e80a257d6a2" +SRC_URI[sha256sum] = "23ee33b34066ac83ce9a98bc9930049e69839438fb60489bd453bec8c2068950" inherit autotools pkgconfig -- 2.40.1