diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/patches/kde-cli-tools-delay-mime-db.patch | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/patches/kde-cli-tools-delay-mime-db.patch')
| -rw-r--r-- | gnu/packages/patches/kde-cli-tools-delay-mime-db.patch | 26 |
1 files changed, 26 insertions, 0 deletions
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 <phodina@protonmail.com> +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 + |