Age | Commit message (Expand) | Author |
2020-11-18 | gnu: bitcoin-core: Update to 0.20.1....* gnu/packages/finance.scm (bitcoin-core): Update to 0.20.1.
[source]: Remove obsolete patch.
[native-inputs]: Add autoconf, automake and libtool.
[inputs]: Remove protobuf.
[arguments]: Add "set-no-git-flag" phase to indicate the build is not taking
place within a git repository.
* gnu/packages/patches/bitcoin-core-python-compat.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Signed-off-by: Christopher Baines <mail@cbaines.net>
| Simon South |
2020-11-17 | Merge remote-tracking branch 'origin/version-1.2.0' into master...Conflicts:
gnu/packages/bioinformatics.scm
The python-pysam package fixed in master was kept instead of the update done
in the version-1.2.0 branch.
| Maxim Cournoyer |
2020-11-17 | gnu: tomb: Update to 2.8....Fixes CVE-2020-28638.
* gnu/packages/crypto.scm (tomb): Update to 2.8
[source]: Remove obsolete patch.
* gnu/packages/patches/tomb-fix-errors-on-open.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
| Eric Bavier |
2020-11-16 | gnu: gcc-vc4: Update to commit 0fe4b83897341742f9df65797474cb0feab4b377....* gnu/packages/patches/gcc-6-fix-buffer-size.patch: New file.
* gnu/packages/patches/gcc-6-fix-isl-includes.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/embedded.scm (gcc-vc4): Update to commit
0fe4b83897341742f9df65797474cb0feab4b377.
[source]: Add the patches from above.
| Danny Milosavljevic |
2020-11-16 | gnu: scribus: Update to 1.5.6....* gnu/packages/scribus.scm (scribus): Update to 1.5.6.
[source]: Remove patch.
[inputs]: Substitute python for python-2.
* gnu/packages/patches/scribus-1.5.5-poppler-0.86-build-fix.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
| Tobias Geerinckx-Rice |
2020-11-15 | gnu: multipath-tools: Update to 0.8.5....* gnu/packages/linux.scm (multipath-tools): Update to 0.8.5.
[source]: Remove patch.
[arguments]: Add a ‘skip-failing-tests’ phase.
* gnu/packages/patches/multipath-tools-sans-systemd.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
| Tobias Geerinckx-Rice |
2020-11-15 | gnu: perl-www-curl: Fix build with curl@7.69.1....* gnu/packages/web.scm (perl-www-curl)[source]:
Add perl-www-curl-fix-struct-void.patch.
* gnu/packages/patches/perl-www-curl-remove-symbol.patch: Update.
* gnu/packages/patches/perl-www-curl-fix-struct-void.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
| Tobias Geerinckx-Rice |
2020-11-13 | gnu: glib: Graft patch to detect changes to the installed applications....Fixes <https://bugs.gnu.org/35594>.
Reported by sirgazil <sirgazil@zoho.com> and others.
* gnu/packages/patches/glib-appinfo-watch.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/glib.scm (glib)[replacement]: New field.
(glib-with-gio-patch): New variable.
(glib-with-documentation): Use 'package/inherit'.
| Ludovic Courtès |
2020-11-12 | Merge branch 'version-1.2.0' | Ludovic Courtès |
2020-11-10 | gnu: oath-toolkit: Update to 2.6.3....* gnu/packages/authentication.scm (oath-toolkit): Update to 2.6.3.
[source]: Remove obsolete patches.
* gnu/packages/patches/oath-toolkit-glibc-compat.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Signed-off-by: Leo Famulari <leo@famulari.name>
| Simon Josefsson |
2020-11-10 | gnu: sdcc: Remove non-free code....* gnu/packages/sdcc.scm (sdcc)[source]: Add snippet to remove bundled non-free
source code.
Add patch to disable use of non-free code in build scripts and compiler and
update documentation to match.
* gnu/packages/patches/sdcc-disable-non-free-code.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Signed-off-by: Marius Bakke <marius@gnu.org>
| Simon South |
2020-11-10 | gnu: audiofile: Shorten patch file names....At least 'audiofile-division-by-zero-BlockCodec-runPull.patch' could end
up not being included in a tarball.
* gnu/packages/patches/audiofile-Check-the-number-of-coefficients.patch:
Rename to...
* gnu/packages/patches/audiofile-check-number-of-coefficients.patch:
... this.
* gnu/packages/patches/audiofile-division-by-zero-BlockCodec-runPull.patch:
Rename to...
* gnu/packages/patches/audiofile-division-by-zero.patch: ....this.
* gnu/packages/patches/audiofile-signature-of-multiplyCheckOverflow.patch:
Rename to...
* gnu/packages/patches/audiofile-function-signature.patch: ... this.
* gnu/packages/patches/audiofile-Fix-multiply-overflow-sfconvert.patch:
Rename to....
* gnu/packages/patches/audiofile-multiply-overflow.patch: ... this.
* gnu/packages/patches/audiofile-Fix-overflow-in-MSADPCM-decodeSam.patch:
Rename to...
* gnu/packages/patches/audiofile-overflow-in-MSADPCM.patch: ... this.
* gnu/packages/audio.scm (audiofile)[source]: Adjust accordingly.
* gnu/local.mk (dist_patch_DATA): Likewise.
| Ludovic Courtès |
2020-11-10 | gnu: python2-pygobject@2: Shorten patch file name....The file would not be included in the tarball produced by "make dist"
because its name was too long.
* gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch:
Rename to...
* gnu/packages/patches/python2-pygobject-2-deprecation.patch: ... this.
* gnu/packages/glib.scm (python2-pygobject-2)[source]: Adjust accordingly.
* gnu/local.mk (dist_patch_DATA): Likewise.
| Ludovic Courtès |
2020-11-08 | gnu: Add ublock-origin-chromium....* gnu/packages/browser-extensions.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly.
| Marius Bakke |
2020-11-08 | Add (gnu build chromium-extension)....* gnu/build/chromium-extension.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly.
| Marius Bakke |
2020-11-07 | gnu: libffi: Fix building on powerpc....* gnu/packages/libffi.scm (libffi)[inputs]: New field.
[arguments]: Add 'apply-patch' phase when targeting PowerPC.
* gnu/packages/patches/libffi-3.3-powerpc-fixes.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
| Efraim Flashner |
2020-11-05 | gnu: Add yggdrasil....* gnu/packages/networking.scm (yggdrasil): New variable.
* gnu/packages/patches/yggdrasil-extra-config.patch: New file.
* gnu/local.mk (dist_PATCH_DATA): Add it.
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
| raingloom |
2020-11-05 | gnu: ungoogled-chromium: Add search path for installed extensions....* gnu/packages/patches/ungoogled-chromium-extension-search-path.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/chromium.scm (%guix-patches): New variable.
(ungoogled-chromium-snippet): Apply %GUIX-PATCHES.
(ungoogled-chromium)[arguments]: Don't hard-code extensions directory.
[native-search-paths]: New field.
| Marius Bakke |
2020-11-04 | gnu: Add bsd-games....* gnu/packages/games.scm (bsd-games): New variable.
New patches, taken from Arch and Debian:
* gnu/packages/patches/bsd-games-2.17-64bit.patch
* gnu/packages/patches/bsd-games-bad-ntohl-cast.patch
* gnu/packages/patches/bsd-games-gamescreen.h.patch
* gnu/packages/patches/bsd-games-getline.patch
* gnu/packages/patches/bsd-games-null-check.patch
* gnu/packages/patches/bsd-games-number.c-and-test.patch
* gnu/packages/patches/bsd-games-prevent-name-collisions.patch
* gnu/packages/patches/bsd-games-stdio.h.patch
New patches with our customizations (configure-config built after Arch's):
* gnu/packages/patches/bsd-games-add-configure-config.patch
* gnu/packages/patches/bsd-games-add-wrapper.patch
* gnu/packages/patches/bsd-games-dont-install-empty-files.patch
Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
| Vitaliy Shatrov |
2020-10-31 | gnu: sbcl-geco: Fix build....* gnu/packages/patches/sbcl-geco-fix-organism-class.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/lisp-xyz.scm (sbcl-geco)[source]: Use it.
| Guillaume Le Vaillant |
2020-10-29 | gnu: Add bcm2835....* gnu/packages/raspberry-pi.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
| Danny Milosavljevic |
2020-10-27 | gnu: kpackage: Fix build errors in dependent packages....Fix build errors in dependent packages if PREFIX is different from ECM's
PREFIX - which is the case in Guix. See <https://bugs.kde.org/424483> for
details.
* gnu/packages/patches/plasma-framework-fix-KF5PackageMacros.cmake.patch: New
file.
* gnu/local.mk (dist_patch_DATA) Add it.
* packages/kde-frameworks.scm (package)[source]: Use this patch.
| Hartmut Goebel |
2020-10-27 | gnu: plasma-framework: Fix build errors in dependent packages....Fix build errors in dependent packages if PREFIX is different from ECM's
PREFIX - which is the case in Guix. See <https://bugs.kde.org/424483> for
details.
* gnu/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch: New
file.
* gnu/local.mk (dist_patch_DATA) Add it.
* packages/kde-frameworks.scm (plasma-framework)[source]: Use this patch.
| Hartmut Goebel |
2020-10-26 | gnu: Remove unused patch....This patch was unused since commit
e4070d404d5daa71fcc83a7fecc9b58570d280c2.
* gnu/packages/patches/ocaml-bisect-fix-camlp4-in-another-directory.patch: Remove.
* gnu/local.mk (dist_patch_DATA): Remove it.
| Ludovic Courtès |
2020-10-26 | gnu: python-robotframework: Shorten patch file name....* gnu/packages/patches/python-robotframework-honor-source-date-epoch.patch:
Rename to...
* gnu/packages/patches/python-robotframework-source-date-epoch.patch:
... this.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/python-xyz.scm (python-robotframework)[source]: Likewise.
| Ludovic Courtès |
2020-10-26 | gnu: benchmark: Update to 1.5.2...* gnu/packages/benchmark.scm (benchmark): Update to 1.5.2
[native-inputs]: Add googletest-source.
[arguments]: Add phase 'unpack-googletest.
* gnu/packages/patches/benchmark-unbundle-googletst.patch: Delete file.
* gnu/packages/local.mk: Remove benchmark-unbundle-googletest.patch.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| Malte Frank Gerdes |
2020-10-26 | gnu: gdb: Add version 10.1....* gnu/packages/gdb.scm (gdb-9.2): Rename to...
(gdb-10): ... this, and upgrade to 10.1.
[inputs]: New field.
(gdb-minimal): Adjust accordingly.
* gnu/packages/patches/gdb-hurd.patch: Remove.
* gnu/local.mk (dist_patch_DATA): Remove it.
| Ludovic Courtès |
2020-10-26 | gnu: netcdf: Update to 4.7.4....This will fix an issue building qgis.
* gnu/packages/maths.scm (netcdf): Update to 4.7.4.
[source]: Remove the netcdf-tst_h_par.patch, also change the naming of the
source tarball, as the name seems to have changed for recent releases.
[inputs]: Update hdf5 and add curl.
* gnu/packages/patches/netcdf-tst_h_par.patch: Delete.
* gnu/local.mk (dist_patch_DATA): Remove deleted patch.
| Christopher Baines |
2020-10-23 | gnu: rcs: Update to 5.10.0....* gnu/packages/version-control.scm (rcs): Update to 5.10.0.
[source]: Update patches.
[arguments]: Remove field.
* gnu/packages/patches/rcs-5.9.4-noreturn.patch: Remove file.
* gnu/packages/patches/rcs-5.10.0-no-stdin.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
| Efraim Flashner |
2020-10-22 | gnu: openocd: Update to 9a877a83a1c8b1f105cdc0de46c5cbc4d9e8799e....* gnu/packages/embedded.scm (openocd): Update to 9a877a83a1c8b1f105cdc0de46c5cbc4d9e8799e.
[version]: Substitute release with current master.
[source]: Remove openocd-nrf52.patch
[arguments]: Replace bootstrap build phase.
* gnu/local.mk: Remove openocd-nrf52.patch.
* gnu/packages/patches/openocd-nrf52.patch: Remove file.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| Malte Frank Gerdes |
2020-10-20 | gnu: Add farstream....* gnu/packages/freedesktop.scm (farstream): New variable.
* gnu/packages/patches/farstream-make.patch: New file.
* gnu/local.mk (dist_PATCH_DATA): Add it.
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
| Raghav Gururajan |
2020-10-19 | gnu: LLVM, Clang: Add 11.0.0....* gnu/packages/patches/clang-11.0-libc-search-path.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/llvm.scm (llvm-11, clang-runtime-11, clang-11,
clang-toolchain-11): New variables.
| Marius Bakke |
2020-10-17 | gnu: xpra: Fix HTML server...* gnu/packages/patches/xpra-4.0.4-norequests.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/xorg.scm (xpra)[patches]: Apply it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| Lars-Dominik Braun |
2020-10-15 | gnu: unison: Build with ocaml-4.09....* gnu/packages/ocaml.scm (unison)[sources]: Add an upstream patch.
[native-inputs]: Use ocaml-4.09.
* gnu/packages/patches/unison-fix-ocaml-4.08.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
| Julien Lepiller |
2020-10-14 | gnu: Add nginx-socket-cloexec....* gnu/packages/patches/nginx-socket-cloexec.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add this.
* gnu/packages/web.scm (nginx-socket-cloexec): New variable.
| Oleg Pykhalov |
2020-10-14 | Revert "gnu: python-chardet: Enable tests."...This causes too many rebuilds for the master branch.
This reverts commit 331aaf52806b27430c4efaf8f230097ede69e61a.
| Marius Bakke |
2020-10-13 | gnu: python-chardet: Enable tests....* gnu/packages/python-xyz.scm (python-chardet) [source]: Add upstream patch.
[arguments]: Remove.
* gnu/packages/patches/python-chardet-3.0.4-pytest.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Signed-off-by: Marius Bakke <marius@gnu.org>
| Lars-Dominik Braun |
2020-10-13 | gnu: knot: Update to 3.0.1....* gnu/packages/dns.scm (knot): Update to 3.0.1.
[source]: Remove patch.
* gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
| Tobias Geerinckx-Rice |
2020-10-12 | gnu: libcanberra: Fix crashes on wayland....* gnu/packages/patches/libcanberra-wayland-crash.patch: New file.
* gnu/packages/libcanberra.scm (libcanberra): Add it.
* gnu/local.mk (dist_PATCH_DATA): Add it.
| Julien Lepiller |
2020-10-10 | gnu: folly: Remove reference to missing patch....The patch is unnecessary because tests are disabled.
This is a follow-up to 5b548a1ee45bb12111af50cf00eb696207e207c5.
* gnu/packages/cpp.scm (folly)[source](patches): Remove.
* gnu/local.mk (dist_patch_DATA): Remove missing patch.
| Marius Bakke |
2020-10-10 | gnu: Add folly....* gnu/packages/cpp.scm (folly): New variable.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| Greg Hogan |
2020-10-08 | gnu: sunxi-tools: Fix build....* gnu/packages/patches/sunxi-tools-remove-sys-io.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/admin.scm (sunxi-tools-source): Add it.
| Danny Milosavljevic |
2020-10-06 | gnu: knot: Fix test failure on aarch64-linux....* gnu/packages/dns.scm (knot)[source]: Apply patch from upstream that
helps ensure the "test_net_shortwrite" test suite can complete
regardless of platform or configuration.
* gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
| Simon South |
2020-10-05 | gnu: lsh: Fix X11 forwarding....Fixes <https://issues.guix.gnu.org/24049>.
* gnu/packages/patches/lsh-fix-x11-forwarding.patch: Add patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/ssh.scm (lsh)[source]: Apply it.
[inputs]: Add libxau.
Reported-by: myglc2 <myglc2@gmail.com>
| Maxim Cournoyer |
2020-10-05 | gnu: Move graphics crates to crates-graphics.scm....* gnu/packages/crates-graphics.scm: New module. Move rust-andrew-0.2,
rust-ansi-colours-1, rust-ansi-term-0.12, rust-ansi-term-0.11,
rust-ansi-term-0.10, rust-aom-sys-0.1, rust-ascii-canvas-2,
rust-cgl-0.3, rust-cgl-0.2, rust-cgmath-0.17, rust-cglmath-0.16,
rust-core-graphics-0.17, rust-core-video-sys-0.1, rust-dav1d-sys-0.3,
rust-euclid-0.20, rust-gfx-0.18, rust-gfx-core-0.9,
rust-gfx-device-gl-0.16, rust-gfx-gl-0.6, rust-gif-0.10, rust-gl-0.11,
rust-gl-generator-0.14, rust-gl-generator-0.13, rust-gl-generator-0.11,
rust-gl-generator-0.10, rust-gleam-0.6, rust-glutin-0.22,
rust-glutin-0.21, rust-glutin-egl-sys-0.1,
rust-glutin-emscripten-sys-0.1, rust-glutin-gles2-sys-0.1,
rust-glutin-glx-sys-0.1, rust-glutin-wayland-sys-0.1, rust-image-0.23,
rust-image-0.22, rust-image-0.21, rust-image-0.20,
rust-jpeg-decoder-0.1, rust-line-drawing-0.7, rust-lyon-geom-0.14,
rust-lyon-path-0.14, rust-osmesa-sys-0.1, rust-piston-0.49,
rust-piston-float-1.0, rust-piston-gfx-texture-0.40,
rust-piston-graphics-api-version-0.2,
rust-piston-shaders-graphics2d-0.3, rust-piston-texture-0.8,
rust-piston-viewport-1.0, rust-piston-window-0.105,
rust-piston2d-gfx-graphics-0.66, rust-pison2d-graphics-0.35,
rust-piston-event-loop-0.49, rust-pistoncore-glutin-window-0.63,
rust-pistoncore-input-0.28, rust-pistoncore-window-0.44, rust-png-0.16,
rust-png-0.15, rust-png-0.14, rust-png-0.12, rust-raw-window-handle-0.3,
rust-resize-0.3, rust-rgb-0.8, rust-smithay-client-toolkit-0.6,
rust-smithay-client-toolkit-0.4, rust-smithay-clipboard-0.3,
rust-tiff-0.5, rust-tiff-0.3, rust-tiff-0.2, rust-wayland-client-0.23,
rust-wayland-client-0.21, rust-wayland-commons-0.23,
rust-wayland-commons-0.21, rust-wayland-protocols-0.23,
rust-wayland-protocols-0.21, rust-wayland-scanner-0.23,
rust-wayland-scanner-0.21, rust-wayland-server-0.23,
rust-wayland-server-0.21, rust-wayland-sys-0.23, rust-wayland-sys-0.21,
rust-winit-0.20, rust-winit-0.19, rust-x11-2, rust-x11-clipboard-0.4,
rust-x11-dl-2, rust-y4m-0.5 to here.
* gnu/packages/crates-io.scm: ... from here.
* gnu/local.mk (GNU_SYSTEM_MODULES): Register new module.
* gnu/packages/crates-io.scm, gnu/packages/crates-gtk.scm,
gnu/packages/gnome.scm, gnu/packages/rust-apps.scm,
gnu/packages/terminals.scm, gnu/packages/video.scm: Adjust for
package movement.
| Efraim Flashner |
2020-10-05 | gnu: Move gtk crates to crates-gtk.scm....* gnu/packages/crates-gtk.scm: New module. Move rust-cairo-rs-0.8,
rust-cairo-rs-0.7, rust-cairo-sys-rs-0.9, rust-gdk-pixbuf-0.8,
rust-gdk-pixbuf-0.7, rust-gdk-pixbuf-sys-0.9, rust-gio-0.8,
rust-gio-0.7, rust-gio-sys-0.9, rust-gir-format-check-0.1,
rust-glib-0.9, rust-glib-0.8, rust-glib-sys-0.9, rust-gobject-sys-0.9,
rust-gtk-rs-lgpl-docs-0.1, rust-pango-0.8, rust-pango-0.7,
rust-pango-sys-0.9, rust-pangocairo-0.9, rust-pangocairo-0.8,
rust-pangocairo-sys-0.10 to here...
* gnu/packages/crates-io.scm: ... from here.
* gnu/local.mk (GNU_SYSTEM_MODULES): Register new module.
* gnu/packages/gnome.scm: Adjust for package movement.
| Efraim Flashner |
2020-10-05 | images: Add pine64 support....* gnu/system/images/pine64.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* gnu/system/image.scm (arm64-disk-image, arm64-image-type): New variables.
| Mathieu Othacehe |
2020-10-05 | gnu: picard: Update to 2.4.4....* gnu/packages/music.scm (picard): Update to 2.4.4.
[native-inputs]: Add python-dateutil.
[source]: Add temporary patch to fix failing test due to missing "."
in temporary filename.
* gnu/packages/patches/picard-fix-id3-rename-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| raingloom |
2020-10-05 | gnu: konversation: Update to 1.7.6....* gnu/packages/kde-internet.scm (konversation): Update to 1.7.6.
[source]: Remove obsolete patch.
* gnu/packages/patches/konversation-Fix-build-with-Qt-5.11.patch: Delete
file.
* gnu/local.mk (dist_patch_DATA): Remove it.
| Tobias Geerinckx-Rice |
2020-10-04 | gnu: hplip: Update to 3.20.9 [security fixes]....* gnu/packages/cups.scm (hplip): Update to 3.20.9.
[source]: Add hplip-fix-bug-1898438.patch.
[arguments]: Follow upstream defaults.
* gnu/packages/patches/hplip-fix-bug-1898438.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
| Tobias Geerinckx-Rice |