This fixes a build failure in VTK when building against recent versions of freetype. https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7432 Patch by Ben Boeckel Subject: [PATCH] vtkFreeTypeTools: avoid using an internal macro This macro has been removed upstream as it was always intended to be private. --- Rendering/FreeType/vtkFreeTypeTools.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Rendering/FreeType/vtkFreeTypeTools.cxx b/Rendering/FreeType/vtkFreeTypeTools.cxx index c54289dc60..03b899c4da 100644 --- a/Rendering/FreeType/vtkFreeTypeTools.cxx +++ b/Rendering/FreeType/vtkFreeTypeTools.cxx @@ -387,11 +387,8 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMapCache() } //---------------------------------------------------------------------------- -FT_CALLBACK_DEF(FT_Error) -vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id, - FT_Library lib, - FT_Pointer request_data, - FT_Face* face) +static FT_Error vtkFreeTypeToolsFaceRequester( + FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) { #if VTK_FTFC_DEBUG_CD printf("vtkFreeTypeToolsFaceRequester()\n"); -- 2.30.1 77556ca06b569d39f5604c7176'>treecommitdiff
path: root/gnu/tests/networking.scm
AgeCommit message (Expand)Author
2021-12-13tests: static-networking: Adjust to new style....* gnu/tests/networking.scm (run-static-networking-test)[test]: Remove 'mkdir', 'chdir', and 'exit' calls'. Add 'test-runner-current' call. Ludovic Courtès
2021-12-13Merge branch 'master' into core-updates-frozenLudovic Courtès
2021-12-12tests: Replace uses of deprecated 'static-networking-service'....* gnu/tests/ganeti.scm (%ganeti-os): Replace call to 'static-networking-service' by instantiating STATIC-NETWORKING-SERVICE-TYPE. * gnu/tests/networking.scm (%test-static-networking) (%openvswitch-os, %dhcpd-os): Likewise. Ludovic Courtès
2021-12-12services: static-networking: Change interface to mimic netlink....* gnu/services/base.scm (<static-networking>)[interface, ip, netmask] [gateway]: Remove. [addresses, links, routes]: New fields. [requirement]: Default to '(udev). (<network-address>, <network-link>, <network-route>): New record types. (ensure-no-separate-netmask, %ensure-no-separate-netmask): Remove. (ipv6-address?, cidr->netmask, ip+netmask->cidr) (network-set-up/hurd, network-tear-down/hurd) (network-set-up/linux, network-tear-down/linux) (static-networking->hurd-pfinet-options): New procedures. (static-networking-shepherd-service): New procedure. (static-networking-shepherd-services): Rewrite in terms of the above. (static-networking-service): Deprecate. Adjust to new 'static-networking' API. (%base-services): Likewise. * gnu/system/install.scm (%installation-services): Likewise. * gnu/system/hurd.scm (%base-services/hurd): Likewise, and separate 'loopback' from 'networking'. * gnu/build/hurd-boot.scm (set-hurd-device-translators): Remove "servers/socket/2". * gnu/tests/networking.scm (run-openvswitch-test)["networking has started on ovs0"]: Check for 'networking instead of 'networking-ovs0, which is no longer provided. * doc/guix.texi (Networking Setup): Document the new interface. Remove documentation of 'static-networking-service'. (Virtualization Services): Change Ganeti example to use the new interface. Ludovic Courtès
2021-12-12tests: openvswitch: Check whether ovs0 is up....* gnu/tests/networking.scm (run-openvswitch-test)["ovs0 is up"]: New test. Ludovic Courtès
2021-12-12tests: Add 'static-networking' test....* gnu/tests/networking.scm (run-static-networking-test): New procedure. (%test-static-networking): New variable. Ludovic Courtès