Github messages for voidlinux
 help / color / mirror / Atom feed
From: ndowens <ndowens@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] oil: update to 0.8.4
Date: Sat, 21 Nov 2020 00:50:51 +0100	[thread overview]
Message-ID: <20201120235051.0nKnDmAekTZfNPZMhV2RZoKyK3qtQFpCUKbMUGJ35dc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26432@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 312 bytes --]

There is an updated pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages oil-shell
https://github.com/void-linux/void-packages/pull/26432

oil: update to 0.8.4


A patch file from https://github.com/void-linux/void-packages/pull/26432.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-oil-shell-26432.patch --]
[-- Type: text/x-diff, Size: 1576 bytes --]

From cf229ea68c61a724e0d35bc0fa2a30acb5e3c3ec Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 16 Nov 2020 09:31:48 -0600
Subject: [PATCH] oil: update to 0.8.4

Use system python instead of internal
---
 srcpkgs/oil/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 0e13b5d103f..b68eca52034 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,19 +1,20 @@
 # Template file for 'oil'
 pkgname=oil
-version=0.8.3
+version=0.8.4
 revision=1
 build_style=configure
 configure_args="--prefix=/usr $(vopt_with readline)"
-makedepends="$(vopt_if readline readline-devel)"
+hostmakedepends="$(vopt_if readline readline-devel) python"
+makedepends="$hostmakedepends"
 short_desc="Oil, a new unix shell"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.oilshell.org"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
-checksum=3f78c606cde84ef0e90d1744d400c8428941eaab6515f382fabc28cf16453ccb
-python_version=2 #unverified
+checksum=08fd1c6d653ea594a5dcecb7bf40037e683845cf7627129bbeeb4d0b9fe7b879
+python_version=2
 register_shell="/usr/bin/osh"
-nocross="oil is nocross"
+nocross="Binaries doesn't build if cross built"
 nostrip=yes
 
 build_options="readline"
@@ -22,6 +23,8 @@ build_options_default="readline"
 pre_build() {
 	# Remove the strip wrapper
 	rm -f "${XBPS_WRAPPERDIR}"/strip
+	# Use system python
+	vsed -i 's|$PREPARE_DIR/python|python|g' build/actions.sh
 }
 
 do_install() {

  parent reply	other threads:[~2020-11-20 23:50 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-16 15:32 [PR PATCH] " ndowens
2020-11-16 15:36 ` [PR PATCH] [Updated] " ndowens
2020-11-16 15:39 ` ndowens
2020-11-19  3:28 ` ericonr
2020-11-19 12:19 ` ndowens
2020-11-19 21:57 ` [PR PATCH] [Updated] " ndowens
2020-11-19 21:57 ` ndowens
2020-11-19 21:58 ` ndowens
2020-11-20 23:50 ` ndowens [this message]
2020-11-21 19:30 ` [PR PATCH] [Merged]: " the-maldridge

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201120235051.0nKnDmAekTZfNPZMhV2RZoKyK3qtQFpCUKbMUGJ35dc@z \
    --to=ndowens@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).