Hello community, here is the log from the commit of package kontact for openSUSE:Factory checked in at 2017-05-08 18:54:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kontact (Old) and /work/SRC/openSUSE:Factory/.kontact.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kontact" Mon May 8 18:54:19 2017 rev:5 rq:490457 version:17.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kontact/kontact.changes 2017-03-15 00:56:07.901133685 +0100 +++ /work/SRC/openSUSE:Factory/.kontact.new/kontact.changes 2017-05-08 18:54:23.109281388 +0200 @@ -1,0 +2,44 @@ +Sat Apr 22 12:49:13 UTC 2017 - [email protected] + +- Add patch to fix scrollbars in navigation pane: + * 0001-Take-vertical-scrollbar-into-account-when-calculatin.patch + +------------------------------------------------------------------- +Sun Apr 16 10:45:07 CEST 2017 - [email protected] + +- Update to 17.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04.0.php +- Changes since 17.03.90: + * None + +------------------------------------------------------------------- +Wed Apr 12 20:25:49 CEST 2017 - [email protected] + +- Update to 17.03.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04-rc.php +- Changes since 17.03.80: + * None + +------------------------------------------------------------------- +Sat Mar 25 23:10:38 CET 2017 - [email protected] + +- Update to 17.03.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.03.80.php +- Changes since 16.12.3: + * Remove mailcommon dependancy + * Remove not necessary signal/slot. Use QActionGroup signal + * Disable more feature + * Clean up + * Add summary + * update kontact docbook to kf5, delete kontact-admin docbook + import valid info to kontact docbook + * Update copyright + * port to for(...:...) + * Add ECMCoverageOption + +------------------------------------------------------------------- Old: ---- kontact-16.12.3.tar.xz New: ---- 0001-Take-vertical-scrollbar-into-account-when-calculatin.patch kontact-17.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kontact.spec ++++++ --- /var/tmp/diff_new_pack.0sTYoK/_old 2017-05-08 18:54:23.725194383 +0200 +++ /var/tmp/diff_new_pack.0sTYoK/_new 2017-05-08 18:54:23.729193818 +0200 @@ -16,16 +16,22 @@ # +%bcond_without lang + Name: kontact -Version: 16.12.3 +Version: 17.04.0 Release: 0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.3 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +# It can only build on the same platforms as Qt Webengine +ExclusiveArch: %ix86 x86_64 %arm aarch64 mips mips64 Summary: Personal Information Manager License: GPL-2.0+ Group: Productivity/Other Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM (https://phabricator.kde.org/D5542) +Patch100: 0001-Take-vertical-scrollbar-into-account-when-calculatin.patch BuildRequires: akonadi-server-devel BuildRequires: extra-cmake-modules BuildRequires: grantleetheme-devel @@ -40,7 +46,6 @@ BuildRequires: kpimtextedit-devel BuildRequires: kwindowsystem-devel BuildRequires: libkdepim-devel -BuildRequires: mailcommon-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: xz @@ -55,16 +60,20 @@ Suggests: korganizer Provides: kontact5 = %{version} Obsoletes: kontact5 < %{version} -# It can only build on the same platforms as Qt Webengine -ExclusiveArch: %ix86 x86_64 %arm aarch64 mips mips64 +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Kontact combines the individual applications KMail, KAddressBook and KOrganizer as views in one window. +%if %{with lang} +%lang_package +%endif + %prep %setup -q +%patch100 -p1 %build %cmake_kf5 -d build @@ -72,6 +81,10 @@ %install %kf5_makeinstall -C build +%if %{with lang} + %find_lang %{name} --with-man --all-name + %kf5_find_htmldocs +%endif %suse_update_desktop_file org.kde.kontact Office Core-Office %post -p /sbin/ldconfig @@ -84,10 +97,8 @@ %{_kf5_bindir}/kontact %{_kf5_appstreamdir}/org.kde.kontact.appdata.xml %{_kf5_applicationsdir}/org.kde.kontact.desktop -%{_kf5_applicationsdir}/kontact-admin.desktop %{_kf5_configkcfgdir}/kontact.kcfg %{_kf5_htmldir}/en/kontact/ -%{_kf5_htmldir}/en/kontact-admin/ %{_kf5_servicesdir}/kontactconfig.desktop %config %{_kf5_configdir}/kontact.categories %config %{_kf5_configdir}/kontact.renamecategories @@ -98,4 +109,9 @@ %{_kf5_kxmlguidir}/kontact/ %{_datadir}/messageviewer/ +%if %{with lang} +%files lang -f %{name}.lang +%doc COPYING* +%endif + %changelog ++++++ 0001-Take-vertical-scrollbar-into-account-when-calculatin.patch ++++++ >From 957d3528812d76deab247abf331577d5bf623f9e Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Sat, 22 Apr 2017 14:41:42 +0200 Subject: [PATCH] Take vertical scrollbar into account when calculating navbar width Summary: Otherwise the vertical scrollbar obstructs the icons and forces a horizontal scrollbar as well. Test Plan: Built and tested, no horizontal or vertical scrollbar visible. Reviewers: mlaurent, dvratil Subscribers: kde-pim, #kde_pim Tags: #kde_pim Differential Revision: https://phabricator.kde.org/D5542 --- src/iconsidepane.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/iconsidepane.cpp b/src/iconsidepane.cpp index 3f90c640..ad4704b5 100644 --- a/src/iconsidepane.cpp +++ b/src/iconsidepane.cpp @@ -27,6 +27,7 @@ using namespace Kontact; #include <KontactInterface/Core> #include <KontactInterface/Plugin> +#include <QApplication> #include <QAction> #include <QIcon> #include <KLocalizedString> @@ -405,6 +406,9 @@ QSize Navigator::sizeHint() const maxWidth = qMax(maxWidth, sizeHintForIndex(index).width()); } + // Take vertical scrollbar into account + maxWidth += qApp->style()->pixelMetric(QStyle::PM_ScrollBarExtent); + int viewHeight = QListView::sizeHint().height(); QSize size(maxWidth + rect().width() - contentsRect().width(), viewHeight); -- 2.12.0 ++++++ kontact-16.12.3.tar.xz -> kontact-17.04.0.tar.xz ++++++ ++++ 112166 lines of diff (skipped)
