Attachment 179665 Details for Bug 216841 – update diff

[patch] update diff

guile2.diff (text/plain), 7.06 KB, created by Ashish SHUKLA on 2017-02-06 05:31:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ashish SHUKLA

Created: 2017-02-06 05:31:50 UTC

Size: 7.06 KB

patch

obsolete

>Index: guile2/Makefile
>===================================================================
>--- guile2/Makefile	(revision 433471)
>+++ guile2/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	guile
>-PORTVERSION=	2.0.11
>-PORTREVISION=	3
>+PORTVERSION=	2.0.13
> CATEGORIES=	lang scheme
> MASTER_SITES=	GNU
> PKGNAMESUFFIX=	2
>Index: guile2/distinfo
>===================================================================
>--- guile2/distinfo	(revision 433471)
>+++ guile2/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (guile-2.0.11.tar.gz) = e6786c934346fa2e38e46d8d81a622bb1c16d130153523f6129fcd79ef1fb040
>-SIZE (guile-2.0.11.tar.gz) = 7516053
>+TIMESTAMP = 1486353598
>+SHA256 (guile-2.0.13.tar.gz) = ee8073c4582bb4f06412452fdf5dd185aae607441f1313c824f44bdd668b0bde
>+SIZE (guile-2.0.13.tar.gz) = 7808173
>Index: guile2/files/patch-156119b0223cf14d335ebda84701a69b2ba95757
>===================================================================
>--- guile2/files/patch-156119b0223cf14d335ebda84701a69b2ba95757	(revision 433471)
>+++ guile2/files/patch-156119b0223cf14d335ebda84701a69b2ba95757	(nonexistent)
>@@ -1,62 +0,0 @@
>-From 156119b0223cf14d335ebda84701a69b2ba95757 Mon Sep 17 00:00:00 2001
>-From: Mark H Weaver <mhw@netris.org>
>-Date: Sat, 20 Sep 2014 03:49:46 -0400
>-Subject: [PATCH] Do not assume that 64-bit integers will be 64-bit aligned.
>-
>-* libguile/foreign.c (raw_bytecode, objcode_cells):
>-* libguile/gsubr.c (raw_bytecode, objcode_cells): Use SCM_ALIGNED to
>-  ensure 64-bit alignment.
>-
>---- libguile/foreign.c.orig	2014-01-21 21:20:53 UTC
>-+++ libguile/foreign.c
>-@@ -1,4 +1,4 @@
>--/* Copyright (C) 2010, 2011, 2012, 2013  Free Software Foundation, Inc.
>-+/* Copyright (C) 2010-2014  Free Software Foundation, Inc.
>-  *
>-  * This library is free software; you can redistribute it and/or
>-  * modify it under the terms of the GNU Lesser General Public License
>-@@ -814,7 +814,7 @@ SCM_DEFINE (scm_pointer_to_procedure, "p
>- 
>- static const struct
>- {
>--  scm_t_uint64 dummy; /* ensure 8-byte alignment; perhaps there's a better way */
>-+  SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */
>-   const scm_t_uint8 bytes[10 * (sizeof (struct scm_objcode) + 8
>-                                 + sizeof (struct scm_objcode) + 32)];
>- } raw_bytecode = {
>-@@ -867,7 +867,7 @@ make_objcode_trampoline (unsigned int na
>- 
>- static const struct
>- {
>--  scm_t_uint64 dummy; /* alignment */
>-+  SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */
>-   scm_t_cell cells[10 * 2]; /* 10 double cells */
>- } objcode_cells = {
>-   0,
>---- libguile/gsubr.c.orig	2012-07-02 09:28:13 UTC
>-+++ libguile/gsubr.c
>-@@ -1,4 +1,5 @@
>--/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
>-+/* Copyright (C) 1995-2001, 2006, 2008-2011,
>-+ *   2014 Free Software Foundation, Inc.
>-  *
>-  * This library is free software; you can redistribute it and/or
>-  * modify it under the terms of the GNU Lesser General Public License
>-@@ -213,7 +214,7 @@
>- */
>- static const struct
>- {
>--  scm_t_uint64 dummy; /* ensure 8-byte alignment; perhaps there's a better way */
>-+  SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */
>-   const scm_t_uint8 bytes[121 * (sizeof (struct scm_objcode) + 16
>-                                  + sizeof (struct scm_objcode) + 32)];
>- } raw_bytecode = {
>-@@ -317,7 +318,7 @@ static const struct
>- 
>- static const struct
>- {
>--  scm_t_uint64 dummy; /* alignment */
>-+  SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */
>-   scm_t_cell cells[121 * 2]; /* 11*11 double cells */
>- } objcode_cells = {
>-   0,
>
>Property changes on: guile2/files/patch-156119b0223cf14d335ebda84701a69b2ba95757
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: guile2/files/patch-libguile_filesys.c
>===================================================================
>--- guile2/files/patch-libguile_filesys.c	(nonexistent)
>+++ guile2/files/patch-libguile_filesys.c	(working copy)
>@@ -0,0 +1,12 @@
>+--- libguile/filesys.c.orig	2017-02-06 04:37:29 UTC
>++++ libguile/filesys.c
>+@@ -1486,6 +1486,9 @@ SCM_DEFINE (scm_i_mkstemp, "mkstemp!", 1
>+       mode_bits = scm_i_mode_bits (mode);
>+     }
>+ 
>++#ifdef __FreeBSD__
>++  open_flags &= O_APPEND | O_DIRECT | O_SHLOCK | O_EXLOCK | O_CLOEXEC;
>++#endif
>+   SCM_SYSCALL (rv = mkostemp (c_tmpl, open_flags));
>+   if (rv == -1)
>+     SCM_SYSERROR;
>
>Property changes on: guile2/files/patch-libguile_filesys.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: guile2/pkg-plist
>===================================================================
>--- guile2/pkg-plist	(revision 433471)
>+++ guile2/pkg-plist	(working copy)
>@@ -113,6 +113,7 @@
> include/guile/%%GUILE_VER%%/libguile/threads.h
> include/guile/%%GUILE_VER%%/libguile/throw.h
> include/guile/%%GUILE_VER%%/libguile/trees.h
>+include/guile/%%GUILE_VER%%/libguile/unicode.h
> include/guile/%%GUILE_VER%%/libguile/uniform.h
> include/guile/%%GUILE_VER%%/libguile/validate.h
> include/guile/%%GUILE_VER%%/libguile/values.h
>@@ -127,8 +128,8 @@
> lib/libguile-%%GUILE_VER%%.a
> lib/libguile-%%GUILE_VER%%.so
> lib/libguile-%%GUILE_VER%%.so.22
>-lib/libguile-%%GUILE_VER%%.so.22.7.2
>-lib/libguile-%%GUILE_VER%%.so.22.7.2-gdb.scm
>+lib/libguile-%%GUILE_VER%%.so.22.8.1
>+lib/libguile-%%GUILE_VER%%.so.22.8.1-gdb.scm
> lib/libguilereadline-v-18.a
> lib/libguilereadline-v-18.so
> lib/libguilereadline-v-18.so.18
>@@ -201,6 +202,7 @@
> lib/guile/%%GUILE_VER%%/ccache/ice-9/threads.go
> lib/guile/%%GUILE_VER%%/ccache/ice-9/time.go
> lib/guile/%%GUILE_VER%%/ccache/ice-9/top-repl.go
>+lib/guile/%%GUILE_VER%%/ccache/ice-9/unicode.go
> lib/guile/%%GUILE_VER%%/ccache/ice-9/vlist.go
> lib/guile/%%GUILE_VER%%/ccache/ice-9/weak-vector.go
> lib/guile/%%GUILE_VER%%/ccache/language/assembly.go
>@@ -322,6 +324,7 @@
> lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-2.go
> lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-26.go
> lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-27.go
>+lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-28.go
> lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-31.go
> lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-34.go
> lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-35.go
>@@ -470,6 +473,7 @@
> %%DATADIR%%/%%GUILE_VER%%/ice-9/threads.scm
> %%DATADIR%%/%%GUILE_VER%%/ice-9/time.scm
> %%DATADIR%%/%%GUILE_VER%%/ice-9/top-repl.scm
>+%%DATADIR%%/%%GUILE_VER%%/ice-9/unicode.scm
> %%DATADIR%%/%%GUILE_VER%%/ice-9/vlist.scm
> %%DATADIR%%/%%GUILE_VER%%/ice-9/weak-vector.scm
> %%DATADIR%%/%%GUILE_VER%%/language/assembly.scm
>@@ -591,6 +595,7 @@
> %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-2.scm
> %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-26.scm
> %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-27.scm
>+%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-28.scm
> %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-31.scm
> %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-34.scm
> %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-35.scm

Actions: View | Diff

Attachments on bug 216841: 179665