From patchwork Wed May 16 10:55:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 159588 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 7C182B6FA7 for ; Wed, 16 May 2012 20:55:35 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 92A93A02F6; Wed, 16 May 2012 10:55:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OC+IQhQ6ly5K; Wed, 16 May 2012 10:55:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 25FC2A02FB; Wed, 16 May 2012 10:55:27 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 34E5E8F753 for ; Wed, 16 May 2012 10:55:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 21A4C8CE8C for ; Wed, 16 May 2012 10:55:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7YsXGEsMsEbe for ; Wed, 16 May 2012 10:55:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com [74.125.83.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id F04238CE65 for ; Wed, 16 May 2012 10:55:18 +0000 (UTC) Received: by eeke50 with SMTP id e50so227631eek.16 for ; Wed, 16 May 2012 03:55:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=eUs0zeRugn8a0gfCk9tbQz6l99BaQw9vZ2il3mBLuFI=; b=sMW6o3Poe6d4zC8HC3l5GZQFbHzTo7bSd3PFvDcu96LtjEq7Lwr1IJLvCABpuBLuUT PcehG5rrPBZWF9psl2JSyGmTC47/bywZ8zGJOKGQdrPza/CqxnMW0PbSYhqFnuI6v+7p Sh1q/BzcCCGQaLKlY21WrN+gRej9lQDd7UNnbS6iX22D8xAkbKLjbpzs83/YtwAnUCYW 3R/PjJX+2q6Xj9SpaFnrpk37Yt3TnoXJNeukAC/+B+M5qXHSM49um0KllINFtnI87Ksq ZqHBHiPFSaXvllDYS6Z+BjAnCh87bAcF4J1rMAnnHuc3iQnRpLi5mki3WDp33sNXCbqP PP8A== Received: by 10.213.98.84 with SMTP id p20mr1311794ebn.16.1337165717122; Wed, 16 May 2012 03:55:17 -0700 (PDT) Received: from percy.train.local ([213.170.149.177]) by mx.google.com with ESMTPS id u7sm2738351eeb.7.2012.05.16.03.55.15 (version=SSLv3 cipher=OTHER); Wed, 16 May 2012 03:55:15 -0700 (PDT) From: spdawson@gmail.com To: buildroot@busybox.net Date: Wed, 16 May 2012 11:55:13 +0100 Message-Id: <1337165713-9950-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH] midori: bump version to 0.4.6 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Simon Dawson Signed-off-by: Simon Dawson --- 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 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 +