gtk-webcore : update default preferences

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

diff --git a/packages/gtk-webcore/osb-jscore_20070816.bb b/packages/gtk-webcore/osb-jscore_20070816.bb
index b5aa879a183f6d9f139f35a689afb4a9f2ddaf6b..672b0ba0a7c027b2c0765f392633c12a0b7fd648 100644 (file)
--- a/packages/gtk-webcore/osb-jscore_20070816.bb
+++ b/packages/gtk-webcore/osb-jscore_20070816.bb
@@ -12,7 +12,7 @@ SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;m
            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
 

diff --git a/packages/gtk-webcore/osb-jscore_svn.bb b/packages/gtk-webcore/osb-jscore_svn.bb
index a504be42fa7a7d075313033aabb9516af0973576..554ab5b96dd6d6b7e32e162e4e03bd2ba1bc4ff2 100644 (file)
--- a/packages/gtk-webcore/osb-jscore_svn.bb
+++ b/packages/gtk-webcore/osb-jscore_svn.bb
@@ -3,8 +3,6 @@ HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
 LICENSE = "GPL"
 PRIORITY = "optional"
 
-DEFAULT_PREFERENCE = "-1"
-
 PV = "0.5.2+svnr${SRCREV}"
 PR = "r1"
 

diff --git a/packages/gtk-webcore/osb-nrcit_20070816.bb b/packages/gtk-webcore/osb-nrcit_20070816.bb
index 3bfec989240d9263360cb7ba260460df1891125d..3441d1d50809af5ffc461f33ab010b787aedb39e 100644 (file)
--- a/packages/gtk-webcore/osb-nrcit_20070816.bb
+++ b/packages/gtk-webcore/osb-nrcit_20070816.bb
@@ -15,7 +15,7 @@ SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;m
            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
 

diff --git a/packages/gtk-webcore/osb-nrcit_svn.bb b/packages/gtk-webcore/osb-nrcit_svn.bb
index 2cab1101cabeb8ec718a512c9d4a1b6329a6c23d..7ea8b3b6fa55a81c57e8786901bae79a73dc2e84 100644 (file)
--- a/packages/gtk-webcore/osb-nrcit_svn.bb
+++ b/packages/gtk-webcore/osb-nrcit_svn.bb
@@ -11,12 +11,11 @@ DEPENDS = "curl librsvg osb-nrcore pango"
 
 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
 
+S = "${WORKDIR}/NRCit"
+
 EXTRA_OECONF = " --enable-pango "
 
 do_configure () {

diff --git a/packages/gtk-webcore/osb-nrcore_20070816.bb b/packages/gtk-webcore/osb-nrcore_20070816.bb
index 991af8d24d659b03df445ac72873407c4acc2c1f..1c946d05c6465f52b8915c8a9215485d1ac1f659 100644 (file)
--- a/packages/gtk-webcore/osb-nrcore_20070816.bb
+++ b/packages/gtk-webcore/osb-nrcore_20070816.bb
@@ -11,4 +11,4 @@ SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;m
 
 S = "${WORKDIR}/NRCore"
 
-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"

diff --git a/packages/gtk-webcore/osb-nrcore_svn.bb b/packages/gtk-webcore/osb-nrcore_svn.bb
index 402638d28ee974619a36c240bf249b75dd673ea3..8e0b4b04b660fcd968f6c28deb5e1d2fef64fd1a 100644 (file)
--- a/packages/gtk-webcore/osb-nrcore_svn.bb
+++ b/packages/gtk-webcore/osb-nrcore_svn.bb
@@ -1,7 +1,5 @@
 require osb-nrcore.inc
 
-DEFAULT_PREFERENCE = "-1"
-
 PV = "0.5.2+svnr${SRCREV}"
 PR = "r1"