diff options
| author | Marius Bakke <marius@gnu.org> | 2020-12-29 17:39:24 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-12-29 17:39:24 +0100 |
| commit | 78cf7a4571081ff9c9e4ab678bf67368de1add59 (patch) | |
| tree | d37341b9129f7ea1c6288f5095af2d046fb27710 /gnu/packages/patches | |
| parent | afa493c4c7ef307455b16b52a87d180f0c4a8c6b (diff) | |
| parent | a22e75c073c785a3a71c952d97fb7ab87dfd282d (diff) | |
| download | guix-78cf7a4571081ff9c9e4ab678bf67368de1add59.tar.gz guix-78cf7a4571081ff9c9e4ab678bf67368de1add59.zip | |
Merge branch 'ungrafting' into staging
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/audacity-add-include.patch | 15 | ||||
| -rw-r--r-- | gnu/packages/patches/dbxfs-remove-sentry-sdk.patch | 2 | ||||
| -rw-r--r-- | gnu/packages/patches/shakespeare-spl-fix-grammar.patch | 16 |
3 files changed, 32 insertions, 1 deletions
diff --git a/gnu/packages/patches/audacity-add-include.patch b/gnu/packages/patches/audacity-add-include.patch new file mode 100644 index 0000000000..a7f27918e7 --- /dev/null +++ b/gnu/packages/patches/audacity-add-include.patch @@ -0,0 +1,15 @@ +Without <sys/time.h>, gettimeofday is undefined. + +diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp +index 0187e3962..e15d55f4c 100644 +--- a/src/AudioIO.cpp ++++ b/src/AudioIO.cpp +@@ -479,6 +479,8 @@ time warp info and AudioIOListener and whether the playback is looped. + #include "../lib-src/portmidi/porttime/porttime.h" + #include "../lib-src/header-substitutes/allegro.h" + ++#include <sys/time.h> ++ + #define MIDI_SLEEP 10 /* milliseconds */ + // how long do we think the thread that fills MIDI buffers, + // if it is separate from the portaudio thread, diff --git a/gnu/packages/patches/dbxfs-remove-sentry-sdk.patch b/gnu/packages/patches/dbxfs-remove-sentry-sdk.patch index 7079fa8c3c..e4f660000d 100644 --- a/gnu/packages/patches/dbxfs-remove-sentry-sdk.patch +++ b/gnu/packages/patches/dbxfs-remove-sentry-sdk.patch @@ -54,7 +54,7 @@ index 89e25c6..f940d47 100644 @@ -43,7 +43,6 @@ setup( "privy>=6.0,<7", "keyring>=15.1.0", - "keyrings.alt>=3.1,<4", + "keyrings.alt>=3.1,<5", - "sentry_sdk>=0.3,<1", ], extras_require={ diff --git a/gnu/packages/patches/shakespeare-spl-fix-grammar.patch b/gnu/packages/patches/shakespeare-spl-fix-grammar.patch new file mode 100644 index 0000000000..737c0eb8c1 --- /dev/null +++ b/gnu/packages/patches/shakespeare-spl-fix-grammar.patch @@ -0,0 +1,16 @@ +ROMAN_HUNDREDS, ROMAN_TENS and ROMAN_ONES seem to use syntax, that is not +recognized (any longer?) by flex, so let's expand their definitions. + +Index: spl-1.2.1/include/roman_numbers.metaflex +=================================================================== +--- spl-1.2.1.orig/include/roman_numbers.metaflex ++++ spl-1.2.1/include/roman_numbers.metaflex +@@ -1,5 +1,5 @@ + ROMAN_THOUSANDS m+ +-ROMAN_HUNDREDS (c(d|m)|dc{0,3}|c{1,3}) +-ROMAN_TENS (x(l|c)|lx{0,3}|x{1,3}) +-ROMAN_ONES (i(v|x)|vi{0,3}|i{1,3}) ++ROMAN_HUNDREDS (c(d|m|c?c?)|dc?c?c?) ++ROMAN_TENS (x(l|c|x?x?)|lx?x?x?) ++ROMAN_ONES (i(v|x|i?i?)|vi?i?i?) + ROMAN_NUMBER {ROMAN_ONES}|{ROMAN_TENS}{ROMAN_ONES}?|{ROMAN_HUNDREDS}{ROMAN_TENS}?{ROMAN_ONES}?|{ROMAN_THOUSANDS}{ROMAN_HUNDREDS}?{ROMAN_TENS}?{ROMAN_ONES}? |