| 1 |
commit: 899627c5cdde43c63f064b94a20808008b6107a5 |
| 2 |
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 27 03:37:01 2011 +0000 |
| 4 |
Commit: Marc Schiffbauer <marc <AT> schiffbauer <DOT> net> |
| 5 |
CommitDate: Tue Dec 27 03:37:01 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=899627c5 |
| 7 |
|
| 8 |
[kde-base/kdelibs] Add files/kdelibs-4.7.96-mimetypes.patch |
| 9 |
|
| 10 |
and switch to KDE/4.8 branch in 9999, too |
| 11 |
|
| 12 |
--- |
| 13 |
.../kdelibs/files/kdelibs-4.7.96-mimetypes.patch | 38 ++++++++++++++++++++ |
| 14 |
kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild | 2 +- |
| 15 |
kde-base/kdelibs/kdelibs-9999.ebuild | 4 +- |
| 16 |
3 files changed, 41 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-base/kdelibs/files/kdelibs-4.7.96-mimetypes.patch b/kde-base/kdelibs/files/kdelibs-4.7.96-mimetypes.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..049cef8 |
| 21 |
--- /dev/null |
| 22 |
+++ b/kde-base/kdelibs/files/kdelibs-4.7.96-mimetypes.patch |
| 23 |
@@ -0,0 +1,38 @@ |
| 24 |
+diff -ur kdelibs-4.8.49.9999.orig/mimetypes/kde.xml kdelibs-4.8.49.9999/mimetypes/kde.xml |
| 25 |
+--- kdelibs-4.8.49.9999.orig/mimetypes/kde.xml 2011-12-27 04:20:35.982831561 +0100 |
| 26 |
++++ kdelibs-4.8.49.9999/mimetypes/kde.xml 2011-12-27 04:30:15.747168085 +0100 |
| 27 |
+@@ -178,34 +178,6 @@ |
| 28 |
+ <glob pattern="*.abc"/> |
| 29 |
+ </mime-type> |
| 30 |
+ |
| 31 |
+- <!-- all/ fake mime types --> |
| 32 |
+- <mime-type type="all/all"> |
| 33 |
+- <comment>all files and folders</comment> |
| 34 |
+- </mime-type> |
| 35 |
+- <mime-type type="all/allfiles"> |
| 36 |
+- <comment>all files</comment> |
| 37 |
+- </mime-type> |
| 38 |
+- |
| 39 |
+- <!-- uri/ fake mime types --> |
| 40 |
+- <mime-type type="uri/mms"> |
| 41 |
+- <comment>mms: URIs</comment> |
| 42 |
+- </mime-type> |
| 43 |
+- <mime-type type="uri/mmst"> |
| 44 |
+- <comment>mmst: URIs</comment> |
| 45 |
+- </mime-type> |
| 46 |
+- <mime-type type="uri/mmsu"> |
| 47 |
+- <comment>mmsu: URIs</comment> |
| 48 |
+- </mime-type> |
| 49 |
+- <mime-type type="uri/pnm"> |
| 50 |
+- <comment>pnm: URIs</comment> |
| 51 |
+- </mime-type> |
| 52 |
+- <mime-type type="uri/rtspt"> |
| 53 |
+- <comment>rtspt: URIs</comment> |
| 54 |
+- </mime-type> |
| 55 |
+- <mime-type type="uri/rtspu"> |
| 56 |
+- <comment>rtspu: URIs</comment> |
| 57 |
+- </mime-type> |
| 58 |
+- |
| 59 |
+ <mime-type type="application/vnd.kde.fontspackage"> |
| 60 |
+ <sub-class-of type="application/zip"/> |
| 61 |
+ <comment>fonts package</comment> |
| 62 |
|
| 63 |
diff --git a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild |
| 64 |
index 4dd416c..763a9dd 100644 |
| 65 |
--- a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild |
| 66 |
+++ b/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild |
| 67 |
@@ -129,7 +129,7 @@ add_blocker kcontrol 4.4.50 |
| 68 |
PATCHES=( |
| 69 |
"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" |
| 70 |
"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" |
| 71 |
- "${FILESDIR}/${PN}-4.5.90-mimetypes.patch" |
| 72 |
+ "${FILESDIR}/${PN}-4.7.96-mimetypes.patch" |
| 73 |
"${FILESDIR}/${PN}-4.4.90-xslt.patch" |
| 74 |
"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
| 75 |
"${FILESDIR}/${PN}-4.6.3-bytecode.patch" |
| 76 |
|
| 77 |
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild |
| 78 |
index f400411..763a9dd 100644 |
| 79 |
--- a/kde-base/kdelibs/kdelibs-9999.ebuild |
| 80 |
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild |
| 81 |
@@ -12,7 +12,7 @@ inherit kde4-base fdo-mime toolchain-funcs |
| 82 |
|
| 83 |
# The "master" branch is out of date, so use KDE/4.7 per upstream's |
| 84 |
# recommendation (KDE/4.8 will be branched off of KDE/4.7) |
| 85 |
-EGIT_BRANCH="KDE/4.7" |
| 86 |
+EGIT_BRANCH="KDE/4.8" |
| 87 |
|
| 88 |
DESCRIPTION="KDE libraries needed by all KDE programs." |
| 89 |
HOMEPAGE="http://www.kde.org/" |
| 90 |
@@ -129,7 +129,7 @@ add_blocker kcontrol 4.4.50 |
| 91 |
PATCHES=( |
| 92 |
"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" |
| 93 |
"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" |
| 94 |
- "${FILESDIR}/${PN}-4.5.90-mimetypes.patch" |
| 95 |
+ "${FILESDIR}/${PN}-4.7.96-mimetypes.patch" |
| 96 |
"${FILESDIR}/${PN}-4.4.90-xslt.patch" |
| 97 |
"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
| 98 |
"${FILESDIR}/${PN}-4.6.3-bytecode.patch" |
Archives