summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/pcmanfm
diff options
context:
space:
mode:
authorValentin Popa <valentin.popa@intel.com>2013-10-28 14:37:27 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-29 10:41:40 +0000
commit5e75eba0276d49efe3bf7a0d5ac10a686744fe46 (patch)
treee8266576b425de1efcc8ea701be4a7f8d7550b6e /meta/recipes-sato/pcmanfm
parentdce662ac5887c766a4daee4ca51bd67a06ba8f0d (diff)
downloadpoky-5e75eba0276d49efe3bf7a0d5ac10a686744fe46.tar.gz
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). (From OE-Core rev: ba93c0faba5f4b5418ecc99da5e04d2ce0642875) Signed-off-by: Valentin Popa <valentin.popa@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/pcmanfm')
-rw-r--r--meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch18
-rw-r--r--meta/recipes-sato/pcmanfm/pcmanfm_1.1.2.bb (renamed from meta/recipes-sato/pcmanfm/pcmanfm_1.1.0.bb)5
2 files changed, 2 insertions, 21 deletions
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 @@
1pcmanfm need a binary xml-purge(from its own source code) to optimize size of
2data file, which cause build error on cross-compile environment. Simplely
3remove it to work aound this issue.
4
5Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
6
7Upstream-Status: Inappropriate [embedded specific]
8
9Index: pcmanfm-0.9.7/data/ui/Makefile.am
10===================================================================
11--- pcmanfm-0.9.7.orig/data/ui/Makefile.am 2010-07-29 15:10:18.000000000 +0800
12+++ pcmanfm-0.9.7/data/ui/Makefile.am 2010-07-29 15:11:24.000000000 +0800
13@@ -21,4 +21,4 @@
14 # Purge GtkBuilder UI files
15 %.ui: %.glade
16 cp $< $@
17- $(top_builddir)/src/xml-purge $@
18+# $(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
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 \
20 file://gnome-fs-regular.png \ 20 file://gnome-fs-regular.png \
21 file://gnome-mime-text-plain.png \ 21 file://gnome-mime-text-plain.png \
22 file://emblem-symbolic-link.png \ 22 file://emblem-symbolic-link.png \
23 file://cross-compile-fix.patch \
24 file://no-desktop.patch" 23 file://no-desktop.patch"
25 24
26SRC_URI[md5sum] = "af0cff78690e658f3c06ceabf27bc71a" 25SRC_URI[md5sum] = "41104699e653ff2b0a9a9e80a257d6a2"
27SRC_URI[sha256sum] = "1f6301f330ad648f3322708ec6c0f680a8695a9453932fe19653bab6731e5582" 26SRC_URI[sha256sum] = "23ee33b34066ac83ce9a98bc9930049e69839438fb60489bd453bec8c2068950"
28 27
29inherit autotools pkgconfig 28inherit autotools pkgconfig
30 29