[Buildroot] [PATCH 1/2] vala: do not append a -dirty suffix to the valac version number

[Buildroot] [PATCH 1/2] vala: do not append a -dirty suffix to the valac version number

[spdawson at gmail.com]

From: Simon Dawson <spdawson@gmail.com>

Signed-off-by: Simon Dawson <spdawson@gmail.com>
---
 package/vala/vala-fix-dirty-version-suffix.patch |   15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 package/vala/vala-fix-dirty-version-suffix.patch

diff --git a/package/vala/vala-fix-dirty-version-suffix.patch b/package/vala/vala-fix-dirty-version-suffix.patch
new file mode 100644
index 0000000..4b0044d
--- /dev/null
+++ b/package/vala/vala-fix-dirty-version-suffix.patch
@@ -0,0 +1,15 @@
+Do not append a -dirty suffix to the valac version number. The presence of
+the suffix can caused problems for packages (e.g. midori) which check the
+valac version number during configuration.
+
+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,6 @@
+     *) # Append the suffix only if there isn't one already.
+ 	case $v in
+ 	  *-dirty) ;;
+-	  *) v="$v-dirty" ;;
+ 	esac ;;
+ esac
+ 
-- 
1.7.9.5

[Buildroot] [PATCH 2/2] midori: bump version to 0.4.6

[spdawson at gmail.com]

From: Simon Dawson <spdawson@gmail.com>

Signed-off-by: Simon Dawson <spdawson@gmail.com>
---
 package/midori/Config.in |    3 +++
 package/midori/midori.mk |    8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/package/midori/Config.in b/package/midori/Config.in
index 95a0afb..49867e4 100644
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -2,6 +2,9 @@ config BR2_PACKAGE_MIDORI
 	bool "midori"
 	select BR2_PACKAGE_WEBKIT
 	select BR2_PACKAGE_LIBSEXY
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	depends on BR2_PACKAGE_LIBGTK2
 	depends on BR2_INSTALL_LIBSTDCPP # webkit
 	depends on BR2_USE_WCHAR	 # webkit
diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 3e46b1a..19bf6dd 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -4,10 +4,10 @@
 #
 #############################################################
 
-MIDORI_VERSION = 0.3.6
+MIDORI_VERSION = 0.4.6
 MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2
-MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.3/
-MIDORI_DEPENDENCIES = host-pkg-config host-intltool webkit libsexy libgtk2
+MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.4/
+MIDORI_DEPENDENCIES = host-pkg-config host-intltool webkit libsexy libgtk2 host-vala $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 ifneq ($(BR2_PACKAGE_XORG7),y)
 define MIDORI_WITHOUT_X11
@@ -21,7 +21,7 @@ define MIDORI_CONFIGURE_CMDS
 		$(TARGET_CONFIGURE_OPTS)	\
 		./waf configure			\
 		--prefix=/usr			\
-		--disable-vala			\
+		--disable-libnotify			\
        )
 endef
 
-- 
1.7.9.5

[Buildroot] [PATCH 1/2] vala: do not append a -dirty suffix to the valac version number

[Peter Korsgaard]

>>>>> "spdawson" == spdawson  <spdawson@gmail.com> writes:

 spdawson> From: Simon Dawson <spdawson@gmail.com>
 spdawson> Signed-off-by: Simon Dawson <spdawson@gmail.com>
 spdawson> ---
 spdawson>  package/vala/vala-fix-dirty-version-suffix.patch |   15 +++++++++++++++
 spdawson>  1 file changed, 15 insertions(+)
 spdawson>  create mode 100644 package/vala/vala-fix-dirty-version-suffix.patch

 spdawson> diff --git a/package/vala/vala-fix-dirty-version-suffix.patch b/package/vala/vala-fix-dirty-version-suffix.patch
 spdawson> new file mode 100644
 spdawson> index 0000000..4b0044d
 spdawson> --- /dev/null
 spdawson> +++ b/package/vala/vala-fix-dirty-version-suffix.patch
 spdawson> @@ -0,0 +1,15 @@
 spdawson> +Do not append a -dirty suffix to the valac version number. The presence of
 spdawson> +the suffix can caused problems for packages (e.g. midori) which check the
 spdawson> +valac version number during configuration.

Why is this needed? We don't apply any patches to vala, and I don't see
any "-dirty" suffix in valac --version:

./output/host/usr/bin/valac --version
Vala 0.15.2

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/2] vala: do not append a -dirty suffix to the valac version number

[Simon Dawson]

> Why is this needed? We don't apply any patches to vala, and I don't see
> any "-dirty" suffix in valac --version:
>
> ./output/host/usr/bin/valac --version
> Vala 0.15.2

It may be because the Buildroot checkout in which you are testing has
no uncommitted changes. The valac build process calls

$ git diff-index --name-only HEAD 2>/dev/null

and appends the -dirty version suffix if anything is returned. In my
case --- with uncommitted changes to my Buildroot Git checkout --- the
-dirty suffix does get applied. Consequently, for me:

$ ./output/host/usr/bin/valac --version
Vala 0.15.2-dirty

In essence, I think the patch is necessary in order to prevent the
valac build process from falling foul of uncommitted changes in the
local Buildroot checkout. Of course, if you've got uncommitted changes
in the repository in which you're testing, then my theory goes out of
the window...

Simon.

[Buildroot] [PATCH 1/2] vala: do not append a -dirty suffix to the valac version number

[Peter Korsgaard]

>>>>> "Simon" == Simon Dawson <spdawson@gmail.com> writes:

Hi,

 Simon> In essence, I think the patch is necessary in order to prevent the
 Simon> valac build process from falling foul of uncommitted changes in the
 Simon> local Buildroot checkout. Of course, if you've got uncommitted changes
 Simon> in the repository in which you're testing, then my theory goes out of
 Simon> the window...

Ahh, ok. That was not clear to me from your commit message. We have
something similar for autoconf
(autoconf-2.65-dont-add-dirty-to-version.patch). Care to adjust patch
description and commit message and resend?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/2] vala: do not append a -dirty suffix to the valac version number

[spdawson at gmail.com]

From: Simon Dawson <spdawson@gmail.com>

When vala is built inside a Git repository with uncommitted changes, the
valac version number has -dirty appended. This creates problems for
packages (e.g. Midori) which require a valac version number without
the -dirty suffix.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
---
 ...la-0.15.2-dont-add-dirty-to-valac-version.patch |   25 ++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch

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
new file mode 100644
index 0000000..a2a0623
--- /dev/null
+++ b/package/vala/vala-0.15.2-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 <spdawson@gmail.com>
+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
+ 
-- 
1.7.9.5

[Buildroot] [PATCH 1/2] vala: do not append a -dirty suffix to the valac version number

[Peter Korsgaard]

>>>>> "spdawson" == spdawson  <spdawson@gmail.com> writes:

 spdawson> From: Simon Dawson <spdawson@gmail.com>
 spdawson> When vala is built inside a Git repository with uncommitted changes, the
 spdawson> valac version number has -dirty appended. This creates problems for
 spdawson> packages (e.g. Midori) which require a valac version number without
 spdawson> the -dirty suffix.

Committed, thanks.

-- 
Bye, Peter Korsgaard