From 8fcc59ed275986f92fcf803fb9d201d5f32e587d Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 9 Oct 2024 17:07:28 +0200 Subject: [PATCH] [ci] remove docbook and xml dependencies --- .github/workflows/abi-checker.yml | 2 - .github/workflows/alt-architectures.yml | 3 -- .github/workflows/clang-tidy.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 - .github/workflows/coverity.yml | 2 - cmake/FindDocBookXSL.cmake | 52 ------------------------- packaging/deb/freerdp-nightly/control | 3 -- packaging/rpm/freerdp-nightly.spec | 7 ---- 8 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 cmake/FindDocBookXSL.cmake diff --git a/.github/workflows/abi-checker.yml b/.github/workflows/abi-checker.yml index 4d00d12f5..933bfd4d7 100644 --- a/.github/workflows/abi-checker.yml +++ b/.github/workflows/abi-checker.yml @@ -45,7 +45,6 @@ jobs: libpulse-dev \ libasound2-dev \ libpcsclite-dev \ - xsltproc \ libxcb-cursor-dev \ libxcursor-dev \ libcairo2-dev \ @@ -66,7 +65,6 @@ jobs: libcairo2-dev \ libsoxr-dev \ libsdl2-dev \ - docbook-xsl \ libkrb5-dev \ libcjson-dev \ libsdl2-ttf-dev \ diff --git a/.github/workflows/alt-architectures.yml b/.github/workflows/alt-architectures.yml index 29c508f6f..7b5acdd5c 100644 --- a/.github/workflows/alt-architectures.yml +++ b/.github/workflows/alt-architectures.yml @@ -52,8 +52,6 @@ jobs: libpulse-dev \ libasound2-dev \ libpcsclite-dev \ - xsltproc \ - libxml2-dev \ libxcb-cursor-dev \ libxcursor-dev \ libcairo2-dev \ @@ -74,7 +72,6 @@ jobs: libsdl2-dev \ libsdl2-ttf-dev \ libsdl2-image-dev \ - docbook-xsl \ libkrb5-dev \ libcjson-dev \ libpkcs11-helper1-dev \ diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index 10608a3a4..f1692a329 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -16,7 +16,7 @@ jobs: split_workflow: true clang_tidy_checks: '' # List of packages to install - apt_packages: libkrb5-dev,libxkbcommon-dev,libxkbfile-dev,libx11-dev,libwayland-dev,libxrandr-dev,libxi-dev,libxrender-dev,libxext-dev,libxinerama-dev,libxfixes-dev,libxcursor-dev,libxv-dev,libxdamage-dev,libxtst-dev,libcups2-dev,libcairo2-dev,libpcsclite-dev,libasound2-dev,libswscale-dev,libpulse-dev,libavformat-dev,libavcodec-dev,libavutil-dev,libfuse3-dev,libswresample-dev,libusb-1.0-0-dev,libudev-dev,libdbus-glib-1-dev,libpam0g-dev,uuid-dev,libxml2-dev,libcjson-dev,libsdl2-2.0-0,libsdl2-dev,libsdl2-ttf-dev,libsdl2-image-dev,libsystemd-dev,liburiparser-dev,libopus-dev,libwebp-dev,libjpeg-dev,libpng-dev,xsltproc,docbook-xsl,libgsm1-dev,libfaac-dev,libfaad-dev,libsoxr-dev,opencl-c-headers,opencl-headers,ocl-icd-opencl-dev,libssl-dev,libv4l-dev + apt_packages: libkrb5-dev,libxkbcommon-dev,libxkbfile-dev,libx11-dev,libwayland-dev,libxrandr-dev,libxi-dev,libxrender-dev,libxext-dev,libxinerama-dev,libxfixes-dev,libxcursor-dev,libxv-dev,libxdamage-dev,libxtst-dev,libcups2-dev,libcairo2-dev,libpcsclite-dev,libasound2-dev,libswscale-dev,libpulse-dev,libavformat-dev,libavcodec-dev,libavutil-dev,libfuse3-dev,libswresample-dev,libusb-1.0-0-dev,libudev-dev,libdbus-glib-1-dev,libpam0g-dev,uuid-dev,libcjson-dev,libsdl2-2.0-0,libsdl2-dev,libsdl2-ttf-dev,libsdl2-image-dev,libsystemd-dev,liburiparser-dev,libopus-dev,libwebp-dev,libjpeg-dev,libpng-dev,libgsm1-dev,libfaac-dev,libfaad-dev,libsoxr-dev,opencl-c-headers,opencl-headers,ocl-icd-opencl-dev,libssl-dev,libv4l-dev # CMake command to run in order to generate compile_commands.json build_dir: tidy diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e9897066c..13648d032 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -94,7 +94,6 @@ jobs: libpulse-dev \ libasound2-dev \ libpcsclite-dev \ - xsltproc \ libxcb-cursor-dev \ libxcursor-dev \ libcairo2-dev \ @@ -116,7 +115,6 @@ jobs: libcairo2-dev \ libsoxr-dev \ libsdl2-dev \ - docbook-xsl \ libkrb5-dev \ libcjson-dev \ libsdl2-ttf-dev \ diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index 970c34c41..629a78a94 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -32,7 +32,6 @@ jobs: libasound2-dev \ libpcsclite-dev \ libv4l-dev \ - xsltproc \ libxcb-cursor-dev \ libxcursor-dev \ libcairo2-dev \ @@ -54,7 +53,6 @@ jobs: libcairo2-dev \ libsoxr-dev \ libsdl2-dev \ - docbook-xsl \ libkrb5-dev \ libcjson-dev \ libsdl2-ttf-dev \ diff --git a/cmake/FindDocBookXSL.cmake b/cmake/FindDocBookXSL.cmake deleted file mode 100644 index fb905d6a4..000000000 --- a/cmake/FindDocBookXSL.cmake +++ /dev/null @@ -1,52 +0,0 @@ -# Try to find DocBook XSL stylesheet -# Once done, it will define: -# -# DOCBOOKXSL_FOUND - system has the required DocBook XML DTDs -# DOCBOOKXSL_DIR - the directory containing the stylesheets -# used to process DocBook XML - -# Copyright (c) 2010, Luigi Toscano, -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -set (STYLESHEET_PATH_LIST - share/xml/docbook/stylesheet/docbook-xsl - share/xml/docbook/xsl-stylesheets - share/sgml/docbook/xsl-stylesheets - share/xml/docbook/stylesheet/nwalsh/current - share/xml/docbook/stylesheet/nwalsh - share/xsl/docbook - share/xsl/docbook-xsl -) - -find_path (DOCBOOKXSL_DIR lib/lib.xsl - PATHS ${CMAKE_SYSTEM_PREFIX_PATH} - PATH_SUFFIXES ${STYLESHEET_PATH_LIST} -) - -if (NOT DOCBOOKXSL_DIR) - # hacks for systems that put the version in the stylesheet dirs - set (STYLESHEET_PATH_LIST) - foreach (STYLESHEET_PREFIX_ITER ${CMAKE_SYSTEM_PREFIX_PATH}) - file(GLOB STYLESHEET_SUFFIX_ITER RELATIVE ${STYLESHEET_PREFIX_ITER} - ${STYLESHEET_PREFIX_ITER}/share/xml/docbook/xsl-stylesheets-*-nons - ) - if (STYLESHEET_SUFFIX_ITER) - list (APPEND STYLESHEET_PATH_LIST ${STYLESHEET_SUFFIX_ITER}) - endif () - endforeach () - - find_path (DOCBOOKXSL_DIR VERSION - PATHS ${CMAKE_SYSTEM_PREFIX_PATH} - PATH_SUFFIXES ${STYLESHEET_PATH_LIST} - ) -endif (NOT DOCBOOKXSL_DIR) - - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args (DocBookXSL - "Could NOT find DocBook XSL stylesheets" - DOCBOOKXSL_DIR) - -mark_as_advanced (DOCBOOKXSL_DIR) diff --git a/packaging/deb/freerdp-nightly/control b/packaging/deb/freerdp-nightly/control index 586e7ff34..3525df442 100644 --- a/packaging/deb/freerdp-nightly/control +++ b/packaging/deb/freerdp-nightly/control @@ -10,8 +10,6 @@ Build-Depends: cmake, pkg-config, libssl-dev, - docbook-xsl, - xsltproc, ninja-build, libkrb5-dev | krb5-multidev | heimdal-multidev, libxkbcommon-dev, @@ -44,7 +42,6 @@ Build-Depends: libdbus-glib-1-dev, libpam0g-dev, uuid-dev, - libxml2-dev, libjson-c-dev | libcjson-dev, libsdl3-0 | libsdl2-2.0-0, libsdl3-dev | libsdl2-dev, diff --git a/packaging/rpm/freerdp-nightly.spec b/packaging/rpm/freerdp-nightly.spec index 2040e7e47..1b57ab6e0 100644 --- a/packaging/rpm/freerdp-nightly.spec +++ b/packaging/rpm/freerdp-nightly.spec @@ -42,7 +42,6 @@ BuildRequires: libXtst-devel BuildRequires: cups-devel BuildRequires: cairo-devel BuildRequires: pcsc-lite-devel -BuildRequires: libxml2-devel BuildRequires: zlib-devel BuildRequires: krb5-devel BuildRequires: uriparser-devel @@ -61,8 +60,6 @@ BuildRequires: uuid-devel BuildRequires: libSDL2-devel BuildRequires: libSDL2_ttf-devel BuildRequires: libSDL2_image-devel -BuildRequires: docbook-xsl-stylesheets -BuildRequires: libxslt-tools BuildRequires: pkg-config BuildRequires: libopenssl-devel BuildRequires: alsa-devel @@ -86,8 +83,6 @@ BuildRequires: opus-devel BuildRequires: SDL2-devel BuildRequires: SDL2_ttf-devel BuildRequires: SDL2_image-devel -BuildRequires: docbook-style-xsl -BuildRequires: libxslt BuildRequires: pkgconfig BuildRequires: openssl-devel BuildRequires: alsa-lib-devel @@ -109,8 +104,6 @@ BuildRequires: opus-devel BuildRequires: SDL2-devel BuildRequires: SDL2_ttf-devel BuildRequires: SDL2_image-devel -BuildRequires: docbook-style-xsl -BuildRequires: libxslt BuildRequires: pkgconfig BuildRequires: openssl-devel BuildRequires: alsa-lib-devel