[Gsrc-commit] trunk r7493: update aris to 2.2

[Carl Hansen]

------------------------------------------------------------
revno: 7493
revision-id: carlhansen@gnu.org-20210417220441-53y2wrio21w63bku
parent: carlhansen@gnu.org-20210417200716-z3vb3mn4zzxm9zkq
committer: Carl Hansen <carlhansen@gnu.org>
branch nick: trunk
timestamp: Sat 2021-04-17 15:04:41 -0700
message:
  update aris to 2.2
added:
  pkg/gnu/aris/files/            files-20210417220421-yg9oy7e9ul1mppro-1
  pkg/gnu/aris/files/aris-fix.diff 
arisfix.diff-20210417220421-yg9oy7e9ul1mppro-2
modified:
  pkg/gnu/aris/Makefile          makefile-20160617014725-uokjfnggs70iry9h-408

=== modified file 'pkg/gnu/aris/Makefile'
--- a/pkg/gnu/aris/Makefile     2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/aris/Makefile     2021-04-17 22:04:41 +0000
@@ -36,6 +36,7 @@
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
 INSTALL_SCRIPTS += $(WORKSRC)/Makefile doc
+PATCHFILES = $(DISTNAME)-fix.diff
 
 BUILDDEPS =
 LIBDEPS =
@@ -49,3 +50,4 @@
 install-doc:
        $(INSTALL_INFO) $(WORKSRC)/doc/aris.info
        $(MAKECOOKIE)
+

=== added directory 'pkg/gnu/aris/files'
=== added file 'pkg/gnu/aris/files/aris-fix.diff'
--- a/pkg/gnu/aris/files/aris-fix.diff  1970-01-01 00:00:00 +0000
+++ b/pkg/gnu/aris/files/aris-fix.diff  2021-04-17 22:04:41 +0000
@@ -0,0 +1,23 @@
+diff -x config.log -x config.status -ru tmp/aris-2.2/src/app.h 
work/aris-2.2/src/app.h
+--- tmp/aris-2.2/src/app.h     2014-02-27 17:32:07.000000000 -0800
++++ work/aris-2.2/src/app.h    2021-04-17 14:45:45.931821663 -0700
+@@ -106,6 +106,6 @@
+ 
+ int app_set_color (aris_app * app, int index, int red, int green, int blue);
+ /* The main application */
+-aris_app * the_app;
++extern aris_app * the_app;
+ 
+ #endif /* ARIS_APP_H */
+diff -x config.log -x config.status -ru tmp/aris-2.2/src/process.h 
work/aris-2.2/src/process.h
+--- tmp/aris-2.2/src/process.h 2014-03-02 11:30:39.000000000 -0800
++++ work/aris-2.2/src/process.h        2021-04-17 14:46:21.942955123 -0700
+@@ -170,7 +170,7 @@
+ 
+ // The main connectives.
+ 
+-struct connectives_list main_conns;
++extern struct connectives_list main_conns;
+ 
+ // Definitions.
+