diff options
author | Ludovic Courtès <ludo@gnu.org> | 2022-06-22 18:48:00 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2022-06-22 18:48:00 +0200 |
commit | 8655a714457dbf1cde45979507012d9515614028 (patch) | |
tree | 7712625328f45794ccda9baa730a4825bb2efb47 /gnu/packages/patches | |
parent | a589049e141588ebcf4079116e378d60b779f6b4 (diff) | |
parent | 2af3f5eef045f7d177cc394c89be069bac895688 (diff) | |
download | guix-8655a714457dbf1cde45979507012d9515614028.tar.gz guix-8655a714457dbf1cde45979507012d9515614028.zip |
Merge branch master into core-updates
Diffstat (limited to 'gnu/packages/patches')
19 files changed, 726 insertions, 273 deletions
diff --git a/gnu/packages/patches/alpine-fix-privacy-policy-crash.patch b/gnu/packages/patches/alpine-fix-privacy-policy-crash.patch deleted file mode 100644 index d514ac33a0..0000000000 --- a/gnu/packages/patches/alpine-fix-privacy-policy-crash.patch +++ /dev/null @@ -1,39 +0,0 @@ -X-Git-Url: https://repo.or.cz/alpine.git/blobdiff_plain/fb2217ac67706e4cbef69bea41041e2fb8b910e9..3ee981816abfb7d47ffc0ac522fff002b5749b72:/alpine/help.c - -diff --git a/alpine/help.c b/alpine/help.c -index 4f1bf46..e9c7b34 100644 ---- a/alpine/help.c -+++ b/alpine/help.c -@@ -36,6 +36,7 @@ static char rcsid[] = "$Id: help.c 1032 2008-04-11 00:30:04Z hubert@u.washington - #include "../pith/detoken.h" - #include "../pith/list.h" - #include "../pith/margin.h" -+#include "../pith/busy.h" - - - typedef struct _help_scroll { -@@ -135,10 +136,12 @@ helper_internal(HelpType text, char *frag, char *title, int flags) - is_external = 0; - - if(shown_text && *shown_text && !struncmp(*shown_text, "x-alpine-http:", 14)){ -- int status; -+ int status, we_cancel = 0; -+ -+ we_cancel = busy_cue(_("Retrieving help text"), NULL, 1); - HTTPSTREAM *stream = http_open(*shown_text + 14); - if(stream) help_text = http_get(stream, NULL); -- status = stream->status ? stream->status->code : -1; -+ status = stream && stream->status ? stream->status->code : -1; - if(stream) http_close(stream); - if(status != HTTP_OK){ - shown_text = NO_HELP; -@@ -165,7 +168,8 @@ helper_internal(HelpType text, char *frag, char *title, int flags) - *rv = NULL; - } - } -- -+ if(we_cancel) -+ cancel_busy_cue(-1); - } - - if(F_ON(F_BLANK_KEYMENU,ps_global)){ diff --git a/gnu/packages/patches/epiphany-update-libportal-usage.patch b/gnu/packages/patches/epiphany-update-libportal-usage.patch deleted file mode 100644 index 0d8ea045fb..0000000000 --- a/gnu/packages/patches/epiphany-update-libportal-usage.patch +++ /dev/null @@ -1,53 +0,0 @@ -Fix for epiphany with libportal-0.5. - -This patch was adapted from upstream -https://gitlab.gnome.org/GNOME/epiphany/-/commit/e4d259f614f75c26ad0d2094f4f569ffd1bc06d1 - -diff --git a/lib/ephy-flatpak-utils.c b/lib/ephy-flatpak-utils.c -index 6fc9a5dec17a63c0660cbc1d95103c8f77231d30..0fd90b3f178392930e812a8391fd81bf1371b8bf 100644 ---- a/lib/ephy-flatpak-utils.c -+++ b/lib/ephy-flatpak-utils.c -@@ -29,7 +29,7 @@ - #include <gio/gio.h> - #include <gio/gunixfdlist.h> - #if USE_LIBPORTAL --#include <libportal/portal-gtk3.h> -+#include <libportal-gtk3/portal-gtk3.h> - #endif - #include <string.h> - #include <sys/stat.h> -diff --git a/lib/meson.build b/lib/meson.build -index 264f9c5fb66268fc248f780b8d1c06c8291f856d..db0a0557f0ae634d7fb95e57aba0cd901ca4d6c1 100644 ---- a/lib/meson.build -+++ b/lib/meson.build -@@ -66,6 +66,7 @@ libephymisc_deps = [ - libxml_dep, - m_dep, - portal_dep, -+ portal_gtk_dep, - sqlite3_dep, - webkit2gtk_dep - ] -diff --git a/meson.build b/meson.build -index 0b9f862b22a23619289342ec39fa0a0274558c25..4285a975004e48366789a4e66f8b23f3af05a636 100644 ---- a/meson.build -+++ b/meson.build -@@ -95,7 +95,8 @@ libhandy_dep = dependency('libhandy-1', version: '>= 1.5.0') - libsecret_dep = dependency('libsecret-1', version: '>= 0.19.0') - libxml_dep = dependency('libxml-2.0', version: '>= 2.6.12') - nettle_dep = dependency('nettle', version: nettle_requirement) --portal_dep = dependency('libportal', version: '>= 0.0.2', required: get_option('libportal')) -+portal_dep = dependency('libportal', version: '>= 0.5', required: get_option('libportal')) -+portal_gtk_dep = dependency('libportal-gtk3', version: '>= 0.5', required: get_option('libportal')) - sqlite3_dep = dependency('sqlite3', version: '>= 3.22') - - if get_option('soup2').enabled() -@@ -108,7 +109,7 @@ else - webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.1', version: webkitgtk_requirement) - endif - --conf.set10('USE_LIBPORTAL', portal_dep.found()) -+conf.set10('USE_LIBPORTAL', portal_dep.found() and portal_gtk_dep.found()) - - webkit_revision = webkit2gtk_dep.get_variable(pkgconfig : 'revision', default_value : '') - if webkit_revision == 'tarball' diff --git a/gnu/packages/patches/fplll-std-fenv.patch b/gnu/packages/patches/fplll-std-fenv.patch deleted file mode 100644 index aa2438f0c9..0000000000 --- a/gnu/packages/patches/fplll-std-fenv.patch +++ /dev/null @@ -1,18 +0,0 @@ -See https://github.com/fplll/fplll/issues/444 - ---- fplll-5.3.3-checkout.old/fplll/enum/enumerate_base.h 2020-09-23 13:55:27.833769823 +0200 -+++ fplll-5.3.3-checkout/fplll/enum/enumerate_base.h 2020-09-23 13:56:14.313771769 +0200 -@@ -127,10 +127,10 @@ - int rounding_backup; - void save_rounding() - { -- rounding_backup = std::fegetround(); -- std::fesetround(FE_TONEAREST); -+ rounding_backup = fegetround(); -+ fesetround(FE_TONEAREST); - } -- void restore_rounding() { std::fesetround(rounding_backup); } -+ void restore_rounding() { fesetround(rounding_backup); } - - inline bool next_pos_up() - { diff --git a/gnu/packages/patches/java-commons-lang-fix-dependency.patch b/gnu/packages/patches/java-commons-lang-fix-dependency.patch new file mode 100644 index 0000000000..4e0d42d2ed --- /dev/null +++ b/gnu/packages/patches/java-commons-lang-fix-dependency.patch @@ -0,0 +1,38 @@ +Prevent java-commons-lang3 from depending on junit-bom when used with +maven. + +From 5c15b04ff9d05235460ea58f303fcf3502a943f2 Mon Sep 17 00:00:00 2001 +From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com> +Date: Mon, 13 Jun 2022 09:25:42 +0300 +Subject: [PATCH] pom.xml: Remove dependency on 'junit-bom' + +--- + pom.xml | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 167a85a47..6cd9be57b 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -513,18 +513,6 @@ + </contributor> + </contributors> + +- <dependencyManagement> +- <dependencies> +- <dependency> +- <groupId>org.junit</groupId> +- <artifactId>junit-bom</artifactId> +- <version>5.7.1</version> +- <type>pom</type> +- <scope>import</scope> +- </dependency> +- </dependencies> +- </dependencyManagement> +- + <!-- Lang should depend on very little --> + <dependencies> + <!-- testing --> +-- +2.25.1 + diff --git a/gnu/packages/patches/kismet-unbundle-boost.patch b/gnu/packages/patches/kismet-unbundle-boost.patch new file mode 100644 index 0000000000..06e028bb23 --- /dev/null +++ b/gnu/packages/patches/kismet-unbundle-boost.patch @@ -0,0 +1,104 @@ +From 170ed96fe53531f93cdbca184faeda4bdf457169 Mon Sep 17 00:00:00 2001 +From: Petr Hodina <phodina@protonmail.com> +Date: Tue, 7 Jun 2022 11:34:29 +0200 +Subject: [PATCH] Unbundle boost. + + +diff --git a/globalregistry.h b/globalregistry.h +index 1974f54..3d97364 100644 +--- a/globalregistry.h ++++ b/globalregistry.h +@@ -34,7 +34,7 @@ + #include "util.h" + #include "uuid.h" + +-#include "boost/asio.hpp" ++#include <boost/asio.hpp> + + class global_registry; + +diff --git a/gpsgpsd_v3.h b/gpsgpsd_v3.h +index 77acb14..8cb3cd4 100644 +--- a/gpsgpsd_v3.h ++++ b/gpsgpsd_v3.h +@@ -25,7 +25,7 @@ + #include "kis_gps.h" + #include "timetracker.h" + +-#include "boost/asio.hpp" ++#include <boost/asio.hpp> + + using boost::asio::ip::tcp; + +diff --git a/gpsnmea_v2.h b/gpsnmea_v2.h +index d761fd3..7518b94 100644 +--- a/gpsnmea_v2.h ++++ b/gpsnmea_v2.h +@@ -28,7 +28,7 @@ + #define ASIO_HAS_STD_CHRONO + #define ASIO_HAS_MOVE + +-#include "boost/asio.hpp" ++#include <boost/asio.hpp> + + // Generic NMEA parser for GPS + +diff --git a/gpsserial_v3.h b/gpsserial_v3.h +index c9f633f..2fa9acb 100644 +--- a/gpsserial_v3.h ++++ b/gpsserial_v3.h +@@ -29,7 +29,7 @@ + #define ASIO_HAS_STD_CHRONO + #define ASIO_HAS_MOVE + +-#include "boost/asio.hpp" ++#include <boost/asio.hpp> + + // NMEA serial-attached GPS + // Implemented using ASIO serial +diff --git a/gpstcp_v2.h b/gpstcp_v2.h +index 75ec2e9..ab46216 100644 +--- a/gpstcp_v2.h ++++ b/gpstcp_v2.h +@@ -29,7 +29,7 @@ + #define ASIO_HAS_STD_CHRONO + #define ASIO_HAS_MOVE + +-#include "boost/asio.hpp" ++#include <boost/asio.hpp> + + using boost::asio::ip::tcp; + +diff --git a/kis_external.h b/kis_external.h +index 217f18a..af397b5 100644 +--- a/kis_external.h ++++ b/kis_external.h +@@ -42,7 +42,7 @@ + #include "kis_external_packet.h" + #include "kis_net_beast_httpd.h" + +-#include "boost/asio.hpp" ++#include <boost/asio.hpp> + using boost::asio::ip::tcp; + + #include <google/protobuf/message_lite.h> +diff --git a/kis_net_beast_httpd.h b/kis_net_beast_httpd.h +index 355996c..989745e 100644 +--- a/kis_net_beast_httpd.h ++++ b/kis_net_beast_httpd.h +@@ -28,9 +28,9 @@ + #include <thread> + #include <unordered_map> + +-#include "boost/asio.hpp" +-#include "boost/beast.hpp" +-#include "boost/optional.hpp" ++#include <boost/asio.hpp> ++#include <boost/beast.hpp> ++#include <boost/optional.hpp> + + #include "entrytracker.h" + #include "future_chainbuf.h" +-- +2.35.1 + diff --git a/gnu/packages/patches/llvm-roc-3.0.0-add_libraries.patch b/gnu/packages/patches/llvm-roc-3.0.0-add_libraries.patch deleted file mode 100644 index f6bc639f33..0000000000 --- a/gnu/packages/patches/llvm-roc-3.0.0-add_libraries.patch +++ /dev/null @@ -1,22 +0,0 @@ -Taken from https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-devel/llvm-roc/files - -diff -Naur a/clang/lib/Basic/CMakeLists.txt b/clang/lib/Basic/CMakeLists.txt ---- a/clang/lib/Basic/CMakeLists.txt 2019-12-28 07:42:49.119055933 +0100 -+++ b/clang/lib/Basic/CMakeLists.txt 2019-12-28 07:42:13.265056070 +0100 -@@ -2,6 +2,7 @@ - Core - MC - Support -+ Option - ) - - find_first_existing_vc_file("${LLVM_MAIN_SRC_DIR}" llvm_vc) -diff -Naur a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt ---- a/clang/lib/Driver/CMakeLists.txt 2019-12-28 07:41:39.521056199 +0100 -+++ b/clang/lib/Driver/CMakeLists.txt 2019-12-28 07:40:23.998056487 +0100 -@@ -79,4 +79,5 @@ - LINK_LIBS - clangBasic - ${system_libs} -+ pthread - ) diff --git a/gnu/packages/patches/llvm-roc-4.2.0-add_Object.patch b/gnu/packages/patches/llvm-roc-4.2.0-add_Object.patch deleted file mode 100644 index f1762a558b..0000000000 --- a/gnu/packages/patches/llvm-roc-4.2.0-add_Object.patch +++ /dev/null @@ -1,13 +0,0 @@ -Taken from https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-devel/llvm-roc/files - -diff --color -uprN orig/lib/Target/AMDGPU/Disassembler/CMakeLists.txt llvm/lib/Target/AMDGPU/Disassembler/CMakeLists.txt ---- a/llvm/lib/Target/AMDGPU/Disassembler/CMakeLists.txt 2021-06-14 11:57:54.222796911 +0800 -+++ b/llvm/lib/Target/AMDGPU/Disassembler/CMakeLists.txt 2021-06-14 11:58:35.206796875 +0800 -@@ -11,6 +11,7 @@ add_llvm_component_library(LLVMAMDGPUDis - MC - MCDisassembler - Support -+ Object - - ADD_TO_COMPONENT - AMDGPU diff --git a/gnu/packages/patches/llvm-roc-5.0.0-linkdl.patch b/gnu/packages/patches/llvm-roc-5.0.0-linkdl.patch new file mode 100644 index 0000000000..d6ed3aef93 --- /dev/null +++ b/gnu/packages/patches/llvm-roc-5.0.0-linkdl.patch @@ -0,0 +1,15 @@ +Taken from the Gentoo patch: +https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-devel/llvm-roc/files/llvm-roc-5.0.0-linkdl.patch + +LLVMOffloadArch should link libdl to fix undefined symbol 'dlsym' when linking + +--- a/llvm/lib/OffloadArch/offload-arch/CMakeLists.txt ++++ b/llvm/lib/OffloadArch/offload-arch/CMakeLists.txt +@@ -3,6 +3,7 @@ add_llvm_tool(offload-arch + ${CMAKE_CURRENT_SOURCE_DIR}/offload-arch.cpp + DEPENDS generated-table LLVMOffloadArch + ) ++target_link_libraries(LLVMOffloadArch PRIVATE ${CMAKE_DL_LIBS}) + target_link_libraries(offload-arch PRIVATE LLVMOffloadArch) + + if(CMAKE_HOST_UNIX) diff --git a/gnu/packages/patches/mathjax-3.1.2-no-a11y.patch b/gnu/packages/patches/mathjax-3.1.2-no-a11y.patch new file mode 100644 index 0000000000..97bd82c536 --- /dev/null +++ b/gnu/packages/patches/mathjax-3.1.2-no-a11y.patch @@ -0,0 +1,281 @@ +commit 9bb6f1e11264fb075bfa70fa3684f10a32414594 +Author: Lars-Dominik Braun <lars@6xq.net> +Date: Wed Dec 1 14:28:06 2021 +0100 + + guix: Remove accessibility. + + We cannot build speech-rule-engine from source and thus all dependents + must be removed. This affects all a11y modules and menu items, which + may try to load components. + +diff --git a/components/src/dependencies.js b/components/src/dependencies.js +index f9be6f93..822f8fb6 100644 +--- a/components/src/dependencies.js ++++ b/components/src/dependencies.js +@@ -16,6 +16,3 @@ + export const dependencies = { +- 'a11y/semantic-enrich': ['input/mml', '[sre]'], +- 'a11y/complexity': ['a11y/semantic-enrich'], +- 'a11y/explorer': ['a11y/semantic-enrich', 'ui/menu'], + '[tex]/all-packages': ['input/tex-base'], + '[tex]/action': ['input/tex-base', '[tex]/newcommand'], +@@ -58,6 +55,5 @@ export const dependencies = { + export const paths = { + tex: '[mathjax]/input/tex/extensions', +- sre: '[mathjax]/sre/' + (typeof window === 'undefined' ? 'sre-node' : 'sre_browser') + }; + + const allPackages = [ +diff --git a/components/src/mml-chtml/mml-chtml.js b/components/src/mml-chtml/mml-chtml.js +index c0bd18ee..a283a1ab 100644 +--- a/components/src/mml-chtml/mml-chtml.js ++++ b/components/src/mml-chtml/mml-chtml.js +@@ -5,5 +5,4 @@ import '../input/mml/mml.js'; + import '../output/chtml/chtml.js'; + import '../output/chtml/fonts/tex/tex.js'; + import '../ui/menu/menu.js'; +-import '../a11y/assistive-mml/assistive-mml.js'; + import '../startup/startup.js'; +diff --git a/components/src/mml-chtml/preload.js b/components/src/mml-chtml/preload.js +index e3f202f7..3699570e 100644 +--- a/components/src/mml-chtml/preload.js ++++ b/components/src/mml-chtml/preload.js +@@ -5,5 +5,5 @@ Loader.preLoad( + 'core', + 'input/mml', + 'output/chtml', 'output/chtml/fonts/tex.js', +- 'ui/menu', 'a11y/assistive-mml' ++ 'ui/menu' + ); +diff --git a/components/src/mml-svg/mml-svg.js b/components/src/mml-svg/mml-svg.js +index 172b2433..23b66e69 100644 +--- a/components/src/mml-svg/mml-svg.js ++++ b/components/src/mml-svg/mml-svg.js +@@ -5,5 +5,4 @@ import '../input/mml/mml.js'; + import '../output/svg/svg.js'; + import '../output/svg/fonts/tex/tex.js'; + import '../ui/menu/menu.js'; +-import '../a11y/assistive-mml/assistive-mml.js'; + import '../startup/startup.js'; +diff --git a/components/src/mml-svg/preload.js b/components/src/mml-svg/preload.js +index 3cb47d42..89f6b9f9 100644 +--- a/components/src/mml-svg/preload.js ++++ b/components/src/mml-svg/preload.js +@@ -5,5 +5,5 @@ Loader.preLoad( + 'core', + 'input/mml', + 'output/svg', 'output/svg/fonts/tex.js', +- 'ui/menu', 'a11y/assistive-mml' ++ 'ui/menu' + ); +diff --git a/components/src/source.js b/components/src/source.js +index ba6d6835..02ecf18d 100644 +--- a/components/src/source.js ++++ b/components/src/source.js +@@ -62,11 +62,5 @@ export const source = { + 'output/chtml/fonts/tex': `${src}/output/chtml/fonts/tex/tex.js`, + 'output/svg': `${src}/output/svg/svg.js`, + 'output/svg/fonts/tex': `${src}/output/svg/fonts/tex/tex.js`, +- 'a11y/assistive-mml': `${src}/a11y/assistive-mml/assistive-mml.js`, +- 'a11y/semantic-enrich': `${src}/a11y/semantic-enrich/semantic-enrich.js`, +- 'a11y/complexity': `${src}/a11y/complexity/complexity.js`, +- 'a11y/explorer': `${src}/a11y/explorer/explorer.js`, +- '[sre]': (typeof window === 'undefined' ? `${src}/../../js/a11y/sre-node.js` : +- `${src}/../../node_modules/speech-rule-engine/lib/sre_browser.js`), + 'ui/menu': `${src}/ui/menu/menu.js`, + 'ui/safe': `${src}/ui/safe/safe.js`, +diff --git a/components/src/tex-chtml-full/preload.js b/components/src/tex-chtml-full/preload.js +index 76c81c92..0eb3a8e2 100644 +--- a/components/src/tex-chtml-full/preload.js ++++ b/components/src/tex-chtml-full/preload.js +@@ -5,5 +5,5 @@ Loader.preLoad( + 'core', + 'input/tex-full', + 'output/chtml', 'output/chtml/fonts/tex.js', +- 'ui/menu', 'a11y/assistive-mml' ++ 'ui/menu' + ); +diff --git a/components/src/tex-chtml-full/tex-chtml-full.js b/components/src/tex-chtml-full/tex-chtml-full.js +index 12291be9..c3f59e6b 100644 +--- a/components/src/tex-chtml-full/tex-chtml-full.js ++++ b/components/src/tex-chtml-full/tex-chtml-full.js +@@ -5,5 +5,4 @@ import '../input/tex-full/tex-full.js'; + import '../output/chtml/chtml.js'; + import '../output/chtml/fonts/tex/tex.js'; + import '../ui/menu/menu.js'; +-import '../a11y/assistive-mml/assistive-mml.js'; + import '../startup/startup.js'; +diff --git a/components/src/tex-chtml/preload.js b/components/src/tex-chtml/preload.js +index 89f110c5..5dae092f 100644 +--- a/components/src/tex-chtml/preload.js ++++ b/components/src/tex-chtml/preload.js +@@ -5,5 +5,5 @@ Loader.preLoad( + 'core', + 'input/tex', + 'output/chtml', 'output/chtml/fonts/tex.js', +- 'ui/menu', 'a11y/assistive-mml' ++ 'ui/menu' + ); +diff --git a/components/src/tex-chtml/tex-chtml.js b/components/src/tex-chtml/tex-chtml.js +index 8d98865e..4d100a48 100644 +--- a/components/src/tex-chtml/tex-chtml.js ++++ b/components/src/tex-chtml/tex-chtml.js +@@ -5,5 +5,4 @@ import '../input/tex/tex.js'; + import '../output/chtml/chtml.js'; + import '../output/chtml/fonts/tex/tex.js'; + import '../ui/menu/menu.js'; +-import '../a11y/assistive-mml/assistive-mml.js'; + import '../startup/startup.js'; +diff --git a/components/src/tex-mml-chtml/preload.js b/components/src/tex-mml-chtml/preload.js +index 7adb6a3b..3945370f 100644 +--- a/components/src/tex-mml-chtml/preload.js ++++ b/components/src/tex-mml-chtml/preload.js +@@ -5,5 +5,5 @@ Loader.preLoad( + 'core', + 'input/tex', 'input/mml', + 'output/chtml', 'output/chtml/fonts/tex.js', +- 'ui/menu', 'a11y/assistive-mml' ++ 'ui/menu' + ); +diff --git a/components/src/tex-mml-chtml/tex-mml-chtml.js b/components/src/tex-mml-chtml/tex-mml-chtml.js +index 4167bd59..0b068dc6 100644 +--- a/components/src/tex-mml-chtml/tex-mml-chtml.js ++++ b/components/src/tex-mml-chtml/tex-mml-chtml.js +@@ -6,5 +6,4 @@ import '../input/mml/mml.js'; + import '../output/chtml/chtml.js'; + import '../output/chtml/fonts/tex/tex.js'; + import '../ui/menu/menu.js'; +-import '../a11y/assistive-mml/assistive-mml.js'; + import '../startup/startup.js'; +diff --git a/components/src/tex-mml-svg/preload.js b/components/src/tex-mml-svg/preload.js +index 69d6a2c5..bad39af1 100644 +--- a/components/src/tex-mml-svg/preload.js ++++ b/components/src/tex-mml-svg/preload.js +@@ -5,5 +5,5 @@ Loader.preLoad( + 'core', + 'input/tex', 'input/mml', + 'output/svg', 'output/svg/fonts/tex.js', +- 'ui/menu', 'a11y/assistive-mml' ++ 'ui/menu' + ); +diff --git a/components/src/tex-mml-svg/tex-mml-svg.js b/components/src/tex-mml-svg/tex-mml-svg.js +index acff78dd..3ca4e6cf 100644 +--- a/components/src/tex-mml-svg/tex-mml-svg.js ++++ b/components/src/tex-mml-svg/tex-mml-svg.js +@@ -6,5 +6,4 @@ import '../input/mml/mml.js'; + import '../output/svg/svg.js'; + import '../output/svg/fonts/tex/tex.js'; + import '../ui/menu/menu.js'; +-import '../a11y/assistive-mml/assistive-mml.js'; + import '../startup/startup.js'; +diff --git a/components/src/tex-svg-full/preload.js b/components/src/tex-svg-full/preload.js +index d4165cf8..8871781a 100644 +--- a/components/src/tex-svg-full/preload.js ++++ b/components/src/tex-svg-full/preload.js +@@ -5,5 +5,5 @@ Loader.preLoad( + 'core', + 'input/tex-full', + 'output/svg', 'output/svg/fonts/tex.js', +- 'ui/menu', 'a11y/assistive-mml' ++ 'ui/menu' + ); +diff --git a/components/src/tex-svg-full/tex-svg-full.js b/components/src/tex-svg-full/tex-svg-full.js +index 55ce32f2..09c7e65c 100644 +--- a/components/src/tex-svg-full/tex-svg-full.js ++++ b/components/src/tex-svg-full/tex-svg-full.js +@@ -5,5 +5,4 @@ import '../input/tex-full/tex-full.js'; + import '../output/svg/svg.js'; + import '../output/svg/fonts/tex/tex.js'; + import '../ui/menu/menu.js'; +-import '../a11y/assistive-mml/assistive-mml.js'; + import '../startup/startup.js'; +diff --git a/components/src/tex-svg/preload.js b/components/src/tex-svg/preload.js +index 284ce317..3eb02665 100644 +--- a/components/src/tex-svg/preload.js ++++ b/components/src/tex-svg/preload.js +@@ -5,5 +5,5 @@ Loader.preLoad( + 'core', + 'input/tex', + 'output/svg', 'output/svg/fonts/tex.js', +- 'ui/menu', 'a11y/assistive-mml' ++ 'ui/menu' + ); +diff --git a/components/src/tex-svg/tex-svg.js b/components/src/tex-svg/tex-svg.js +index f4ce644e..5d8caa5c 100644 +--- a/components/src/tex-svg/tex-svg.js ++++ b/components/src/tex-svg/tex-svg.js +@@ -5,5 +5,4 @@ import '../input/tex/tex.js'; + import '../output/svg/svg.js'; + import '../output/svg/fonts/tex/tex.js'; + import '../ui/menu/menu.js'; +-import '../a11y/assistive-mml/assistive-mml.js'; + import '../startup/startup.js'; +diff --git a/ts/ui/menu/Menu.ts b/ts/ui/menu/Menu.ts +index 7553aafc..ca0b9780 100644 +--- a/ts/ui/menu/Menu.ts ++++ b/ts/ui/menu/Menu.ts +@@ -135,7 +135,7 @@ export class Menu { + autocollapse: false, + collapsible: false, + inTabOrder: true, +- assistiveMml: true, ++ assistiveMml: false, + explorer: false + }, + jax: { +@@ -475,7 +475,7 @@ export class Menu { + this.command('Reset', 'Reset to defaults', () => this.resetDefaults()) + ]), + this.submenu('Accessibility', 'Accessibility', [ +- this.checkbox('Activate', 'Activate', 'explorer'), ++ this.checkbox('Activate', 'Activate', 'explorer', {disabled: true}), + this.submenu('Speech', 'Speech', [ + this.checkbox('Speech', 'Speech Output', 'speech'), + this.checkbox('Subtitles', 'Speech Subtitles', 'subtitles'), +@@ -534,11 +534,11 @@ export class Menu { + this.checkbox('Prefix', 'Prefix', 'infoPrefix') + ], true), + this.rule(), +- this.checkbox('Collapsible', 'Collapsible Math', 'collapsible'), ++ this.checkbox('Collapsible', 'Collapsible Math', 'collapsible', {disabled: true}), + this.checkbox('AutoCollapse', 'Auto Collapse', 'autocollapse', {disabled: true}), + this.rule(), + this.checkbox('InTabOrder', 'Include in Tab Order', 'inTabOrder'), +- this.checkbox('AssistiveMml', 'Include Hidden MathML', 'assistiveMml') ++ this.checkbox('AssistiveMml', 'Include Hidden MathML', 'assistiveMml', {disabled: true}) + ]), + this.submenu('Language', 'Language'), + this.rule(), +@@ -722,6 +722,7 @@ export class Menu { + * @param {boolean} mml True to output hidden Mathml, false to not + */ + protected setAssistiveMml(mml: boolean) { ++ mml = false; + this.document.options.enableAssistiveMml = mml; + if (!mml || (MathJax._.a11y && MathJax._.a11y['assistive-mml'])) { + this.rerender(); +@@ -734,6 +735,7 @@ export class Menu { + * @param {boolean} explore True to enable the explorer, false to not + */ + protected setExplorer(explore: boolean) { ++ explore = false; + this.enableExplorerItems(explore); + this.document.options.enableExplorer = explore; + if (!explore || (MathJax._.a11y && MathJax._.a11y.explorer)) { +@@ -747,6 +749,7 @@ export class Menu { + * @param {boolean} collapse True to enable collapsible math, false to not + */ + protected setCollapsible(collapse: boolean) { ++ collapse = false; + this.document.options.enableComplexity = collapse; + if (!collapse || (MathJax._.a11y && MathJax._.a11y.complexity)) { + this.rerender(STATE.COMPILED); +@@ -845,6 +848,8 @@ export class Menu { + * @param {string} component The name of the a11y component to load + */ + public loadA11y(component: string) { ++ console.log ('ignoring load for', component); ++ return; + const noEnrich = !STATE.ENRICHED; + this.loadComponent('a11y/' + component, () => { + const startup = MathJax.startup; diff --git a/gnu/packages/patches/nftables-fix-makefile.patch b/gnu/packages/patches/nftables-fix-makefile.patch deleted file mode 100644 index 1660635874..0000000000 --- a/gnu/packages/patches/nftables-fix-makefile.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 18a08fb7f0443f8bde83393bd6f69e23a04246b3 Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso <pablo@netfilter.org> -Date: Tue, 22 Feb 2022 00:56:36 +0100 -Subject: examples: compile with `make check' and add AM_CPPFLAGS - -Compile examples via `make check' like libnftnl does. Use AM_CPPFLAGS to -specify local headers via -I. - -Unfortunately, `make distcheck' did not catch this compile time error in -my system, since it was using the nftables/libnftables.h file of the -previous nftables release. - -Fixes: 5b364657a35f ("build: missing SUBIRS update") -Fixes: caf2a6ad2d22 ("examples: add libnftables example program") -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - examples/Makefile.am | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/examples/Makefile.am b/examples/Makefile.am -index c972170d..3b8b0b67 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -1,4 +1,6 @@ --noinst_PROGRAMS = nft-buffer \ -+check_PROGRAMS = nft-buffer \ - nft-json-file - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - LDADD = $(top_builddir)/src/libnftables.la --- -cgit v1.2.3 - diff --git a/gnu/packages/patches/omake-fix-non-determinism.patch b/gnu/packages/patches/omake-fix-non-determinism.patch index 813ce3cd7d..e5060bd703 100644 --- a/gnu/packages/patches/omake-fix-non-determinism.patch +++ b/gnu/packages/patches/omake-fix-non-determinism.patch @@ -1,6 +1,6 @@ -From 2e7e254160506dc00f1beabf170512a8e932934b Mon Sep 17 00:00:00 2001 +From 9f70bca2d823b93b334ecb0f92e940d20aafc1c6 Mon Sep 17 00:00:00 2001 From: Julien Lepiller <julien@lepiller.eu> -Date: Sat, 31 Dec 2016 15:43:38 +0100 +Date: Sat, 18 Jun 2022 12:02:49 +0200 Subject: [PATCH] fix build date in binary --- @@ -8,19 +8,19 @@ Subject: [PATCH] fix build date in binary 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/magic/omake_gen_magic.ml b/src/magic/omake_gen_magic.ml -index b2419ba..fad52f5 100644 +index c2b9329..3d36c0c 100644 --- a/src/magic/omake_gen_magic.ml +++ b/src/magic/omake_gen_magic.ml @@ -150,7 +150,7 @@ let ir_magic = "%s" let obj_magic = "%s" let lib_dir = "%s" let version = "%s" --let version_message = "OMake %s:\\n\\tbuild [%s %s %d %02d:%02d:%02d %d]\\n\\ton %s" +-let version_message = "OMake %s:\n build [%s %s %d %02d:%02d:%02d %d]\n on %s" +let version_message = "OMake %s" |} default_save_interval digest_len -@@ -160,15 +160,7 @@ let version_message = "OMake %s:\\n\\tbuild [%s %s %d %02d:%02d:%02d %d]\\n\\ton +@@ -160,15 +160,7 @@ let version_message = "OMake %s:\n build [%s %s %d %02d:%02d:%02d %d]\n on (digest_files ".omo.magic" ".omo" omo_files) (String.escaped libdir) (String.escaped (shorten_version version)) @@ -37,5 +37,6 @@ index b2419ba..fad52f5 100644 List.iter (fun (name,value) -> Printf.fprintf buf "let %s = %S\n" name value --- -2.11.0 +-- +2.36.1 + diff --git a/gnu/packages/patches/public-inbox-fix-spawn-test.patch b/gnu/packages/patches/public-inbox-fix-spawn-test.patch new file mode 100644 index 0000000000..2739b1974d --- /dev/null +++ b/gnu/packages/patches/public-inbox-fix-spawn-test.patch @@ -0,0 +1,43 @@ +From 5593489d9c3ce22b1942f35c7ebb0e06fcf2bfa8 Mon Sep 17 00:00:00 2001 +From: Thiago Jung Bauermann <bauermann@kolabnow.com> +Date: Fri, 10 Jun 2022 12:39:18 -0300 +Subject: [PATCH] t/spawn: Find invalid PID to try to join its process group + +In the container used to build packages of the GNU Guix distribution, PID 1 +runs as the same user as the test so this spawn that should fail actually +succeeds. + +Fix the problem by going through different PIDs and picking one that +either doesn't exist or we aren't allowed to signal. +--- + +This patch is taken from the public-inbox repository and will appear in the +release after v1.8. + + t/spawn.t | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/t/spawn.t b/t/spawn.t +index 6168c1f6171c..5fc99a2a101c 100644 +--- a/t/spawn.t ++++ b/t/spawn.t +@@ -24,7 +24,18 @@ SKIP: { + is(waitpid($pid, 0), $pid, 'waitpid succeeds on spawned process'); + is($?, 0, 'true exited successfully'); + pipe(my ($r, $w)) or BAIL_OUT; +- $pid = eval { spawn(['true'], undef, { pgid => 1, 2 => $w }) }; ++ ++ # Find invalid PID to try to join its process group. ++ my $wrong_pgid = 1; ++ for (my $i=0x7fffffff; $i >= 2; $i--) { ++ if (kill(0, $i) == 0) { ++ $wrong_pgid = $i; ++ last; ++ } ++ } ++ ++ # Test spawn behavior when it can't join the requested process group. ++ $pid = eval { spawn(['true'], undef, { pgid => $wrong_pgid, 2 => $w }) }; + close $w; + my $err = do { local $/; <$r> }; + # diag "$err ($@)"; diff --git a/gnu/packages/patches/python-zeep-Fix-pytest_httpx-test-cases.patch b/gnu/packages/patches/python-zeep-Fix-pytest_httpx-test-cases.patch new file mode 100644 index 0000000000..7f022b4e46 --- /dev/null +++ b/gnu/packages/patches/python-zeep-Fix-pytest_httpx-test-cases.patch @@ -0,0 +1,73 @@ +From 2907848185adcb4e6d8c093db6c617c64cb8c8bf Mon Sep 17 00:00:00 2001 +From: Georg Sauthoff <mail@gms.tf> +Date: Sat, 5 Feb 2022 14:42:10 +0100 +Subject: [PATCH] Use current pytest_httpx add_response keyword + +The new text keyword was introduced in pytest_httpx 0.14, deprecated +in 0.14 and 0.17 and removed in 0.18. + +Thus, an appropriate constraint to that dependency is added. + +FWIW, this fixes the test cases on the upcoming Fedora 36 release. + +See also: +- https://github.com/Colin-b/pytest_httpx/blob/develop/CHANGELOG.md#0180---2022-01-17 +- https://github.com/Colin-b/pytest_httpx/blob/develop/CHANGELOG.md#0140---2021-10-22 +--- + setup.py | 2 +- + tests/test_async_transport.py | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/setup.py b/setup.py +index 4cf9073b..58a5c24f 100755 +--- a/setup.py ++++ b/setup.py +@@ -29,7 +29,7 @@ + "freezegun==0.3.15", + "pretend==1.0.9", + "pytest-cov==2.8.1", +- "pytest-httpx", ++ "pytest-httpx>=0.14", + "pytest-asyncio", + "pytest==6.2.5", + "requests_mock>=0.7.0", +diff --git a/tests/test_async_transport.py b/tests/test_async_transport.py +index f5e8d1b0..ee215265 100644 +--- a/tests/test_async_transport.py ++++ b/tests/test_async_transport.py +@@ -19,7 +19,7 @@ def test_load(httpx_mock): + cache = stub(get=lambda url: None, add=lambda url, content: None) + transport = AsyncTransport(cache=cache) + +- httpx_mock.add_response(url="http://tests.python-zeep.org/test.xml", data="x") ++ httpx_mock.add_response(url="http://tests.python-zeep.org/test.xml", text="x") + result = transport.load("http://tests.python-zeep.org/test.xml") + assert result == b"x" + +@@ -30,7 +30,7 @@ def test_load_cache(httpx_mock): + cache = InMemoryCache() + transport = AsyncTransport(cache=cache) + +- httpx_mock.add_response(url="http://tests.python-zeep.org/test.xml", data="x") ++ httpx_mock.add_response(url="http://tests.python-zeep.org/test.xml", text="x") + result = transport.load("http://tests.python-zeep.org/test.xml") + assert result == b"x" + +@@ -45,7 +45,7 @@ async def test_post(httpx_mock: HTTPXMock): + + envelope = etree.Element("Envelope") + +- httpx_mock.add_response(url="http://tests.python-zeep.org/test.xml", data="x") ++ httpx_mock.add_response(url="http://tests.python-zeep.org/test.xml", text="x") + result = await transport.post_xml( + "http://tests.python-zeep.org/test.xml", envelope=envelope, headers={} + ) +@@ -67,7 +67,7 @@ async def test_http_error(httpx_mock: HTTPXMock): + transport = AsyncTransport() + + httpx_mock.add_response( +- url="http://tests.python-zeep.org/test.xml", data="x", status_code=500 ++ url="http://tests.python-zeep.org/test.xml", text="x", status_code=500 + ) + with pytest.raises(exceptions.TransportError) as exc: + transport.load("http://tests.python-zeep.org/test.xml") diff --git a/gnu/packages/patches/rocm-comgr-3.1.0-dependencies.patch b/gnu/packages/patches/rocm-comgr-3.1.0-dependencies.patch index c91d273f92..fc2c74718a 100644 --- a/gnu/packages/patches/rocm-comgr-3.1.0-dependencies.patch +++ b/gnu/packages/patches/rocm-comgr-3.1.0-dependencies.patch @@ -11,11 +11,11 @@ Without these additional required dependencies, linking fails with errors such a CMakeLists.txt | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1794a07..c7b852a 100644 +diff --git a/lib/comgr/CMakeLists.txt b/lib/comgr/CMakeLists.txt +index 8b5ca2f..a7d226f 100644 --- a/lib/comgr/CMakeLists.txt +++ b/lib/comgr/CMakeLists.txt -@@ -207,7 +207,11 @@ install(FILES +@@ -294,7 +294,11 @@ install(FILES DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}") set(CLANG_LIBS @@ -28,7 +28,7 @@ index 1794a07..c7b852a 100644 set(LLD_LIBS lldELF -@@ -218,8 +222,20 @@ if (LLVM_LINK_LLVM_DYLIB) +@@ -305,8 +309,21 @@ if (LLVM_LINK_LLVM_DYLIB) else() llvm_map_components_to_libnames(LLVM_LIBS ${LLVM_TARGETS_TO_BUILD} @@ -46,7 +46,8 @@ index 1794a07..c7b852a 100644 + IRReader + CodeGen + Linker ++ Demangle + BinaryFormat) endif() - target_link_libraries(amd_comgr + target_link_options(amd_comgr diff --git a/gnu/packages/patches/rocm-opencl-runtime-3.10.0-includes.patch b/gnu/packages/patches/rocm-opencl-runtime-3.10.0-includes.patch deleted file mode 100644 index d81bb0747f..0000000000 --- a/gnu/packages/patches/rocm-opencl-runtime-3.10.0-includes.patch +++ /dev/null @@ -1,14 +0,0 @@ -Add missing include dirs for ROCclr. - ---- a/amdocl/CMakeLists.txt 2020-12-05 22:05:55.838529158 +0100 -+++ b/amdocl/CMakeLists.txt 2020-12-05 22:07:35.677524507 +0100 -@@ -23,6 +23,9 @@ - include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos) - include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos/headers) - include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos/headers/opencl2.2) -+include_directories(${ROCclr_DIR}/../../../include) -+include_directories(${ROCclr_DIR}/../../../include/compiler/lib/include/) -+include_directories(${ROCclr_DIR}/../../../include/elf/) - - if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR - (CMAKE_${COMPILER}_COMPILER_ID MATCHES "Clang")) diff --git a/gnu/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch b/gnu/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch index 5709e0d19a..97376fd421 100644 --- a/gnu/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch +++ b/gnu/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch @@ -4,25 +4,26 @@ diff --git a/CMakeLists.txt.orig b/CMakeLists.txt index 76847d3..3f62bfe 100644 --- a/CMakeLists.txt.orig +++ b/CMakeLists.txt -@@ -72,7 +72,7 @@ find_package(ROCclr REQUIRED CONFIG +@@ -15,9 +15,9 @@ option(FILE_REORG_BACKWARD_COMPATIBILITY "Enable File Reorganization backward co - add_subdirectory(khronos/icd) + + set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_LIST_DIR}/khronos/headers/opencl2.2" CACHE PATH "") + #add_subdirectory(khronos/icd) add_subdirectory(amdocl) -add_subdirectory(tools/clinfo) +#add_subdirectory(tools/clinfo) add_subdirectory(tools/cltrace) if(BUILD_TESTS) add_subdirectory(tests/ocltst) -@@ -108,9 +108,9 @@ endif() - ###--- Packaging ------------------------------------------------------------### +diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt +index 48353eb..cd1e7c1 100644 +--- a/packaging/CMakeLists.txt ++++ b/packaging/CMakeLists.txt +@@ -5,6 +5,6 @@ set(CPACK_COMPONENTS_ALL binary dev icd) + set(CPACK_DEB_COMPONENT_INSTALL ON) + set(CPACK_RPM_COMPONENT_INSTALL ON) - # MAIN package --install(PROGRAMS $<TARGET_FILE:clinfo> -- DESTINATION bin -- COMPONENT MAIN) -+#install(PROGRAMS $<TARGET_FILE:clinfo> -+# DESTINATION bin -+# COMPONENT MAIN) - install(PROGRAMS $<TARGET_FILE:cltrace> - DESTINATION lib - COMPONENT MAIN) +-install(TARGETS clinfo DESTINATION bin COMPONENT binary) ++#install(TARGETS clinfo DESTINATION bin COMPONENT binary) + install(TARGETS amdocl DESTINATION lib COMPONENT binary) + install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt DESTINATION share/doc/${CMAKE_PROJECT_NAME} COMPONENT binary) diff --git a/gnu/packages/patches/rocm-opencl-runtime-4.3-nocltrace.patch b/gnu/packages/patches/rocm-opencl-runtime-4.3-nocltrace.patch deleted file mode 100644 index e0328d7734..0000000000 --- a/gnu/packages/patches/rocm-opencl-runtime-4.3-nocltrace.patch +++ /dev/null @@ -1,25 +0,0 @@ -Do not build and install cltrace. - -diff --git a/CMakeLists.txt.orig b/CMakeLists.txt -index c449db4..9cff673 100644 ---- a/CMakeLists.txt.orig -+++ b/CMakeLists.txt -@@ -73,7 +73,7 @@ find_package(ROCclr REQUIRED CONFIG - #add_subdirectory(khronos/icd) - add_subdirectory(amdocl) - #add_subdirectory(tools/clinfo) --add_subdirectory(tools/cltrace) -+#add_subdirectory(tools/cltrace) - if(BUILD_TESTS) - add_subdirectory(tests/ocltst) - endif() -@@ -108,9 +108,6 @@ endif() - #install(PROGRAMS $<TARGET_FILE:clinfo> - # DESTINATION bin - # COMPONENT MAIN) --install(PROGRAMS $<TARGET_FILE:cltrace> -- DESTINATION lib -- COMPONENT MAIN) - install(PROGRAMS $<TARGET_FILE:amdocl64> - DESTINATION lib - COMPONENT MAIN) diff --git a/gnu/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch b/gnu/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch index ed20f02503..9f80d7da9d 100644 --- a/gnu/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch +++ b/gnu/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch @@ -2,36 +2,21 @@ Do not build and install libOpenCL. --- b/CMakeLists.txt +++ b/CMakeLists.txt -@@ -70,7 +70,7 @@ - ${ROCclr_DIR} - ${LIBROCclr_STATIC_DIR}) +@@ -15,9 +15,9 @@ option(FILE_REORG_BACKWARD_COMPATIBILITY "Enable File Reorganization backward co + + set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_LIST_DIR}/khronos/headers/opencl2.2" CACHE PATH "") -add_subdirectory(khronos/icd) +#add_subdirectory(khronos/icd) add_subdirectory(amdocl) - #add_subdirectory(tools/clinfo) + add_subdirectory(tools/clinfo) add_subdirectory(tools/cltrace) -@@ -93,9 +93,6 @@ - OUTPUT_VARIABLE OPENCL_VERSION_GITDATE - OUTPUT_STRIP_TRAILING_WHITESPACE) + if(BUILD_TESTS) + add_subdirectory(tests/ocltst) +@@ -25,16 +25,6 @@ endif() + + ###--- Packaging ------------------------------------------------------------### --get_target_property(OPENCL_LIB_VERSION_MAJOR OpenCL SOVERSION) --get_target_property(OPENCL_LIB_VERSION_STRING OpenCL VERSION) -- - find_package(ROCM QUIET CONFIG PATHS /opt/rocm) - - if(ROCM_FOUND) -@@ -117,25 +114,6 @@ - install(PROGRAMS $<TARGET_FILE:amdocl64> - DESTINATION lib - COMPONENT MAIN) --install(PROGRAMS $<TARGET_FILE:OpenCL> -- DESTINATION lib -- COMPONENT MAIN) --install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL> -- DESTINATION lib -- COMPONENT MAIN) -- -# DEV package -install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL" - DESTINATION include @@ -41,15 +26,26 @@ Do not build and install libOpenCL. - PATTERN cl_d3d11.h EXCLUDE - PATTERN cl_dx9_media_sharing.h EXCLUDE - PATTERN cl_egl.h EXCLUDE) --install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL> -- DESTINATION lib -- COMPONENT DEV) - +- ############################# # Packaging steps + ############################# +@@ -53,8 +43,8 @@ if (DEFINED ROCM_PATCH_VERSION) + set(OPENCL_AMD_ICD_FILE "amdocl64_${ROCM_PATCH_VERSION}.icd") + endif() + +-get_target_property(OPENCL_LIB_VERSION_MAJOR OpenCL SOVERSION) +-get_target_property(OPENCL_LIB_VERSION_STRING OpenCL VERSION) ++#get_target_property(OPENCL_LIB_VERSION_MAJOR OpenCL SOVERSION) ++#get_target_property(OPENCL_LIB_VERSION_STRING OpenCL VERSION) + + #Set Package Version + set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) +diff --git a/khronos/icd/CMakeLists.txt b/khronos/icd/CMakeLists.txt +index 4bafa86..987dd6f 100644 --- a/khronos/icd/CMakeLists.txt 2020-06-07 16:05:32.425022904 +0200 +++ b/khronos/icd/CMakeLists.txt 2020-06-07 16:06:03.273022786 +0200 -@@ -132,7 +132,7 @@ +@@ -132,7 +132,7 @@ if (BUILD_TESTING) add_subdirectory (test) endif() @@ -61,3 +57,14 @@ Do not build and install libOpenCL. +# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +# ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt +index 48353eb..cd1e7c1 100644 +--- a/packaging/CMakeLists.txt ++++ b/packaging/CMakeLists.txt +@@ -17,5 +17,5 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/khronos/headers/opencl2.2/CL + PATTERN cl_dx9_media_sharing.h EXCLUDE + PATTERN cl_egl.h EXCLUDE ) + +-install(TARGETS OpenCL DESTINATION lib COMPONENT icd ) ++#install(TARGETS OpenCL DESTINATION lib COMPONENT icd ) + install(FILES ${CMAKE_SOURCE_DIR}/khronos/icd/LICENSE DESTINATION share/doc/rocm-ocl-icd COMPONENT icd) diff --git a/gnu/packages/patches/timescaledb-flaky-test.patch b/gnu/packages/patches/timescaledb-flaky-test.patch new file mode 100644 index 0000000000..6268bcecad --- /dev/null +++ b/gnu/packages/patches/timescaledb-flaky-test.patch @@ -0,0 +1,107 @@ +Use fixed dates in test for consistent results. + +Taken from upstream: + + https://github.com/timescale/timescaledb/commit/1d0670e703862b284c241ab797404f851b25b5df + +diff --git a/test/expected/copy-12.out b/test/expected/copy-12.out +index 5cb28a45a2..37abf6f6ff 100644 +--- a/test/expected/copy-12.out ++++ b/test/expected/copy-12.out +@@ -324,13 +324,12 @@ INSERT INTO hyper_copy_large + SELECT time, + random() AS value + FROM +-generate_series(now() - INTERVAL '1 months', now() - INTERVAL '1 day', +- INTERVAL '1 hour') AS g1(time) ++generate_series('2022-01-01', '2022-01-31', INTERVAL '1 hour') AS g1(time) + ORDER BY time; + SELECT COUNT(*) FROM hyper_copy_large; + count + ------- +- 697 ++ 721 + (1 row) + + -- Migrate data to chunks by using copy +@@ -345,7 +344,7 @@ NOTICE: migrating data to chunks + SELECT COUNT(*) FROM hyper_copy_large; + count + ------- +- 697 ++ 721 + (1 row) + + ---------------------------------------------------------------- +diff --git a/test/expected/copy-13.out b/test/expected/copy-13.out +index 02bf913eff..89e16fe8e2 100644 +--- a/test/expected/copy-13.out ++++ b/test/expected/copy-13.out +@@ -324,13 +324,12 @@ INSERT INTO hyper_copy_large + SELECT time, + random() AS value + FROM +-generate_series(now() - INTERVAL '1 months', now() - INTERVAL '1 day', +- INTERVAL '1 hour') AS g1(time) ++generate_series('2022-01-01', '2022-01-31', INTERVAL '1 hour') AS g1(time) + ORDER BY time; + SELECT COUNT(*) FROM hyper_copy_large; + count + ------- +- 697 ++ 721 + (1 row) + + -- Migrate data to chunks by using copy +@@ -345,7 +344,7 @@ NOTICE: migrating data to chunks + SELECT COUNT(*) FROM hyper_copy_large; + count + ------- +- 697 ++ 721 + (1 row) + + ---------------------------------------------------------------- +diff --git a/test/expected/copy-14.out b/test/expected/copy-14.out +index 02bf913eff..89e16fe8e2 100644 +--- a/test/expected/copy-14.out ++++ b/test/expected/copy-14.out +@@ -324,13 +324,12 @@ INSERT INTO hyper_copy_large + SELECT time, + random() AS value + FROM +-generate_series(now() - INTERVAL '1 months', now() - INTERVAL '1 day', +- INTERVAL '1 hour') AS g1(time) ++generate_series('2022-01-01', '2022-01-31', INTERVAL '1 hour') AS g1(time) + ORDER BY time; + SELECT COUNT(*) FROM hyper_copy_large; + count + ------- +- 697 ++ 721 + (1 row) + + -- Migrate data to chunks by using copy +@@ -345,7 +344,7 @@ NOTICE: migrating data to chunks + SELECT COUNT(*) FROM hyper_copy_large; + count + ------- +- 697 ++ 721 + (1 row) + + ---------------------------------------------------------------- +diff --git a/test/sql/copy.sql.in b/test/sql/copy.sql.in +index 91402c2ab8..bba4265064 100644 +--- a/test/sql/copy.sql.in ++++ b/test/sql/copy.sql.in +@@ -276,8 +276,7 @@ INSERT INTO hyper_copy_large + SELECT time, + random() AS value + FROM +-generate_series(now() - INTERVAL '1 months', now() - INTERVAL '1 day', +- INTERVAL '1 hour') AS g1(time) ++generate_series('2022-01-01', '2022-01-31', INTERVAL '1 hour') AS g1(time) + ORDER BY time; + + SELECT COUNT(*) FROM hyper_copy_large; |