Hello community, here is the log from the commit of package plasma5-desktop for openSUSE:Factory checked in at 2018-01-16 09:37:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-desktop (Old) and /work/SRC/openSUSE:Factory/.plasma5-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-desktop" Tue Jan 16 09:37:54 2018 rev:74 rq:563859 version:5.11.5 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-desktop/plasma5-desktop.changes 2018-01-03 13:37:33.594781530 +0100 +++ /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma5-desktop.changes 2018-01-16 09:37:55.890156170 +0100 @@ -1,0 +2,6 @@ +Fri Jan 12 14:17:26 UTC 2018 - [email protected] + +- Add patch to fix generation of font previews: + * 0001-Support-font-ttf-and-font-otf-mimetypes-in-kfontinst.patch + +------------------------------------------------------------------- New: ---- 0001-Support-font-ttf-and-font-otf-mimetypes-in-kfontinst.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-desktop.spec ++++++ --- /var/tmp/diff_new_pack.uAORrq/_old 2018-01-16 09:37:56.770114981 +0100 +++ /var/tmp/diff_new_pack.uAORrq/_new 2018-01-16 09:37:56.774114793 +0100 @@ -34,7 +34,8 @@ # PATCH-FIX-OPENSUSE Patch1: 0001-Use-themed-user-face-icon-in-kickoff.patch # PATCHES 100-200 and above are from upstream 5.11 branch -# PATCHES 201-300 and above are from upstream master/5.11 branch +Patch101: 0001-Support-font-ttf-and-font-otf-mimetypes-in-kfontinst.patch +# PATCHES 201-300 and above are from upstream master/5.12 branch Patch201: 0001-Folder-View-Accept-mouse-events-if-we-handled-them.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel @@ -181,6 +182,7 @@ %prep %setup -q -n plasma-desktop-%{version} %patch1 -p1 +%patch101 -p1 %patch201 -p1 # Workaround for boo#1038368 sed -i"" "s/Name=Desktop/Name=Desktop Containment/g" containments/desktop/package/metadata.desktop ++++++ 0001-Support-font-ttf-and-font-otf-mimetypes-in-kfontinst.patch ++++++ >From ccc30ddd8e6baef7b8eaeb0cd1cbf199711e6265 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Mon, 8 Jan 2018 18:01:54 +0100 Subject: [PATCH] Support font/ttf and font/otf mimetypes in kfontinst Summary: Those mimetypes are new and kfontinst/kfontview/fontthumbnail weren't aware of that. As the old types are aliases of the new types, it doesn't need to be added to the file dialog options (it would create duplicate entries). However, it broke thumbnail generation. Test Plan: .ttf files have thumbnails again. Reviewers: #plasma, broulik Reviewed By: #plasma, broulik Subscribers: anthonyfieroni, plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D9738 --- kcms/kfontinst/apps/installfont.desktop | 2 +- kcms/kfontinst/apps/org.kde.kfontview.desktop | 2 +- kcms/kfontinst/kcmfontinst/FontList.cpp | 4 +++- kcms/kfontinst/lib/Misc.cpp | 3 ++- kcms/kfontinst/thumbnail/FontThumbnail.cpp | 4 ++-- kcms/kfontinst/thumbnail/fontthumbnail.desktop | 2 +- kcms/kfontinst/viewpart/FontViewPart.cpp | 4 ++-- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/kcms/kfontinst/apps/installfont.desktop b/kcms/kfontinst/apps/installfont.desktop index 97afdcc3..e1650689 100644 --- a/kcms/kfontinst/apps/installfont.desktop +++ b/kcms/kfontinst/apps/installfont.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -X-KDE-ServiceTypes=KonqPopupMenu/Plugin,application/x-font-ttf,application/x-font-type1,application/x-font-bdf,application/x-font-pcf,application/x-font-otf,application/x-font-afm,fonts/package +X-KDE-ServiceTypes=KonqPopupMenu/Plugin,application/x-font-ttf,application/x-font-type1,application/x-font-bdf,application/x-font-pcf,application/x-font-otf,application/x-font-afm,fonts/package,font/ttf,font/otf Actions=installFont; Type=Service diff --git a/kcms/kfontinst/apps/org.kde.kfontview.desktop b/kcms/kfontinst/apps/org.kde.kfontview.desktop index c112557d..11e7aad3 100755 --- a/kcms/kfontinst/apps/org.kde.kfontview.desktop +++ b/kcms/kfontinst/apps/org.kde.kfontview.desktop @@ -92,7 +92,7 @@ Exec=kfontview %U Icon=kfontview X-KDE-StartupNotify=true Type=Application -MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-pcf;application/x-font-bdf;application/vnd.kde.fontspackage; +MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-pcf;application/x-font-bdf;application/vnd.kde.fontspackage;font/otf;font/ttf; GenericName=Font Viewer GenericName[af]=Skriftipe Besigter GenericName[ar]=عارض الخطوط diff --git a/kcms/kfontinst/kcmfontinst/FontList.cpp b/kcms/kfontinst/kcmfontinst/FontList.cpp index 4c5e434f..64df0917 100644 --- a/kcms/kfontinst/kcmfontinst/FontList.cpp +++ b/kcms/kfontinst/kcmfontinst/FontList.cpp @@ -54,7 +54,9 @@ namespace KFI { -const QStringList CFontList::fontMimeTypes(QStringList() << "application/x-font-ttf" +const QStringList CFontList::fontMimeTypes(QStringList() << "font/ttf" + << "font/otf" + << "application/x-font-ttf" << "application/x-font-otf" << "application/x-font-type1" << "application/x-font-pcf" diff --git a/kcms/kfontinst/lib/Misc.cpp b/kcms/kfontinst/lib/Misc.cpp index d722cc7d..a201b06a 100644 --- a/kcms/kfontinst/lib/Misc.cpp +++ b/kcms/kfontinst/lib/Misc.cpp @@ -290,7 +290,8 @@ int getIntQueryVal(const QUrl &url, const char *key, int defVal) bool printable(const QString &mime) { - return "application/x-font-type1"==mime || "application/x-font-ttf"==mime || + return "font/otf"==mime || "font/ttf"==mime || + "application/x-font-type1"==mime || "application/x-font-ttf"==mime || "application/x-font-otf"==mime || "application/x-font-type1"==mime; } diff --git a/kcms/kfontinst/thumbnail/FontThumbnail.cpp b/kcms/kfontinst/thumbnail/FontThumbnail.cpp index 52bfdb41..412272dd 100644 --- a/kcms/kfontinst/thumbnail/FontThumbnail.cpp +++ b/kcms/kfontinst/thumbnail/FontThumbnail.cpp @@ -93,8 +93,8 @@ bool CFontThumbnail::create(const QString &path, int width, int height, QImage & QString mime(db.mimeTypeForFile(tempDir->path()+QLatin1Char('/')+entry->name()).name()); - if(mime=="application/x-font-ttf" || mime=="application/x-font-otf" || - mime=="application/x-font-type1") + if(mime=="font/ttf" || mime=="font/otf" || mime=="application/x-font-ttf" || + mime=="application/x-font-otf" || mime=="application/x-font-type1") { realPath=tempDir->path()+QLatin1Char('/')+entry->name(); break; diff --git a/kcms/kfontinst/thumbnail/fontthumbnail.desktop b/kcms/kfontinst/thumbnail/fontthumbnail.desktop index a2a86f79..4268ea12 100644 --- a/kcms/kfontinst/thumbnail/fontthumbnail.desktop +++ b/kcms/kfontinst/thumbnail/fontthumbnail.desktop @@ -92,6 +92,6 @@ Name[x-test]=xxFont Filesxx Name[zh_CN]=字体文件 Name[zh_TW]=字型檔案 X-KDE-ServiceTypes=ThumbCreator -MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-bdf;application/x-font-pcf;application/x-font-otf;fonts/package; +MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-bdf;application/x-font-pcf;application/x-font-otf;fonts/package;font/ttf;font/otf; X-KDE-Library=fontthumbnail CacheThumbnail=true diff --git a/kcms/kfontinst/viewpart/FontViewPart.cpp b/kcms/kfontinst/viewpart/FontViewPart.cpp index 488c8d0c..7138e939 100644 --- a/kcms/kfontinst/viewpart/FontViewPart.cpp +++ b/kcms/kfontinst/viewpart/FontViewPart.cpp @@ -319,8 +319,8 @@ void CFontViewPart::timeout() QMimeDatabase db; QString mime(db.mimeTypeForFile(itsTempDir->path()+QLatin1Char('/')+entry->name()).name()); - if(mime=="application/x-font-ttf" || mime=="application/x-font-otf" || - mime=="application/x-font-type1") + if(mime=="font/ttf" || mime=="font/otf" || mime=="application/x-font-ttf" || + mime=="application/x-font-otf" || mime=="application/x-font-type1") { fontFile=itsTempDir->path()+QLatin1Char('/')+entry->name(); //setLocalFilePath(itsTempDir->path()+QLatin1Char('/')+entry->name()); -- 2.15.1
