George Rawlinson pushed to branch main at Arch Linux / Packaging / Packages / fish
Commits: d5455a14 by Sebastian Wiesner at 2025-02-28T07:05:59+01:00 Remove unused patch file - - - - - 6c1ae7c2 by Sebastian Wiesner at 2025-02-28T07:07:42+01:00 Enforce system pcre2 Do not rely on auto-detection to avoid mistakenly building with embedded pcre2. - - - - - 0cf57d9b by Sebastian Wiesner at 2025-02-28T07:08:45+01:00 Enable gettext support - - - - - dccb3c6c by Sebastian Wiesner at 2025-02-28T07:11:49+01:00 Add additional optdepends See https://github.com/fish-shell/fish-shell/blob/4.0.0/README.rst#dependencies - - - - - ffc454d0 by George Rawlinson at 2025-03-19T04:27:20+00:00 Merge branch 'main' into 'small-fixes' # Conflicts: # PKGBUILD - - - - - 2 changed files: - PKGBUILD - − sphinx-no-parallel.patch Changes: ===================================== PKGBUILD ===================================== @@ -14,7 +14,12 @@ arch=('x86_64') license=('GPL-2.0-only AND BSD-3-Clause AND ISC AND MIT AND PSF-2.0') depends=('glibc' 'gcc-libs' 'ncurses' 'pcre2') optdepends=('python: man page completion parser / web config tool' - 'pkgfile: command-not-found hook') + 'pkgfile: command-not-found hook' + 'nroff: --help for built-in commmands' + 'mandoc: --help for built-in commmands (alternative)' + 'xsel: X11 clipboard integration' + 'xclip: X11 clipboard integration (alternative)' + 'wl-clipboard: Wayland clipboard integration') makedepends=('cmake' 'git' 'jq' 'rust' 'python-sphinx') checkdepends=('expect' 'procps-ng') options=(!lto) @@ -30,11 +35,13 @@ build() { export CXXFLAGS+=" ${CPPFLAGS}" cmake \ -B build \ - -D CMAKE_INSTALL_PREFIX=/usr \ - -D CMAKE_INSTALL_SYSCONFDIR=/etc \ - -D CMAKE_BUILD_TYPE=Release \ - -D BUILD_DOCS=True \ - -W no-dev + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_DOCS=True \ + -DFISH_USE_SYSTEM_PCRE2=ON \ + -DWITH_GETTEXT=ON \ + -Wno-dev make -C build VERBOSE=1 } ===================================== sphinx-no-parallel.patch deleted ===================================== @@ -1,13 +0,0 @@ -diff --git a/cmake/Docs.cmake b/cmake/Docs.cmake -index 2a3faf896..bacd3296a 100644 ---- a/cmake/Docs.cmake -+++ b/cmake/Docs.cmake -@@ -18,7 +18,7 @@ add_custom_target(sphinx-docs - mkdir -p ${SPHINX_HTML_DIR}/_static/ - COMMAND env PATH="${CMAKE_BINARY_DIR}:$$PATH" - ${SPHINX_EXECUTABLE} -- -j auto -+ -j 1 - -q -b html - -c "${SPHINX_SRC_DIR}" - -d "${SPHINX_ROOT_DIR}/.doctrees-html" View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/fish/-/compare/2a3229ba01a93ee8923837763e09febb4488940a...ffc454d01c6b9cbe89941f21f62e176774b6a8dd -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/fish/-/compare/2a3229ba01a93ee8923837763e09febb4488940a...ffc454d01c6b9cbe89941f21f62e176774b6a8dd You're receiving this email because of your account on gitlab.archlinux.org.
