Merge branch 'master' of jsoftware.com:jsource

jsoftware · Nov 27, 2024 · ad5aa5c · ad5aa5c
2 parents e4e7f26 + 7f933ff
commit ad5aa5c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/jlibrary/addons/dev/eformat/eformat.ijs b/jlibrary/addons/dev/eformat/eformat.ijs
@@ -442,7 +442,6 @@ case. EVSPELL do. if. selfar -: <'".' do. emsg =. check_spelling_j_ a
                   elseif. selfar -: <,':' do. emsg=. check_spelling_j_ w 5!:0 end.
                   if. 0-:#emsg do. emsg =. 'words with . or : inflections must be J primitive words' end.
 case. EVMISSINGGMP do. emsg =. 'extended-precision library not found.  Run  install ''gmp''  or refer to your installation instructions'
-case. EVSIDAMAGE do. if. prim -.@-: ;:'T.' do. emsg =. 'you must turn debugging off before you redefine an entity other than the one at the top of the execution stack' end.  NB. obsolete 
 case. EVDEADLOCK do. emsg =. 'this action would deadlock the system'
 end.
 if. #emsg do. hdr , emsg return. end.  NB. pee

diff --git a/jlibrary/system/main/stdlib.ijs b/jlibrary/system/main/stdlib.ijs
@@ -1,7 +1,7 @@
 cocurrent <'z'
 3 : 0 ''
 
-JLIB=: '9.6.9'
+JLIB=: '9.6.10'
 
 notdef=. 0: ~: 4!:0 @ <
 hostpathsep=: ('/\'{~6=9!:12'')&(I. @ (e.&'/\')@] })

diff --git a/jlibrary/system/util/pacman.ijs b/jlibrary/system/util/pacman.ijs
@@ -1722,9 +1722,9 @@ y=. (*#y){::0;y
 
 smoutput 'Installing Qt library...'
 if. IFWIN do.
-  z=. 'qt65-win',((y-:'slim')#'-slim'),'.zip'
+  z=. 'qt68-win',((y-:'slim')#'-slim'),'.zip'
 else.
-  z=. 'qt65-mac',((y-:'slim')#'-slim'),'.zip'
+  z=. 'qt68-mac',((y-:'slim')#'-slim'),'.zip'
 end.
 'rc p'=. httpget_jpacman_ www,'/qtlib/',z
 if. rc do.

diff --git a/pthreads4w/bin/pthreadVC3-arm64.dll b/pthreads4w/bin/pthreadVC3-arm64.dll