From 883530835d463124fcc9bc6143ef139819f6c981 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Thu, 18 Apr 2019 12:07:34 +0100 Subject: [PATCH] appveyor: Drop installing unnecessary packages Drop installing packages which were used by the autotools build (or maybe even monolithic build!) but are no longer required by the meson build Also, alphabetically sort within tools, protocol headers, devel libraries, miscellaneous groups to match [1] [1] https://x.cygwin.com/docs/cg/prog-build-prerequisites.html Also, update to require xkbcomp-devel, split from xkbcomp --- .appveyor.yml | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 450e4c27b..14b1a64a1 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -16,29 +16,24 @@ install: - curl -fsSL https://gist.githubusercontent.com/jon-turney/0338af595313f598bfab15a0ac0df847/raw/bd0eeca6be899e7846aa988fbcf15e4e12f5f842/zp_libtool_cleanlafiles.sh -o %CYGWIN_ROOT%\etc\postinstall\zp_libtool_cleanlafiles.sh - echo Updating Cygwin and installing build prerequisites - "%CYGWIN_ROOT%\\%SETUP% -qnNdO -R %CYGWIN_ROOT% -s %CYGWIN_MIRROR% -l %CACHE% -g -P \ -meson,\ binutils,\ bison,\ -bzip2,\ -diffutils,\ -fileutils,\ -findutils,\ flex,\ -gawk,\ gcc-core,\ -make,\ -patch,\ +meson,\ +ninja,\ pkg-config,\ python3,\ -sed,\ -tar,\ -xorgproto,\ windowsdriproto,\ +xorgproto,\ libdmx-devel,\ +libepoxy-devel,\ libfontenc-devel,\ libfreetype-devel,\ libGL-devel,\ +libnettle-devel,\ libpixman1-devel,\ +libtirpc-devel,\ libX11-devel,\ libXRes-devel,\ libXau-devel,\ @@ -63,17 +58,12 @@ libxcb-shape-devel,\ libxcb-util-devel,\ libxcb-xkb-devel,\ libxkbfile-devel,\ -zlib,\ font-util,\ khronos-opengl-registry,\ python3-lxml,\ -xorg-util-macros,\ -xtrans,\ -xkbcomp,\ +xkbcomp-devel,\ xkeyboard-config,\ -libnettle-devel,\ -libepoxy-devel,\ -libtirpc-devel" +xtrans" - echo Install done cache: - C:\cache