Merge branch 'master' into as-iterable

r-devel · Apr 25, 2024 · 104ee6a · 104ee6a
2 parents 8a136bd + faa2ca5
commit 104ee6a
Show file tree

Hide file tree

Showing 935 changed files with 138,823 additions and 33,534 deletions.
diff --git a/.github/scripts/win-check.sh b/.github/scripts/win-check.sh
@@ -4,7 +4,7 @@ set -e
 set -x
 
 # Put pdflatex on the path (needed only for CMD check)
-export PATH="/c/x86_64-w64-mingw32.static.posix/bin:$PATH:$HOME/AppData/Local/Programs/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX 2.9/miktex/bin/x64"
+export PATH="/c/x86_64-w64-mingw32.static.posix/bin:$PATH:/c/Users/$USER/AppData/Roaming/TinyTeX/bin/windows:$HOME/AppData/Local/Programs/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX 2.9/miktex/bin/x64"
 echo "PATH: $PATH"
 pdflatex --version
 texindex --version

diff --git a/.github/scripts/win-installer.sh b/.github/scripts/win-installer.sh
@@ -4,7 +4,7 @@ set -e
 set -x
 
 # Put pdflatex on the path (needed only for CMD check)
-export PATH="/c/x86_64-w64-mingw32.static.posix/bin:$PATH:$HOME/AppData/Local/Programs/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX 2.9/miktex/bin/x64"
+export PATH="/c/x86_64-w64-mingw32.static.posix/bin:$PATH:/c/Users/$USER/AppData/Roaming/TinyTeX/bin/windows:$HOME/AppData/Local/Programs/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX 2.9/miktex/bin/x64"
 echo "PATH: $PATH"
 pdflatex --version
 texindex --version

diff --git a/.github/workflows/build-svn.yaml b/.github/workflows/build-svn.yaml
@@ -31,7 +31,7 @@ jobs:
         localedef -i en_US -f UTF-8 en_US.UTF-8
         echo "LANG=en_US.UTF-8" >> $GITHUB_ENV
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 100
 
@@ -106,9 +106,10 @@ jobs:
         ./.github/scripts/svn-info.sh
 
     - name: Configure
-      run: CC=clang ./configure --prefix=/opt/R/${ARCH}/r-devel --disable-java --with-cairo --without-tcltk --without-x --with-aqua --with-lapack --with-blas --enable-R-shlib SED=/usr/bin/sed
+      run: CC=clang ./configure --prefix=/opt/R/${ARCH}/r-devel --disable-java --with-cairo --without-tcltk --without-x --with-aqua $ACCELERATE --enable-R-shlib SED=/usr/bin/sed
       env:
         PDFLATEX: ${{github.workspace}}/.github/scripts/dummy
+        ACCELERATE: ${{ matrix.OS != 'macOS-13' && '--with-lapack --with-blas' || '' }}
 
     - name: Build
       run: make
@@ -156,14 +157,14 @@ jobs:
       shell: bash
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 100
 
     - uses: msys2/setup-msys2@v2
       with:
         msystem: MSYS
-        install: git make perl curl texinfo texinfo-tex rsync unzip diffutils
+        install: git make perl curl texinfo texinfo-tex rsync zip unzip diffutils
 
     - name: "Download rtools44 toolchain"
       run: |
@@ -172,12 +173,20 @@ jobs:
         #echo "RTOOLS44_HOME=c:" >> $GITHUB_ENV
         #echo "R_CUSTOM_TOOLS_SOFT=c:/x86_64-w64-mingw32.static.posix" >> $GITHUB_ENV
 
-    - name: Install Miktex
+    - name: Set timezone
       shell: powershell
+      run: tzutil /s "GMT Standard Time"
+
+    - uses: r-lib/actions/setup-tinytex@v2
+      env:
+        TINYTEX_INSTALLER: TinyTeX
+
+    - name: Install additional LaTeX packages
       run: |
-        Import-Module .\.github\scripts\installers.ps1
-        SetTimezone
-        InstallMiktex -ErrorAction SilentlyContinue;
+        tlmgr update --self
+        tlmgr install texinfo
+        tlmgr list --only-installed
+      shell: powershell
 
     - name: Build and Check
       run: |

diff --git a/Makefile.in b/Makefile.in
@@ -17,7 +17,7 @@ NON_SVN_INSTFILES = SVN-REVISION
 DISTFILES = $(INSTFILES) \
 	ChangeLog INSTALL README VERSION VERSION-NICK \
 	Makeconf.in Makefile.in Makefile.fw \
-	config.site configure configure.ac configure.patch
+	config.site configure configure.ac
 SUBDIRS = m4 tools doc etc share src tests
 SUBDIRS_WITH_NO_BUILD = po
 
@@ -45,9 +45,8 @@ ACINCLUDE_DEPENDENCIES = \
 CONFIGURE_DEPENDENCIES = $(srcdir)/VERSION
 config.status: $(srcdir)/configure
 	@$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(srcdir)/configure.patch
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	@BD=`pwd`; cd $(srcdir) && $(AUTOCONF) -f -B $${BD}
-	-@($(AUTOCONF) --version | sed -n 1p | grep -F 2.71) && (cd $(srcdir); patch -p0 < configure.patch)
 $(ACLOCAL_M4): $(srcdir)/configure.ac acinclude.m4
 	@BD=`pwd`; cd $(srcdir) && $(ACLOCAL) --output=$${BD}/$@ -I $${BD}
 acinclude.m4: $(srcdir)/configure.ac $(ACINCLUDE_DEPENDENCIES)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.4.0 Under development (unstable)
+4.5.0 Under development (unstable)