diff --git a/.cirrus.yml b/.cirrus.yml index c8cbd43fd..d315d8fd1 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -2,7 +2,7 @@ freebsd_test_task: freebsd_instance: image_family: freebsd-14-0 name: cirrus/FreeBSD - install_script: pkg install -y cmake git pkgconf bash wx32-gtk3 libssh openssl libnfs neon libarchive samba416 pcre uchardet xerces-c3 + install_script: pkg install -y cmake git pkgconf bash wx32-gtk3 libssh openssl libnfs neon libarchive samba416 pcre uchardet libxml2 script: mkdir build && cd build && cmake .. && make -j $(getconf _NPROCESSORS_ONLN) && ./install/far2l --help macos_test_task: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8fd32d81e..8ce65f99e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,7 +60,7 @@ jobs: run: > sudo apt-get update; sudo apt-get -y install - libuchardet-dev libxerces-c-dev libwxgtk3.0-gtk3-dev + libuchardet-dev libxml2-dev libwxgtk3.0-gtk3-dev libx11-dev libxi-dev libssl-dev libsmbclient-dev libnfs-dev libneon27-dev libssh-dev libarchive-dev libpcre3-dev @@ -111,7 +111,7 @@ jobs: run: > sudo apt-get update; sudo apt-get -y install - libuchardet-dev libxerces-c-dev libwxgtk3.0-gtk3-dev + libuchardet-dev libxml2-dev libwxgtk3.0-gtk3-dev libx11-dev libxi-dev libssl-dev libsmbclient-dev libnfs-dev libneon27-dev libssh-dev libarchive-dev libpcre3-dev @@ -162,7 +162,7 @@ jobs: run: > sudo apt-get update; sudo apt-get -y install - libuchardet-dev libxerces-c-dev libwxgtk3.2-dev + libuchardet-dev libxml2-dev libwxgtk3.2-dev libx11-dev libxi-dev libssl-dev libsmbclient-dev libnfs-dev libneon27-dev libssh-dev libarchive-dev libpcre3-dev @@ -198,7 +198,7 @@ jobs: # libx11, openssl is already installed run: > brew install - uchardet xerces-c wxwidgets + uchardet libxml2 wxwidgets libxi samba libnfs neon libssh libarchive pcre diff --git a/.travis.yml b/.travis.yml index 61d6fc438..933a06b91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ matrix: - g++-5 - cmake - libwxgtk3.0-dev - - libxerces-c-dev + - libxml2-dev - libuchardet-dev - libssh-dev - libsmbclient-dev @@ -40,7 +40,7 @@ matrix: - g++-6 - cmake - libwxgtk3.0-dev - - libxerces-c-dev + - libxml2-dev - libuchardet-dev - libssh-dev - libsmbclient-dev @@ -64,7 +64,7 @@ matrix: - clang-3.6 - cmake - libwxgtk3.0-dev - - libxerces-c-dev + - libxml2-dev - libuchardet-dev - libssh-dev - libsmbclient-dev @@ -88,7 +88,7 @@ matrix: - clang-3.7 - cmake - libwxgtk3.0-dev - - libxerces-c-dev + - libxml2-dev - libuchardet-dev - libssh-dev - libsmbclient-dev diff --git a/Brewfile b/Brewfile index 2fa3d9f2c..b2a9ef831 100644 --- a/Brewfile +++ b/Brewfile @@ -10,4 +10,4 @@ brew "pkg-config" brew "uchardet" brew "wget" brew "wxwidgets" -brew "xerces-c" +brew "libxml2" diff --git a/README.md b/README.md index 39bbc2767..8cda456aa 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,7 @@ See also [Community packages & binaries](#community_bins) * `libwxgtk3.0-gtk3-dev` (or `libwxgtk3.2-dev` in newer distributions, or `libwxgtk3.0-dev` in older ones, _optional_ - needed for **GUI backend**, not needed with `-DUSEWX=no`) * `libx11-dev` (_optional_ - needed for **X11 extension** that provides better UX for TTY backend wherever X11 is available) * `libxi-dev` (_optional_ - needed for **X11/Xi extension** that provides best UX for TTY backend wherever X11 Xi extension is available) -* `libxerces-c-dev` (_optional_ - needed for **Colorer plugin**, not needed with `-DCOLORER=no`) +* `libxml2-dev` (_optional_ - needed for **Colorer plugin**, not needed with `-DCOLORER=no`) * `libuchardet-dev` (_optional_ - needed for **auto charset detection**, not needed with `-DUSEUCD=no`) * `libssh-dev` (_optional_ - needed for **NetRocks/SFTP**) * `libssl-dev` (_optional_ - needed for **NetRocks/FTPS**) diff --git a/dependencies-minimal.txt b/dependencies-minimal.txt index 3f3948dd3..2bbf518ce 100644 --- a/dependencies-minimal.txt +++ b/dependencies-minimal.txt @@ -1,3 +1,3 @@ libwxgtk3.0-gtk3-dev libuchardet-dev -libxerces-c-dev +libxml2-dev diff --git a/dependencies.txt b/dependencies.txt index 2a61865ee..4c3dcee87 100644 --- a/dependencies.txt +++ b/dependencies.txt @@ -7,7 +7,7 @@ libx11-dev libxi-dev libuchardet-dev -libxerces-c-dev +libxml2-dev libarchive-dev libssh-dev