Campbell Jones pushed to branch main at Arch Linux / Packaging / Packages / fish
Commits:
d17fd8ac by Campbell Jones at 2024-04-13T20:09:45-04:00
upgpkg: 3.7.1-2: Force Sphinx HTML jobs to 1 to fix reproducibility
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + sphinx-no-parallel.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = fish
pkgdesc = Smart and user friendly shell intended mostly for interactive
use
pkgver = 3.7.1
- pkgrel = 1
+ pkgrel = 2
url = https://fishshell.com/
install = fish.install
arch = x86_64
@@ -10,6 +10,7 @@ pkgbase = fish
checkdepends = procps-ng
makedepends = cmake
makedepends = python-sphinx
+ makedepends = jq
depends = glibc
depends = gcc-libs
depends = ncurses
@@ -19,10 +20,13 @@ pkgbase = fish
backup = etc/fish/config.fish
source =
https://github.com/fish-shell/fish-shell/releases/download/3.7.1/fish-3.7.1.tar.xz
source =
https://github.com/fish-shell/fish-shell/releases/download/3.7.1/fish-3.7.1.tar.xz.asc
+ source = sphinx-no-parallel.patch
validpgpkeys = 003837986104878835FA516D7A67D962D88A709A
sha256sums =
614c9f5643cd0799df391395fa6bbc3649427bb839722ce3b114d3bbc1a3b250
sha256sums = SKIP
+ sha256sums =
16e15755ab363e1b9f04969091104c88c3cfc39a67621ad636419535e692874f
sha512sums =
f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe
sha512sums = SKIP
+ sha512sums =
3f9a0f53fa80bc1fa9ce1f66d230710d0b906bcc169dfef8fa68d194a1b29cc1cb194bd9db8ec1e682ba2393a474a000061e6ac12123b8b0baff1513d0f786c8
pkgname = fish
=====================================
PKGBUILD
=====================================
@@ -7,7 +7,7 @@
pkgname=fish
pkgver=3.7.1
-pkgrel=1
+pkgrel=2
pkgdesc='Smart and user friendly shell intended mostly for interactive use'
url='https://fishshell.com/'
arch=('x86_64')
@@ -15,16 +15,24 @@ license=('GPL2')
depends=('glibc' 'gcc-libs' 'ncurses' 'pcre2')
optdepends=('python: man page completion parser / web config tool'
'pkgfile: command-not-found hook')
-makedepends=('cmake' 'python-sphinx')
+makedepends=('cmake' 'python-sphinx' 'jq')
checkdepends=('expect' 'procps-ng')
install=fish.install
backup=(etc/fish/config.fish)
-source=(https://github.com/fish-shell/fish-shell/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz{,.asc})
+source=(https://github.com/fish-shell/fish-shell/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz{,.asc}
+ sphinx-no-parallel.patch)
validpgpkeys=(003837986104878835FA516D7A67D962D88A709A) # David Adam
<zanc...@gmail.com>
sha256sums=('614c9f5643cd0799df391395fa6bbc3649427bb839722ce3b114d3bbc1a3b250'
- 'SKIP')
+ 'SKIP'
+ '16e15755ab363e1b9f04969091104c88c3cfc39a67621ad636419535e692874f')
sha512sums=('f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe'
- 'SKIP')
+ 'SKIP'
+
'3f9a0f53fa80bc1fa9ce1f66d230710d0b906bcc169dfef8fa68d194a1b29cc1cb194bd9db8ec1e682ba2393a474a000061e6ac12123b8b0baff1513d0f786c8')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 < "$srcdir/sphinx-no-parallel.patch" # can be removed when sphinx
7.3.0 releases
+}
build() {
cd ${pkgname}-${pkgver}
@@ -46,6 +54,7 @@ check() {
package() {
cd ${pkgname}-${pkgver}
+
make -C build DESTDIR="${pkgdir}" install
}
=====================================
sphinx-no-parallel.patch
=====================================
@@ -0,0 +1,13 @@
+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/-/commit/d17fd8acf612ae223d74c2c6936eb9a74a3e3f87
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/fish/-/commit/d17fd8acf612ae223d74c2c6936eb9a74a3e3f87
You're receiving this email because of your account on gitlab.archlinux.org.
