From 313f4d5a74eaf13d8750b8023d22f27a75b47678 Mon Sep 17 00:00:00 2001 From: in3otd Date: Sun, 2 Feb 2020 09:27:38 +0100 Subject: [PATCH 1/3] [skip travis] Fix Qt4 removal from MSYS2 packages by fetching package manually. --- .appveyor.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 1ce514fb0c..3277a2abbd 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -34,7 +34,16 @@ install: # Switch from SF to msys2.org (default, much faster) - bash -lc "pacman --noconfirm --sync pacman-mirrors" - bash -lc "pacman --noconfirm -S autoconf automake bison flex" - - bash -lc "pacman --noconfirm -S mingw-w64-$MARCH-qt4" + #- bash -lc "pacman --noconfirm -S mingw-w64-$MARCH-qt4" + # Qt4 was removed from MSYS2, see + # https://github.com/msys2/MINGW-packages/issues/3881 + # and https://github.com/slowphil/texmacs-win-builder/issues/3 for the "fix" + # copied below + # pacman no longer finds qt4 probably because of https://github.com/msys2/MINGW-packages/issues/3881 + # nevertheless the binary still exists in the repo (for the moment) + # https://msys2.duckdns.org/repos + # https://wiki.archlinux.org/index.php/offline_installation_of_packages + - bash -lc "cd /var/cache/pacman/pkg && wget http://repo.msys2.org/mingw/$MARCH/mingw-w64-$MARCH-qt4-4.8.7-4-any.pkg.tar.xz && pacman --noconfirm -U mingw-w64-$MARCH-qt4-4.8.7-4-any.pkg.tar.xz" # Set compiler (64bit) - set "CC=/c/msys64/mingw%MBITS%/bin/gcc.exe" From c4652d64152a082b2e8428b26f2b0b7b7245eeb1 Mon Sep 17 00:00:00 2001 From: in3otd Date: Sun, 2 Feb 2020 10:50:22 +0100 Subject: [PATCH 2/3] [skip travis] Enable pacman packages caching --- .appveyor.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 3277a2abbd..00cc8ded85 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -15,8 +15,11 @@ skip_commits: - .travis.yml - '*.md' -#cache: -# - C:\msys64\var\cache\pacman\pkg\mingw-w64-x86_64-qt4* -> .appveyor.yml +cache: + # cache pacman packages + # max cache size is 1 GB, which should be enough + # but in case we could cache only mingw-w64-*-qt4-* + - C:\msys64\var\cache\pacman\pkg\ -> .appveyor.yml install: @@ -43,7 +46,10 @@ install: # nevertheless the binary still exists in the repo (for the moment) # https://msys2.duckdns.org/repos # https://wiki.archlinux.org/index.php/offline_installation_of_packages - - bash -lc "cd /var/cache/pacman/pkg && wget http://repo.msys2.org/mingw/$MARCH/mingw-w64-$MARCH-qt4-4.8.7-4-any.pkg.tar.xz && pacman --noconfirm -U mingw-w64-$MARCH-qt4-4.8.7-4-any.pkg.tar.xz" + # + # download package directly into the local pacman packages directory, cached by AppVeyor + # use "no-clobber" option for wget since the file could/should already be in the cache + - bash -lc "cd /var/cache/pacman/pkg && wget -nc http://repo.msys2.org/mingw/$MARCH/mingw-w64-$MARCH-qt4-4.8.7-4-any.pkg.tar.xz && pacman --noconfirm -U mingw-w64-$MARCH-qt4-4.8.7-4-any.pkg.tar.xz" # Set compiler (64bit) - set "CC=/c/msys64/mingw%MBITS%/bin/gcc.exe" From bdf94f6c26197f65a6ba2054242d4a1b5fda6a41 Mon Sep 17 00:00:00 2001 From: in3otd Date: Sun, 2 Feb 2020 11:25:52 +0100 Subject: [PATCH 3/3] [skip travis] Avoid re-installing up-to-date pacman packages --- .appveyor.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 00cc8ded85..09f918139a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -35,9 +35,9 @@ install: - bash -lc "pacman --version" - bash -lc "pacman -Q" # Switch from SF to msys2.org (default, much faster) - - bash -lc "pacman --noconfirm --sync pacman-mirrors" - - bash -lc "pacman --noconfirm -S autoconf automake bison flex" - #- bash -lc "pacman --noconfirm -S mingw-w64-$MARCH-qt4" + - bash -lc "pacman --noconfirm --needed --sync pacman-mirrors" + - bash -lc "pacman --noconfirm --needed -S autoconf automake bison flex" + #- bash -lc "pacman --noconfirm --needed -S mingw-w64-$MARCH-qt4" # Qt4 was removed from MSYS2, see # https://github.com/msys2/MINGW-packages/issues/3881 # and https://github.com/slowphil/texmacs-win-builder/issues/3 for the "fix" @@ -48,8 +48,10 @@ install: # https://wiki.archlinux.org/index.php/offline_installation_of_packages # # download package directly into the local pacman packages directory, cached by AppVeyor + # make sure pacman packages directory exists (may not be there if no packages downloaded yet) + - bash -lc "mkdir -p /var/cache/pacman/pkg" # use "no-clobber" option for wget since the file could/should already be in the cache - - bash -lc "cd /var/cache/pacman/pkg && wget -nc http://repo.msys2.org/mingw/$MARCH/mingw-w64-$MARCH-qt4-4.8.7-4-any.pkg.tar.xz && pacman --noconfirm -U mingw-w64-$MARCH-qt4-4.8.7-4-any.pkg.tar.xz" + - bash -lc "cd /var/cache/pacman/pkg && wget -nc http://repo.msys2.org/mingw/$MARCH/mingw-w64-$MARCH-qt4-4.8.7-4-any.pkg.tar.xz && pacman --noconfirm --needed -U mingw-w64-$MARCH-qt4-4.8.7-4-any.pkg.tar.xz" # Set compiler (64bit) - set "CC=/c/msys64/mingw%MBITS%/bin/gcc.exe"