From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by mail.openembedded.org (Postfix) with ESMTP id 3F3AF6F9F4 for ; Tue, 1 Apr 2014 17:14:02 +0000 (UTC) Received: by mail-wi0-f178.google.com with SMTP id bs8so5575617wib.11 for ; Tue, 01 Apr 2014 10:14:03 -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=eBCIuQQjH0V6uz6IYpskDSPXM915tCVlR61HrRIFEj4=; b=EIpa1yG6/A+VivCM8aK45pFnvN/e2E/RPoH8qNU9VejqFsFm2tIYPj4HamHEgyi3Wp cfaotcvyCyVl4D9w2Ef3taYBL1Y7wDpwJvtNq2XxOB/xIYKbC1XJUbJ67i2U8PlbQjpT 0r/28RNdXOpB/sPuOUY6ce15fX1IjsQJZFA7filD8dCxjQeaQoTMNbrfB2qp5V/MsyFk mQ+sWrbAl0onkk0c79gF3EbslJd5678jJifiQSLqePV9K+TAnneQ/7SUFCnVR36KPrAm aC8oP9jGhahEc7Vce6uSpflZQhSnwNDIbN/Dcy3pdpB2zUSJE/901P4BSWjv0nNdlFII P+MA== X-Received: by 10.194.20.65 with SMTP id l1mr22988319wje.39.1396372443252; Tue, 01 Apr 2014 10:14:03 -0700 (PDT) Received: from localhost (ip-89-176-104-3.net.upcbroadband.cz. [89.176.104.3]) by mx.google.com with ESMTPSA id o5sm41867525eeg.8.2014.04.01.10.14.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Apr 2014 10:14:02 -0700 (PDT) From: Martin Jansa To: openembedded-devel@lists.openembedded.org Date: Tue, 1 Apr 2014 19:13:11 +0200 Message-Id: <1396372434-10710-3-git-send-email-Martin.Jansa@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1396372434-10710-1-git-send-email-Martin.Jansa@gmail.com> References: <1396372434-10710-1-git-send-email-Martin.Jansa@gmail.com> Subject: [meta-oe][PATCH 03/46] e-wm: upgrade to 0.18.4 and drop old 0.17.5 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Apr 2014 17:14:03 -0000 * fix building e17 modules with elementary-1.9 * remove 0.17 version, because that one isn't going to be tested enough Signed-off-by: Martin Jansa --- .../0001-remove-another-elm-1.8-requirement.patch | 25 +++++++++++++++++++++ meta-efl/recipes-efl/e17/e-wm_0.17.5.bb | 26 ---------------------- .../e17/{e-wm_0.18.3.bb => e-wm_0.18.4.bb} | 5 +++-- 3 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 meta-efl/recipes-efl/e17/e-wm/0001-remove-another-elm-1.8-requirement.patch delete mode 100644 meta-efl/recipes-efl/e17/e-wm_0.17.5.bb rename meta-efl/recipes-efl/e17/{e-wm_0.18.3.bb => e-wm_0.18.4.bb} (68%) diff --git a/meta-efl/recipes-efl/e17/e-wm/0001-remove-another-elm-1.8-requirement.patch b/meta-efl/recipes-efl/e17/e-wm/0001-remove-another-elm-1.8-requirement.patch new file mode 100644 index 0000000..f4f034a --- /dev/null +++ b/meta-efl/recipes-efl/e17/e-wm/0001-remove-another-elm-1.8-requirement.patch @@ -0,0 +1,25 @@ +From dd1406e40700df60a055db24d7358480b1fbc5bf Mon Sep 17 00:00:00 2001 +From: Mike Blumenkrantz +Date: Mon, 3 Mar 2014 17:38:55 -0500 +Subject: [PATCH] remove another elm 1.8 requirement + +Upstream-Status: backport dd1406e40700df60a055db24d7358480b1fbc5bf +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 999df79..26f6775 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -579,7 +579,6 @@ eina >= ${efl_version} \ + eldbus >= ${efl_version} \ + eio >= ${efl_version} \ + elementary >= ${elm_version} \ +-elementary < 1.8.99 \ + emotion >= ${efl_version} \ + $udisks_mount \ + $eeze_mount \ +-- +1.9.0 + diff --git a/meta-efl/recipes-efl/e17/e-wm_0.17.5.bb b/meta-efl/recipes-efl/e17/e-wm_0.17.5.bb deleted file mode 100644 index d374680..0000000 --- a/meta-efl/recipes-efl/e17/e-wm_0.17.5.bb +++ /dev/null @@ -1,26 +0,0 @@ -require ${BPN}.inc - -SRCNAME = "enlightenment" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ - file://enlightenment_start.oe \ - file://applications.menu \ -" - -SRC_URI[md5sum] = "5aefb55df0b1a0a0ae0cf9d0610cf7c7" -SRC_URI[sha256sum] = "25d4967277cf27d4efb474a9b8eceb1200aa813a51c248b61cc23f69291bff0f" - -do_install_append() { - install -d ${D}/${datadir}/applications/ - install -m 644 ${S}/src/modules/fileman/module.desktop ${D}/${datadir}/applications/efm.desktop - sed "s#Type=Link#Type=Application#g" -i ${D}/${datadir}/applications/efm.desktop - echo "Exec=enlightenment_remote -efm-open-dir" >> ${D}/${datadir}/applications/efm.desktop - echo "Terminal=false" >> ${D}/${datadir}/applications/efm.desktop - echo "Categories=Application;" >> ${D}/${datadir}/applications/efm.desktop - echo "StartupNotify=true" >> ${D}/${datadir}/applications/efm.desktop - install -d ${D}/${datadir}/icons/ - install -m 644 ${S}/data/themes/img/O/icon_icon_theme.png ${D}/${datadir}/icons/e-module-fileman.png -} diff --git a/meta-efl/recipes-efl/e17/e-wm_0.18.3.bb b/meta-efl/recipes-efl/e17/e-wm_0.18.4.bb similarity index 68% rename from meta-efl/recipes-efl/e17/e-wm_0.18.3.bb rename to meta-efl/recipes-efl/e17/e-wm_0.18.4.bb index ae21cc1..0122cad 100644 --- a/meta-efl/recipes-efl/e17/e-wm_0.18.3.bb +++ b/meta-efl/recipes-efl/e17/e-wm_0.18.4.bb @@ -6,12 +6,13 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" SRC_URI = "\ ${E_RELEASES}/apps/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ + file://0001-remove-another-elm-1.8-requirement.patch \ file://enlightenment_start.oe \ file://applications.menu \ " -SRC_URI[md5sum] = "9f6e6c296b88b038ac05415006c678fd" -SRC_URI[sha256sum] = "17d207246bf10dec5a5fa854da5763e0e6dd61decde3474ff5fedffbb9dc8629" +SRC_URI[md5sum] = "d3534c765d562524c63852f2f40932c3" +SRC_URI[sha256sum] = "273afe860b65e1e39323bab80ab51e44845bcddcd25063b47eadab1c925a77c9" do_configure_prepend() { sed '/^ *EFL_PKG_CHECK_VAR/ s/systemduserunitdir/systemdsystemunitdir/g' -i ${S}/configure.ac -- 1.9.1