commit: c187ceb3c356bd8a728bcac24eb70622638a7ebf
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 23 15:09:35 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Apr 23 15:39:01 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c187ceb3
[kde-base/kdelibs] Rebase MIME types patch due to upstream changes wrt bug
#508518.
Package-Manager: portage-2.2.8-r1
---
.../kdelibs/files/kdelibs-4.14.0-mimetypes.patch | 39 ++++++++++++++++++++++
kde-base/kdelibs/kdelibs-9999.ebuild | 2 +-
2 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.0-mimetypes.patch
b/kde-base/kdelibs/files/kdelibs-4.14.0-mimetypes.patch
new file mode 100644
index 0000000..5e54390
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.14.0-mimetypes.patch
@@ -0,0 +1,39 @@
+Remove fake MIME types that cause warnings.
+
+The offending MIME types are commented out rather than
+physically removed because doing so would cause the patch
+to be too large.
+
+diff --git a/mimetypes/kde.xml b/mimetypes/kde.xml
+index 76303db..23351c4 100644
+--- a/mimetypes/kde.xml
++++ b/mimetypes/kde.xml
+@@ -1783,8 +1783,8 @@ Notes:
+ </magic>
+ <glob pattern="*.abc"/>
+ </mime-type>
+-
+- <!-- all/ fake mime types -->
++<!--
++ all/ fake mime types
+ <mime-type type="all/all">
+ <comment>all files and folders</comment>
+ <comment xml:lang="ar">كل الملفات و المجلدات</comment>
+@@ -1902,7 +1902,7 @@ Notes:
+ <comment xml:lang="zh_TW">所有檔案</comment>
+ </mime-type>
+
+- <!-- uri/ fake mime types -->
++ uri/ fake mime types
+ <mime-type type="uri/mms">
+ <comment>mms: URIs</comment>
+ <comment xml:lang="ar">mms: وصلات</comment>
+@@ -2245,7 +2245,7 @@ Notes:
+ <comment xml:lang="zh_CN">rtspu: 地址</comment>
+ <comment xml:lang="zh_TW">rtspu: 網址</comment>
+ </mime-type>
+-
++-->
+ <mime-type type="application/vnd.kde.fontspackage">
+ <sub-class-of type="application/zip"/>
+ <comment>fonts package</comment>
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild
b/kde-base/kdelibs/kdelibs-9999.ebuild
index 8f77154..c22f10c 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -127,7 +127,7 @@ PDEPEND="
PATCHES=(
"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
- "${FILESDIR}/${PN}-4.7.96-mimetypes.patch"
+ "${FILESDIR}/${PN}-4.14.0-mimetypes.patch"
"${FILESDIR}/${PN}-4.4.90-xslt.patch"
"${FILESDIR}/${PN}-4.6.2-armlinking.patch"
"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
