Patchwork midori: bump version to 0.4.6

login
register
mail settings
Submitter Simon Dawson
Date May 16, 2012, 10:55 a.m.
Message ID <1337165713-9950-1-git-send-email-spdawson@gmail.com>
Download mbox | patch
Permalink /patch/159588/
State Superseded
Headers show

Comments

Simon Dawson - May 16, 2012, 10:55 a.m.
From: Simon Dawson <spdawson@gmail.com>

Signed-off-by: Simon Dawson <spdawson@gmail.com>
---
 package/midori/Config.in                         |    6 ++++--
 package/midori/midori.mk                         |    8 ++++----
 package/vala/vala-fix-dirty-version-suffix.patch |   15 +++++++++++++++
 3 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 package/vala/vala-fix-dirty-version-suffix.patch
Peter Korsgaard - May 16, 2012, 11:37 a.m.
>>>>> "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/midori/Config.in                         |    6 ++++--
 spdawson>  package/midori/midori.mk                         |    8 ++++----
 spdawson>  package/vala/vala-fix-dirty-version-suffix.patch |   15 +++++++++++++++

Please put the vala patch in a seperate commit.

 spdawson>  3 files changed, 23 insertions(+), 6 deletions(-)
 spdawson>  create mode 100644 package/vala/vala-fix-dirty-version-suffix.patch

 spdawson> diff --git a/package/midori/Config.in b/package/midori/Config.in
 spdawson> index 95a0afb..a9315fe 100644
 spdawson> --- a/package/midori/Config.in
 spdawson> +++ b/package/midori/Config.in
 spdawson> @@ -3,6 +3,8 @@ config BR2_PACKAGE_MIDORI
 spdawson>  	select BR2_PACKAGE_WEBKIT
 spdawson>  	select BR2_PACKAGE_LIBSEXY
 spdawson>  	depends on BR2_PACKAGE_LIBGTK2
 spdawson> +	depends on BR2_PACKAGE_LIBINTL
 spdawson> +	depends on BR2_PACKAGE_LIBICONV

Are you sure libintl/iconv is always needed? For most packages it
depends on if the toolchain has locale support or not.

Patch

diff --git a/package/midori/Config.in b/package/midori/Config.in
index 95a0afb..a9315fe 100644
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -3,6 +3,8 @@  config BR2_PACKAGE_MIDORI
 	select BR2_PACKAGE_WEBKIT
 	select BR2_PACKAGE_LIBSEXY
 	depends on BR2_PACKAGE_LIBGTK2
+	depends on BR2_PACKAGE_LIBINTL
+	depends on BR2_PACKAGE_LIBICONV
 	depends on BR2_INSTALL_LIBSTDCPP # webkit
 	depends on BR2_USE_WCHAR	 # webkit
 	help
@@ -10,5 +12,5 @@  config BR2_PACKAGE_MIDORI
 
 	  http://software.twotoasts.de/?page=midori
 
-comment "midori requires C++, WCHAR in toolchain and libgtk2"
-        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_PACKAGE_LIBGTK2
+comment "midori requires C++, WCHAR in toolchain, libgtk2, libintl and libiconv"
+        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_PACKAGE_LIBGTK2 || !BR2_PACKAGE_LIBINTL || !BR2_PACKAGE_LIBICONV
diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 3e46b1a..8a364ca 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 libintl 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
 
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
+