diff options
| author | Philippe De Swert <philippedeswert@scarlet.be> | 2007-10-08 12:02:15 +0000 |
|---|---|---|
| committer | Philippe De Swert <philippedeswert@scarlet.be> | 2007-10-08 12:02:15 +0000 |
| commit | 8fc86a2a51d4d283d89c57482ec24bb1f7658f03 (patch) | |
| tree | cdb234f2aec109147a5c5b14605a56a157b5907b /packages/gtk-webcore | |
| parent | e36e0e382ca878a5b4f518b348af96fb41096121 (diff) | |
gtk-webcore : update default preferences
* default preference update so that the correct version gets build for gpe-image
* fixes bug #3109
Diffstat (limited to 'packages/gtk-webcore')
| -rw-r--r-- | packages/gtk-webcore/osb-jscore_20070816.bb | 2 | ||||
| -rw-r--r-- | packages/gtk-webcore/osb-jscore_svn.bb | 2 | ||||
| -rw-r--r-- | packages/gtk-webcore/osb-nrcit_20070816.bb | 2 | ||||
| -rw-r--r-- | packages/gtk-webcore/osb-nrcit_svn.bb | 5 | ||||
| -rw-r--r-- | packages/gtk-webcore/osb-nrcore_20070816.bb | 2 | ||||
| -rw-r--r-- | packages/gtk-webcore/osb-nrcore_svn.bb | 2 |
6 files changed, 5 insertions, 10 deletions
diff --git a/packages/gtk-webcore/osb-jscore_20070816.bb b/packages/gtk-webcore/osb-jscore_20070816.bb index b5aa879a18..672b0ba0a7 100644 --- 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 a504be42fa..554ab5b96d 100644 --- 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 3bfec98924..3441d1d508 100644 --- 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 2cab1101ca..7ea8b3b6fa 100644 --- 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 991af8d24d..1c946d05c6 100644 --- 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 402638d28e..8e0b4b04b6 100644 --- 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" |