From patchwork Fri Aug 1 01:33:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hadrien Boutteville X-Patchwork-Id: 375494 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 8E3E3140140 for ; Fri, 1 Aug 2014 11:32:52 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 99C9E8CD27; Fri, 1 Aug 2014 01:32:51 +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 TLC+UMC7d7DJ; Fri, 1 Aug 2014 01:32:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 242158CD24; Fri, 1 Aug 2014 01:32:28 +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 2D0851C2455 for ; Fri, 1 Aug 2014 01:32:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 26A1B8B739 for ; Fri, 1 Aug 2014 01:32:26 +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 lZZY8-iBQgGH for ; Fri, 1 Aug 2014 01:32:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f181.google.com (mail-we0-f181.google.com [74.125.82.181]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 51EBD8B746 for ; Fri, 1 Aug 2014 01:32:22 +0000 (UTC) Received: by mail-we0-f181.google.com with SMTP id k48so3604364wev.26 for ; Thu, 31 Jul 2014 18:32:20 -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=oHPuUstu4Y2BMr0E1JBhHs8YQhPFSTMzsx+qCM9B3uk=; b=FGM67ChnlSiizUKHOdDJT72ajD/qvn1MI4rlhBJmLgJPqsuqC0Vlz+KMR/uYiVQBMV NZjWvIugG7gu/CZCApVuk6pEFd38uDF2kL5XZPDTBr8oUmxOtle35qLRH2f62YUoN91L XrWaxnbPYX30b6VB0SLO+iOUChC7hmcr+17wFKZyYKhQASZhvss86ivbcgBMwgVbU9oA XqApsgn46Yo8wOtVcLO+tpo4vKYPFHgz3/6omlqI4zofNKUOIvSqVlLpsyrAUYPi2C2+ swz1PBCTReFCDCc4UQWFWM74HVzmSEkTOOJqw3DBtiTFMwX85uARZP7JLulwipJHP6V5 neNg== X-Received: by 10.180.100.133 with SMTP id ey5mr2155735wib.16.1406856740612; Thu, 31 Jul 2014 18:32:20 -0700 (PDT) Received: from localhost.localdomain (AAubervilliers-652-1-148-113.w83-114.abo.wanadoo.fr. [83.114.243.113]) by mx.google.com with ESMTPSA id ev18sm2747275wid.1.2014.07.31.18.32.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 31 Jul 2014 18:32:20 -0700 (PDT) From: Hadrien Boutteville To: buildroot@buildroot.org Date: Fri, 1 Aug 2014 03:33:48 +0200 Message-Id: <1406856828-17350-4-git-send-email-hadrien.boutteville@gmail.com> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1406856828-17350-1-git-send-email-hadrien.boutteville@gmail.com> References: <1406856828-17350-1-git-send-email-hadrien.boutteville@gmail.com> Cc: Thomas Petazzoni , "Yann E. MORIN" Subject: [Buildroot] [PATCH v4 3/3] 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 Changes v2 -> v3: - fix the need of librsvg for the host --- package/midori/Config.in | 15 +++-- package/midori/blocked.png | Bin 0 -> 522 bytes package/midori/disabled.png | Bin 0 -> 510 bytes package/midori/enabled.png | Bin 0 -> 639 bytes package/midori/logo-shade.png | Bin 0 -> 23862 bytes .../midori-0001-remove-libnotify-dependency.patch | 27 +++++++++ .../midori-0002-do-not-use-rsvg-convert.patch | 39 ++++++++++++ package/midori/midori.mk | 66 ++++++++++++--------- 8 files changed, 114 insertions(+), 33 deletions(-) create mode 100644 package/midori/blocked.png create mode 100644 package/midori/disabled.png create mode 100644 package/midori/enabled.png create mode 100644 package/midori/logo-shade.png create mode 100644 package/midori/midori-0001-remove-libnotify-dependency.patch create mode 100644 package/midori/midori-0002-do-not-use-rsvg-convert.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/blocked.png b/package/midori/blocked.png new file mode 100644 index 0000000000000000000000000000000000000000..c21a154260de039ff862b3a88120f39e14c870f8 GIT binary patch literal 522 zcmV+l0`>igP)^&DH@!K44!CofYm#u0@ZZ3*$6-EIHJ0_-OR#DCNa2BwSSRAi8~7 zGFQnt$-%rDK^Jz{Tk{gK=y7w|eXKQWP;v^Ha3(4S(vWQ4TgbIDD5XKo4dx9pPjmB( za55?eQdJ9zxhDsNPbetqfHY`_%zGS_Oe#1M70*EC074jV{DT+uWA&x`_9`019*is6 zAKgAK&ZRHkUoOU2wN2(T*5Nmrg*TED^GW1sb>bDKg|?`eDnOJ?3RiPrGe(pgTV~#g z;aqbiDyAAoV8Sgt$*VRsn-|Q(T7~D>iiaw0&-a!*nsIzg2OE`;Cc>ax>G1t2IvO?e~#dbO)`XbI_Ev8eRN354Q z>A+OP^@!RO?|WH{AYmAlAi9`xV>JUi`LR4sfk7Nt{yAl657lDmw`OlHEOEEOr@YMq z=deGtHJQ_G4M4(NlFivvuV_oCC8P=SBb*8Ng@hT119le0QQC8&>q~yujWrlHBt8Lwt`L zF}`L~%sZ^XoNSb5C5|m85uEkn38ok6>|rv73KO^*1lv(-<4B%dXAABG%#|J{n>L;j zCk%#-kJc&Y$mN7L3F!#;(%c0%o$?qRKY1a$yw548QqnlfzKr@R4(iyt}JO8zhP2jyUZXwB?JD*ylh07*qoM6N<$f|r2i AJOBUy literal 0 HcmV?d00001 diff --git a/package/midori/enabled.png b/package/midori/enabled.png new file mode 100644 index 0000000000000000000000000000000000000000..c46668af8f76b126f6ddd223e3e9cd4dd72424ee GIT binary patch literal 639 zcmV-_0)YLAP)Zq5fmC*J2N}`Iy5`1W~Y9aAH3iD ze12aZPx!~_xxvP=?X&{eMsYE7if`-n$=bq^J8U)s>w>5Z0d`n+L2vq|Kl&ua*S`dv zBbW^dyG4{F!Z~0Au%gNf5orQ#1>(Rm!ZiuVEH8QQ=SCS5jA+*xYeEqFvA!-09E9?VH)?csb3$fV+OW84B8%M&Y&b! z*%=AK+s_TSSE|9}RchV1Jp~*Gd=VYY_WP6Fw`{+{8sR7kfO%+&`Upj$5-2petRw%@unAQewz zQ(bARO(b{)>;m#e$=EwH3gIjML;Feteqm75M0FXFC$y1w>RX&h!_)RL_96&+eGO zbeOZn{ZY3m`gx)*VFl$!AX@|;WCz^qmA6%^oE#_an)Wk1-?WlsS;s~(hx#ageg8U~217362}cApIH2gR6=um|L)3ZqVwcQ$tdcWwWF ZpWn~W&Evb)r0M_w002ovPDHLkV1lr|6ubZc literal 0 HcmV?d00001 diff --git a/package/midori/logo-shade.png b/package/midori/logo-shade.png new file mode 100644 index 0000000000000000000000000000000000000000..f23bec1ff5609c0138e8592d5558de0975fc5f51 GIT binary patch literal 23862 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

+dxG?AEfkl~e6vu-u-wgV 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 literal 0 HcmV?d00001 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-0002-do-not-use-rsvg-convert.patch b/package/midori/midori-0002-do-not-use-rsvg-convert.patch new file mode 100644 index 0000000..8cbb5ea --- /dev/null +++ b/package/midori/midori-0002-do-not-use-rsvg-convert.patch @@ -0,0 +1,39 @@ +Fix the need of librsvg for the host. + +Midori install script uses rsvg-convert to convert some SVG images to PNG. So, +we need to build librsvg for the host but this requires to build some heavy +other packages like Cairo and Pango for the host. Therefore, we hack the build +to remove the use of rsvg-convert and we copy prerendered PNGs to the target. + +Signed-off-by: Hadrien Boutteville + +--- a/data/CMakeLists.txt ++++ b/data/CMakeLists.txt +@@ -1,10 +1,5 @@ + # Copyright (C) 2013 Christian Dywan + +-include(FindConvert) +-if (NOT CONVERT_FOUND) +- message(FATAL_ERROR "rsvg-convert not found") +-endif () +- + include(FindIntltool) + if (NOT INTLTOOL_MERGE_FOUND) + message(FATAL_ERROR "intltool-merge not found") +@@ -28,16 +23,6 @@ + string(REPLACE ".appdata.xml.in" "" DESKTOP_ID ${FILE}) + INTLTOOL_MERGE_APPDATA (${DESKTOP_ID} po) + endif () +- elseif (${FILE} MATCHES "\\.svg$") +- string(REPLACE ".svg" "" IMG_ID ${FILE}) +- string (FIND ${FILE} "/" IS_DIR) +- if (IS_DIR GREATER -1) +- string(REPLACE "/" ";" DIR_LIST ${FILE}) +- LIST(GET DIR_LIST 0 S_DIR) +- SVG2PNG (${IMG_ID} "${CMAKE_INSTALL_DATADIR}/midori/res/${S_DIR}") +- else () +- SVG2PNG (${IMG_ID} "${CMAKE_INSTALL_DATADIR}/midori/res/") +- endif() + # These are being handled in add_executable for the "midori" binary + elseif (${FILE} MATCHES "\\.ico$") + elseif (${FILE} MATCHES "\\.rc$") diff --git a/package/midori/midori.mk b/package/midori/midori.mk index d55f5f1..66df56a 100644 --- a/package/midori/midori.mk +++ b/package/midori/midori.mk @@ -4,45 +4,57 @@ # ################################################################################ -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 +MIDORI_CONF_OPT = -DUSE_ZEITGEIST=OFF + +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_CONFIGURE_CMDS - $(MIDORI_WITHOUT_X11) - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - $(HOST_DIR)/usr/bin/python2 ./waf configure \ - --prefix=/usr \ - --disable-libnotify \ - ) +define MIDORI_EXTRACT_CMDS + $(call suitable-extractor,$(MIDORI_SOURCE)) $(DL_DIR)/$(MIDORI_SOURCE) \ + | $(TAR) $(TAR_STRIP_COMPONENTS)=0 -C $(@D) $(TAR_OPTIONS) - endef -define MIDORI_BUILD_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS)) +# Midori install script uses rsvg-convert to convert some SVG images to PNG. So, +# we need to build librsvg for the host but this requires to build some heavy +# other packages like Cairo and Pango for the host. Therefore, we hack the build +# to remove the use of rsvg-convert and we copy prerendered PNGs to the target. +define MIDORI_INSTALL_PNG + $(RM) $(TARGET_DIR)/usr/share/midori/res/logo-shade.svg + $(INSTALL) -D -m 0644 package/midori/logo-shade.png \ + $(TARGET_DIR)/usr/share/midori/res/logo-shade.png + $(RM) $(TARGET_DIR)/usr/share/midori/res/adblock/blocked.svg + $(INSTALL) -D -m 0644 package/midori/blocked.png \ + $(TARGET_DIR)/usr/share/midori/res/adblock/blocked.png + $(RM) $(TARGET_DIR)/usr/share/midori/res/adblock/enabled.svg + $(INSTALL) -D -m 0644 package/midori/enabled.png \ + $(TARGET_DIR)/usr/share/midori/res/adblock/enabled.png + $(RM) $(TARGET_DIR)/usr/share/midori/res/adblock/disabled.svg + $(INSTALL) -D -m 0644 package/midori/disabled.png \ + $(TARGET_DIR)/usr/share/midori/res/adblock/disabled.png endef -define MIDORI_INSTALL_TARGET_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) install) -endef +MIDORI_POST_INSTALL_TARGET_HOOKS += MIDORI_INSTALL_PNG -$(eval $(generic-package)) +$(eval $(cmake-package))