Attachment 197066 Details for Bug 230369 – Upgrade to 0.7.8

[patch] Upgrade to 0.7.8

xonsh.patch (text/plain), 3.46 KB, created by Roberto Fernandez Cueto on 2018-09-13 10:56:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roberto Fernandez Cueto

Created: 2018-09-13 10:56:49 UTC

Size: 3.46 KB

patch

obsolete

>Index: shells/xonsh/Makefile
>===================================================================
>--- shells/xonsh/Makefile	(revision 479669)
>+++ shells/xonsh/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	xonsh
>-PORTVERSION=	0.6.0
>+PORTVERSION=	0.7.8
> CATEGORIES=	shells python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -9,7 +9,7 @@
> MAINTAINER=	roberfern@gmail.com
> COMMENT=	Python-ish BASH-wards shell
> 
>-LICENSE=	BSD2CLAUSE
>+LICENSE_FILE=	${WRCDIR}/license
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}amalgamate>=0:devel/py-amalgamate@${PY_FLAVOR}
> 
>Index: shells/xonsh/distinfo
>===================================================================
>--- shells/xonsh/distinfo	(revision 479669)
>+++ shells/xonsh/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1511473787
>-SHA256 (xonsh-0.6.0.tar.gz) = 19aa4c075378aef8476b8b2cdb0bea6fa5e10933163de443b958fa485e0f6dc6
>-SIZE (xonsh-0.6.0.tar.gz) = 652164
>+TIMESTAMP = 1536835442
>+SHA256 (xonsh-0.7.8.tar.gz) = 956c7fbf19968afaade11fa5cb627a7f2c177a9e05f8cb03f7efa86b5fe4cb08
>+SIZE (xonsh-0.7.8.tar.gz) = 827000
>Index: shells/xonsh/files/patch-xonsh_platform.py
>===================================================================
>--- shells/xonsh/files/patch-xonsh_platform.py	(revision 479669)
>+++ shells/xonsh/files/patch-xonsh_platform.py	(working copy)
>@@ -1,11 +1,11 @@
>---- xonsh/platform.py.orig	2017-03-12 02:36:40 UTC
>-+++ xonsh/platform.py
>-@@ -491,7 +491,7 @@ def LIBC():
>-         libc = ctypes.CDLL('cygwin1.dll')
>+--- xonsh/platform.py.orig	2018-09-13 12:49:50.901559000 +0200
>++++ xonsh/platform.py	2018-09-13 12:51:16.043551000 +0200
>+@@ -571,7 +571,7 @@
>+         libc = ctypes.CDLL("msys-2.0.dll")
>      elif ON_BSD:
>          try:
>--            libc = ctypes.CDLL('libc.so')
>-+      	     libc = ctypes.CDLL(ctypes.util.find_library("c"))
>+-            libc = ctypes.CDLL("libc.so")
>++            libc = ctypes.CDLL(ctypes.util.find_library("c"))
>          except AttributeError:
>              libc = None
>          except OSError:
>Index: shells/xonsh/files/patch-xonsh_xoreutils_uptime.py
>===================================================================
>--- shells/xonsh/files/patch-xonsh_xoreutils_uptime.py	(revision 479669)
>+++ shells/xonsh/files/patch-xonsh_xoreutils_uptime.py	(working copy)
>@@ -1,11 +1,18 @@
>---- xonsh/xoreutils/uptime.py.orig	2017-02-11 16:24:07 UTC
>-+++ xonsh/xoreutils/uptime.py
>-@@ -100,7 +100,7 @@ def _uptime_bsd():
>+--- xonsh/xoreutils/uptime.py.orig	2018-09-13 12:52:13.885001000 +0200
>++++ xonsh/xoreutils/uptime.py	2018-09-13 12:53:15.599470000 +0200
>+@@ -100,13 +100,13 @@
>          return None
>      # Determine how much space we need for the response.
>      sz = ctypes.c_uint(0)
>--    xp.LIBC.sysctlbyname('kern.boottime', None, ctypes.byref(sz), None, 0)
>-+    xp.LIBC.sysctlbyname(b'kern.boottime', None, ctypes.byref(sz), None, 0)
>-     if sz.value != struct.calcsize('@LL'):
>+-    xp.LIBC.sysctlbyname("kern.boottime", None, ctypes.byref(sz), None, 0)
>++    xp.LIBC.sysctlbyname(b"kern.boottime", None, ctypes.byref(sz), None, 0)
>+     if sz.value != struct.calcsize("@LL"):
>          # Unexpected, let's give up.
>          return None
>+     # For real now.
>+     buf = ctypes.create_string_buffer(sz.value)
>+-    xp.LIBC.sysctlbyname("kern.boottime", buf, ctypes.byref(sz), None, 0)
>++    xp.LIBC.sysctlbyname(b"kern.boottime", buf, ctypes.byref(sz), None, 0)
>+     sec, usec = struct.unpack_from("@LL", buf.raw)
>+     # OS X disagrees what that second value is.
>+     if usec > 1000000:

Actions: View | Diff

Attachments on bug 230369: 195872 | 195873 | 195874 | 196112 | 196264 | 196493 | 196703 | 197066 | 197074