From 15dde1c22c7d09c06119bc43cabd5aa295994632 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 24 Apr 2015 21:00:56 +0200 Subject: vala-dbus-binding-tool: upgrade to different 0.4.0 release * new version of vala-dbus-binding-tool was released with 0.4.0 version but unfortunately there already was 0.4.0 and 0.4.1 version, see comment in git recipe for more details * be aware that it's actually newer than 0.4.1 used before and it's compatible with gee-0.8 which is newer than gee-1.0 and yes I know how incorrect it sounds, but it's truth * remove negative preference from git recipe so it's used by default and most people wont notice the mess with 0.4.0 archives Signed-off-by: Martin Jansa --- .../vala-dbus-binding-tool/vala-dbus-binding-tool.inc | 2 +- .../vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb | 4 ++-- .../vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb | 13 ++++++++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool.inc b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool.inc index 7c8e341a3e..074513038f 100644 --- a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool.inc +++ b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool.inc @@ -9,7 +9,7 @@ INC_PR = "r3" export XDG_DATA_DIRS = "${STAGING_DATADIR}" -SRC_URI = "http://downloads.freesmartphone.org/sources/${BPN}/${BP}.tar.bz2;name=archive" +SRC_URI = "${SOURCEFORGE_MIRROR}/freesmartphone/sources/${BP}.tar.bz2" inherit autotools perlnative pkgconfig diff --git a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb index 3473971b2d..82fb73c3fb 100644 --- a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb +++ b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb @@ -1,4 +1,4 @@ require vala-dbus-binding-tool.inc -SRC_URI[archive.md5sum] = "b7537a087f9f468e25170e81df0ed93f" -SRC_URI[archive.sha256sum] = "6b0d3796e92b031839e2e2f484e294153ad9eaf9d32915056199a49ce8328722" +SRC_URI[md5sum] = "59eab7abf38f35355d3786803bd2441f" +SRC_URI[sha256sum] = "1e37ab2e6238eaef9f573560ea7379e6955570f7c9503083e50c4c185c1956df" diff --git a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb index 32d2818a0b..c0c3aa3e7d 100644 --- a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb +++ b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb @@ -1,9 +1,16 @@ require vala-dbus-binding-tool.inc -DEFAULT_PREFERENCE = "-1" +# Temporary remove negative preference, because there are 2 versions of 0.4.0 archives: +# the original one depending on libgee1.0 from +# http://downloads.freesmartphone.org/sources/${BPN}/${BP}.tar.bz2 +# and new one depending on libgee0.8 from +# http://sourceforge.net/projects/freesmartphone/files/sources/ +# The original one can be already deployed on various premirrors, +# so prefer the git recipe which doesn't suffer from this issue +# DEFAULT_PREFERENCE = "-1" -SRCREV = "53d56816a4154e3467f07bd22f4e27d166e3e3f3" +SRCREV = "742c04c2bb0743891904522ce47e50f9e5c99b12" PV = "0.4.0+gitr${SRCPV}" -SRC_URI = "${FREESMARTPHONE_GIT}/vala-dbus-binding-tool.git;branch=master" +SRC_URI = "git://github.com/freesmartphone/vala-dbus-binding-tool.git;protocol=https" S = "${WORKDIR}/git" -- cgit 1.2.3-korg