[oe-commits] org.oe.dev merge of '0f7564fadffb99d20d47c3f490dfd75ce830ba2a'

[xora commit]

merge of '0f7564fadffb99d20d47c3f490dfd75ce830ba2a'
     and 'f560dfa2d097d4a4b936e073f125c30f8f522a07'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: e1044fe696e88a46202678a1f2cfb4c62771fcee
ViewMTN: http://monotone.openembedded.org/revision/info/e1044fe696e88a46202678a1f2cfb4c62771fcee
Files:
1
packages/gimp/gimp_2.5.2.bb
classes/cpan.bbclass
Diffs:

#
# mt diff -r0f7564fadffb99d20d47c3f490dfd75ce830ba2a -re1044fe696e88a46202678a1f2cfb4c62771fcee
#
#
#
# add_file "packages/gimp/gimp_2.5.2.bb"
#  content [9c89b8d8103081d0931b9b8ae5eda2e158992b98]
#
============================================================
--- packages/gimp/gimp_2.5.2.bb	9c89b8d8103081d0931b9b8ae5eda2e158992b98
+++ packages/gimp/gimp_2.5.2.bb	9c89b8d8103081d0931b9b8ae5eda2e158992b98
@@ -0,0 +1,13 @@
+require gimp.inc
+
+DEPENDS += "lcms gegl hal"
+
+SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.5/gimp-${PV}.tar.bz2 \
+          "
+
+do_compile_prepend() {
+	for i in ca de fr ja oc ru sv; do
+		echo >  ${S}/po/$i.po
+	done
+}
+


#
# mt diff -rf560dfa2d097d4a4b936e073f125c30f8f522a07 -re1044fe696e88a46202678a1f2cfb4c62771fcee
#
#
#
# patch "classes/cpan.bbclass"
#  from [37cd3844dffec6f7c9516f2353be95eda9f98c1a]
#    to [260c9e28c5f7b6f682e8bfc326558a3b825ce267]
#
============================================================
--- classes/cpan.bbclass	37cd3844dffec6f7c9516f2353be95eda9f98c1a
+++ classes/cpan.bbclass	260c9e28c5f7b6f682e8bfc326558a3b825ce267
@@ -10,6 +10,7 @@ export PERL_INC = "${STAGING_LIBDIR}/per
 
 # Env var which tells perl where the perl include files are
 export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE"
+export PERL_ARCHLIB = "${STAGING_LIBDIR_NATIVE}/perl/${@get_perl_version(d)}"
 
 cpan_do_configure () {
 	yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS}