[oe-commits] org.oe.dev gtk-webcore : update default preferences

[philippe commit]

gtk-webcore : update default preferences 
* default preference update so that the correct version gets build for gpe-image
* fixes bug #3109

Author: philippe at openembedded.org
Branch: org.openembedded.dev
Revision: dd45113e8bcd39417dfea0772aff5a1b737a45f8
ViewMTN: http://monotone.openembedded.org/revision/info/dd45113e8bcd39417dfea0772aff5a1b737a45f8
Files:
1
packages/gtk-webcore/osb-jscore_20070816.bb
packages/gtk-webcore/osb-jscore_svn.bb
packages/gtk-webcore/osb-nrcit_20070816.bb
packages/gtk-webcore/osb-nrcit_svn.bb
packages/gtk-webcore/osb-nrcore_20070816.bb
packages/gtk-webcore/osb-nrcore_svn.bb
Diffs:

#
# mt diff -r6dbc754c42e248771938edac13b6a108628e7151 -rdd45113e8bcd39417dfea0772aff5a1b737a45f8
#
# 
# 
# patch "packages/gtk-webcore/osb-jscore_20070816.bb"
#  from [f75cec607dc603a1d44cb282610d16fc56f9ac8b]
#    to [e294746d0c3e747d77046efe00228853c75a28fe]
# 
# patch "packages/gtk-webcore/osb-jscore_svn.bb"
#  from [b9e84c178b8314578103df9fe9f70faa86e25b62]
#    to [f16f66a0040d60171532bcf345935cddcc1ebba5]
# 
# patch "packages/gtk-webcore/osb-nrcit_20070816.bb"
#  from [0e6772f3aacbd62d88777e50475c7f6c36f78949]
#    to [fcf2301e02b7800c288ef826508d795176876e38]
# 
# patch "packages/gtk-webcore/osb-nrcit_svn.bb"
#  from [d2946241f9a427b0631ba309b8c8408ff33bebf7]
#    to [d70113c981456053b3eb81fb001830ff3a66089b]
# 
# patch "packages/gtk-webcore/osb-nrcore_20070816.bb"
#  from [6e579f3f6ac84177795301fcc33ff6537085db24]
#    to [ad60fa66ab49ede11652a121ad658e81d7cc1991]
# 
# patch "packages/gtk-webcore/osb-nrcore_svn.bb"
#  from [8a2e36e22d6546437b3ebec3bc6df6aa17c82174]
#    to [ab839622392a9399df985a1c3d43b212da7e0e56]
# 
============================================================
--- packages/gtk-webcore/osb-jscore_20070816.bb	f75cec607dc603a1d44cb282610d16fc56f9ac8b
+++ packages/gtk-webcore/osb-jscore_20070816.bb	e294746d0c3e747d77046efe00228853c75a28fe
@@ -12,7 +12,7 @@ S = "${WORKDIR}/JavaScriptCore"
            file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;patch=1"
 S = "${WORKDIR}/JavaScriptCore"
 
-DEFAULT_PREFERENCE = "${@['-1', '1'][not bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1) or bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}"
+DEFAULT_PREFERENCE = "-1"
 
 inherit autotools pkgconfig
 
============================================================
--- packages/gtk-webcore/osb-jscore_svn.bb	b9e84c178b8314578103df9fe9f70faa86e25b62
+++ packages/gtk-webcore/osb-jscore_svn.bb	f16f66a0040d60171532bcf345935cddcc1ebba5
@@ -1,10 +1,8 @@ PRIORITY = "optional"
 DESCRIPTION = "Gtk+ WebCore - JavaScriptCore"
 HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
 LICENSE = "GPL"
 PRIORITY = "optional"
 
-DEFAULT_PREFERENCE = "-1"
-
 PV = "0.5.2+svnr${SRCREV}"
 PR = "r1"
 
============================================================
--- packages/gtk-webcore/osb-nrcit_20070816.bb	0e6772f3aacbd62d88777e50475c7f6c36f78949
+++ packages/gtk-webcore/osb-nrcit_20070816.bb	fcf2301e02b7800c288ef826508d795176876e38
@@ -15,7 +15,7 @@ S = "${WORKDIR}/NRCit"
            file://gcc4-fno-threadsafe-statics-NRCit.patch;patch=1"
 S = "${WORKDIR}/NRCit"
 
-DEFAULT_PREFERENCE = "${@['-1', '1'][not bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1) or bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}"
+DEFAULT_PREFERENCE = "-1"
 
 inherit autotools pkgconfig
 
============================================================
--- packages/gtk-webcore/osb-nrcit_svn.bb	d2946241f9a427b0631ba309b8c8408ff33bebf7
+++ packages/gtk-webcore/osb-nrcit_svn.bb	d70113c981456053b3eb81fb001830ff3a66089b
@@ -11,11 +11,10 @@ SRC_URI = "svn://gtk-webcore.svn.sourcef
 
 SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCit;proto=https \
            file://gcc4-fno-threadsafe-statics-NRCit.patch;patch=1"
-S = "${WORKDIR}/NRCit"
 
-DEFAULT_PREFERENCE = "-1"
+inherit autotools pkgconfig
 
-inherit autotools pkgconfig
+S = "${WORKDIR}/NRCit"
 
 EXTRA_OECONF = " --enable-pango "
 
============================================================
--- packages/gtk-webcore/osb-nrcore_20070816.bb	6e579f3f6ac84177795301fcc33ff6537085db24
+++ packages/gtk-webcore/osb-nrcore_20070816.bb	ad60fa66ab49ede11652a121ad658e81d7cc1991
@@ -11,4 +11,4 @@ S = "${WORKDIR}/NRCore"
 
 S = "${WORKDIR}/NRCore"
 
+DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE = "${@['-1', '1'][not bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1) or bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}"
============================================================
--- packages/gtk-webcore/osb-nrcore_svn.bb	8a2e36e22d6546437b3ebec3bc6df6aa17c82174
+++ packages/gtk-webcore/osb-nrcore_svn.bb	ab839622392a9399df985a1c3d43b212da7e0e56
@@ -1,7 +1,5 @@ require osb-nrcore.inc
 require osb-nrcore.inc
 
-DEFAULT_PREFERENCE = "-1"
-
 PV = "0.5.2+svnr${SRCREV}"
 PR = "r1"