From bf5f225dca807b70f80168a23dadc9e29e71cf20 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 6 Sep 2012 15:48:19 +0200 Subject: vala: bump version Signed-off-by: Peter Korsgaard --- ...la-0.15.2-dont-add-dirty-to-valac-version.patch | 25 ---------------------- .../vala-dont-add-dirty-to-valac-version.patch | 25 ++++++++++++++++++++++ package/vala/vala.mk | 4 ++-- 3 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch create mode 100644 package/vala/vala-dont-add-dirty-to-valac-version.patch (limited to 'package') diff --git a/package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch b/package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch deleted file mode 100644 index a2a062336..000000000 --- a/package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch +++ /dev/null @@ -1,25 +0,0 @@ -valac: don't append -dirty to version - -Don't append -dirty to the valac version number if the Buildroot Git -tree has uncommited changes. - -The patched script is meant for the valac developers, but it also -activates if you build valac in a subdirectory of a Git tree (e.g. -as is commonly done in Buildroot). - -The effect is that valac gets built as being version x.y.z-dirty, which -breaks programs (such as Midori) that explicitly check for valac-x.y.z. - -Signed-off-by: Simon Dawson -diff -Nur a/build-aux/git-version-gen b/build-aux/git-version-gen ---- a/build-aux/git-version-gen 2010-08-15 12:49:03.000000000 +0100 -+++ b/build-aux/git-version-gen 2012-05-14 10:17:19.977204570 +0100 -@@ -135,7 +135,7 @@ - *) # Append the suffix only if there isn't one already. - case $v in - *-dirty) ;; -- *) v="$v-dirty" ;; -+ #*) v="$v-dirty" ;; - esac ;; - esac - diff --git a/package/vala/vala-dont-add-dirty-to-valac-version.patch b/package/vala/vala-dont-add-dirty-to-valac-version.patch new file mode 100644 index 000000000..a2a062336 --- /dev/null +++ b/package/vala/vala-dont-add-dirty-to-valac-version.patch @@ -0,0 +1,25 @@ +valac: don't append -dirty to version + +Don't append -dirty to the valac version number if the Buildroot Git +tree has uncommited changes. + +The patched script is meant for the valac developers, but it also +activates if you build valac in a subdirectory of a Git tree (e.g. +as is commonly done in Buildroot). + +The effect is that valac gets built as being version x.y.z-dirty, which +breaks programs (such as Midori) that explicitly check for valac-x.y.z. + +Signed-off-by: Simon Dawson +diff -Nur a/build-aux/git-version-gen b/build-aux/git-version-gen +--- a/build-aux/git-version-gen 2010-08-15 12:49:03.000000000 +0100 ++++ b/build-aux/git-version-gen 2012-05-14 10:17:19.977204570 +0100 +@@ -135,7 +135,7 @@ + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; +- *) v="$v-dirty" ;; ++ #*) v="$v-dirty" ;; + esac ;; + esac + diff --git a/package/vala/vala.mk b/package/vala/vala.mk index 7c0ea9ffe..984043cf1 100644 --- a/package/vala/vala.mk +++ b/package/vala/vala.mk @@ -4,8 +4,8 @@ # ############################################################# -VALA_VERSION_MAJOR = 0.15 -VALA_VERSION_MINOR = 2 +VALA_VERSION_MAJOR = 0.17 +VALA_VERSION_MINOR = 6 VALA_VERSION = $(VALA_VERSION_MAJOR).$(VALA_VERSION_MINOR) VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) VALA_SOURCE = vala-$(VALA_VERSION).tar.xz -- cgit v1.2.3