diff options
| author | root <root@alpha.trunkmasters.com> | 2026-09-11 01:41:34 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-09-11 01:41:34 -0500 |
| commit | fc39c62a8944e95c0ecccfc9781763822b23e66c (patch) | |
| tree | 11feafa0dbddccf6fcd9dabb290b0ce5faafec36 /dev-qt | |
| parent | 98068fb4a1502cade02134b1834439134ca4eed1 (diff) | |
| download | baldeagleos-repo-fc39c62a8944e95c0ecccfc9781763822b23e66c.tar.gz baldeagleos-repo-fc39c62a8944e95c0ecccfc9781763822b23e66c.tar.xz baldeagleos-repo-fc39c62a8944e95c0ecccfc9781763822b23e66c.zip | |
Adding metadata
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtbase/files/qtbase-6.11.2-mimeinfo2.5.patch | 22 | ||||
| -rw-r--r-- | dev-qt/qtbase/qtbase-6.11.2-r2.ebuild (renamed from dev-qt/qtbase/qtbase-6.11.2-r1.ebuild) | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/dev-qt/qtbase/files/qtbase-6.11.2-mimeinfo2.5.patch b/dev-qt/qtbase/files/qtbase-6.11.2-mimeinfo2.5.patch new file mode 100644 index 000000000000..50bbebc87824 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.11.2-mimeinfo2.5.patch @@ -0,0 +1,22 @@ +https://bugs.kde.org/show_bug.cgi?id=522948 +https://codereview.qt-project.org/c/qt/qtbase/+/765860 +--- a/src/corelib/mimetypes/qmimedatabase.cpp ++++ b/src/corelib/mimetypes/qmimedatabase.cpp +@@ -270,5 +270,2 @@ + const QStringView myGroup = QStringView{mimeTypeName}.left(mimeTypeName.indexOf(u'/')); +- // All text/* types are subclasses of text/plain. +- if (myGroup == "text"_L1 && mimeTypeName != plainTextMimeType()) +- return plainTextMimeType(); + // All real-file mimetypes implicitly derive from application/octet-stream +@@ -297,2 +294,11 @@ + provider->addParents(mimeName, result); ++ ++ // Implicit rule from the spec: all text/* types are subclasses of text/plain. It holds even ++ // for types that declare other parents, and shared-mime-info >= 2.5 relies on that rather ++ // than listing text/plain (e.g. text/x-shellscript only declares application/x-executable). ++ if (mimeName.startsWith("text/"_L1) && mimeName != plainTextMimeType() ++ && !result.contains(plainTextMimeType())) { ++ result.append(plainTextMimeType()); ++ } ++ + if (result.isEmpty()) { diff --git a/dev-qt/qtbase/qtbase-6.11.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.11.2-r2.ebuild index 9ead1430f498..c30083299097 100644 --- a/dev-qt/qtbase/qtbase-6.11.2-r1.ebuild +++ b/dev-qt/qtbase/qtbase-6.11.2-r2.ebuild @@ -189,6 +189,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.8.2-cross.patch "${FILESDIR}"/${PN}-6.9.0-no-direct-extern-access.patch "${FILESDIR}"/${PN}-6.11.2-QTBUG-149431.patch + "${FILESDIR}"/${PN}-6.11.2-mimeinfo2.5.patch ) src_prepare() { |