openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

upgrading package: txr 194 -> 197

master
Dr. Ralf S. Engelschall 8 years ago
parent
58bfa98d4d
commit
54d53c71db
2 changed files with 68 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 120
      txr/txr.patch
  2. 5
      txr/txr.spec

120
txr/txr.patch
Unescape View File

@ -1,8 +1,8 @@
Index: combi.c
--- combi.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ combi.c 2016-05-21 09:35:33.121506537 +0200
@@ -24,6 +24,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- combi.c.orig 2018-05-18 15:38:20.000000000 +0200
+++ combi.c 2018-05-28 08:29:43.963230000 +0200
@@ -25,6 +25,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <stdlib.h>
@ -10,9 +10,9 @@ Index: combi.c
#include <wchar.h>
#include <signal.h>
Index: configure
--- configure.orig 2016-05-20 15:10:51.000000000 +0200
+++ configure 2016-05-21 09:35:33.121506537 +0200
@@ -840,6 +840,7 @@
--- configure.orig 2018-05-18 15:38:20.000000000 +0200
+++ configure 2018-05-28 08:29:43.963627000 +0200
@@ -886,6 +886,7 @@
#include <sys/wait.h>
#include <time.h>
#include <unistd.h>
@ -20,7 +20,7 @@ Index: configure
#include <wchar.h>
#include <wctype.h>
@@ -1017,13 +1018,6 @@
@@ -1059,13 +1060,6 @@
broken128=
output=$($make conftest.ccver)
set -- $output
@ -34,7 +34,7 @@ Index: configure
superlong=
@@ -2022,6 +2016,7 @@
@@ -2149,6 +2143,7 @@
cat > conftest.c <<!
#include "config.h"
#include <process.h>
@ -42,7 +42,7 @@ Index: configure
#include <wchar.h>
int main(int argc, char **argv)
@@ -2378,7 +2373,7 @@
@@ -2528,7 +2523,7 @@
printf "Checking for alloca ... "
@ -52,9 +52,9 @@ Index: configure
#include <$try_header>
Index: eval.c
--- eval.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ eval.c 2016-05-21 09:35:33.121506537 +0200
@@ -34,7 +34,6 @@
--- eval.c.orig 2018-05-18 15:38:20.000000000 +0200
+++ eval.c 2018-05-28 08:29:43.964319000 +0200
@@ -35,7 +35,6 @@
#include <time.h>
#include <assert.h>
#include "config.h"
@ -63,9 +63,9 @@ Index: eval.c
#include "gc.h"
#include "args.h"
Index: hash.c
--- hash.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ hash.c 2016-05-21 09:35:33.121506537 +0200
@@ -32,7 +32,6 @@
--- hash.c.orig 2018-05-18 15:38:20.000000000 +0200
+++ hash.c 2018-05-28 08:29:43.964541000 +0200
@@ -33,7 +33,6 @@
#include <limits.h>
#include <signal.h>
#include "config.h"
@ -74,9 +74,9 @@ Index: hash.c
#include "gc.h"
#include "args.h"
Index: lib.c
--- lib.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ lib.c 2016-05-21 09:35:33.121506537 +0200
@@ -37,10 +37,12 @@
--- lib.c.orig 2018-05-18 15:38:20.000000000 +0200
+++ lib.c 2018-05-28 08:29:43.965569000 +0200
@@ -38,10 +38,12 @@
#include <math.h>
#include <time.h>
#include <signal.h>
@ -91,9 +91,9 @@ Index: lib.c
#define NOMINMAX
#include <windows.h>
Index: match.c
--- match.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ match.c 2016-05-21 09:35:33.121506537 +0200
@@ -32,7 +32,6 @@
--- match.c.orig 2018-05-18 15:38:20.000000000 +0200
+++ match.c 2018-05-28 08:29:43.966065000 +0200
@@ -33,7 +33,6 @@
#include <wchar.h>
#include <signal.h>
#include "config.h"
@ -102,9 +102,9 @@ Index: match.c
#include "gc.h"
#include "args.h"
Index: parser.y
--- parser.y.orig 2016-05-20 15:10:51.000000000 +0200
+++ parser.y 2016-05-21 09:35:33.121506537 +0200
@@ -36,8 +36,8 @@
--- parser.y.orig 2018-05-18 15:38:20.000000000 +0200
+++ parser.y 2018-05-28 08:29:43.966374000 +0200
@@ -37,8 +37,8 @@
#include <setjmp.h>
#include <wchar.h>
#include <signal.h>
@ -115,9 +115,9 @@ Index: parser.y
#include "signal.h"
#include "unwind.h"
Index: signal.c
--- signal.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ signal.c 2016-05-21 09:35:33.121506537 +0200
@@ -29,6 +29,9 @@
--- signal.c.orig 2018-05-18 15:38:20.000000000 +0200
+++ signal.c 2018-05-28 08:29:43.966525000 +0200
@@ -30,6 +30,9 @@
#include <stdarg.h>
#include <errno.h>
#include <wchar.h>
@ -128,9 +128,9 @@ Index: signal.c
#include "config.h"
#if HAVE_SYS_TIME
Index: socket.c
--- socket.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ socket.c 2016-05-21 09:38:01.701586547 +0200
@@ -35,6 +35,9 @@
--- socket.c.orig 2018-05-18 15:38:20.000000000 +0200
+++ socket.c 2018-05-28 08:29:43.966743000 +0200
@@ -36,6 +36,9 @@
#include <errno.h>
#include <unistd.h>
#include <fcntl.h>
@ -141,9 +141,9 @@ Index: socket.c
#include <netdb.h>
#include "config.h"
Index: stream.c
--- stream.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ stream.c 2016-05-21 09:35:33.121506537 +0200
@@ -34,8 +34,12 @@
--- stream.c.orig 2018-05-18 15:38:20.000000000 +0200
+++ stream.c 2018-05-28 08:29:43.967193000 +0200
@@ -35,8 +35,12 @@
#include <ctype.h>
#include <wchar.h>
#include <wctype.h>
@ -156,7 +156,7 @@ Index: stream.c
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -52,7 +56,6 @@
@@ -56,7 +60,6 @@
#if HAVE_SOCKETS
#include <sys/socket.h>
#endif
@ -165,20 +165,20 @@ Index: stream.c
#include "gc.h"
#include "signal.h"
Index: struct.c
--- struct.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ struct.c 2016-05-21 09:35:33.131493560 +0200
@@ -33,7 +33,6 @@
#include <limits.h>
--- struct.c.orig 2018-05-18 15:38:20.000000000 +0200
+++ struct.c 2018-05-28 08:29:43.967471000 +0200
@@ -35,7 +35,6 @@
#include <signal.h>
#include <assert.h>
#include "config.h"
-#include ALLOCA_H
#include "lib.h"
#include "hash.h"
#include "eval.h"
Index: sysif.c
--- sysif.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ sysif.c 2016-05-21 09:35:33.131493560 +0200
@@ -27,6 +27,7 @@
--- sysif.c.orig 2018-05-18 15:38:20.000000000 +0200
+++ sysif.c 2018-05-28 08:29:43.967758000 +0200
@@ -28,6 +28,7 @@
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
@ -186,18 +186,18 @@ Index: sysif.c
#include <string.h>
#include <wchar.h>
#include <signal.h>
@@ -67,7 +68,6 @@
#endif
#include <fnmatch.h>
@@ -74,7 +75,6 @@
#if HAVE_DLOPEN
#include <dlfcn.h>
#endif
-#include ALLOCA_H
#include "lib.h"
#include "stream.h"
#include "hash.h"
Index: syslog.c
--- syslog.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ syslog.c 2016-05-21 09:35:33.131493560 +0200
@@ -33,7 +33,6 @@
--- syslog.c.orig 2018-05-18 15:38:20.000000000 +0200
+++ syslog.c 2018-05-28 08:29:43.967884000 +0200
@@ -34,7 +34,6 @@
#include <dirent.h>
#include <syslog.h>
#include "config.h"
@ -206,9 +206,9 @@ Index: syslog.c
#include "stream.h"
#include "gc.h"
Index: termios.c
--- termios.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ termios.c 2016-05-21 09:39:41.462010288 +0200
@@ -451,13 +451,21 @@
--- termios.c.orig 2018-05-18 15:38:20.000000000 +0200
+++ termios.c 2018-05-28 08:29:43.968105000 +0200
@@ -452,13 +452,21 @@
reg_varl(intern(lit("ocrnl"), user_package), num_fast(OCRNL));
reg_varl(intern(lit("onocr"), user_package), num_fast(ONOCR));
reg_varl(intern(lit("onlret"), user_package), num_fast(ONLRET));
@ -230,7 +230,7 @@ Index: termios.c
#ifdef NLDLY
reg_varl(intern(lit("nldly"), user_package), num_fast(NLDLY));
reg_varl(intern(lit("nl0"), user_package), num_fast(NL0));
@@ -473,10 +481,16 @@
@@ -474,10 +482,16 @@
#ifdef TABDLY
reg_varl(intern(lit("tabdly"), user_package), num_fast(TABDLY));
reg_varl(intern(lit("tab0"), user_package), num_fast(TAB0));
@ -248,9 +248,9 @@ Index: termios.c
reg_varl(intern(lit("bsdly"), user_package), num_fast(BSDLY));
reg_varl(intern(lit("bs0"), user_package), num_fast(BS0));
Index: txr.c
--- txr.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ txr.c 2016-05-21 09:35:33.131493560 +0200
@@ -29,6 +29,7 @@
--- txr.c.orig 2018-05-18 15:38:20.000000000 +0200
+++ txr.c 2018-05-28 18:54:28.826107000 +0200
@@ -30,6 +30,7 @@
#include <limits.h>
#include <dirent.h>
#include <stdarg.h>
@ -258,3 +258,13 @@ Index: txr.c
#include <wchar.h>
#include <signal.h>
#include "config.h"
@@ -254,6 +255,9 @@
#else
static val get_self_path(void)
{
+ char *p = getenv("TXR_INST_PATH");
+ if (p != NULL)
+ return string_utf8(p);
return lit(TXR_INST_PATH);
}
#endif

5
txr/txr.spec
Unescape View File

@ -31,8 +31,8 @@ Distribution: OpenPKG Community
Class: EVAL
Group: Searching
License: BSD
Version: 194
Release: 20180430
Version: 197
Release: 20180528
# list of sources
Source0: http://www.kylheku.com/cgit/txr/snapshot/txr-%{version}.tar.bz2
@ -66,6 +66,7 @@ PreReq: OpenPKG, openpkg >= 20160101
--prefix=%{l_prefix} \
--install_prefix=$RPM_BUILD_ROOT \
--mandir=%{l_prefix}/man
export TXR_INST_PATH=`pwd`/txr
%{l_make} %{l_mflags}
%install

Write Preview
Loading…
Cancel
Save