From: Matt Birkholz Date: Fri, 22 Jun 2018 18:12:43 +0000 (-0700) Subject: Merge branch 'master' into pucked. X-Git-Tag: mit-scheme-pucked-9.2.15~10 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=2427782118931a349e6ee2f9e75eb8718fc0e3f4;p=mit-scheme.git Merge branch 'master' into pucked. --- 2427782118931a349e6ee2f9e75eb8718fc0e3f4 diff --cc doc/ffi/ffi.texinfo index 12d481574,717fd1058..71312dace --- a/doc/ffi/ffi.texinfo +++ b/doc/ffi/ffi.texinfo @@@ -1,11 -1,9 +1,11 @@@ - \input texinfo @c -*-texinfo-*- + \input texinfo @c -*-Texinfo-*- @comment %**start of header -@setfilename mit-scheme-ffi +@setfilename ffi +@comment From automake's version.texi someday: - @set VERSION 0.2 - @set UPDATED 6 August 2017 + @set VERSION 1.0 -@set UPDATED 2018-06-10 -@settitle FFI @value{VERSION} ++@set UPDATED 10 June 2018 +@set SCMVERS 9.2.13 +@settitle MIT/GNU Scheme Pucked FFI Manual @comment %**end of header @ifhtml @@@ -42,15 -40,18 +42,18 @@@ Documentation License.' @end direntry @titlepage -@title The FFI Reference Manual +@title MIT/GNU Scheme Pucked FFI Manual @subtitle a Foreign Function Interface (version @value{VERSION}) -@subtitle for MIT/GNU Scheme version 9.0.1 +@subtitle for MIT/GNU Scheme Pucked version @value{SCMVERS} @subtitle @value{UPDATED} @author by Matt Birkholz + @end titlepage @page + @iftex + @contents @vskip 0pt plus 1filll @insertcopying - @end titlepage + @end iftex @ifnottex @node Top, Introduction, (dir), (dir) diff --cc src/blowfish/NEWS index 045523621,68650e4ee..8faf2dcce --- a/src/blowfish/NEWS +++ b/src/blowfish/NEWS @@@ -26,41 -22,25 +26,47 @@@ along with MIT/GNU Scheme; if not, writ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -mit-scheme-blowfish 1.0 - Matt Birkholz, 2018-06-22 -=================================================== ++mit-scheme-pucked-blowfish 1.0.0 - Matt Birkholz, 2018-06-22 ++============================================================ ++ ++New upstream has replaced the bfish µmodule and deprecated the ++(runtime blowfish) package, which now autoloads this plugin. ++ +mit-scheme-pucked-blowfish 0.2.5 - Matt Birkholz, 2018-06-05 +============================================================ + +New upstream. + +mit-scheme-pucked-blowfish 0.2.4 - Matt Birkholz, 2017-12-29 +============================================================ + +check-doc.sh missing from source distribution. + +mit-scheme-pucked-blowfish 0.2.3 - Matt Birkholz, 2017-12-26 +============================================================ + +Upstream includes new blowfish tests. + +mit-scheme-pucked-blowfish 0.2.2 - Matt Birkholz, 2017-11-06 +============================================================ -Replace the bfish µmodule. The deprecated (runtime blowfish) package -now autoloads this plugin. +Upstream now sports a texinfo manual, scraped from the OpenSSL manual +pages. -mit-scheme-blowfish 0.2 - Matt Birkholz, 2017-05-18 -=================================================== +mit-scheme-pucked-blowfish 0.2.1 - Matt Birkholz, 2017-05-18 +============================================================ -Use byte vectors for binary data instead of strings. This changes -every export except blowfish-file? and perhaps compute-blowfish-init- -vector IF you don't care whether the init vector is a string. Every -procedure that previously accepted/returned strings now -requires/produces byte vectors. If it accepted/returned generic ports -it now requires/produces binary ports. If you are using the md5 -plugin to produce a digest for blowfish-set-key, you're winning, with -blowfish-set-key at least; md5 digests are now byte vectors too. +Upstream now uses byte vectors for binary data instead of strings. +This changes every global binding except blowfish-file? and perhaps +compute-blowfish-init-vector IF you don't care whether the init vector +is a string or something else. Every procedure that previously +accepted/returned strings now requires/produces bytevectors. If it +accepted/returned generic ports it now requires/ produces binary +ports. If you are using the md5 procedures to produce a digest for +blowfish-set-key, you're winning, with blowfish-set-key at least; md5 +digests are now bytevectors too. -mit-scheme-blowfish 0.1 - Matt Birkholz, 2016-02-19 -=================================================== +mit-scheme-pucked-blowfish 0.1.1 - Matt Birkholz, 2017-03-01 +============================================================ -Use libtool and automake. +Stole v0.1 from MIT/GNU Scheme. diff --cc src/blowfish/configure.ac index 2153123c5,5dc0afeca..14a4e01b9 --- a/src/blowfish/configure.ac +++ b/src/blowfish/configure.ac @@@ -1,10 -1,10 +1,10 @@@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([MIT/GNU Scheme blowfish plugin], - [1.0], - [bug-mit-scheme@gnu.org], - [mit-scheme-blowfish]) +AC_INIT([MIT/GNU Scheme Pucked blowfish plugin], - [0.2.5], ++ [1.0.0], + [matt@birchwood-abbey.net], + [mit-scheme-pucked-blowfish]) AC_CONFIG_SRCDIR([blowfish.pkg]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff --cc src/blowfish/debian/changelog index b4f2604b0,000000000..f1c6e8001 mode 100644,000000..100644 --- a/src/blowfish/debian/changelog +++ b/src/blowfish/debian/changelog @@@ -1,44 -1,0 +1,51 @@@ ++mit-scheme-pucked-blowfish (1.0.0) birchwood; urgency=low ++ ++ * New upstream has replaced the bfish µmodule and deprecated the ++ (runtime blowfish) package, which now autoloads this plugin. ++ ++ -- Matt Birkholz Fri, 22 Jun 2018 00:00:00 -0000 ++ +mit-scheme-pucked-blowfish (0.2.5) birchwood; urgency=low + + * New upstream. + + -- Matt Birkholz Tue, 5 Jun 2018 00:00:00 -0000 + +mit-scheme-pucked-blowfish (0.2.4) birchwood; urgency=low + + * check-doc.sh missing from source distribution. + + -- Matt Birkholz Fri, 29 Dec 2017 00:00:00 -0000 + +mit-scheme-pucked-blowfish (0.2.3) birchwood; urgency=low + + * Upstream includes new blowfish tests. + + -- Matt Birkholz Tue, 26 Dec 2017 17:00:00 -0700 + +mit-scheme-pucked-blowfish (0.2.2) birchwood; urgency=low + + * Upstream now sports a texinfo manual, scraped from the OpenSSL + manual pages. + + -- Matt Birkholz Mon, 6 Nov 2017 17:00:00 -0700 + +mit-scheme-pucked-blowfish (0.2.1) birchwood; urgency=low + + * Upstream now uses byte vectors for binary data instead of strings. + This changes every global binding except blowfish-file? and + perhaps compute-blowfish-init-vector IF you don't care whether the + init vector is a string or something else. Every procedure that + previously accepted/returned strings now requires/produces + bytevectors. If it accepted/returned generic ports it now + requires/ produces binary ports. If you are using the md5 plugin + to produce a digest for blowfish-set-key, you're winning, with + blowfish-set-key at least; md5 digests are now bytevectors too. + + -- Matt Birkholz Thu, 18 May 2017 00:00:00 -0700 + +mit-scheme-pucked-blowfish (0.1.1) birchwood; urgency=low + + * Stole v0.1 from MIT/GNU Scheme. + + -- Matt Birkholz Wed, 1 Mar 2017 00:00:00 -0700 diff --cc src/blowfish/make.scm index ad202beac,ec00f8600..813a8b5b4 --- a/src/blowfish/make.scm +++ b/src/blowfish/make.scm @@@ -6,4 -6,4 +6,4 @@@ (lambda () (load-package-set "blowfish"))) - (add-subsystem-identification! "Blowfish" '(0 2 5)) -(add-subsystem-identification! "Blowfish" '(1 0)) ++(add-subsystem-identification! "Blowfish" '(1 0 0)) diff --cc src/gdbm/NEWS index e2198e220,3050986c5..389ce4b5d --- a/src/gdbm/NEWS +++ b/src/gdbm/NEWS @@@ -26,13 -22,15 +26,20 @@@ along with MIT/GNU Scheme; if not, writ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -mit-scheme-gdbm 1.0 - Matt Birkholz, 2018-06-22 -=============================================== ++mit-scheme-pucked-gdbm 1.0.0 - Matt Birkholz, 2018-06-22 ++======================================================== ++ ++New upstream has replaced the gdbm µmodule, changed the option name to ++"gdbm", renamed the import procedure "import-gdbm", and deprecated the ++(runtime gdbm) package, which now autoloads this plugin. ++ +mit-scheme-pucked-gdbm 0.4.1 - Matt Birkholz, 2018-06-05 +======================================================== -Replace the gdbm µmodule. Change the option name to "gdbm". Rename -the import procedure "import-gdbm". The deprecated (runtime gdbm) -package now autoloads this plugin. +New upstream that accommodates gdbm 1.14. -mit-scheme-gdbm 0.4 - Matt Birkholz, 2018-06-01 -=============================================== +mit-scheme-pucked-gdbm 0.3.4 - Matt Birkholz, 2018-05-30 +======================================================== Accommodate gdbm 1.14 (in Ubuntu 18.04) but disable its file locking. diff --cc src/gdbm/configure.ac index 31084acba,401a53172..8c58e9cd8 --- a/src/gdbm/configure.ac +++ b/src/gdbm/configure.ac @@@ -1,10 -1,10 +1,10 @@@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([MIT/GNU Scheme gdbm plugin], - [1.0], - [bug-mit-scheme@gnu.org], - [mit-scheme-gdbm]) +AC_INIT([MIT/GNU Scheme Pucked gdbm plugin], - [0.4.1], - [puck@birchwood-abbey.net], ++ [1.0.0], ++ [matt@birchwood-abbey.net], + [mit-scheme-pucked-gdbm]) AC_CONFIG_SRCDIR([gdbm.pkg]) AC_CONFIG_MACRO_DIR([m4]) diff --cc src/gdbm/debian/changelog index 9c26b93d5,000000000..93136f69b mode 100644,000000..100644 --- a/src/gdbm/debian/changelog +++ b/src/gdbm/debian/changelog @@@ -1,45 -1,0 +1,54 @@@ ++mit-scheme-pucked-gdbm (1.0.0) birchwood; urgency=low ++ ++ * New upstream has replaced the gdbm µmodule, changed the option ++ name to "gdbm", renamed the import procedure "import-gdbm", and ++ deprecated the (runtime gdbm) package, which now autoloads this ++ plugin. ++ ++ -- Matt Birkholz Fri, 22 Jun 2018 00:00:00 -0000 ++ +mit-scheme-pucked-gdbm (0.4.1) birchwood; urgency=low + + * New upstream. + + -- Matt Birkholz Tue, 5 Jun 2018 00:00:00 -0000 + +mit-scheme-pucked-gdbm (0.3.4) birchwood; urgency=low + + * Accommodate gdbm 1.14 (in Ubuntu 18.04) but disable its file + locking. + + -- Matt Birkholz Wed, 30 May 2018 00:00:00 -0000 + +mit-scheme-pucked-gdbm (0.3.3) birchwood; urgency=low + + * Typos in debian/doc-base and gdbm.texi. Missing build-depends. + + -- Matt Birkholz Sun, 7 Jan 2018 00:00:00 -0000 + +mit-scheme-pucked-gdbm (0.3.2) birchwood; urgency=low + + * check-doc.sh missing from source distribution. + + -- Matt Birkholz Thu, 28 Dec 2017 00:00:00 -0000 + +mit-scheme-pucked-gdbm (0.3.1) birchwood; urgency=low + + * New upstream includes a manual and uses new Unicode support in the + FFI. + + -- Matt Birkholz Sat, 23 Dec 2017 17:00:00 -0700 + +mit-scheme-pucked-gdbm (0.2.1) birchwood; urgency=low + + * New upstream converts non-ASCII strings (keys and data) to UTF8. This + assumes any other program adding non-ASCII keys or data is using the + same encoding. + + -- Matt Birkholz Thu, 18 May 2017 00:00:00 -0700 + +mit-scheme-pucked-gdbm (0.1.1) birchwood; urgency=low + + * Stole v0.1 from MIT/GNU Scheme. + + -- Matt Birkholz Wed, 1 Mar 2017 00:00:00 -0700 diff --cc src/gdbm/make.scm index 7404a148c,19c9946d9..fe1920f09 --- a/src/gdbm/make.scm +++ b/src/gdbm/make.scm @@@ -6,4 -6,4 +6,4 @@@ (lambda () (load-package-set "gdbm"))) - (add-subsystem-identification! "GDBM" '(0 4 1)) -(add-subsystem-identification! "GDBM" '(1 0)) ++(add-subsystem-identification! "GDBM" '(1 0 0)) diff --cc src/mcrypt/NEWS index fa0cdb023,361ad4ba9..6d9fd6814 --- a/src/mcrypt/NEWS +++ b/src/mcrypt/NEWS @@@ -26,23 -22,24 +26,29 @@@ along with MIT/GNU Scheme; if not, writ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -mit-scheme-mcrypt 1.0 - Matt Birkholz, 2018-06-22 -================================================= ++mit-scheme-pucked-mcrypt 1.0.0 - Matt Birkholz, 2018-06-22 ++========================================================== ++ ++New upstream has replaced the mcrypt µmodule, and deprecated the ++(runtime crypto) package, which now autoloads this plugin. ++ +mit-scheme-pucked-mcrypt 0.2.2 - Matt Birkholz, 2018-06-05 +========================================================== -Replace the mcrypt µmodule. The largely deprecated (runtime crypto) -package now autoloads this plugin. +New upstream. -mit-scheme-mcrypt 0.2 - Matt Birkholz, 2017-05-18 -================================================= +mit-scheme-pucked-mcrypt 0.2.1 - Matt Birkholz, 2017-05-18 +========================================================== -Use byte vectors for binary data instead of strings. Thus all keys -and init vectors now must be byte vectors of the appropriate length -(per mcrypt-supported-key-sizes or mcrypt-init-vector-size -respectively). The input and output arguments to mcrypt-encrypt -should now be byte vectors, and the input and output arguments to -mcrypt-encrypt-port must now be binary ports. Other changes: mcrypt- -encrypt! and mcrypt-decrypt! were added. +Upstream now uses byte vectors for binary data instead of strings. +Thus all keys and init vectors now must be byte vectors of the +appropriate length (per mcrypt-supported-key-sizes or mcrypt-init- +vector-size respectively). The input and output arguments to +mcrypt-encrypt should now be byte vectors, and the input and output +arguments to mcrypt-encrypt-port must now be binary ports. Other +changes: mcrypt-encrypt! and mcrypt-decrypt! were added. -mit-scheme-mcrypt 0.1 - Matt Birkholz, 2016-02-19 -================================================= +mit-scheme-pucked-mcrypt 0.1.1 - Matt Birkholz, 2017-03-01 +========================================================== -Use libtool and automake. +Stole v0.1 from MIT/GNU Scheme. diff --cc src/mcrypt/configure.ac index 31974996c,54947a6f4..2de8a762c --- a/src/mcrypt/configure.ac +++ b/src/mcrypt/configure.ac @@@ -1,10 -1,10 +1,10 @@@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([MIT/GNU Scheme mcrypt plugin], - [1.0], - [bug-mit-scheme@gnu.org], - [mit-scheme-mcrypt]) +AC_INIT([MIT/GNU Scheme Pucked mcrypt plugin], - [0.2.2], ++ [1.0.0], + [matt@birchwood-abbey.net], + [mit-scheme-pucked-mcrypt]) AC_CONFIG_SRCDIR([mcrypt.pkg]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff --cc src/mcrypt/debian/changelog index 80c97bdb3,000000000..aa8cf0039 mode 100644,000000..100644 --- a/src/mcrypt/debian/changelog +++ b/src/mcrypt/debian/changelog @@@ -1,23 -1,0 +1,30 @@@ ++mit-scheme-pucked-mcrypt (1.0.0) birchwood; urgency=low ++ ++ * New upstream has replaced the mcrypt µmodule, and deprecated the ++ (runtime crypto) package, which now autoloads this plugin. ++ ++ -- Matt Birkholz Fri, 22 Jun 2018 00:00:00 -0000 ++ +mit-scheme-pucked-mcrypt (0.2.2) birchwood; urgency=low + + * New upstream. + + -- Matt Birkholz Tue, 5 Jun 2018 00:00:00 -0000 + +mit-scheme-pucked-mcrypt (0.2.1) birchwood; urgency=low + + * Upstream now uses byte vectors for binary data instead of strings. + Thus all keys and init vectors now must be byte vectors of the + appropriate length (per mcrypt-supported-key-sizes or mcrypt-init- + vector-size respectively). The input and output arguments to + mcrypt-encrypt should now be byte vectors, and the input and + output arguments to mcrypt-encrypt-port must now be binary ports. + Other changes: mcrypt-encrypt! and mcrypt-decrypt! were added. + + -- Matt Birkholz Thu, 18 May 2017 00:00:00 -0700 + +mit-scheme-pucked-mcrypt (0.1.1) birchwood; urgency=low + + * Stole v0.1 from MIT/GNU Scheme. + + -- Matt Birkholz Wed, 1 Mar 2017 00:00:00 -0700 diff --cc src/mcrypt/make.scm index 4f68457c9,61e1c8ad7..e610f94e5 --- a/src/mcrypt/make.scm +++ b/src/mcrypt/make.scm @@@ -6,28 -6,4 +6,28 @@@ (lambda () (load-package-set "mcrypt"))) - (add-subsystem-identification! "mcrypt" '(0 2 2)) -(add-subsystem-identification! "mcrypt" '(0 2)) ++(add-subsystem-identification! "mcrypt" '(1 0 0)) + +;; "Export" these to the (runtime crypto) package bindings. +(let ((crypto (->environment '(runtime crypto))) + (mcrypt (->environment '(mcrypt)))) + (for-each + (lambda (name) + (environment-assign! crypto name (environment-lookup mcrypt name))) + '(mcrypt-algorithm-name + mcrypt-algorithm-names + mcrypt-block-algorithm-mode? + mcrypt-block-algorithm? + mcrypt-block-mode? + mcrypt-context? + mcrypt-encrypt + mcrypt-encrypt-port + mcrypt-end + mcrypt-init + mcrypt-init-vector-size + mcrypt-key-size + mcrypt-mode-name + mcrypt-mode-names + mcrypt-open-module + mcrypt-self-test + mcrypt-supported-key-sizes))) diff --cc src/pgsql/NEWS index e2dd5eceb,4086541a1..1888316e7 --- a/src/pgsql/NEWS +++ b/src/pgsql/NEWS @@@ -22,17 -22,14 +22,25 @@@ along with MIT/GNU Scheme; if not, writ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -mit-scheme-pgsql 1.0 - Matt Birkholz, 2018-06-22 -================================================ ++mit-scheme-pucked-pgsql 1.0.0 - Matt Birkholz, 2018-06-22 ++========================================================= + -Replace the prpgsql µmodule. Change the option name to "postgresql". -Rename the import procedure "import-postgresql". The deprecated -(runtime postgresql) package now autoloads this plugin. ++New upstream has replaced the pgsql µmodule, changed the option name ++to "postgresql", renamed the import procedure "import-postgresql" and ++deprecated the (runtime postgresql) package, which now autoloads this ++plugin. + -mit-scheme-pgsql 0.1 - Matt Birkholz, 2017-07-02 -================================================ +mit-scheme-pucked-pgsql 0.1.3 - Matt Birkholz, 2018-06-05 +========================================================= -Now a plugin using libtool and automake. +New upstream. + +mit-scheme-pucked-pgsql 0.1.2 - Matt Birkholz, 2017-11-06 +========================================================= + +Correct version number. + +mit-scheme-pucked-pgsql 0.1.1 - Matt Birkholz, 2017-07-02 +========================================================= + +Stole v0.1 from MIT/GNU Scheme. diff --cc src/pgsql/configure.ac index ac945aa52,af5371d2d..49f8c6187 --- a/src/pgsql/configure.ac +++ b/src/pgsql/configure.ac @@@ -1,10 -1,10 +1,10 @@@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([MIT/GNU Scheme pgsql plugin], - [1.0], - [bug-mit-scheme@gnu.org], - [mit-scheme-pgsql]) +AC_INIT([MIT/GNU Scheme Pucked pgsql plugin], - [0.1.3], ++ [1.0.0], + [matt@birchwood-abbey.net], + [mit-scheme-pucked-pgsql]) AC_CONFIG_SRCDIR([pgsql.pkg]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff --cc src/pgsql/debian/changelog index 7cac8988f,000000000..8e648c890 mode 100644,000000..100644 --- a/src/pgsql/debian/changelog +++ b/src/pgsql/debian/changelog @@@ -1,17 -1,0 +1,26 @@@ ++mit-scheme-pucked-pgsql (1.0.0) birchwood; urgency=low ++ ++ * New upstream has replaced the pgsql µmodule, changed the option ++ name to "postgresql", renamed the import procedure ++ "import-postgresql" and deprecated the (runtime postgresql) ++ package, which now autoloads this plugin. ++ ++ -- Matt Birkholz Fri, 22 Jun 2018 18:00:00 -0700 ++ +mit-scheme-pucked-pgsql (0.1.3) birchwood; urgency=low + + * New upstream. + + -- Matt Birkholz Tue, 5 Jun 2018 18:00:00 -0700 + +mit-scheme-pucked-pgsql (0.1.2) birchwood; urgency=low + + * Correct version number. + + -- Matt Birkholz Mon, 6 Nov 2017 18:00:00 -0700 + +mit-scheme-pucked-pgsql (0.1.1) birchwood; urgency=low + + * Stole v0.1 from MIT/GNU Scheme. + + -- Matt Birkholz Sun, 2 Jul 2017 00:00:00 -0700 diff --cc src/pgsql/make.scm index 0e12f583b,bc7d1e3b0..679a4e77c --- a/src/pgsql/make.scm +++ b/src/pgsql/make.scm @@@ -6,4 -6,4 +6,4 @@@ (lambda () (load-package-set "pgsql"))) - (add-subsystem-identification! "PGSQL" '(0 1 3)) -(add-subsystem-identification! "PostgreSQL" '(1 0)) ++(add-subsystem-identification! "PostgreSQL" '(1 0 0)) diff --cc src/runtime/runtime.pkg index 40a50e093,781f883b2..e9f988626 --- a/src/runtime/runtime.pkg +++ b/src/runtime/runtime.pkg @@@ -4226,7 -4241,132 +4242,132 @@@ USA image/width image? make-graphics-device - make-graphics-device-type)) - make-graphics-device-type) - (export (runtime x-graphics) ++ make-graphics-device-type + make-image-type)) + + (define-package (runtime x-graphics) + (file-case os-type + ((unix) "x11graph") + (else)) + (parent (runtime)) + (export () deprecated:x11graph + create-x-colormap + create-x-image + x-character-bounds/ascent + x-character-bounds/descent + x-character-bounds/lbearing + x-character-bounds/rbearing + x-character-bounds/width + x-close-all-displays + x-colormap/allocate-color + x-colormap/free + x-colormap/query-color + x-colormap/store-color + x-colormap/store-colors + x-colormap? + x-display/name + x-display/properties + x-font-structure/all-chars-exist? + x-font-structure/character-bounds + x-font-structure/default-char + x-font-structure/direction + x-font-structure/max-ascent + x-font-structure/max-bounds + x-font-structure/max-descent + x-font-structure/min-bounds + x-font-structure/name + x-font-structure/start-index + x-geometry-string + x-graphics-default-display-name + x-graphics-default-geometry + x-graphics-device-type + x-graphics/available? + x-graphics/clear + x-graphics/close-display + x-graphics/close-window + x-graphics/color? + x-graphics/coordinate-limits + x-graphics/copy-area + x-graphics/device-coordinate-limits + x-graphics/disable-keyboard-focus + x-graphics/discard-events + x-graphics/display + x-graphics/drag-cursor + x-graphics/draw-arc + x-graphics/draw-circle + x-graphics/draw-line + x-graphics/draw-lines + x-graphics/draw-point + x-graphics/draw-points + x-graphics/draw-text + x-graphics/enable-keyboard-focus + x-graphics/fill-circle + x-graphics/flush + x-graphics/font-structure + x-graphics/get-colormap + x-graphics/get-default + x-graphics/iconify-window + x-graphics/image-depth + x-graphics/lower-window + x-graphics/map-window + x-graphics/move-cursor + x-graphics/move-window + x-graphics/open-display + x-graphics/open-display? + x-graphics/open-window? + x-graphics/query-pointer + x-graphics/raise-window + x-graphics/read-button + x-graphics/read-user-event + x-graphics/reset-clip-rectangle + x-graphics/resize-window + x-graphics/select-user-events + x-graphics/set-background-color + x-graphics/set-border-color + x-graphics/set-border-width + x-graphics/set-clip-rectangle + x-graphics/set-colormap + x-graphics/set-coordinate-limits + x-graphics/set-drawing-mode + x-graphics/set-font + x-graphics/set-foreground-color + x-graphics/set-icon-name + x-graphics/set-input-hint + x-graphics/set-internal-border-width + x-graphics/set-line-style + x-graphics/set-mouse-color + x-graphics/set-mouse-shape + x-graphics/set-window-name + x-graphics/visual-info + x-graphics/window-id + x-graphics/withdraw-window + x-graphics:auto-raise? + x-image/destroy + x-image/draw + x-image/draw-subimage + x-image/fill-from-byte-vector + x-image/get-pixel + x-image/height + x-image/set-pixel + x-image/width + x-image? + x-visual-class:direct-color + x-visual-class:gray-scale + x-visual-class:pseudo-color + x-visual-class:static-color + x-visual-class:static-gray + x-visual-class:true-color + x-visual-info/bits-per-rgb + x-visual-info/blue-mask + x-visual-info/class + x-visual-info/colormap-size + x-visual-info/depth + x-visual-info/green-mask + x-visual-info/red-mask + x-visual-info/screen + x-visual-info/visual + x-visual-info/visual-id)) ++>>>>>>> 38a01aac203925429e4a26afee8dd33110349cc0 (define-package (runtime state-space) (files "wind") @@@ -5537,6 -5706,73 +5707,72 @@@ vector-parser) (initialization (initialize-package!))) + (define-package (runtime postgresql) + (file-case options + ((load) "pgsql") + (else)) + (parent (runtime)) + (export () deprecated:postgresql + call-with-pgsql-conn + close-pgsql-conn + condition-type:pgsql-connection-error + condition-type:pgsql-error + condition-type:pgsql-query-error + decode-pgsql-bytea + encode-pgsql-bytea + escape-pgsql-string + exec-pgsql-query + guarantee-pgsql-available + make-empty-pgsql-result + open-pgsql-conn + pgsql-available? + pgsql-bad-response + pgsql-clear + pgsql-cmd-status + pgsql-cmd-tuples + pgsql-command-ok + pgsql-conn-db + pgsql-conn-error-message + pgsql-conn-host + pgsql-conn-open? + pgsql-conn-options + pgsql-conn-pass + pgsql-conn-port + pgsql-conn-reset + pgsql-conn-reset-start + pgsql-conn-status + pgsql-conn-tty + pgsql-conn-user + pgsql-connection-auth-ok + pgsql-connection-awaiting-response + pgsql-connection-bad + pgsql-connection-made + pgsql-connection-ok + pgsql-connection-setenv + pgsql-connection-started + pgsql-copy-in + pgsql-copy-out + pgsql-empty-query + pgsql-fatal-error + pgsql-field-name + pgsql-get-is-null? + pgsql-get-line + pgsql-get-value + pgsql-n-fields + pgsql-n-tuples + pgsql-nonfatal-error + pgsql-polling-active + pgsql-polling-failed + pgsql-polling-ok + pgsql-polling-reading + pgsql-polling-writing + pgsql-put-line + pgsql-result-error-message + pgsql-result-status + pgsql-tuples-ok + poll-pgsql-conn + poll-pgsql-reset)) + - (os-type-case ((nt) (define-package (runtime win32-registry) diff --cc src/x11-screen/NEWS index e6ed55aa1,6391bec42..b0cc490d6 --- a/src/x11-screen/NEWS +++ b/src/x11-screen/NEWS @@@ -28,30 -22,19 +28,36 @@@ along with MIT/GNU Scheme; if not, writ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -mit-scheme-x11-screen 1.0 - Matt Birkholz, 2018-06-21 -===================================================== ++mit-scheme-pucked-x11-screen 1.0.0 - Matt Birkholz, 2018-06-22 ++============================================================== ++ ++New upstream cooperates with Edwin's x-display-type which autoloads ++this plugin. ++ +mit-scheme-pucked-x11-screen 0.2.4 - Matt Birkholz, 2018-06-05 +============================================================== + +New upstream. + +mit-scheme-pucked-x11-screen 0.2.3 - Matt Birkholz, 2017-11-05 +============================================================== + +Correct subsystem version number. + +mit-scheme-pucked-x11-screen 0.2.2 - Matt Birkholz, 2017-11-05 +============================================================== -Cooperate with Edwin's x-display-type which autoloads this plugin. +Steal the .svg icon and .desktop file from the core and use them to +associate our "application" with the icon and the "Pucked" window +class. Previously, Edwin windows were confused with Emacs windows in +Unity and GNOME. -mit-scheme-x11-screen 0.2 - Matt Birkholz, 2017-05-23 -===================================================== +mit-scheme-pucked-x11-screen 0.2.1 - Matt Birkholz, 2017-05-23 +============================================================== -Updated to use new string procedures, with help from Chris Hanson. +New upstream using new string procedures. -mit-scheme-x11-screen 0.1 - Matt Birkholz, 2016-05-25 -===================================================== +mit-scheme-pucked-x11-screen 0.1.1 - Matt Birkholz, 2017-03-01 +============================================================== -The Edwin display type x11-screen is now a separately buildable and -installable automake package. It requires MIT/GNU Scheme with an x11 -plugin to build and operate. +Stole v0.1 from MIT/GNU Scheme. diff --cc src/x11-screen/README index b94de5b65,6fe2f9959..16b954402 --- a/src/x11-screen/README +++ b/src/x11-screen/README @@@ -1,17 -1,18 +1,11 @@@ The X11-SCREEN option. --This plugin creates an (edwin screen x11-screen) package that - registers an Edwin display type named X11. The plugin is built in the -registers an Edwin display type named X11, an exact replacement for -the microcode module based X screen type. The plugin is built in the ++This plugin creates an (edwin screen x11-screen) package autoloaded by ++Edwin's X display type. The plugin is built in the customary GNU way: ./configure ... make all check install --To load: -- -- (load-option 'x11-screen) -- --Loading this plugin re-assigns bindings in (edwin) and (edwin --x-commands); any existing Edwin screens will stop working. You must --load this option before starting Edwin. If the DISPLAY environment - variable is set, Edwin will then create X11 screens. -variable is set, Edwin will create X11 screens. ++If the DISPLAY environment variable is set correctly and this plugin ++is installed, Edwin will create X11 screens. diff --cc src/x11-screen/configure.ac index 5a59892ef,25636bbab..1dc1b0af5 --- a/src/x11-screen/configure.ac +++ b/src/x11-screen/configure.ac @@@ -1,9 -1,9 +1,9 @@@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([MIT/GNU Scheme Edwin X11 Screen plugin], - [1.0], - [bug-mit-scheme@gnu.org], - [mit-scheme-x11-screen]) +AC_INIT([MIT/GNU Scheme Pucked Edwin X11 Screen plugin], - [0.2.4], ++ [1.0.0], + [matt@birchwood-abbey.net], + [mit-scheme-pucked-x11-screen]) AC_CONFIG_SRCDIR([x11-screen.pkg]) AC_COPYRIGHT( diff --cc src/x11-screen/debian/changelog index 42821a3fc,000000000..124f37752 mode 100644,000000..100644 --- a/src/x11-screen/debian/changelog +++ b/src/x11-screen/debian/changelog @@@ -1,32 -1,0 +1,39 @@@ ++mit-scheme-pucked-x11-screen (1.0.0) birchwood; urgency=low ++ ++ * New upstream cooperates with Edwin's x-display-type which ++ autoloads this plugin. ++ ++ -- Matt Birkholz Fri, 22 Jun 2018 00:00:00 -0000 ++ +mit-scheme-pucked-x11-screen (0.2.4) birchwood; urgency=low + + * New upstream. + + -- Matt Birkholz Tue, 5 Jun 2018 00:00:00 -0000 + +mit-scheme-pucked-x11-screen (0.2.3) birchwood; urgency=low + + * Correct subsystem version number. + + -- Matt Birkholz Mon, 6 Nov 2017 15:00:00 -0700 + +mit-scheme-pucked-x11-screen (0.2.2) birchwood; urgency=low + + * Steal the .svg icon and .desktop file from the core and use them + to associate our "application" with the icon and the "Pucked" + window class. Previously, Edwin windows were confused with Emacs + windows in Unity and GNOME. + + -- Matt Birkholz Sun, 5 Nov 2017 10:30:00 -0700 + +mit-scheme-pucked-x11-screen (0.2.1) birchwood; urgency=low + + * New upstream using new string procedures. + + -- Matt Birkholz Tue, 23 May 2017 00:00:00 -0700 + +mit-scheme-pucked-x11-screen (0.1.1) birchwood; urgency=low + + * Stole v0.1 from MIT/GNU Scheme. + + -- Matt Birkholz Wed, 1 Mar 2017 00:00:00 -0700 diff --cc src/x11-screen/make.scm index 00815e325,7c676f66c..192efe804 --- a/src/x11-screen/make.scm +++ b/src/x11-screen/make.scm @@@ -7,4 -7,25 +7,26 @@@ Load the X11-Screen option. | (with-loader-base-uri (system-library-uri "x11-screen/") (lambda () (load-package-set "x11-screen"))) - (add-subsystem-identification! "X11-Screen" '(0 2 4)) -(add-subsystem-identification! "X11-Screen" '(1 0)) ++ ++(add-subsystem-identification! "X11-Screen" '(1 0 0)) + + ;; Replace stubs in (edwin screen x-screen). + (let ((x (->environment '(edwin screen x-screen))) + (x11 (->environment '(edwin screen x11-screen)))) + (for-each + (lambda (name) + (environment-assign! x name (environment-lookup x11 name))) + '(make-xterm-screen + get-xterm-input-operations + with-editor-interrupts-from-x + with-x-interrupts-enabled + with-x-interrupts-disabled))) + + ;; Replace stubs in (edwin). + (let ((edwin (->environment '(edwin))) + (x11 (->environment '(edwin screen x11-screen)))) + (for-each + (lambda (name) + (environment-assign! edwin name (environment-lookup x11 name))) + '(os/interprogram-cut + os/interprogram-paste))) diff --cc src/x11-screen/x11-screen.pkg index ff6324bc3,7de182cb0..2a5e2188b --- a/src/x11-screen/x11-screen.pkg +++ b/src/x11-screen/x11-screen.pkg @@@ -49,15 -51,9 +51,8 @@@ Inc., 51 Franklin St, Fifth Floor, Bost keyboard-peek-busy-no-hang) (import (edwin process) register-process-output-events) - (import (edwin x11-keys) - x-make-special-key) - (import (edwin x11-commands) - update-xterm-screen-names!) - (import (edwin) - os/interprogram-cut - os/interprogram-paste) (import (x11) x-change-property - x-close-all-displays x-close-display x-close-window x-convert-selection diff --cc src/x11/NEWS index 2fa72803b,05bc0b55d..f68505b26 --- a/src/x11/NEWS +++ b/src/x11/NEWS @@@ -26,26 -22,28 +26,33 @@@ along with MIT/GNU Scheme; if not, writ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -mit-scheme-x11 1.0 - Matt Birkholz, 2018-06-21 -============================================== ++mit-scheme-pucked-x11 1.0.0 - Matt Birkholz, 2018-06-22 ++======================================================= ++ ++New upstream has replaced the x11 µmodule, added an import-x11 ++procedure, and deprecated the (runtime x-graphics) package, which now ++autoloads this plugin. ++ +mit-scheme-pucked-x11 0.3.1 - Matt Birkholz, 2018-06-04 +======================================================= -Replace the prx11.so µcode module. Add an import-x11 procedure. The -deprecated (runtimem x-graphics) package now autoloads this plugin. +New upstream allows CurrentTime as a Time argument. -mit-scheme-x11 0.3 - Matt Birkholz, 2018-06-01 -============================================== +mit-scheme-pucked-x11 0.2.2 - Matt Birkholz, 2018-03-16 +======================================================= -Allow CurrentTime as a Time argument (to fix an intermittent error -when cutting/pasting). +Allow CurrentTime (0) as an argument to procedures expecting a Time. +This eliminates a spurious error when cutting/pasting in Edwin. -mit-scheme-x11 0.2 - Matt Birkholz, 2017-05-23 -============================================== +mit-scheme-pucked-x11 0.2.1 - Matt Birkholz, 2017-05-23 +======================================================= -Use new Unicode support. Convert (restrict) strings (atom names and -xterm content) to iso8859-1. This should be transparent if you were -using standard Latin1 property names and writing only Latin1 graphical +New upstream converts (restricts) strings (atom names and xterm +content) to iso8859-1. This should be transparent if you were using +standard Latin1 property names and writing only Latin1 graphical characters to your xterms. -mit-scheme-x11 0.1 - Matt Birkholz, 2016-02-19 -============================================== +mit-scheme-pucked-x11 0.1.1 - Matt Birkholz, 2017-03-01 +======================================================= -Converted to a libtool plugin. Moved X11 data parsing -(x_event_to_object) to Scheme/FFI code. +Stole v0.1 from MIT/GNU Scheme. diff --cc src/x11/README index 57b69f1f8,d9160eb0a..4f234d8c2 --- a/src/x11/README +++ b/src/x11/README @@@ -1,17 -1,20 +1,23 @@@ The X11 option. -This plugin creates an (x11) package. It is built in the customary -GNU way: +This plugin creates an (x11) package that registers a graphics device - type named X11. The plugin is built in the customary GNU way: ++type named X11. It is built in the customary GNU way: ./configure ... make all check install - To load: + To use: (load-option 'x11) + (import-x11) - If the DISPLAY environment variable set, make-graphics-device will - create an X11 window by default. ++If the DISPLAY environment variable is correctly set, ++make-graphics-device will create an X window by default. ++ + Import-x11 will modify the REPL's current environment by adding + bindings linked to the plugin's exports. They are not exported to the + global environment because they would conflict with the deprecated + exports from (runtime x-graphics). To import into a CREF package set, add this to your .pkg file: diff --cc src/x11/configure.ac index ec8fb5cfb,f3626a50d..227df7136 --- a/src/x11/configure.ac +++ b/src/x11/configure.ac @@@ -1,10 -1,10 +1,10 @@@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([MIT/GNU Scheme x11 plugin], - [1.0], - [bug-mit-scheme@gnu.org], - [mit-scheme-x11]) +AC_INIT([MIT/GNU Scheme Pucked x11 plugin], - [0.3.1], - [puck@birchwood-abbey.net], ++ [1.0.0], ++ [matt@birchwood-abbey.net], + [mit-scheme-pucked-x11]) AC_CONFIG_SRCDIR([x11.pkg]) AC_CONFIG_MACRO_DIR([m4]) diff --cc src/x11/debian/changelog index 86e6abf6f,000000000..c71341798 mode 100644,000000..100644 --- a/src/x11/debian/changelog +++ b/src/x11/debian/changelog @@@ -1,27 -1,0 +1,35 @@@ ++mit-scheme-pucked-x11 (1.0.0) birchwood; urgency=low ++ ++ * New upstream has replaced the x11 µmodule, added an import-x11 ++ procedure, and deprecated the (runtime x-graphics) package, which ++ now autoloads this plugin. ++ ++ -- Matt Birkholz Fri, 22 Jun 2018 00:00:00 -0000 ++ +mit-scheme-pucked-x11 (0.3.1) birchwood; urgency=low + + * New upstream allows CurrentTime as a Time argument. + + -- Matt Birkholz Tue, 5 Jun 2018 00:00:00 -0000 + +mit-scheme-pucked-x11 (0.2.2) birchwood; urgency=low + + * Allow CurrentTime (0) as an argument to procedures expecting a Time. + This eliminates a spurious error when cutting/pasting in Edwin. + + -- Matt Birkholz Fri, 16 Mar 2018 00:00:00 -0000 + +mit-scheme-pucked-x11 (0.2.1) birchwood; urgency=low + + * New upstream converts (restricts) strings (atom names and xterm + content) to iso8859-1. This should be transparent if you were + using standard Latin1 property names and writing only Latin1 + graphical characters to your xterms. + + -- Matt Birkholz Tue, 23 May 2017 00:00:00 -0700 + +mit-scheme-pucked-x11 (0.1.1) birchwood; urgency=low + + * Stole v0.1 from MIT/GNU Scheme. + + -- Matt Birkholz Wed, 1 Mar 2017 00:00:00 -0700 diff --cc src/x11/make.scm index 61f4f8fea,13c9216fb..20f396cbe --- a/src/x11/make.scm +++ b/src/x11/make.scm @@@ -5,4 -5,4 +5,4 @@@ Load the X11 option. | (with-loader-base-uri (system-library-uri "x11/") (lambda () (load-package-set "x11"))) - (add-subsystem-identification! "X11" '(0 3 1)) -(add-subsystem-identification! "X11" '(1 0)) ++(add-subsystem-identification! "X11" '(1 0 0))