X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail.ovgu.de (mail.ovgu.de [141.44.1.66]) by lists.alpinelinux.org (Postfix) with ESMTP id 3FB7A5C4D74 for ; Sun, 24 Dec 2017 17:39:13 +0000 (GMT) Received: from mail.ovgu.de (localhost [127.0.0.1]) by localhost (Postfix) with SMTP id 0E5C34006B for ; Sun, 24 Dec 2017 18:39:11 +0100 (CET) Received: from notebook-marian.fritz.box (i577B0F90.versanet.de [87.123.15.144]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.ovgu.de (Postfix) with ESMTPSA id 37E5F40064; Sun, 24 Dec 2017 18:39:10 +0100 (CET) From: Marian Buschsieweke To: alpine-aports@lists.alpinelinux.org Cc: Marian Buschsieweke Subject: [alpine-aports] [PATCH] testing/micropython: Update to version 1.9.3 Date: Sun, 24 Dec 2017 18:39:07 +0100 Message-Id: <20171224173907.19992-1-marian.buschsieweke@ovgu.de> X-Mailer: git-send-email 2.15.0 X-PMX-Version: 6.4.1.2730818, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2017.12.24.173016, AntiVirus-Engine: 5.46.0, AntiVirus-Data: 2017.12.23.5460003 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, LEGITIMATE_SIGNS 0, MULTIPLE_REAL_RCPTS 0, RDNS_POOLED 0, RDNS_SUSP 0, RDNS_SUSP_SPECIFIC 0, __ANY_URI 0, __C230066_P5 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CP_URI_IN_BODY 0, __FRAUD_MONEY_CURRENCY 0, __FRAUD_MONEY_CURRENCY_DOLLAR 0, __FROM_DOMAIN_IN_ANY_CC1 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HTTPS_URI 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MULTIPLE_URI_TEXT 0, __NO_HTML_TAG_RAW 0, __RDNS_POOLED_3 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_IN_BODY 0, __URI_NOT_IMG 0, __URI_NS , __URI_WITHOUT_PATH 0, __URI_WITH_PATH 0' X-Spam-Score: Gauge=IIIIIIII X-PMX-consideredAsSpam: no X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- testing/micropython/0000-unix-mpconfigport.patch | 4 ++-- testing/micropython/APKBUILD | 16 +++++++--------- testing/micropython/python3.patch | 10 ---------- 3 files changed, 9 insertions(+), 21 deletions(-) delete mode 100644 testing/micropython/python3.patch diff --git a/testing/micropython/0000-unix-mpconfigport.patch b/testing/micropython/0000-unix-mpconfigport.patch index bd9afa52f8..4175138928 100644 --- a/testing/micropython/0000-unix-mpconfigport.patch +++ b/testing/micropython/0000-unix-mpconfigport.patch @@ -1,5 +1,5 @@ ---- micropython-1.9.2-old/unix/mpconfigport.mk -+++ micropython-1.9.2/unix/mpconfigport.mk +--- micropython-1.9.3-old/ports/unix/mpconfigport.mk ++++ micropython-1.9.3/ports/unix/mpconfigport.mk @@ -9,7 +9,7 @@ MICROPY_USE_READLINE = 1 diff --git a/testing/micropython/APKBUILD b/testing/micropython/APKBUILD index 34a7da644c..05bbb3330d 100644 --- a/testing/micropython/APKBUILD +++ b/testing/micropython/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Marian # Maintainer: Marian pkgname=micropython -pkgver=1.9.2 +pkgver=1.9.3 pkgrel=0 pkgdesc="A lean and efficient Python implementation for MCUs and constrained systems" url="http://www.micropython.org/" @@ -14,14 +14,13 @@ depends="" makedepends="libffi-dev python3" subpackages="$pkgname-cross" source="${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz - 0000-unix-mpconfigport.patch - python3.patch + 0000-unix-mpconfigport.patch " builddir="${srcdir}/${pkgname}-${pkgver}" build() { cd "$builddir" - make -C unix PYTHON=python3 + make -C ports/unix PYTHON=python3 } check() { @@ -30,13 +29,13 @@ check() { # ffi callback fails on kernel with PaX rm tests/unix/ffi_callback.py - make -C unix test PYTHON=python3 + make -C ports/unix test PYTHON=python3 } package() { cd "$builddir" mkdir -p "${pkgdir}/usr/bin" - install -m755 unix/micropython "${pkgdir}/usr/bin/micropython" + install -m755 ports/unix/micropython "${pkgdir}/usr/bin/micropython" } cross() { @@ -46,6 +45,5 @@ cross() { install -m755 mpy-cross/mpy-cross "${subpkgdir}/usr/bin/mpy-cross" } -sha512sums="f9caa268766e1e312d845d2338f15d9e362cec75d8c2d99d2c32b42aef6e8db018dc58631781fb3da61914d850151d36070ef5f005f432029fedd5ac96cae4a6 micropython-1.9.2.tar.gz -636914a6347b57390de6fb45ff389f751c312b2959f30748c7ce08a4ea95b1eac804812255677aceb24dd5e9f1c9e5f4db9fa4c50f945f4da2623217b45ee360 0000-unix-mpconfigport.patch -66ca172a6e9f4866e733e6c9303882dbb5f5729ffc685e0ba200010bacb8d5014527efd82da4c2ab62266e0816917758ae8e6089fb575ec31c3dc4441909343f python3.patch" +sha512sums="d276dc9a300e400f5fd5742bfc8c641c0af2d3b7f3ae9221b811100d85e9c2a6c6c558775183c58dd4be39a31284c596c0e98c9bb2c8e60ce4cf0d83434d0a47 micropython-1.9.3.tar.gz +4c1de6a6477453e846998565402c69d1dd716cf692a3bb55aa16b6991722a94d8364c05f0603b981a7dd9e9af577a3f46910a60d501513af547ebbf3ed574711 0000-unix-mpconfigport.patch" diff --git a/testing/micropython/python3.patch b/testing/micropython/python3.patch deleted file mode 100644 index ca269d39c3..0000000000 --- a/testing/micropython/python3.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/tools/make-frozen.py b/tools/make-frozen.py -index 1051b52..06ee7a3 100755 ---- a/tools/make-frozen.py -+++ b/tools/make-frozen.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # Create frozen modules structure for MicroPython. - # -- 2.15.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---