From patchwork Fri Jul 18 15:39:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hadrien Boutteville X-Patchwork-Id: 371632 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 552C21400B9 for ; Sat, 19 Jul 2014 01:39:16 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8469C8BE6F; Fri, 18 Jul 2014 15:39:15 +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 H6yGjiil639P; Fri, 18 Jul 2014 15:39:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8EF7C8BD73; Fri, 18 Jul 2014 15:39:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 5B7181C28B1 for ; Fri, 18 Jul 2014 15:39:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5801B81119 for ; Fri, 18 Jul 2014 15:39:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mITcYUYOkJoj for ; Fri, 18 Jul 2014 15:38:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f170.google.com (mail-we0-f170.google.com [74.125.82.170]) by fraxinus.osuosl.org (Postfix) with ESMTPS id D9CC9876F0 for ; Fri, 18 Jul 2014 15:38:58 +0000 (UTC) Received: by mail-we0-f170.google.com with SMTP id w62so4719255wes.1 for ; Fri, 18 Jul 2014 08:38:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dTxSqxYRymJEiWtleeuSVXt2ofDA6y6p+9Xxw0p3Xak=; b=qfUk2iwkRCZT6+JH/dXAoSWQBy8DqY/sWJnDEPX2JiF0RhOJuqBwFXMBMXCBpCQk1m 5VbcV32Lm58ijVgEZnUEp3c143VB5cfdeVAI9kFs8ckRsxIWJspRagl7oMBvSb9KqFGm T8jj795nsoPu1JkYTkM7gGwVids7Z3pGu8zt7PmjMCMpLQ+nUA1XL4FZ33ZzJYTQAkrk +z/1sMFx5KsGZLruSTD/lSb6CKM7AY3QRIU2+DhufphKXRxNsWNyj2MPHTyJFZQMgOlO c+5+KCvVk4toFbsWHyWZjcDHT7bTsPZdEScrn9I2rPrC3bWHgEMy9KHz8uMFKdY8S9WY hgqw== X-Received: by 10.180.188.203 with SMTP id gc11mr25855566wic.59.1405697935430; Fri, 18 Jul 2014 08:38:55 -0700 (PDT) Received: from antalgix.daviel.openwide.fr. ([193.56.60.160]) by mx.google.com with ESMTPSA id da9sm7923425wib.5.2014.07.18.08.38.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Jul 2014 08:38:54 -0700 (PDT) From: Hadrien Boutteville To: buildroot@buildroot.org Date: Fri, 18 Jul 2014 17:39:39 +0200 Message-Id: <1405697979-23957-5-git-send-email-hadrien.boutteville@gmail.com> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1405697979-23957-1-git-send-email-hadrien.boutteville@gmail.com> References: <1405697979-23957-1-git-send-email-hadrien.boutteville@gmail.com> Cc: Thomas Petazzoni , "Yann E. MORIN" Subject: [Buildroot] [PATCH v2 4/4] midori: bump to version 0.5.8 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 Signed-off-by: Hadrien Boutteville Cc: Thomas Petazzoni Cc: "Yann E. MORIN" --- Changes v1 -> v2: - fix typo --- package/midori/Config.in | 15 ++++--- .../midori-0001-remove-libnotify-dependency.patch | 27 ++++++++++++ package/midori/midori.mk | 51 +++++++++------------- 3 files changed, 57 insertions(+), 36 deletions(-) create mode 100644 package/midori/midori-0001-remove-libnotify-dependency.patch diff --git a/package/midori/Config.in b/package/midori/Config.in index c3b5a1b..821b306 100644 --- a/package/midori/Config.in +++ b/package/midori/Config.in @@ -1,20 +1,23 @@ config BR2_PACKAGE_MIDORI bool "midori" select BR2_PACKAGE_WEBKIT - select BR2_PACKAGE_LIBSEXY + select BR2_PACKAGE_LIBSOUP + select BR2_PACKAGE_LIBSOUP_GNOME + select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - depends on BR2_PACKAGE_LIBGTK2 + depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3 depends on BR2_INSTALL_LIBSTDCPP # webkit depends on BR2_TOOLCHAIN_HAS_THREADS # webkit -> enchant -> libglib2 - depends on BR2_USE_WCHAR # webkit + depends on BR2_USE_WCHAR # webkit, libsoup -> libglib2 depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS help Midori is a lightweight web browser based on WebKit http://software.twotoasts.de/?page=midori -comment "midori needs libgtk2 and a toolchain w/ C++, wchar, threads" +comment "midori needs libgtk2 or libgtk3 and a toolchain w/ C++, wchar, threads" depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_LIBGTK2 + !BR2_TOOLCHAIN_HAS_THREADS || \ + !(BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3) diff --git a/package/midori/midori-0001-remove-libnotify-dependency.patch b/package/midori/midori-0001-remove-libnotify-dependency.patch new file mode 100644 index 0000000..edd1e17 --- /dev/null +++ b/package/midori/midori-0001-remove-libnotify-dependency.patch @@ -0,0 +1,27 @@ +Remove the libnotify dependency. + +For now there is no libnotify package in Buildroot and this feature does not +seem necessary. + +Signed-off-by: Hadrien Boutteville + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -143,16 +143,7 @@ + endif () + endif () + +-if (WIN32) +- add_definitions("-DLIBNOTIFY_VERSION=\"No\"") +-else () +- pkg_check_modules(NOTIFY REQUIRED libnotify) +- add_definitions("-DLIBNOTIFY_VERSION=\"${NOTIFY_VERSION}\"") +- add_definitions("-DHAVE_LIBNOTIFY") +- set(OPTS_INCLUDE_DIRS "${OPTS_INCLUDE_DIRS};${NOTIFY_INCLUDE_DIRS}") +- set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${NOTIFY_LIBRARIES}") +- set(PKGS ${PKGS} libnotify) +-endif () ++add_definitions("-DLIBNOTIFY_VERSION=\"No\"") + + option(USE_GTK3 "Use GTK+3" OFF) + option(HALF_BRO_INCOM_WEBKIT2 "Serve as a guniea pig" OFF) diff --git a/package/midori/midori.mk b/package/midori/midori.mk index d55f5f1..9bbce37 100644 --- a/package/midori/midori.mk +++ b/package/midori/midori.mk @@ -4,45 +4,36 @@ # ################################################################################ -MIDORI_VERSION_MAJOR = 0.4 -MIDORI_VERSION = $(MIDORI_VERSION_MAJOR).6 -MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2 -MIDORI_SITE = http://archive.xfce.org/src/apps/midori/$(MIDORI_VERSION_MAJOR)/ +MIDORI_VERSION = 0.5.8 +MIDORI_SOURCE = midori_$(MIDORI_VERSION)_all_.tar.bz2 +MIDORI_SITE = http://midori-browser.org/downloads/ MIDORI_LICENSE = LGPLv2.1+ MIDORI_LICENSE_FILES = COPYING MIDORI_DEPENDENCIES = \ host-intltool \ host-pkgconf \ host-vala \ - host-python \ - libgtk2 \ - libsexy \ + libsoup \ + sqlite \ + libxml2 \ webkit \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) + $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) -ifneq ($(BR2_PACKAGE_XORG7),y) -define MIDORI_WITHOUT_X11 - $(SED) "s/check_pkg ('x11')/#check_pkg ('x11')/" $(@D)/wscript -endef -endif - -define MIDORI_CONFIGURE_CMDS - $(MIDORI_WITHOUT_X11) - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - $(HOST_DIR)/usr/bin/python2 ./waf configure \ - --prefix=/usr \ - --disable-libnotify \ - ) -endef +MIDORI_CONF_OPT = -DUSE_ZEITGEIST=OFF -define MIDORI_BUILD_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS)) -endef +ifeq ($(BR2_PACKAGE_LIBGTK3),y) +# The actual WebKit logic in Buildroot enable webkit2 when WebKit uses GTK+3 +MIDORI_CONF_OPT += \ + -DUSE_GTK3=ON \ + -DHALF_BRO_INCOM_WEBKIT2=ON +MIDORI_DEPENDENCIES += libgtk3 +else +MIDORI_DEPENDENCIES += libgtk2 +endif -define MIDORI_INSTALL_TARGET_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) install) +define MIDORI_EXTRACT_CMDS + $(call suitable-extractor,$(MIDORI_SOURCE)) $(DL_DIR)/$(MIDORI_SOURCE) \ + | $(TAR) $(TAR_STRIP_COMPONENTS)=0 -C $(@D) $(TAR_OPTIONS) - endef -$(eval $(generic-package)) +$(eval $(cmake-package))