diff options
Diffstat (limited to 'gnu/packages/patches')
10 files changed, 266 insertions, 130 deletions
diff --git a/gnu/packages/patches/audacity-ffmpeg-fallback.patch b/gnu/packages/patches/audacity-ffmpeg-fallback.patch index b78956070a..d18583c9bd 100644 --- a/gnu/packages/patches/audacity-ffmpeg-fallback.patch +++ b/gnu/packages/patches/audacity-ffmpeg-fallback.patch @@ -8,13 +8,11 @@ it. This dynamic loading mechanism fails to properly locate libraries outside of LD_LIBRARY_PATH. See <https://issues.guix.gnu.org/53591>. ---- - libraries/lib-ffmpeg-support/CMakeLists.txt | 8 ++++++++ - libraries/lib-ffmpeg-support/FFmpegFunctions.cpp | 12 ++++++++++++ - 2 files changed, 20 insertions(+) + +Bugs-added-by: Marius Bakke <[email protected]> diff --git a/libraries/lib-ffmpeg-support/CMakeLists.txt b/libraries/lib-ffmpeg-support/CMakeLists.txt -index 8c5f06d7c..00810e4d0 100644 +index b8803a1f5..f86559cca 100644 --- a/libraries/lib-ffmpeg-support/CMakeLists.txt +++ b/libraries/lib-ffmpeg-support/CMakeLists.txt @@ -1,5 +1,7 @@ @@ -25,7 +23,7 @@ index 8c5f06d7c..00810e4d0 100644 set( SOURCES FFmpegTypes.h -@@ -100,6 +102,12 @@ if (${_OPT}use_ffmpeg) +@@ -107,6 +109,12 @@ if (${_OPT}use_ffmpeg) list(APPEND DEFINITIONS PRIVATE _DARWIN_C_SOURCE ) endif() @@ -39,10 +37,10 @@ index 8c5f06d7c..00810e4d0 100644 "${DEFINITIONS}" "" ) diff --git a/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp b/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp -index 66d085a0b..4eeb4aed3 100644 +index 55d6f676b..46640ef83 100644 --- a/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp +++ b/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp -@@ -238,6 +238,18 @@ struct FFmpegFunctions::Private final +@@ -246,6 +246,18 @@ struct FFmpegFunctions::Private final if (library->IsLoaded()) return library; @@ -58,9 +56,6 @@ index 66d085a0b..4eeb4aed3 100644 + } +#endif + - // Loading has failed. - // wxLogSysError doesn't report errors correctly on *NIX - #if defined(_WIN32) --- -2.34.0 - + return {}; + } + }; diff --git a/gnu/packages/patches/ecl-16-format-directive-limit.patch b/gnu/packages/patches/ecl-16-format-directive-limit.patch deleted file mode 100644 index 237db92722..0000000000 --- a/gnu/packages/patches/ecl-16-format-directive-limit.patch +++ /dev/null @@ -1,83 +0,0 @@ -Patch backported by Sage. - -Fix from upstream that happens to work around -https://trac.sagemath.org/ticket/23011 -diff --git a/src/lsp/format.lsp b/src/lsp/format.lsp -index 77ca799..53b887c 100644 ---- a/src/lsp/format.lsp -+++ b/src/lsp/format.lsp -@@ -307,11 +307,13 @@ - :start (format-directive-start struct) - :end (format-directive-end struct)))) - -+(defconstant +format-directive-limit+ (1+ (char-code #\~))) -+ - #+formatter - (defparameter *format-directive-expanders* -- (make-array char-code-limit :initial-element nil)) -+ (make-array +format-directive-limit+ :initial-element nil)) - (defparameter *format-directive-interpreters* -- (make-array char-code-limit :initial-element nil)) -+ (make-array +format-directive-limit+ :initial-element nil)) - - (defparameter *default-format-error-control-string* nil) - (defparameter *default-format-error-offset* nil) -@@ -550,24 +552,24 @@ - (write-string directive stream) - (interpret-directive-list stream (cdr directives) orig-args args)) - (#-ecl format-directive #+ecl vector -+ (multiple-value-bind -+ (new-directives new-args) -+ (let* ((code (char-code (format-directive-character directive))) -+ (function -+ (and (< code +format-directive-limit+) -+ (svref *format-directive-interpreters* code))) -+ (*default-format-error-offset* -+ (1- (format-directive-end directive)))) -+ (unless function -+ (error 'format-error -+ :complaint "Unknown format directive.")) - (multiple-value-bind - (new-directives new-args) -- (let ((function -- (svref *format-directive-interpreters* -- (char-code (format-directive-character -- directive)))) -- (*default-format-error-offset* -- (1- (format-directive-end directive)))) -- (unless function -- (error 'format-error -- :complaint "Unknown format directive.")) -- (multiple-value-bind -- (new-directives new-args) -- (funcall function stream directive -- (cdr directives) orig-args args) -- (values new-directives new-args))) -- (interpret-directive-list stream new-directives -- orig-args new-args))))) -+ (funcall function stream directive -+ (cdr directives) orig-args args) -+ (values new-directives new-args))) -+ (interpret-directive-list stream new-directives -+ orig-args new-args))))) - args)) - - -@@ -639,11 +641,12 @@ - (values `(write-string ,directive stream) - more-directives)) - (format-directive -- (let ((expander -- (aref *format-directive-expanders* -- (char-code (format-directive-character directive)))) -- (*default-format-error-offset* -- (1- (format-directive-end directive)))) -+ (let* ((code (char-code (format-directive-character directive))) -+ (expander -+ (and (< code +format-directive-limit+) -+ (svref *format-directive-expanders* code))) -+ (*default-format-error-offset* -+ (1- (format-directive-end directive)))) - (if expander - (funcall expander directive more-directives) - (error 'format-error diff --git a/gnu/packages/patches/ecl-16-ignore-stderr-write-error.patch b/gnu/packages/patches/ecl-16-ignore-stderr-write-error.patch deleted file mode 100644 index 42d213c0e9..0000000000 --- a/gnu/packages/patches/ecl-16-ignore-stderr-write-error.patch +++ /dev/null @@ -1,17 +0,0 @@ -Patch adapted from Sage. -diff -Naur ecl-16.1.2.orig/src/c/file.d ecl-16.1.2/src/c/file.d ---- ecl-16.1.2.orig/src/c/file.d 2016-05-11 13:10:51.867673867 +1200 -+++ ecl-16.1.2/src/c/file.d 2016-05-11 14:44:48.121907307 +1200 -@@ -3354,8 +3354,10 @@ - ecl_disable_interrupts(); - do { - out = fwrite(c, sizeof(char), n, IO_STREAM_FILE(strm)); -- } while (out < n && restartable_io_error(strm, "fwrite")); -- ecl_enable_interrupts(); -+ /* Ignore write errors to stderr to avoid an infinite loop */ -+ } while (out < n && (IO_STREAM_FILE(strm) != stderr) && restartable_io_error(strm, "fwrite")); -+ -+ ecl_enable_interrupts(); - return out; - } - diff --git a/gnu/packages/patches/ecl-16-libffi.patch b/gnu/packages/patches/ecl-16-libffi.patch deleted file mode 100644 index fc06a07606..0000000000 --- a/gnu/packages/patches/ecl-16-libffi.patch +++ /dev/null @@ -1,16 +0,0 @@ -Patch adapted from Sage. Allows building ECL on libffi 3.3. -diff --git a/src/c/ffi.d b/src/c/ffi.d -index 8861303e..8a959c23 100644 ---- a/src/c/ffi.d -+++ b/src/c/ffi.d -@@ -133,8 +133,8 @@ static struct { - #elif defined(X86_WIN64) - {@':win64', FFI_WIN64}, - #elif defined(X86_ANY) || defined(X86) || defined(X86_64) -- {@':cdecl', FFI_SYSV}, -- {@':sysv', FFI_SYSV}, -+ {@':cdecl', FFI_UNIX64}, -+ {@':sysv', FFI_UNIX64}, - {@':unix64', FFI_UNIX64}, - #endif - }; diff --git a/gnu/packages/patches/kcontacts-incorrect-country-name.patch b/gnu/packages/patches/kcontacts-incorrect-country-name.patch new file mode 100644 index 0000000000..7e15f9f5eb --- /dev/null +++ b/gnu/packages/patches/kcontacts-incorrect-country-name.patch @@ -0,0 +1,85 @@ +From 5fc2ce8b9f34ea3218a030aeede01b70bedb2546 Mon Sep 17 00:00:00 2001 +From: Petr Hodina <[email protected]> +Date: Wed, 28 Sep 2022 20:58:43 +0200 +Subject: [PATCH] autotests: Fix incorrect name of country in comparison. + + +diff --git a/autotests/addresstest.cpp b/autotests/addresstest.cpp +index fc6a9bc7..01e474b6 100644 +--- a/autotests/addresstest.cpp ++++ b/autotests/addresstest.cpp +@@ -157,7 +157,7 @@ void AddressTest::formatTest() + + const QString result( + QStringLiteral("Jim Knopf\nLummerlandstr. 1\n" +- "12345 Lummerstadt\n\nGERMANIA")); ++ "12345 Lummerstadt\n\nGERMANY")); + + QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QStringLiteral("Jim Knopf")), result); + #if KCONTACTS_BUILD_DEPRECATED_SINCE(5, 92) +@@ -175,7 +175,7 @@ void AddressTest::formatTest() + + const QString result( + QStringLiteral("Huck Finn\n457 Foobar Ave\nNERVOUSBREAKTOWN," +- " DC 1A2B3C\n\nSTATI UNITI")); ++ " DC 1A2B3C\n\nUNITED STATES")); + QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QStringLiteral("Huck Finn")), result); + } + +@@ -188,7 +188,7 @@ void AddressTest::formatTest() + + const QString result( + QStringLiteral("Jim Knopf\nLummerlandstr. 1\n" +- "12345 Lummerstadt\n\nGERMANIA")); ++ "12345 Lummerstadt\n\nGERMANY")); + + QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QStringLiteral("Jim Knopf")), result); + } +@@ -214,7 +214,7 @@ void AddressTest::formatTest() + address.setCountry(QStringLiteral("Schweiz")); + + // we want the Italian variant of the Swiss format for it_CH +- const QString result(QStringLiteral("Dr. Konqui\nCasella postale 5678\nHaus Randa\n1234 Randa\n\nSVIZZERA")); ++ const QString result(QStringLiteral("Dr. Konqui\nCasella postale 5678\nHaus Randa\n1234 Randa\n\nSWITZERLAND")); + + QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QStringLiteral("Dr. Konqui")), result); + } +@@ -228,14 +228,14 @@ void AddressTest::formatTest() + address.setCountry(QStringLiteral("CH")); + + // we want the Italian variant of the Swiss format for it_CH +- const QString result(QStringLiteral("Dr. Konqui\nCasella postale 5678\nHaus Randa\n1234 Randa\n\nSVIZZERA")); ++ const QString result(QStringLiteral("Dr. Konqui\nCasella postale 5678\nHaus Randa\n1234 Randa\n\nSWITZERLAND")); + QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QStringLiteral("Dr. Konqui")), result); + } + + { + KContacts::Address address; + address.setCountry(QStringLiteral("CH")); +- QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QString()), QLatin1String("SVIZZERA")); ++ QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QString()), QLatin1String("SWITZERLAND")); + } + + { +@@ -257,14 +257,14 @@ void AddressTest::formatTest() + address.setLocality(QStringLiteral("Minato-ku")); + address.setPostalCode(QStringLiteral("106-0047")); + address.setStreet(QStringLiteral("4-6-28 Minami-Azabu")); +- auto result = QString::fromUtf8("4-6-28 Minami-Azabu, Minato-ku\nTOKYO 106-0047\n\nGIAPPONE"); ++ auto result = QString::fromUtf8("4-6-28 Minami-Azabu, Minato-ku\nTOKYO 106-0047\n\nJAPAN"); + QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal), result); + + address.setRegion(QStringLiteral("東京")); + address.setLocality(QStringLiteral("都港区")); + address.setPostalCode(QStringLiteral("106-0047")); + address.setStreet(QStringLiteral("南麻布 4-6-28")); +- result = QString::fromUtf8("〒106-0047\n東京都港区南麻布 4-6-28\n\nGIAPPONE"); ++ result = QString::fromUtf8("〒106-0047\n東京都港区南麻布 4-6-28\n\nJAPAN"); + QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal), result); + } + } + +base-commit: 1d757eba019718cab5d3b33a231d19daf31eb8ba +-- +2.37.2 + diff --git a/gnu/packages/patches/kde-cli-tools-delay-mime-db.patch b/gnu/packages/patches/kde-cli-tools-delay-mime-db.patch new file mode 100644 index 0000000000..e29b3b192d --- /dev/null +++ b/gnu/packages/patches/kde-cli-tools-delay-mime-db.patch @@ -0,0 +1,26 @@ +From f8cfb96a1540fc3256af95adf8003b75c305183c Mon Sep 17 00:00:00 2001 +From: Petr Hodina <[email protected]> +Date: Fri, 30 Sep 2022 21:55:55 +0200 +Subject: [PATCH] Add delay to update the mime db in testCreateMimeType test + function. + + +diff --git a/keditfiletype/tests/filetypestest.cpp b/keditfiletype/tests/filetypestest.cpp +index e58e6f2..a41d4ad 100644 +--- a/keditfiletype/tests/filetypestest.cpp ++++ b/keditfiletype/tests/filetypestest.cpp +@@ -315,6 +315,9 @@ private Q_SLOTS: + QVERIFY(data.isDirty()); + QVERIFY(data.sync()); + MimeTypeWriter::runUpdateMimeDatabase(); ++ // QMimeDatabase doesn't even try to update the cache if less than ++ // 5000 ms have passed (can't use qmime_secondsBetweenChecks) ++ QTest::qSleep(5000); + QMimeType mime = db.mimeTypeForName(mimeTypeName); + QVERIFY(mime.isValid()); + QCOMPARE(mime.comment(), fakeComment); + +base-commit: b5911cda17521156b22429436e19b508aa442a57 +-- +2.37.2 + diff --git a/gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch b/gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch new file mode 100644 index 0000000000..ec4a34037d --- /dev/null +++ b/gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch @@ -0,0 +1,24 @@ +From 46164a50de4102d02ae9d1d480acdd4b12303db8 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <[email protected]> +Date: Wed, 14 Oct 2015 07:07:22 -0500 +Subject: [PATCH] qdiriterator follow symlinks + +--- + processui/scripting.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/processui/scripting.cpp b/processui/scripting.cpp +index efed8ff..841761a 100644 +--- a/processui/scripting.cpp ++++ b/processui/scripting.cpp +@@ -293,7 +293,7 @@ void Scripting::loadContextMenu() + const QStringList dirs = + QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("ksysguard/scripts/"), QStandardPaths::LocateDirectory); + for (const QString &dir : dirs) { +- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + scripts.append(it.next()); + } +-- +2.5.2 diff --git a/gnu/packages/patches/linux-libre-infodocs-target.patch b/gnu/packages/patches/linux-libre-infodocs-target.patch new file mode 100644 index 0000000000..e9e6495c26 --- /dev/null +++ b/gnu/packages/patches/linux-libre-infodocs-target.patch @@ -0,0 +1,88 @@ +Upstream status: https://marc.info/?l=linux-doc&m=166861669723994&w=2 + +From 7edb5b278ee383ff9bed525329b2cdbe22317bf2 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer <[email protected]> +Date: Mon, 14 Nov 2022 22:51:11 -0500 +Subject: [PATCH] doc: add texinfodocs and infodocs targets + +Sphinx supports generating Texinfo sources and Info documentation, +which can be navigated easily and is convenient to search (via the +indexed nodes or anchors, for example). + +This change also causes the html output to appear under its own output +sub-directory, which makes it easier to install, since it's clean from +.doctrees or other output formats. + +Signed-off-by: Maxim Cournoyer <[email protected]> +--- + Documentation/Makefile | 13 ++++++++++++- + Documentation/userspace-api/media/Makefile | 3 ++- + Makefile | 2 +- + 3 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/Documentation/Makefile b/Documentation/Makefile +index 64d44c1ecad3..bd8dac560633 100644 +--- a/Documentation/Makefile ++++ b/Documentation/Makefile +@@ -93,7 +93,16 @@ quiet_cmd_sphinx = SPHINX $@ --> file://$(abspath $(BUILDDIR)/$3/$4) + + htmldocs: + @$(srctree)/scripts/sphinx-pre-install --version-check +- @+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,html,$(var),,$(var))) ++ @+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,html,$(var),html,$(var))) ++ ++texinfodocs: ++ @$(srctree)/scripts/sphinx-pre-install --version-check ++ @+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,texinfo,$(var),texinfo,$(var))) ++ ++# Note: the 'info' Make target is generated by sphinx itself when ++# running the texinfodocs target define above. ++infodocs: texinfodocs ++ $(MAKE) -C $(BUILDDIR)/texinfo info + + linkcheckdocs: + @$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,linkcheck,$(var),,$(var))) +@@ -143,6 +152,8 @@ cleandocs: + dochelp: + @echo ' Linux kernel internal documentation in different formats from ReST:' + @echo ' htmldocs - HTML' ++ @echo ' texinfodocs - Texinfo' ++ @echo ' infodocs - Info' + @echo ' latexdocs - LaTeX' + @echo ' pdfdocs - PDF' + @echo ' epubdocs - EPUB' +diff --git a/Documentation/userspace-api/media/Makefile b/Documentation/userspace-api/media/Makefile +index 00922aa7efde..3d8aaf5c253b 100644 +--- a/Documentation/userspace-api/media/Makefile ++++ b/Documentation/userspace-api/media/Makefile +@@ -47,10 +47,11 @@ $(BUILDDIR)/lirc.h.rst: ${UAPI}/lirc.h ${PARSER} $(SRC_DIR)/lirc.h.rst.exception + + # Media build rules + +-.PHONY: all html epub xml latex ++.PHONY: all html texinfo epub xml latex + + all: $(IMGDOT) $(BUILDDIR) ${TARGETS} + html: all ++texinfo: all + epub: all + xml: all + latex: $(IMGPDF) all +diff --git a/Makefile b/Makefile +index 58cd4f5e1c3a..b3266c408b6c 100644 +--- a/Makefile ++++ b/Makefile +@@ -1785,7 +1785,7 @@ $(help-board-dirs): help-%: + # Documentation targets + # --------------------------------------------------------------------------- + DOC_TARGETS := xmldocs latexdocs pdfdocs htmldocs epubdocs cleandocs \ +- linkcheckdocs dochelp refcheckdocs ++ linkcheckdocs dochelp refcheckdocs texinfodocs infodocs + PHONY += $(DOC_TARGETS) + $(DOC_TARGETS): + $(Q)$(MAKE) $(build)=Documentation $@ + +base-commit: 81e7cfa3a9eb4ba6993a9c71772fdab21bc5d870 +-- +2.38.1 + diff --git a/gnu/packages/patches/wacomtablet-add-missing-includes.patch b/gnu/packages/patches/wacomtablet-add-missing-includes.patch new file mode 100644 index 0000000000..cd93938075 --- /dev/null +++ b/gnu/packages/patches/wacomtablet-add-missing-includes.patch @@ -0,0 +1,11 @@ +diff -rup wacomtablet-3.1.0/src/kcmodule/styluspagewidget.cpp wacomtablet-3.1.0.new/src/kcmodule/styluspagewidget.cpp +--- wacomtablet-3.1.0/src/kcmodule/styluspagewidget.cpp 2018-06-22 15:07:58.000000000 +0200 ++++ wacomtablet-3.1.0.new/src/kcmodule/styluspagewidget.cpp 2018-07-10 17:38:09.239242847 +0200 +@@ -25,6 +25,7 @@ + #include "profilemanagement.h" + + // common includes ++#include "logging.h" + #include "property.h" + #include "deviceprofile.h" + #include "dbustabletinterface.h" diff --git a/gnu/packages/patches/wacomtablet-qt5.15.patch b/gnu/packages/patches/wacomtablet-qt5.15.patch new file mode 100644 index 0000000000..598ac939e8 --- /dev/null +++ b/gnu/packages/patches/wacomtablet-qt5.15.patch @@ -0,0 +1,23 @@ +From 4f73ff02b3efd5e8728b18fcf1067eca166704ee Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux <[email protected]> +Date: Thu, 4 Jun 2020 16:00:38 +0200 +Subject: [PATCH] Fix build with Qt 5.15 + +--- + src/kcmodule/pressurecurvewidget.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/kcmodule/pressurecurvewidget.cpp b/src/kcmodule/pressurecurvewidget.cpp +index 0c943b3..f047a6c 100644 +--- a/src/kcmodule/pressurecurvewidget.cpp ++++ b/src/kcmodule/pressurecurvewidget.cpp +@@ -22,6 +22,7 @@ + //Qt includes + #include <QDebug> + #include <QPainter> ++#include <QPainterPath> + #include <QMouseEvent> + #include <QResizeEvent> + #include <QTabletEvent> +-- +GitLab |