Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kde5.git;a=commitdiff;h=f3582fa076a06ca0a56ec2841b915809b8de4cbf
commit f3582fa076a06ca0a56ec2841b915809b8de4cbf Author: DeX77 <[email protected]> Date: Fri Mar 11 11:33:43 2016 +0100 plasma-framework-5.19.0-3-x86_64 + add some patches and change QML path diff --git a/source/kf5/plasma-framework/FrugalBuild b/source/kf5/plasma-framework/FrugalBuild index 50d6dcb..96d4bf6 100644 --- a/source/kf5/plasma-framework/FrugalBuild +++ b/source/kf5/plasma-framework/FrugalBuild @@ -3,13 +3,21 @@ pkgname=plasma-framework -pkgrel=2 +pkgrel=3 pkgdesc="Plasma library and runtime components based upon KF5 and Qt5." groups=('kf5') archs=('i686' 'x86_64') _F_kde_project="frameworks" Finclude kde depends=("kactivities5>=$_F_kde_ver" "kdeclarative>=$_F_kde_ver") -sha1sums=('075037c13a450cc8fab9cbf6e9292cf5f32efef7') +source=("${source[@]}" \ + fix_for_non-theme_icon_loading.patch \ + fixstopRedirecting.patch ) + +sha1sums=('075037c13a450cc8fab9cbf6e9292cf5f32efef7' \ + 'b7db89949e1914f3222d41a52e4800fbd5bf7f4c' \ + '1996c58a2bd5331802cc55b7d06a2d9143ca89c3') + +_F_cmake_confopts+=" -DQML_INSTALL_DIR=lib/qt/qml" # optimization OK diff --git a/source/kf5/plasma-framework/fix_for_non-theme_icon_loading.patch b/source/kf5/plasma-framework/fix_for_non-theme_icon_loading.patch new file mode 100644 index 0000000..bc2fc37 --- /dev/null +++ b/source/kf5/plasma-framework/fix_for_non-theme_icon_loading.patch @@ -0,0 +1,32 @@ +From: Dan Vrátil <[email protected]> +Date: Tue, 16 Feb 2016 16:59:32 +0000 +Subject: Fix IconItem not loading non-theme icons with name +X-Git-Tag: v5.20.0-rc1 +X-Git-Url: http://quickgit.kde.org/?p=plasma-framework.git&a=commitdiff&h=525bf2d377c21b41971a72d694a507bf2af0ada6 +--- +Fix IconItem not loading non-theme icons with name + +Commit 5184ac introduced a small regression that caused IconItem +to no longer load non-theme icons with name set, for instance icons +coming from sni-qt, causing sni-qt apps to not show in systray. + +BUG: 359388 +FIXED-IN: 5.20 +REVIEW: 127091 +--- + + +--- a/src/declarativeimports/core/iconitem.cpp ++++ b/src/declarativeimports/core/iconitem.cpp +@@ -148,6 +148,10 @@ + //fail, use QIcon + } else { + m_icon = QIcon::fromTheme(sourceString); ++ if (m_icon.isNull()) { ++ // fallback for non-theme icons ++ m_icon = source.value<QIcon>(); ++ } + delete m_svgIcon; + m_svgIcon = 0; + m_imageIcon = QImage(); + diff --git a/source/kf5/plasma-framework/fixstopRedirecting.patch b/source/kf5/plasma-framework/fixstopRedirecting.patch new file mode 100644 index 0000000..eca8157 --- /dev/null +++ b/source/kf5/plasma-framework/fixstopRedirecting.patch @@ -0,0 +1,25 @@ +From: David Rosca <[email protected]> +Date: Mon, 15 Feb 2016 18:05:26 +0000 +Subject: WindowThumbnail: Discard glx pixmap in stopRedirecting() +X-Git-Tag: v5.20.0-rc1 +X-Git-Url: http://quickgit.kde.org/?p=plasma-framework.git&a=commitdiff&h=1e196fdfb2a6eaf1664e1155c086616d55c6712b +--- +WindowThumbnail: Discard glx pixmap in stopRedirecting() + +BUG: 357895 +FIXED-IN: 5.20 +REVIEW: 127072 +--- + + +--- a/src/declarativeimports/core/windowthumbnail.cpp ++++ b/src/declarativeimports/core/windowthumbnail.cpp +@@ -584,6 +584,7 @@ + return; + } + xcb_composite_unredirect_window(c, m_winId, XCB_COMPOSITE_REDIRECT_AUTOMATIC); ++ discardPixmap(); + if (m_damage == XCB_NONE) { + return; + } +
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
