Mailinglist Archive: opensuse-commit (4019 mails)
| < Previous | Next > |
commit kdepim4 for openSUSE:12.1:Update:Test
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 09 Dec 2011 16:46:53 +0100
- Message-id: <20111209154653.6572F20304@hilbert.suse.de>
Hello community,
here is the log from the commit of package kdepim4 for
openSUSE:12.1:Update:Test checked in at 2011-12-09 16:46:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update:Test/kdepim4 (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.kdepim4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim4", Maintainer is "kde-maintainers@xxxxxxx"
Changes:
--------
New Changes file:
--- /dev/null 2010-08-26 16:28:41.000000000 +0200
+++ /work/SRC/openSUSE:12.1:Update:Test/.kdepim4.new/kdepim4.changes
2011-12-09 16:46:53.000000000 +0100
@@ -0,0 +1,1032 @@
+-------------------------------------------------------------------
+Wed Oct 19 13:40:39 UTC 2011 - wstephenson@xxxxxxxx
+
+- Add 4.7 branch diff
+
+-------------------------------------------------------------------
+Sat Oct 15 13:03:47 UTC 2011 - ctrippe@xxxxxxxxxxxx
+
+- restrict fdupes call to prevent unwanted package dependencies
+ (bnc#724044)
+
+-------------------------------------------------------------------
+Sun Oct 2 16:41:35 CEST 2011 - dmueller@xxxxxxx
+
+- update to 4.7.2
+ * see http://kde.org/announcements/changelogs/changelog4_7_1to4_7_2.php for
details
+
+-------------------------------------------------------------------
+Thu Sep 7 13:22:38 UTC 2011 - toddrme2178@xxxxxxxxx
+
+- Added %kde4_akonadi_requires and %kde4_pimlibs_requires
+ macros (fix for RPMLINT warnings)
+- Added libkdepim4 requires (fix for RPMLINT warning)
+- Removed commented commands (fix for RPMLINT warnings)
+- Removed self-obsoletes (fix for RPMLINT warnings)
+- Added %config macro to kalarm (fix for RPMLINT warning)
+- Added provides for obsoleted packages (fix for RPMLINT warnings)
+- Changed blogilo summary (fix for RPMLINT warnings)
+- Removed unneeded KDE3 obsoletes and provides
+- Cleaned up spec file formatting
+- Removed redundant buildrequires
+
+-------------------------------------------------------------------
+Thu Sep 1 23:17:27 CEST 2011 - dmueller@xxxxxxx
+
+- update to 4.7.1
+ * Bugfixes over KDE 4.7.0
+ * see http://kde.org/announcements/changelogs/changelog4_7_0to4_7_1.php for
details
+
+-------------------------------------------------------------------
+Thu Aug 11 14:00:34 UTC 2011 - idonmez@xxxxxxxxxx
+
+- Refresh kdepim4-4.7-branch.patch
+ * Fix potential crashes
+ * Allow to search by date in KMail
+ * Fix sorting by calendar in Korganizer
+ * Fix KAlarm importing old alarm configurations
+
+-------------------------------------------------------------------
+Tue Aug 9 13:09:15 UTC 2011 - idonmez@xxxxxxxxxx
+
+- kmail & korganizer are licensed under GPLv2 only because they
+ link to GPLv2 only libraries, bnc #710584
+
+-------------------------------------------------------------------
+Fri Aug 5 21:10:16 UTC 2011 - idonmez@xxxxxxxxxx
+
+- Drop kalarm-disable-rtcwake.patch, we are now whitelisted
+
+-------------------------------------------------------------------
+Thu Aug 4 09:58:50 UTC 2011 - idonmez@xxxxxxxxxx
+
+- Add kalarm-disable-rtcwake.patch to disable kalarm rtcwake support
+ until bnc #707723 is resolved
+
+-------------------------------------------------------------------
+Thu Aug 4 08:53:59 UTC 2011 - idonmez@xxxxxxxxxx
+
+- Add kdepim4-4.7-branch.patch, sync with 4.7 branch
+ * Memory leak fixes
+ * Crash fixes
+- Drop fix-progressmanager.diff, already in branch update
+
+-------------------------------------------------------------------
+Wed Jul 27 12:47:49 UTC 2011 - cgiboudeaux@xxxxxxx
+
+- Update fix-progressmanager.diff. Add commit db0f6aba which is also needed
+
+-------------------------------------------------------------------
+Mon Jul 25 10:16:10 UTC 2011 - cgiboudeaux@xxxxxxx
+
+- Add fix-progressmanager.diff
+Fixes kde#278112, kde#278235
+(will be part of kdepim 4.7.1)
+
+
+-------------------------------------------------------------------
+Fri Jul 22 20:20:31 CEST 2011 - dmueller@xxxxxxx
+
+- update to 4.7.0
+ * Small fixes over KDE 4.7 RC2
+ * see http://kde.org/announcements/4.7 for details
+
+
+-------------------------------------------------------------------
+Thu Jul 21 12:57:29 UTC 2011 - idonmez@xxxxxxxxxx
+
+- Update to 4.6.95
+
+-------------------------------------------------------------------
+Thu Apr 21 20:19:41 UTC 2011 - javier@xxxxxxxxxxxx
+
+- Update to 4.4.11.1
+ * Bugfixes over 4.4.10
+
+-------------------------------------------------------------------
+Sat Apr 9 17:48:20 UTC 2011 - wstephenson@xxxxxxxxxx
+
+- Add fixes from kdepim 4.4 branch:
+ * Don't show next and previous buttons if the attendee list is empty
+ (bko#262680)
+ * Fix copied text from email includes HTML tags (bko#259468)
+ * Fix spurious Akonadi error dialog - start apps asynchronously
+ when building vs 4.6
+ * Fix potential crash on check (bko#269173)
+ * Make KTimeTracker spinbox look right with Oxygen
+ * Fix tab labels not updating on folder change in KMail
+ * Fix enable/disable/remove buttons in custom template UI in KMail
+
+-------------------------------------------------------------------
+Thu Jan 27 20:56:12 CET 2011 - cgiboudeaux@xxxxxxxxx
+- Update to 4.4.10:
+ * Bugfixes over 4.4.9
+ * drop kontact_kde250138.diff
+ * Cleanup the spec file
+
+-------------------------------------------------------------------
+Mon Jan 17 13:32:24 CET 2011 - cgiboudeaux@xxxxxxxxx
+- Add kontact_kde250138.diff
+ * Fixes kde250138 - Kontact crashed when switching sidebar options
+
+-------------------------------------------------------------------
+Thu Dec 23 00:47:37 CET 2010 - dmueller@xxxxxxx
+
+- update to 4.4.9:
+ * compatibility fixes for KDE 4.6 RC1
+
+-------------------------------------------------------------------
+Thu Dec 16 13:39:49 UTC 2010 - wstephenson@xxxxxxxxxx
+
+- Revert to 4.4.8 for stability
+
+-------------------------------------------------------------------
+Fri Dec 3 17:14:55 CET 2010 - dmueller@xxxxxxx
+
+- update to 4.5.85
+ * KDE 4.6 Beta2
+ * Final Beta before RC, various fixes from Beta1
+ * no upstream changelog available.
+
+-------------------------------------------------------------------
+Tue Nov 23 07:53:07 UTC 2010 - tittiatcoke@xxxxxxxxx
+
+- remove unnecessary BuildRequires
+
+-------------------------------------------------------------------
+Fri Nov 19 20:08:47 CET 2010 - dmueller@xxxxxxx
+
+- update to 4.5.80
+ * KDE 4.6 Beta1
+ * no upstream changelog available.
+
+-------------------------------------------------------------------
+Mon Nov 8 21:06:19 UTC 2010 - ctrippe@xxxxxxx
+
+- ktimetracker
+ * Make manually editing task times possible again (bnc#651155)-
+
+-------------------------------------------------------------------
+Fri Oct 22 18:16:34 UTC 2010 - javier@xxxxxxxxxxxx
+
+- update to 4.4.7
+ * Bugfixes http://www.kdedevelopers.org/node/4344
+
+-------------------------------------------------------------------
+Thu Sep 16 00:26:42 UTC 2010 - masterpatricko@xxxxxxxxx
+
+- Add knotes-dbus-interface.patch to fix KNotes DBus public interface
+ (fixes bko#251914)
+
+-------------------------------------------------------------------
+Fri Sep 10 12:39:03 UTC 2010 - javier@xxxxxxxxxxxx
+
+- update to 4.4.6
+ * bugfixes over 4.4.5
+
+-------------------------------------------------------------------
+Thu Jul 15 12:50:02 UTC 2010 - wstephenson@xxxxxxxxxx
+
+- Move spamassassin dependency out of kdepimlibs4 (bnc#619563)
+
+-------------------------------------------------------------------
+Thu Jul 8 01:24:20 CEST 2010 - dmueller@xxxxxxx
+
+- update to 4.4.5
+ * bugfixes over 4.4.4
+ * see http://kde.org/announcements/changelogs/changelog4_4_4to4_4_5.php for
details
++++ 835 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:12.1:Update:Test/.kdepim4.new/kdepim4.changes
New:
----
4_7_BRANCH.diff
_link
akregator-useragent.diff
desktop-files.diff
kdepim-4.7.2.tar.bz2
kdepim4.changes
kdepim4.spec
knode-kontact-default.diff
make-kmail-faster.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepim4.spec ++++++
#
# spec file for package kdepim4
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: kdepim4
Version: 4.7.2
Release: 1
License: GPLv2+ ; LGPLv2.1+
Summary: Base package of kdepim
Url: http://www.kde.org
Group: System/GUI/KDE
Source0: kdepim-%{version}.tar.bz2
Patch0: 4_7_BRANCH.diff
Patch1: akregator-useragent.diff
Patch2: desktop-files.diff
Patch3: knode-kontact-default.diff
Patch4: make-kmail-faster.patch
BuildRequires: fdupes
BuildRequires: gpgme-devel
BuildRequires: grantlee-devel
BuildRequires: libassuan-devel
BuildRequires: libkdepimlibs4-devel
BuildRequires: libqca2-devel
Requires: libkdepim4 = %{version}
Suggests: akregator
Suggests: blogilo
Suggests: kaddressbook
Suggests: kalarm
Suggests: kdepim4-wizards
Suggests: kjots
Suggests: kleopatra
Suggests: kmail
Suggests: knode
Suggests: knotes
Suggests: kontact
Suggests: korganizer
Suggests: ktimetracker
Suggests: libkdepim4
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_akonadi_requires
%kde4_pimlibs_requires
%kde4_runtime_requires
%description
This package contains the core files of the kdepim module.
%prep
%setup -q -n kdepim-%{version}
%patch0 -p1
%patch1
%patch2
%patch3
%patch4 -p1
%build
%ifarch ppc64
RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
%cmake_kde4 -d build -- -DKDEPIM_BUILD_MOBILE=OFF
%make_jobs
%install
cd build
%make_install
%create_subdir_filelist -d akonadi_next -v akonadi.devel
%create_subdir_filelist -d akregator -v devel
%create_subdir_filelist -d blogilo -v devel
%create_subdir_filelist -d kaddressbook -v devel
%create_subdir_filelist -d kalarm -v devel
%create_subdir_filelist -d kjots -v devel
%create_subdir_filelist -d kleopatra/libkleopatraclient -f libkdepim -v
libkdepim.devel
%create_subdir_filelist -d kmail -v devel
%create_subdir_filelist -d kmailcvt -f kmail
%create_subdir_filelist -d knode -v devel
%create_subdir_filelist -d knotes -v devel
%create_subdir_filelist -d kontact -v devel
%create_subdir_filelist -d korganizer -v devel
%create_subdir_filelist -d ktimetracker
%create_subdir_filelist -d libkdepim -v libkdepim.devel
%create_subdir_filelist -d wizards
cd ..
%if 0
cat filelists/akonadi.devel | while read line; do echo "%exclude $line";done
#remove kontact plugins' desktop files that are in subpackages from the
kontact list
akregatorplugins="%{_kde4_modulesdir}/kontact_akregatorplugin.so
%{_kde4_servicesdir}/kontact/akregatorplugin.desktop"
kaddressbookplugin="%{_kde4_modulesdir}/kontact_kaddressbookplugin.so"
kjotsplugin="%{_kde4_modulesdir}/kontact_kjotsplugin.so
%{_kde4_servicesdir}/kontact/kjots_plugin.desktop"
kmailplugin="%{_kde4_modulesdir}/kontact_kmailplugin.so
%{_kde4_servicesdir}/kontact/kmailplugin.desktop"
knodeplugin="%{_kde4_modulesdir}/kontact_knodeplugin.so
%{_kde4_servicesdir}/kontact/knodeplugin.desktop"
knotesplugin="%{_kde4_modulesdir}/kontact_knotesplugin.so
%{_kde4_servicesdir}/kontact/knotesplugin.desktop"
korganizerplugins="%{_kde4_modulesdir}/kontact_journalplugin.so
%{_kde4_modulesdir}/kontact_korganizerplugin.so
%{_kde4_modulesdir}/kontact_todoplugin.so
%{_kde4_servicesdir}/kontact/korganizerplugin.desktop
%{_kde4_servicesdir}/kontact/journalplugin.desktop
%{_kde4_servicesdir}/kontact/todoplugin.desktop"
for i in $akregatorplugins $kaddressbookplugin $kjotsplugin $kmailplugin
$knodeplugin $knotesplugin $korganizerplugins
do
sed -ri s,$i,, filelists/kontact
done
for i in $akregatorplugins
do
echo $i >> filelists/akregator
done
for i in $kaddressbookplugin
do
echo $i >> filelists/kaddressbook
done
for i in $kjotsplugin
do
echo $i >> filelists/kjots
done
for i in $kmailplugin
do
echo $i >> filelists/kmail
done
for i in $knodeplugin
do
echo $i >> filelists/knode
done
for i in $knotesplugin
do
echo $i >> filelists/knotes
done
for i in $korganizerplugins
do
echo $i >> filelists/korganizer
done
sed -ri s,.*/usr/%{_lib}/libkabcommon.so.*,, filelists/kaddressbook
grep "/usr/lib" filelists/libkdepim | grep "/kde4/" >filelists/libkdepim.devel
cat filelists/libkdepim.devel | while read line; do echo "%exclude
$line";done >>filelists/devel
grep "/usr/lib" filelists/libkdepim | grep -v "/kde4/"
%create_exclude_filelist
%suse_update_desktop_file -r blogilo Utility WebUtility
%suse_update_desktop_file -u akonadiconsole Network Email
%suse_update_desktop_file KNode Network News
%suse_update_desktop_file Kjots Utility TimeUtility
%suse_update_desktop_file Kontact Office Core-Office
%suse_update_desktop_file akregator Network RSS-News
%suse_update_desktop_file groupwarewizard Utility DesktopSettings
%suse_update_desktop_file kaddressbook Office ContactManagement
%suse_update_desktop_file kalarm Utility TimeUtility
%suse_update_desktop_file kleopatra Utility Security
%suse_update_desktop_file knotes Utility DesktopUtility
%suse_update_desktop_file korganizer Office Calendar
%suse_update_desktop_file ktimetracker Utility TimeUtility
%kde_post_install
#Restrict fdupes call to not cause unwanted dependencies between packages
%fdupes -s %{buildroot}%{_kde4_htmldir}
%fdupes -s %{buildroot}%{_kde4_appsdir}/libkleopatra/
%fdupes -s %{buildroot}%{_kde4_appsdir}/knode/
%fdupes -s %{buildroot}%{_kde4_appsdir}/kmail2/
%fdupes -s %{buildroot}%{_kde4_iconsdir}
%kde_post_install
rm %{buildroot}%{_kde4_libdir}/*.so
grep -v "%{_kde4_libdir}/lib.*so$" filelists/akonadi.devel >
filelists/akonadi.devel.upd
grep -v "%{_kde4_libdir}/lib.*so$" filelists/akonadi_next >
filelists/akonadi_next.upd
grep -v "%{_kde4_libdir}/lib.*so$" filelists/akregator >
filelists/akregator.upd
grep -v "%{_kde4_libdir}/lib.*so$" filelists/exclude > filelists/exclude.upd
grep -v "%{_kde4_libdir}/lib.*so$" filelists/kalarm > filelists/kalarm.upd
grep -v "%{_kde4_libdir}/lib.*so$" filelists/knode > filelists/knode.upd
grep -v "%{_kde4_libdir}/lib.*so$" filelists/korganizer >
filelists/korganizer.upd
grep -v "%{_kde4_libdir}/lib.*so$" filelists/libkdepim >
filelists/libkdepim.upd
grep -v "%{_kde4_libdir}/lib.*so$" filelists/libkdepim.libs >
filelists/libkdepim.libs.upd
rm filelists/devel
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf %{buildroot}
rm -rf filelists
%package -n akonadi
License: GPLv2+ ; LGPLv2.1+
Summary: KDE Resources for PIM Storage Service
Group: System/GUI/KDE
Requires: kdepim4-runtime = %{version}
Requires: soprano
Provides: kde4-akonadi = 4.3.0
Obsoletes: kde4-akonadi < 4.3.0
Obsoletes: akonadi-devel < 4.4.60
Provides: akonadi-devel = 4.4.60
%kde4_runtime_requires
%kde4_pimlibs_requires
%kde4_akonadi_requires
%description -n akonadi
This package contains the KDE resources for Akonadi, the KDE PIM
storage service.
%post -n akonadi -p /sbin/ldconfig
%postun -n akonadi -p /sbin/ldconfig
%files -n akonadi -f filelists/akonadi_next.upd
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%dir %{_datadir}/akonadi
%dir %{_datadir}/akonadi/agents
%dir %{_kde4_libdir}/akonadi
%dir %{_kde4_libdir}/akonadi/contact
%dir %{_kde4_libdir}/akonadi/contact/editorpageplugins
%{_datadir}/akonadi/agents/nepomukemailfeeder.desktop
%{_kde4_libdir}/akonadi/contact/editorpageplugins/cryptopageplugin.so
%package -n akregator
License: LGPLv2.1+
Summary: RSS Feed Reader
Group: Productivity/Networking/News/Utilities
Requires: libkdepim4 = %{version}
Provides: kde4-akregator = 4.3.0
Obsoletes: kde4-akregator < 4.3.0
%kde4_runtime_requires
%kde4_pimlibs_requires
%description -n akregator
A KDE Feed Aggregator
%post -n akregator -p /sbin/ldconfig
%postun -n akregator -p /sbin/ldconfig
%files -n akregator -f filelists/akregator.upd
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%package -n blogilo
License: LGPLv2.1+
Summary: KDE Blog Editor
Group: Productivity/Editors/Other
Requires: libkdepim4 = %{version}
Provides: bilbo = 1.0
Obsoletes: bilbo < 1.0
%kde4_runtime_requires
%kde4_pimlibs_requires
%description -n blogilo
A blog editor for KDE
%post -n blogilo -p /sbin/ldconfig
%postun -n blogilo -p /sbin/ldconfig
%files -n blogilo -f filelists/blogilo
%defattr(-,root,root)
%package -n kaddressbook
License: LGPLv2.1+
Summary: Address Manager
Group: Productivity/Networking/Email/Utilities
Requires: kdepim4-runtime = %{version}
Requires: libkdepim4 = %{version}
Provides: kde4-kaddressbook = 4.3.0
Obsoletes: kde4-kaddressbook < 4.3.0
%kde4_akonadi_requires
%kde4_runtime_requires
%kde4_pimlibs_requires
%description -n kaddressbook
The KDE Address Book
%post -n kaddressbook -p /sbin/ldconfig
%postun -n kaddressbook -p /sbin/ldconfig
%files -n kaddressbook -f filelists/kaddressbook
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%package -n kmail
License: GPL v2.0
Summary: Mail Client
Group: Productivity/Networking/Email/Clients
Requires: akonadi-runtime
Requires: kdepim4-runtime = %{version}
Requires: libkdepim4 = %{version}
Provides: kde4-kmail = 4.3.0
Obsoletes: kde4-kmail < 4.3.0
%kde4_runtime_requires
%kde4_pimlibs_requires
%description -n kmail
KMail is the KDE mail client.
%post -n kmail -p /sbin/ldconfig
%postun -n kmail -p /sbin/ldconfig
%files -n kmail -f filelists/kmail
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%config %{_kde4_configdir}/kmail.antispamrc
%config %{_kde4_configdir}/kmail.antivirusrc
%{_kde4_appsdir}/kmail/pics/*
%package -n knode
License: LGPLv2.1+
Summary: News Reader
Group: Productivity/Networking/News/Clients
Requires: libkdepim4 = %{version}
Provides: kde4-knode = 4.3.0
Obsoletes: kde4-knode < 4.3.0
%kde4_runtime_requires
%kde4_pimlibs_requires
%description -n knode
KNode is a usenet news reader for KDE.
%post -n knode -p /sbin/ldconfig
%postun -n knode -p /sbin/ldconfig
%files -n knode -f filelists/knode.upd
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%{_kde4_appsdir}/knode/pics/*
%package -n knotes
License: LGPLv2.1+
Summary: Popup Notes
Group: Productivity/Other
Requires: libkdepim4 = %{version}
Provides: kde4-knotes = 4.3.0
Obsoletes: kde4-knotes < 4.3.0
%kde4_runtime_requires
%kde4_pimlibs_requires
%description -n knotes
KNotes is a note taking application for KDE.
%post -n knotes -p /sbin/ldconfig
%postun -n knotes -p /sbin/ldconfig
%files -n knotes -f filelists/knotes
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%exclude %{_kde4_appsdir}/knotes/knotes_part.rc
%package -n kontact
License: LGPLv2.1+
Summary: Personal Information Manager
Group: Productivity/Other
Requires: libkdepim4 = %{version}
Recommends: kmail
Suggests: kaddressbook
Suggests: kjots
Suggests: knode
Suggests: knotes
Suggests: korganizer
Suggests: ktimetracker
Obsoletes: kde4-kontact < 4.3.0
Provides: kde4-kontact = 4.3.0
%kde4_runtime_requires
%kde4_pimlibs_requires
%kde4_akonadi_requires
%description -n kontact
Kontact combines the individual applications KMail, KAddressBook and
KOrganizer as views in one window.
%post -n kontact -p /sbin/ldconfig
%postun -n kontact -p /sbin/ldconfig
%files -n kontact -f filelists/kontact
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%package -n korganizer
License: GPL v2.0
Summary: Personal Organizer
Group: Productivity/Office/Organizers
Requires: kdepim4-runtime = %{version}
Requires: libkdepim4 = %{version}
Provides: kde4-korganizer = 4.3.0
Obsoletes: kde4-korganizer < 4.3.0
%kde4_runtime_requires
%kde4_pimlibs_requires
%kde4_akonadi_requires
%description -n korganizer
KOrganizer is a calendar application for KDE.
%post -n korganizer -p /sbin/ldconfig
%postun -n korganizer -p /sbin/ldconfig
%files -n korganizer -f filelists/korganizer.upd
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%config %{_kde4_configdir}/korganizer.knsrc
%{_kde4_servicetypesdir}/calendardecoration.desktop
%{_kde4_servicetypesdir}/calendarplugin.desktop
%package -n ktimetracker
License: LGPLv2.1+
Summary: Personal Time Tracker
Group: Productivity/Other
Requires: libkdepim4 = %{version}
Provides: kde4-ktimetracker = 4.3.0
Obsoletes: kde4-ktimetracker < 4.3.0
%kde4_runtime_requires
%kde4_pimlibs_requires
%description -n ktimetracker
KTimeTracker tracks time spent on various tasks.
%post -n ktimetracker -p /sbin/ldconfig
%postun -n ktimetracker -p /sbin/ldconfig
%files -n ktimetracker -f filelists/ktimetracker
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%package -n kjots
License: GPLv2+
Summary: Note Taker
Group: Productivity/Other
Requires: libkdepim4 = %{version}
Provides: kde4-kjots = 4.3.0
Obsoletes: kde4-kjots < 4.3.0
%kde4_akonadi_requires
%kde4_runtime_requires
%kde4_pimlibs_requires
%description -n kjots
KDE Note Taking Utility
%post -n kjots -p /sbin/ldconfig
%postun -n kjots -p /sbin/ldconfig
%files -n kjots -f filelists/kjots
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%package wizards
License: LGPLv2.1+
Summary: KDE Personal Information Management Wizards
Group: System/GUI/KDE
%kde4_pimlibs_requires
%kde4_runtime_requires
%description wizards
This package contains wizards to setup groupware accounts in Kontact.
%post wizards -p /sbin/ldconfig
%postun wizards -p /sbin/ldconfig
%files wizards -f filelists/wizards
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%package -n kalarm
License: LGPLv2.1+
Summary: Personal Alarm Scheduler
Group: Productivity/Other
Requires: libkdepim4 = %{version}
Provides: kde4-kalarm = 4.3.0
Obsoletes: kde4-kalarm < 4.3.0
%kde4_runtime_requires
%kde4_pimlibs_requires
%kde4_akonadi_requires
%description -n kalarm
Personal alarm message, command and email scheduler for KDE
%post -n kalarm -p /sbin/ldconfig
%postun -n kalarm -p /sbin/ldconfig
%files -n kalarm -f filelists/kalarm.upd
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%config %{_sysconfdir}/dbus-1/system.d/org.kde.kalarmrtcwake.conf
%package -n libkdepim4
License: LGPLv2.1+
Summary: KDE PIM Libraries
Group: System/GUI/KDE
Obsoletes: libkdepim4-devel < 4.6.0
Provides: libkdepim4-devel = 4.6.0
%requires_eq akonadi
%requires_ge libqt4-x11
%description -n libkdepim4
This package contains the basic packages for KDE PIM applications.
%post -n libkdepim4 -p /sbin/ldconfig
%postun -n libkdepim4 -p /sbin/ldconfig
%files -n libkdepim4 -f filelists/libkdepim.libs.upd
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%{_kde4_modulesdir}/kcm_ldap.so
%{_kde4_modulesdir}/plugins/designer/kdepimwidgets.so
%files -f filelists/exclude.upd
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%dir %{_kde4_libdir}/strigi
%config %{_kde4_configdir}/libkleopatrarc
%doc %lang(en) %{_kde4_htmldir}/en/kontact-admin
%doc %lang(en) %{_kde4_htmldir}/en/kabcclient
%doc %lang(en) %{_kde4_htmldir}/en/konsolekalendar
%doc %lang(en) %{_kde4_htmldir}/en/kioslave/news
%doc %lang(en) %{_kde4_htmldir}/en/kioslave
%doc %lang(en) %{_kde4_htmldir}/en/kwatchgnupg
%doc %lang(en) %{_kde4_htmldir}/en/kleopatra
%{_datadir}/dbus-1/interfaces/*
%{_kde4_applicationsdir}/*
%{_kde4_appsdir}
%{_kde4_bindir}/*
%{_kde4_configkcfgdir}
%{_kde4_iconsdir}/hicolor
%{_kde4_iconsdir}/oxygen
%{_kde4_libdir}/*.so.*
%{_kde4_libdir}/strigi/strigiea_*.so
%{_kde4_mandir}/man1/kabcclient.1.gz
%{_kde4_modulesdir}/*
%{_kde4_servicesdir}
%exclude %{_kde4_appsdir}/kmail/pics/*
%exclude %{_kde4_appsdir}/knode/pics/*
%changelog
++++++ 4_7_BRANCH.diff ++++++
++++ 2301 lines (skipped)
++++++ _link ++++++
<link project="openSUSE:12.1" package="kdepim4"
baserev="5d0ca5cc780d3653f283e0c54a473812">
<patches>
<branch/>
</patches>
</link>
++++++ akregator-useragent.diff ++++++
--- akregator/src/akregator_part.cpp
+++ akregator/src/akregator_part.cpp
@@ -264,7 +264,7 @@ Part::Part( QWidget *parentWidget, QObje
connect(m_autosaveTimer, SIGNAL(timeout()), this,
SLOT(slotSaveFeedList()));
m_autosaveTimer->start(5*60*1000); // 5 minutes
- QString useragent = QString( "Akregator/%1; syndication" ).arg(
KDEPIM_VERSION );
+ QString useragent = QString( "Akregator/%1; syndication SUSE" ).arg(
KDEPIM_VERSION );
if( !Settings::customUserAgent().isEmpty() )
useragent = Settings::customUserAgent();
++++++ desktop-files.diff ++++++
Index: akonadiconsole/akonadiconsole.desktop
===================================================================
--- akonadiconsole/akonadiconsole.desktop.orig
+++ akonadiconsole/akonadiconsole.desktop
@@ -90,4 +90,5 @@ Comment[x-test]=xxAkonadi Management and
Comment[zh_CN]=用于管理和调试 Akonadi 的控制台
Comment[zh_TW]=Akonadi 管理與除錯主控台
Terminal=false
-Categories=Qt;KDE;Development;
+Categories=Qt;KDE;Development;Debugger;X-KDE-Utilities-PIM;
+Hidden=true
Index: ktimetracker/support/ktimetracker.desktop
===================================================================
--- ktimetracker/support/ktimetracker.desktop.orig
+++ ktimetracker/support/ktimetracker.desktop
@@ -111,4 +111,4 @@ Type=Application
Terminal=false
X-KDE-StartupNotify=true
X-DBUS-StartupType=Multi
-Categories=Qt;KDE;Utility;Office;Monitor;X-KDE-Utilities-PIM;
+Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM;
Index: kleopatra/kleopatra.desktop
===================================================================
--- kleopatra/kleopatra.desktop.orig
+++ kleopatra/kleopatra.desktop
@@ -1,8 +1,7 @@
[Desktop Entry]
Type=Application
-Categories=Qt;KDE;Utility;
+Categories=Qt;KDE;Utility;Security;X-KDE-Utilities-PIM;
Exec=kleopatra
-Icon=kleopatra
Name=Kleopatra
Name[af]=Kleopatra
Name[ar]=كليوبترا
++++++ knode-kontact-default.diff ++++++
Index: kontact/plugins/knode/knodeplugin.desktop
===================================================================
--- kontact/plugins/knode/knodeplugin.desktop.orig
+++ kontact/plugins/knode/knodeplugin.desktop
@@ -13,7 +13,7 @@ X-KDE-KontactPluginHasSummary=false
X-KDE-PluginInfo-Name=kontact_knodeplugin
X-KDE-PluginInfo-Version=0.1
X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=false
+X-KDE-PluginInfo-EnabledByDefault=true
Comment=Kontact KNode Plugin
Comment[af]=Kontact KNode inprop module
++++++ make-kmail-faster.patch ++++++
From: idoenmez@xxxxxxxx
Subject: ?
Index: kdepim-4.7.2/messagelist/core/themedelegate.cpp
===================================================================
--- kdepim-4.7.2.orig/messagelist/core/themedelegate.cpp
+++ kdepim-4.7.2/messagelist/core/themedelegate.cpp
@@ -51,8 +51,11 @@ ThemeDelegate::ThemeDelegate( QAbstractI
{
mItemView = parent;
mTheme = 0;
+ connect( KGlobalSettings::self(), SIGNAL( kdisplayFontChanged() ), this,
SLOT( slotGeneralFontChanged() ) );
}
+QString ThemeDelegate::mGeneralFontKey = KGlobalSettings::generalFont().key();
+
ThemeDelegate::~ThemeDelegate()
{
}
@@ -87,6 +90,7 @@ void ThemeDelegate::setTheme( const Them
break;
}
mItemView->reset();
+
}
// FIXME: gcc will refuse to inline these functions loudly complaining
@@ -118,6 +122,18 @@ static int cachedFontHeight( const QFont
return fontHeightCache[ fontKey ];
}
+static int cachedFontHeightKey( const QFont &font, const QString &fontKey )
+{
+ static QHash<QString, int> fontHeightCache;
+
+ if ( !fontHeightCache.contains( fontKey ) ) {
+ fontHeightCache.insert( fontKey, cachedFontMetrics( font ).height() );
+ }
+
+ return fontHeightCache[ fontKey ];
+}
+
+
static inline void paint_right_aligned_elided_text( const QString &text,
Theme::ContentItem * ci, QPainter * painter, int &left, int top, int &right,
Qt::LayoutDirection layoutDir, const QFont &font )
{
painter->setFont( font );
@@ -501,7 +517,8 @@ static inline void compute_size_hint_for
if ( ci->displaysText() )
{
const QFont font = ThemeDelegate::itemFont( ci, item );
- const int fontHeight = cachedFontHeight( font );
+ const QString fontKey = ThemeDelegate::itemFontKey( ci, item );
+ const int fontHeight = cachedFontHeightKey( font, fontKey );
if ( fontHeight > maxh )
maxh = fontHeight;
totalw += ci->displaysLongText() ? 128 : 64;
@@ -1670,3 +1687,20 @@ QFont ThemeDelegate::itemFont( const The
return KGlobalSettings::generalFont();
}
+QString ThemeDelegate::itemFontKey( const Theme::ContentItem *ci, const Item
*item )
+{
+ if ( ci && ci->useCustomFont() )
+ return ci->fontKey();
+
+ if ( item && ( item->type() == Item::Message ) )
+ return static_cast< const MessageItem * >( item )->fontKey();
+
+ return mGeneralFontKey;
+}
+
+// Store the new fontKey when the generalFont changes.
+void ThemeDelegate::slotGeneralFontChanged()
+{
+ ThemeDelegate::mGeneralFontKey = KGlobalSettings::generalFont().key();
+}
+
Index: kdepim-4.7.2/messagelist/core/themedelegate.h
===================================================================
--- kdepim-4.7.2.orig/messagelist/core/themedelegate.h
+++ kdepim-4.7.2/messagelist/core/themedelegate.h
@@ -44,6 +44,8 @@ class Item;
*/
class ThemeDelegate : public QStyledItemDelegate
{
+ Q_OBJECT
+
public:
ThemeDelegate( QAbstractItemView * parent );
~ThemeDelegate();
@@ -51,6 +53,7 @@ public:
private:
const Theme * mTheme; ///< Shallow pointer to the current theme
QAbstractItemView * mItemView;
+ static QString mGeneralFontKey;
QColor mGroupHeaderBackgroundColor; // cache
@@ -194,6 +197,9 @@ public:
/// return the font to paint given item with, checking global kmail settings
and theme settings
static QFont itemFont( const Theme::ContentItem *ci, const Item *item );
+ /// return the font key to paint given item with, checking global kmail
settings and theme settings
+ static QString itemFontKey( const Theme::ContentItem *ci, const Item *item );
+
protected:
/**
* Returns the Item for the specified model index. Pure virtual: must be
reimplemented
@@ -211,6 +217,11 @@ protected:
*/
QSize sizeHint( const QStyleOptionViewItem & option, const QModelIndex &
index ) const;
+private slots:
+ /**
+ * Called when the global fonts change (from systemsettings)
+ */
+ void slotGeneralFontChanged();
};
} // namespace Core
Index: kdepim-4.7.2/messagelist/core/theme.cpp
===================================================================
--- kdepim-4.7.2.orig/messagelist/core/theme.cpp
+++ kdepim-4.7.2/messagelist/core/theme.cpp
@@ -167,6 +167,7 @@ bool Theme::ContentItem::applicableToGro
void Theme::ContentItem::setFont( const QFont &font )
{
mFont = font;
+ mFontKey = font.key();
}
void Theme::ContentItem::save( QDataStream &stream ) const
Index: kdepim-4.7.2/messagelist/core/theme.h
===================================================================
--- kdepim-4.7.2.orig/messagelist/core/theme.h
+++ kdepim-4.7.2/messagelist/core/theme.h
@@ -242,6 +242,7 @@ public:
unsigned int mFlags; ///< The flags of the item
QFont mFont; ///< The font to use with this content
item, meaningful only if displaysText() returns true.
+ QString mFontKey; ///< The font key to speedup theme
positioning. QFont.key() is called too many times otherwise.
QColor mCustomColor; ///< The color to use with this content
item, meaningful only if canUseCustomColor() return true.
public:
@@ -420,6 +421,16 @@ public:
{ return mFont; };
/**
+ * Returns the font key used by this item. It may be a custom font key set
by setFont()
+ * or the default application font (returned by
KGlobalSettings::generalFont()).
+ * This setting is valid as long as you have called updateFontMetrics()
+ * with the appropriate paint device.
+ * It is primary used to avoid to calculate the key every time an item is
displayed.
+ */
+ const QString & fontKey() const
+ { return mFontKey; };
+
+ /**
* Returns the custom color set for this item.
* The return value is meaningful only if canUseCustomColor() returns true
* returns true and setUseCustomColor( true ) has been called.
Index: kdepim-4.7.2/messagelist/core/messageitem_p.h
===================================================================
--- kdepim-4.7.2.orig/messagelist/core/messageitem_p.h
+++ kdepim-4.7.2/messagelist/core/messageitem_p.h
@@ -80,6 +80,11 @@ public:
static QFont mFontUnreadMessage;
static QFont mFontImportantMessage;
static QFont mFontToDoMessage;
+ static QString mFontKey;
+ static QString mFontNewMessageKey;
+ static QString mFontUnreadMessageKey;
+ static QString mFontImportantMessageKey;
+ static QString mFontToDoMessageKey;
private:
Index: kdepim-4.7.2/messagelist/core/messageitem.h
===================================================================
--- kdepim-4.7.2.orig/messagelist/core/messageitem.h
+++ kdepim-4.7.2/messagelist/core/messageitem.h
@@ -134,6 +134,8 @@ public:
QFont font() const;
+ QString fontKey() const;
+
SignatureState signatureState() const;
void setSignatureState( SignatureState state );
Index: kdepim-4.7.2/messagelist/core/messageitem.cpp
===================================================================
--- kdepim-4.7.2.orig/messagelist/core/messageitem.cpp
+++ kdepim-4.7.2/messagelist/core/messageitem.cpp
@@ -44,6 +44,7 @@ public:
QColor mTextColor;
QColor mBackgroundColor;
QFont mFont;
+ QString mFontKey;
int mPriority;
};
@@ -123,6 +124,11 @@ QFont MessageItemPrivate::mFont;
QFont MessageItemPrivate::mFontUnreadMessage;
QFont MessageItemPrivate::mFontImportantMessage;
QFont MessageItemPrivate::mFontToDoMessage;
+QString MessageItemPrivate::mFontKey;
+QString MessageItemPrivate::mFontNewMessageKey;
+QString MessageItemPrivate::mFontUnreadMessageKey;
+QString MessageItemPrivate::mFontImportantMessageKey;
+QString MessageItemPrivate::mFontToDoMessageKey;
MessageItemPrivate::MessageItemPrivate( MessageItem* qq )
: ItemPrivate( qq ),
@@ -403,6 +409,35 @@ QFont MessageItem::font() const
return font;
}
+QString MessageItem::fontKey() const
+{
+ Q_D( const MessageItem );
+
+ // for performance reasons we don't want font retrieval to trigger
+ // full tags loading, as the font is used for geometry calculation
+ // and thus this method called for each item
+ if ( d->tagListInitialized() ) {
+ const Tag *bestTag = d->bestTag();
+ if ( bestTag != 0 && bestTag->font() != QFont() ) {
+ return bestTag->font().key();
+ }
+ }
+
+ // from KDE3: "important" overrides "new" overrides "unread" overrides "todo"
+ Akonadi::MessageStatus messageStatus = status();
+ if ( messageStatus.isImportant() ) {
+ return d->mFontImportantMessageKey;
+ } else if ( !messageStatus.isRead() ) {
+ return d->mFontUnreadMessageKey;
+ } else if ( messageStatus.isToAct() ) {
+ return d->mFontToDoMessageKey;
+ } else {
+ return d->mFontKey;
+ }
+
+}
+
+
MessageItem::SignatureState MessageItem::signatureState() const
{
Q_D( const MessageItem );
@@ -572,21 +607,25 @@ void MessageItem::setToDoMessageColor( c
void MessageItem::setGeneralFont( const QFont &font )
{
MessageItemPrivate::mFont = font;
+ MessageItemPrivate::mFontKey = font.key();
}
void MessageItem::setUnreadMessageFont( const QFont &font )
{
MessageItemPrivate::mFontUnreadMessage = font;
+ MessageItemPrivate::mFontUnreadMessageKey = font.key();
}
void MessageItem::setImportantMessageFont( const QFont &font )
{
MessageItemPrivate::mFontImportantMessage = font;
+ MessageItemPrivate::mFontImportantMessageKey = font.key();
}
void MessageItem::setToDoMessageFont( const QFont &font )
{
MessageItemPrivate::mFontToDoMessage = font;
+ MessageItemPrivate::mFontToDoMessageKey = font.key();
}
FakeItemPrivate::FakeItemPrivate( FakeItem *qq ) : MessageItemPrivate( qq )
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
here is the log from the commit of package kdepim4 for
openSUSE:12.1:Update:Test checked in at 2011-12-09 16:46:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update:Test/kdepim4 (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.kdepim4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim4", Maintainer is "kde-maintainers@xxxxxxx"
Changes:
--------
New Changes file:
--- /dev/null 2010-08-26 16:28:41.000000000 +0200
+++ /work/SRC/openSUSE:12.1:Update:Test/.kdepim4.new/kdepim4.changes
2011-12-09 16:46:53.000000000 +0100
@@ -0,0 +1,1032 @@
+-------------------------------------------------------------------
+Wed Oct 19 13:40:39 UTC 2011 - wstephenson@xxxxxxxx
+
+- Add 4.7 branch diff
+
+-------------------------------------------------------------------
+Sat Oct 15 13:03:47 UTC 2011 - ctrippe@xxxxxxxxxxxx
+
+- restrict fdupes call to prevent unwanted package dependencies
+ (bnc#724044)
+
+-------------------------------------------------------------------
+Sun Oct 2 16:41:35 CEST 2011 - dmueller@xxxxxxx
+
+- update to 4.7.2
+ * see http://kde.org/announcements/changelogs/changelog4_7_1to4_7_2.php for
details
+
+-------------------------------------------------------------------
+Thu Sep 7 13:22:38 UTC 2011 - toddrme2178@xxxxxxxxx
+
+- Added %kde4_akonadi_requires and %kde4_pimlibs_requires
+ macros (fix for RPMLINT warnings)
+- Added libkdepim4 requires (fix for RPMLINT warning)
+- Removed commented commands (fix for RPMLINT warnings)
+- Removed self-obsoletes (fix for RPMLINT warnings)
+- Added %config macro to kalarm (fix for RPMLINT warning)
+- Added provides for obsoleted packages (fix for RPMLINT warnings)
+- Changed blogilo summary (fix for RPMLINT warnings)
+- Removed unneeded KDE3 obsoletes and provides
+- Cleaned up spec file formatting
+- Removed redundant buildrequires
+
+-------------------------------------------------------------------
+Thu Sep 1 23:17:27 CEST 2011 - dmueller@xxxxxxx
+
+- update to 4.7.1
+ * Bugfixes over KDE 4.7.0
+ * see http://kde.org/announcements/changelogs/changelog4_7_0to4_7_1.php for
details
+
+-------------------------------------------------------------------
+Thu Aug 11 14:00:34 UTC 2011 - idonmez@xxxxxxxxxx
+
+- Refresh kdepim4-4.7-branch.patch
+ * Fix potential crashes
+ * Allow to search by date in KMail
+ * Fix sorting by calendar in Korganizer
+ * Fix KAlarm importing old alarm configurations
+
+-------------------------------------------------------------------
+Tue Aug 9 13:09:15 UTC 2011 - idonmez@xxxxxxxxxx
+
+- kmail & korganizer are licensed under GPLv2 only because they
+ link to GPLv2 only libraries, bnc #710584
+
+-------------------------------------------------------------------
+Fri Aug 5 21:10:16 UTC 2011 - idonmez@xxxxxxxxxx
+
+- Drop kalarm-disable-rtcwake.patch, we are now whitelisted
+
+-------------------------------------------------------------------
+Thu Aug 4 09:58:50 UTC 2011 - idonmez@xxxxxxxxxx
+
+- Add kalarm-disable-rtcwake.patch to disable kalarm rtcwake support
+ until bnc #707723 is resolved
+
+-------------------------------------------------------------------
+Thu Aug 4 08:53:59 UTC 2011 - idonmez@xxxxxxxxxx
+
+- Add kdepim4-4.7-branch.patch, sync with 4.7 branch
+ * Memory leak fixes
+ * Crash fixes
+- Drop fix-progressmanager.diff, already in branch update
+
+-------------------------------------------------------------------
+Wed Jul 27 12:47:49 UTC 2011 - cgiboudeaux@xxxxxxx
+
+- Update fix-progressmanager.diff. Add commit db0f6aba which is also needed
+
+-------------------------------------------------------------------
+Mon Jul 25 10:16:10 UTC 2011 - cgiboudeaux@xxxxxxx
+
+- Add fix-progressmanager.diff
+Fixes kde#278112, kde#278235
+(will be part of kdepim 4.7.1)
+
+
+-------------------------------------------------------------------
+Fri Jul 22 20:20:31 CEST 2011 - dmueller@xxxxxxx
+
+- update to 4.7.0
+ * Small fixes over KDE 4.7 RC2
+ * see http://kde.org/announcements/4.7 for details
+
+
+-------------------------------------------------------------------
+Thu Jul 21 12:57:29 UTC 2011 - idonmez@xxxxxxxxxx
+
+- Update to 4.6.95
+
+-------------------------------------------------------------------
+Thu Apr 21 20:19:41 UTC 2011 - javier@xxxxxxxxxxxx
+
+- Update to 4.4.11.1
+ * Bugfixes over 4.4.10
+
+-------------------------------------------------------------------
+Sat Apr 9 17:48:20 UTC 2011 - wstephenson@xxxxxxxxxx
+
+- Add fixes from kdepim 4.4 branch:
+ * Don't show next and previous buttons if the attendee list is empty
+ (bko#262680)
+ * Fix copied text from email includes HTML tags (bko#259468)
+ * Fix spurious Akonadi error dialog - start apps asynchronously
+ when building vs 4.6
+ * Fix potential crash on check (bko#269173)
+ * Make KTimeTracker spinbox look right with Oxygen
+ * Fix tab labels not updating on folder change in KMail
+ * Fix enable/disable/remove buttons in custom template UI in KMail
+
+-------------------------------------------------------------------
+Thu Jan 27 20:56:12 CET 2011 - cgiboudeaux@xxxxxxxxx
+- Update to 4.4.10:
+ * Bugfixes over 4.4.9
+ * drop kontact_kde250138.diff
+ * Cleanup the spec file
+
+-------------------------------------------------------------------
+Mon Jan 17 13:32:24 CET 2011 - cgiboudeaux@xxxxxxxxx
+- Add kontact_kde250138.diff
+ * Fixes kde250138 - Kontact crashed when switching sidebar options
+
+-------------------------------------------------------------------
+Thu Dec 23 00:47:37 CET 2010 - dmueller@xxxxxxx
+
+- update to 4.4.9:
+ * compatibility fixes for KDE 4.6 RC1
+
+-------------------------------------------------------------------
+Thu Dec 16 13:39:49 UTC 2010 - wstephenson@xxxxxxxxxx
+
+- Revert to 4.4.8 for stability
+
+-------------------------------------------------------------------
+Fri Dec 3 17:14:55 CET 2010 - dmueller@xxxxxxx
+
+- update to 4.5.85
+ * KDE 4.6 Beta2
+ * Final Beta before RC, various fixes from Beta1
+ * no upstream changelog available.
+
+-------------------------------------------------------------------
+Tue Nov 23 07:53:07 UTC 2010 - tittiatcoke@xxxxxxxxx
+
+- remove unnecessary BuildRequires
+
+-------------------------------------------------------------------
+Fri Nov 19 20:08:47 CET 2010 - dmueller@xxxxxxx
+
+- update to 4.5.80
+ * KDE 4.6 Beta1
+ * no upstream changelog available.
+
+-------------------------------------------------------------------
+Mon Nov 8 21:06:19 UTC 2010 - ctrippe@xxxxxxx
+
+- ktimetracker
+ * Make manually editing task times possible again (bnc#651155)-
+
+-------------------------------------------------------------------
+Fri Oct 22 18:16:34 UTC 2010 - javier@xxxxxxxxxxxx
+
+- update to 4.4.7
+ * Bugfixes http://www.kdedevelopers.org/node/4344
+
+-------------------------------------------------------------------
+Thu Sep 16 00:26:42 UTC 2010 - masterpatricko@xxxxxxxxx
+
+- Add knotes-dbus-interface.patch to fix KNotes DBus public interface
+ (fixes bko#251914)
+
+-------------------------------------------------------------------
+Fri Sep 10 12:39:03 UTC 2010 - javier@xxxxxxxxxxxx
+
+- update to 4.4.6
+ * bugfixes over 4.4.5
+
+-------------------------------------------------------------------
+Thu Jul 15 12:50:02 UTC 2010 - wstephenson@xxxxxxxxxx
+
+- Move spamassassin dependency out of kdepimlibs4 (bnc#619563)
+
+-------------------------------------------------------------------
+Thu Jul 8 01:24:20 CEST 2010 - dmueller@xxxxxxx
+
+- update to 4.4.5
+ * bugfixes over 4.4.4
+ * see http://kde.org/announcements/changelogs/changelog4_4_4to4_4_5.php for
details
++++ 835 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:12.1:Update:Test/.kdepim4.new/kdepim4.changes
New:
----
4_7_BRANCH.diff
_link
akregator-useragent.diff
desktop-files.diff
kdepim-4.7.2.tar.bz2
kdepim4.changes
kdepim4.spec
knode-kontact-default.diff
make-kmail-faster.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepim4.spec ++++++
#
# spec file for package kdepim4
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: kdepim4
Version: 4.7.2
Release: 1
License: GPLv2+ ; LGPLv2.1+
Summary: Base package of kdepim
Url: http://www.kde.org
Group: System/GUI/KDE
Source0: kdepim-%{version}.tar.bz2
Patch0: 4_7_BRANCH.diff
Patch1: akregator-useragent.diff
Patch2: desktop-files.diff
Patch3: knode-kontact-default.diff
Patch4: make-kmail-faster.patch
BuildRequires: fdupes
BuildRequires: gpgme-devel
BuildRequires: grantlee-devel
BuildRequires: libassuan-devel
BuildRequires: libkdepimlibs4-devel
BuildRequires: libqca2-devel
Requires: libkdepim4 = %{version}
Suggests: akregator
Suggests: blogilo
Suggests: kaddressbook
Suggests: kalarm
Suggests: kdepim4-wizards
Suggests: kjots
Suggests: kleopatra
Suggests: kmail
Suggests: knode
Suggests: knotes
Suggests: kontact
Suggests: korganizer
Suggests: ktimetracker
Suggests: libkdepim4
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_akonadi_requires
%kde4_pimlibs_requires
%kde4_runtime_requires
%description
This package contains the core files of the kdepim module.
%prep
%setup -q -n kdepim-%{version}
%patch0 -p1
%patch1
%patch2
%patch3
%patch4 -p1
%build
%ifarch ppc64
RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
%cmake_kde4 -d build -- -DKDEPIM_BUILD_MOBILE=OFF
%make_jobs
%install
cd build
%make_install
%create_subdir_filelist -d akonadi_next -v akonadi.devel
%create_subdir_filelist -d akregator -v devel
%create_subdir_filelist -d blogilo -v devel
%create_subdir_filelist -d kaddressbook -v devel
%create_subdir_filelist -d kalarm -v devel
%create_subdir_filelist -d kjots -v devel
%create_subdir_filelist -d kleopatra/libkleopatraclient -f libkdepim -v
libkdepim.devel
%create_subdir_filelist -d kmail -v devel
%create_subdir_filelist -d kmailcvt -f kmail
%create_subdir_filelist -d knode -v devel
%create_subdir_filelist -d knotes -v devel
%create_subdir_filelist -d kontact -v devel
%create_subdir_filelist -d korganizer -v devel
%create_subdir_filelist -d ktimetracker
%create_subdir_filelist -d libkdepim -v libkdepim.devel
%create_subdir_filelist -d wizards
cd ..
%if 0
cat filelists/akonadi.devel | while read line; do echo "%exclude $line";done
%endiffilelists/devel
#remove kontact plugins' desktop files that are in subpackages from the
kontact list
akregatorplugins="%{_kde4_modulesdir}/kontact_akregatorplugin.so
%{_kde4_servicesdir}/kontact/akregatorplugin.desktop"
kaddressbookplugin="%{_kde4_modulesdir}/kontact_kaddressbookplugin.so"
kjotsplugin="%{_kde4_modulesdir}/kontact_kjotsplugin.so
%{_kde4_servicesdir}/kontact/kjots_plugin.desktop"
kmailplugin="%{_kde4_modulesdir}/kontact_kmailplugin.so
%{_kde4_servicesdir}/kontact/kmailplugin.desktop"
knodeplugin="%{_kde4_modulesdir}/kontact_knodeplugin.so
%{_kde4_servicesdir}/kontact/knodeplugin.desktop"
knotesplugin="%{_kde4_modulesdir}/kontact_knotesplugin.so
%{_kde4_servicesdir}/kontact/knotesplugin.desktop"
korganizerplugins="%{_kde4_modulesdir}/kontact_journalplugin.so
%{_kde4_modulesdir}/kontact_korganizerplugin.so
%{_kde4_modulesdir}/kontact_todoplugin.so
%{_kde4_servicesdir}/kontact/korganizerplugin.desktop
%{_kde4_servicesdir}/kontact/journalplugin.desktop
%{_kde4_servicesdir}/kontact/todoplugin.desktop"
for i in $akregatorplugins $kaddressbookplugin $kjotsplugin $kmailplugin
$knodeplugin $knotesplugin $korganizerplugins
do
sed -ri s,$i,, filelists/kontact
done
for i in $akregatorplugins
do
echo $i >> filelists/akregator
done
for i in $kaddressbookplugin
do
echo $i >> filelists/kaddressbook
done
for i in $kjotsplugin
do
echo $i >> filelists/kjots
done
for i in $kmailplugin
do
echo $i >> filelists/kmail
done
for i in $knodeplugin
do
echo $i >> filelists/knode
done
for i in $knotesplugin
do
echo $i >> filelists/knotes
done
for i in $korganizerplugins
do
echo $i >> filelists/korganizer
done
sed -ri s,.*/usr/%{_lib}/libkabcommon.so.*,, filelists/kaddressbook
grep "/usr/lib" filelists/libkdepim | grep "/kde4/" >filelists/libkdepim.devel
cat filelists/libkdepim.devel | while read line; do echo "%exclude
$line";done >>filelists/devel
grep "/usr/lib" filelists/libkdepim | grep -v "/kde4/"
filelists/libkdepim.libscat filelists/libkdepim.libs | while read line; do echo "%exclude $line";done
filelists/libkdepim
%create_exclude_filelist
%suse_update_desktop_file -r blogilo Utility WebUtility
%suse_update_desktop_file -u akonadiconsole Network Email
%suse_update_desktop_file KNode Network News
%suse_update_desktop_file Kjots Utility TimeUtility
%suse_update_desktop_file Kontact Office Core-Office
%suse_update_desktop_file akregator Network RSS-News
%suse_update_desktop_file groupwarewizard Utility DesktopSettings
%suse_update_desktop_file kaddressbook Office ContactManagement
%suse_update_desktop_file kalarm Utility TimeUtility
%suse_update_desktop_file kleopatra Utility Security
%suse_update_desktop_file knotes Utility DesktopUtility
%suse_update_desktop_file korganizer Office Calendar
%suse_update_desktop_file ktimetracker Utility TimeUtility
%kde_post_install
#Restrict fdupes call to not cause unwanted dependencies between packages
%fdupes -s %{buildroot}%{_kde4_htmldir}
%fdupes -s %{buildroot}%{_kde4_appsdir}/libkleopatra/
%fdupes -s %{buildroot}%{_kde4_appsdir}/knode/
%fdupes -s %{buildroot}%{_kde4_appsdir}/kmail2/
%fdupes -s %{buildroot}%{_kde4_iconsdir}
%kde_post_install
rm %{buildroot}%{_kde4_libdir}/*.so
grep -v "%{_kde4_libdir}/lib.*so$" filelists/akonadi.devel >
filelists/akonadi.devel.upd
grep -v "%{_kde4_libdir}/lib.*so$" filelists/akonadi_next >
filelists/akonadi_next.upd
grep -v "%{_kde4_libdir}/lib.*so$" filelists/akregator >
filelists/akregator.upd
grep -v "%{_kde4_libdir}/lib.*so$" filelists/exclude > filelists/exclude.upd
grep -v "%{_kde4_libdir}/lib.*so$" filelists/kalarm > filelists/kalarm.upd
grep -v "%{_kde4_libdir}/lib.*so$" filelists/knode > filelists/knode.upd
grep -v "%{_kde4_libdir}/lib.*so$" filelists/korganizer >
filelists/korganizer.upd
grep -v "%{_kde4_libdir}/lib.*so$" filelists/libkdepim >
filelists/libkdepim.upd
grep -v "%{_kde4_libdir}/lib.*so$" filelists/libkdepim.libs >
filelists/libkdepim.libs.upd
rm filelists/devel
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf %{buildroot}
rm -rf filelists
%package -n akonadi
License: GPLv2+ ; LGPLv2.1+
Summary: KDE Resources for PIM Storage Service
Group: System/GUI/KDE
Requires: kdepim4-runtime = %{version}
Requires: soprano
Provides: kde4-akonadi = 4.3.0
Obsoletes: kde4-akonadi < 4.3.0
Obsoletes: akonadi-devel < 4.4.60
Provides: akonadi-devel = 4.4.60
%kde4_runtime_requires
%kde4_pimlibs_requires
%kde4_akonadi_requires
%description -n akonadi
This package contains the KDE resources for Akonadi, the KDE PIM
storage service.
%post -n akonadi -p /sbin/ldconfig
%postun -n akonadi -p /sbin/ldconfig
%files -n akonadi -f filelists/akonadi_next.upd
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%dir %{_datadir}/akonadi
%dir %{_datadir}/akonadi/agents
%dir %{_kde4_libdir}/akonadi
%dir %{_kde4_libdir}/akonadi/contact
%dir %{_kde4_libdir}/akonadi/contact/editorpageplugins
%{_datadir}/akonadi/agents/nepomukemailfeeder.desktop
%{_kde4_libdir}/akonadi/contact/editorpageplugins/cryptopageplugin.so
%package -n akregator
License: LGPLv2.1+
Summary: RSS Feed Reader
Group: Productivity/Networking/News/Utilities
Requires: libkdepim4 = %{version}
Provides: kde4-akregator = 4.3.0
Obsoletes: kde4-akregator < 4.3.0
%kde4_runtime_requires
%kde4_pimlibs_requires
%description -n akregator
A KDE Feed Aggregator
%post -n akregator -p /sbin/ldconfig
%postun -n akregator -p /sbin/ldconfig
%files -n akregator -f filelists/akregator.upd
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%package -n blogilo
License: LGPLv2.1+
Summary: KDE Blog Editor
Group: Productivity/Editors/Other
Requires: libkdepim4 = %{version}
Provides: bilbo = 1.0
Obsoletes: bilbo < 1.0
%kde4_runtime_requires
%kde4_pimlibs_requires
%description -n blogilo
A blog editor for KDE
%post -n blogilo -p /sbin/ldconfig
%postun -n blogilo -p /sbin/ldconfig
%files -n blogilo -f filelists/blogilo
%defattr(-,root,root)
%package -n kaddressbook
License: LGPLv2.1+
Summary: Address Manager
Group: Productivity/Networking/Email/Utilities
Requires: kdepim4-runtime = %{version}
Requires: libkdepim4 = %{version}
Provides: kde4-kaddressbook = 4.3.0
Obsoletes: kde4-kaddressbook < 4.3.0
%kde4_akonadi_requires
%kde4_runtime_requires
%kde4_pimlibs_requires
%description -n kaddressbook
The KDE Address Book
%post -n kaddressbook -p /sbin/ldconfig
%postun -n kaddressbook -p /sbin/ldconfig
%files -n kaddressbook -f filelists/kaddressbook
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%package -n kmail
License: GPL v2.0
Summary: Mail Client
Group: Productivity/Networking/Email/Clients
Requires: akonadi-runtime
Requires: kdepim4-runtime = %{version}
Requires: libkdepim4 = %{version}
Provides: kde4-kmail = 4.3.0
Obsoletes: kde4-kmail < 4.3.0
%kde4_runtime_requires
%kde4_pimlibs_requires
%description -n kmail
KMail is the KDE mail client.
%post -n kmail -p /sbin/ldconfig
%postun -n kmail -p /sbin/ldconfig
%files -n kmail -f filelists/kmail
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%config %{_kde4_configdir}/kmail.antispamrc
%config %{_kde4_configdir}/kmail.antivirusrc
%{_kde4_appsdir}/kmail/pics/*
%package -n knode
License: LGPLv2.1+
Summary: News Reader
Group: Productivity/Networking/News/Clients
Requires: libkdepim4 = %{version}
Provides: kde4-knode = 4.3.0
Obsoletes: kde4-knode < 4.3.0
%kde4_runtime_requires
%kde4_pimlibs_requires
%description -n knode
KNode is a usenet news reader for KDE.
%post -n knode -p /sbin/ldconfig
%postun -n knode -p /sbin/ldconfig
%files -n knode -f filelists/knode.upd
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%{_kde4_appsdir}/knode/pics/*
%package -n knotes
License: LGPLv2.1+
Summary: Popup Notes
Group: Productivity/Other
Requires: libkdepim4 = %{version}
Provides: kde4-knotes = 4.3.0
Obsoletes: kde4-knotes < 4.3.0
%kde4_runtime_requires
%kde4_pimlibs_requires
%description -n knotes
KNotes is a note taking application for KDE.
%post -n knotes -p /sbin/ldconfig
%postun -n knotes -p /sbin/ldconfig
%files -n knotes -f filelists/knotes
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%exclude %{_kde4_appsdir}/knotes/knotes_part.rc
%package -n kontact
License: LGPLv2.1+
Summary: Personal Information Manager
Group: Productivity/Other
Requires: libkdepim4 = %{version}
Recommends: kmail
Suggests: kaddressbook
Suggests: kjots
Suggests: knode
Suggests: knotes
Suggests: korganizer
Suggests: ktimetracker
Obsoletes: kde4-kontact < 4.3.0
Provides: kde4-kontact = 4.3.0
%kde4_runtime_requires
%kde4_pimlibs_requires
%kde4_akonadi_requires
%description -n kontact
Kontact combines the individual applications KMail, KAddressBook and
KOrganizer as views in one window.
%post -n kontact -p /sbin/ldconfig
%postun -n kontact -p /sbin/ldconfig
%files -n kontact -f filelists/kontact
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%package -n korganizer
License: GPL v2.0
Summary: Personal Organizer
Group: Productivity/Office/Organizers
Requires: kdepim4-runtime = %{version}
Requires: libkdepim4 = %{version}
Provides: kde4-korganizer = 4.3.0
Obsoletes: kde4-korganizer < 4.3.0
%kde4_runtime_requires
%kde4_pimlibs_requires
%kde4_akonadi_requires
%description -n korganizer
KOrganizer is a calendar application for KDE.
%post -n korganizer -p /sbin/ldconfig
%postun -n korganizer -p /sbin/ldconfig
%files -n korganizer -f filelists/korganizer.upd
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%config %{_kde4_configdir}/korganizer.knsrc
%{_kde4_servicetypesdir}/calendardecoration.desktop
%{_kde4_servicetypesdir}/calendarplugin.desktop
%package -n ktimetracker
License: LGPLv2.1+
Summary: Personal Time Tracker
Group: Productivity/Other
Requires: libkdepim4 = %{version}
Provides: kde4-ktimetracker = 4.3.0
Obsoletes: kde4-ktimetracker < 4.3.0
%kde4_runtime_requires
%kde4_pimlibs_requires
%description -n ktimetracker
KTimeTracker tracks time spent on various tasks.
%post -n ktimetracker -p /sbin/ldconfig
%postun -n ktimetracker -p /sbin/ldconfig
%files -n ktimetracker -f filelists/ktimetracker
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%package -n kjots
License: GPLv2+
Summary: Note Taker
Group: Productivity/Other
Requires: libkdepim4 = %{version}
Provides: kde4-kjots = 4.3.0
Obsoletes: kde4-kjots < 4.3.0
%kde4_akonadi_requires
%kde4_runtime_requires
%kde4_pimlibs_requires
%description -n kjots
KDE Note Taking Utility
%post -n kjots -p /sbin/ldconfig
%postun -n kjots -p /sbin/ldconfig
%files -n kjots -f filelists/kjots
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%package wizards
License: LGPLv2.1+
Summary: KDE Personal Information Management Wizards
Group: System/GUI/KDE
%kde4_pimlibs_requires
%kde4_runtime_requires
%description wizards
This package contains wizards to setup groupware accounts in Kontact.
%post wizards -p /sbin/ldconfig
%postun wizards -p /sbin/ldconfig
%files wizards -f filelists/wizards
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%package -n kalarm
License: LGPLv2.1+
Summary: Personal Alarm Scheduler
Group: Productivity/Other
Requires: libkdepim4 = %{version}
Provides: kde4-kalarm = 4.3.0
Obsoletes: kde4-kalarm < 4.3.0
%kde4_runtime_requires
%kde4_pimlibs_requires
%kde4_akonadi_requires
%description -n kalarm
Personal alarm message, command and email scheduler for KDE
%post -n kalarm -p /sbin/ldconfig
%postun -n kalarm -p /sbin/ldconfig
%files -n kalarm -f filelists/kalarm.upd
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%config %{_sysconfdir}/dbus-1/system.d/org.kde.kalarmrtcwake.conf
%package -n libkdepim4
License: LGPLv2.1+
Summary: KDE PIM Libraries
Group: System/GUI/KDE
Obsoletes: libkdepim4-devel < 4.6.0
Provides: libkdepim4-devel = 4.6.0
%requires_eq akonadi
%requires_ge libqt4-x11
%description -n libkdepim4
This package contains the basic packages for KDE PIM applications.
%post -n libkdepim4 -p /sbin/ldconfig
%postun -n libkdepim4 -p /sbin/ldconfig
%files -n libkdepim4 -f filelists/libkdepim.libs.upd
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%{_kde4_modulesdir}/kcm_ldap.so
%{_kde4_modulesdir}/plugins/designer/kdepimwidgets.so
%files -f filelists/exclude.upd
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%dir %{_kde4_libdir}/strigi
%config %{_kde4_configdir}/libkleopatrarc
%doc %lang(en) %{_kde4_htmldir}/en/kontact-admin
%doc %lang(en) %{_kde4_htmldir}/en/kabcclient
%doc %lang(en) %{_kde4_htmldir}/en/konsolekalendar
%doc %lang(en) %{_kde4_htmldir}/en/kioslave/news
%doc %lang(en) %{_kde4_htmldir}/en/kioslave
%doc %lang(en) %{_kde4_htmldir}/en/kwatchgnupg
%doc %lang(en) %{_kde4_htmldir}/en/kleopatra
%{_datadir}/dbus-1/interfaces/*
%{_kde4_applicationsdir}/*
%{_kde4_appsdir}
%{_kde4_bindir}/*
%{_kde4_configkcfgdir}
%{_kde4_iconsdir}/hicolor
%{_kde4_iconsdir}/oxygen
%{_kde4_libdir}/*.so.*
%{_kde4_libdir}/strigi/strigiea_*.so
%{_kde4_mandir}/man1/kabcclient.1.gz
%{_kde4_modulesdir}/*
%{_kde4_servicesdir}
%exclude %{_kde4_appsdir}/kmail/pics/*
%exclude %{_kde4_appsdir}/knode/pics/*
%changelog
++++++ 4_7_BRANCH.diff ++++++
++++ 2301 lines (skipped)
++++++ _link ++++++
<link project="openSUSE:12.1" package="kdepim4"
baserev="5d0ca5cc780d3653f283e0c54a473812">
<patches>
<branch/>
</patches>
</link>
++++++ akregator-useragent.diff ++++++
--- akregator/src/akregator_part.cpp
+++ akregator/src/akregator_part.cpp
@@ -264,7 +264,7 @@ Part::Part( QWidget *parentWidget, QObje
connect(m_autosaveTimer, SIGNAL(timeout()), this,
SLOT(slotSaveFeedList()));
m_autosaveTimer->start(5*60*1000); // 5 minutes
- QString useragent = QString( "Akregator/%1; syndication" ).arg(
KDEPIM_VERSION );
+ QString useragent = QString( "Akregator/%1; syndication SUSE" ).arg(
KDEPIM_VERSION );
if( !Settings::customUserAgent().isEmpty() )
useragent = Settings::customUserAgent();
++++++ desktop-files.diff ++++++
Index: akonadiconsole/akonadiconsole.desktop
===================================================================
--- akonadiconsole/akonadiconsole.desktop.orig
+++ akonadiconsole/akonadiconsole.desktop
@@ -90,4 +90,5 @@ Comment[x-test]=xxAkonadi Management and
Comment[zh_CN]=用于管理和调试 Akonadi 的控制台
Comment[zh_TW]=Akonadi 管理與除錯主控台
Terminal=false
-Categories=Qt;KDE;Development;
+Categories=Qt;KDE;Development;Debugger;X-KDE-Utilities-PIM;
+Hidden=true
Index: ktimetracker/support/ktimetracker.desktop
===================================================================
--- ktimetracker/support/ktimetracker.desktop.orig
+++ ktimetracker/support/ktimetracker.desktop
@@ -111,4 +111,4 @@ Type=Application
Terminal=false
X-KDE-StartupNotify=true
X-DBUS-StartupType=Multi
-Categories=Qt;KDE;Utility;Office;Monitor;X-KDE-Utilities-PIM;
+Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM;
Index: kleopatra/kleopatra.desktop
===================================================================
--- kleopatra/kleopatra.desktop.orig
+++ kleopatra/kleopatra.desktop
@@ -1,8 +1,7 @@
[Desktop Entry]
Type=Application
-Categories=Qt;KDE;Utility;
+Categories=Qt;KDE;Utility;Security;X-KDE-Utilities-PIM;
Exec=kleopatra
-Icon=kleopatra
Name=Kleopatra
Name[af]=Kleopatra
Name[ar]=كليوبترا
++++++ knode-kontact-default.diff ++++++
Index: kontact/plugins/knode/knodeplugin.desktop
===================================================================
--- kontact/plugins/knode/knodeplugin.desktop.orig
+++ kontact/plugins/knode/knodeplugin.desktop
@@ -13,7 +13,7 @@ X-KDE-KontactPluginHasSummary=false
X-KDE-PluginInfo-Name=kontact_knodeplugin
X-KDE-PluginInfo-Version=0.1
X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=false
+X-KDE-PluginInfo-EnabledByDefault=true
Comment=Kontact KNode Plugin
Comment[af]=Kontact KNode inprop module
++++++ make-kmail-faster.patch ++++++
From: idoenmez@xxxxxxxx
Subject: ?
Index: kdepim-4.7.2/messagelist/core/themedelegate.cpp
===================================================================
--- kdepim-4.7.2.orig/messagelist/core/themedelegate.cpp
+++ kdepim-4.7.2/messagelist/core/themedelegate.cpp
@@ -51,8 +51,11 @@ ThemeDelegate::ThemeDelegate( QAbstractI
{
mItemView = parent;
mTheme = 0;
+ connect( KGlobalSettings::self(), SIGNAL( kdisplayFontChanged() ), this,
SLOT( slotGeneralFontChanged() ) );
}
+QString ThemeDelegate::mGeneralFontKey = KGlobalSettings::generalFont().key();
+
ThemeDelegate::~ThemeDelegate()
{
}
@@ -87,6 +90,7 @@ void ThemeDelegate::setTheme( const Them
break;
}
mItemView->reset();
+
}
// FIXME: gcc will refuse to inline these functions loudly complaining
@@ -118,6 +122,18 @@ static int cachedFontHeight( const QFont
return fontHeightCache[ fontKey ];
}
+static int cachedFontHeightKey( const QFont &font, const QString &fontKey )
+{
+ static QHash<QString, int> fontHeightCache;
+
+ if ( !fontHeightCache.contains( fontKey ) ) {
+ fontHeightCache.insert( fontKey, cachedFontMetrics( font ).height() );
+ }
+
+ return fontHeightCache[ fontKey ];
+}
+
+
static inline void paint_right_aligned_elided_text( const QString &text,
Theme::ContentItem * ci, QPainter * painter, int &left, int top, int &right,
Qt::LayoutDirection layoutDir, const QFont &font )
{
painter->setFont( font );
@@ -501,7 +517,8 @@ static inline void compute_size_hint_for
if ( ci->displaysText() )
{
const QFont font = ThemeDelegate::itemFont( ci, item );
- const int fontHeight = cachedFontHeight( font );
+ const QString fontKey = ThemeDelegate::itemFontKey( ci, item );
+ const int fontHeight = cachedFontHeightKey( font, fontKey );
if ( fontHeight > maxh )
maxh = fontHeight;
totalw += ci->displaysLongText() ? 128 : 64;
@@ -1670,3 +1687,20 @@ QFont ThemeDelegate::itemFont( const The
return KGlobalSettings::generalFont();
}
+QString ThemeDelegate::itemFontKey( const Theme::ContentItem *ci, const Item
*item )
+{
+ if ( ci && ci->useCustomFont() )
+ return ci->fontKey();
+
+ if ( item && ( item->type() == Item::Message ) )
+ return static_cast< const MessageItem * >( item )->fontKey();
+
+ return mGeneralFontKey;
+}
+
+// Store the new fontKey when the generalFont changes.
+void ThemeDelegate::slotGeneralFontChanged()
+{
+ ThemeDelegate::mGeneralFontKey = KGlobalSettings::generalFont().key();
+}
+
Index: kdepim-4.7.2/messagelist/core/themedelegate.h
===================================================================
--- kdepim-4.7.2.orig/messagelist/core/themedelegate.h
+++ kdepim-4.7.2/messagelist/core/themedelegate.h
@@ -44,6 +44,8 @@ class Item;
*/
class ThemeDelegate : public QStyledItemDelegate
{
+ Q_OBJECT
+
public:
ThemeDelegate( QAbstractItemView * parent );
~ThemeDelegate();
@@ -51,6 +53,7 @@ public:
private:
const Theme * mTheme; ///< Shallow pointer to the current theme
QAbstractItemView * mItemView;
+ static QString mGeneralFontKey;
QColor mGroupHeaderBackgroundColor; // cache
@@ -194,6 +197,9 @@ public:
/// return the font to paint given item with, checking global kmail settings
and theme settings
static QFont itemFont( const Theme::ContentItem *ci, const Item *item );
+ /// return the font key to paint given item with, checking global kmail
settings and theme settings
+ static QString itemFontKey( const Theme::ContentItem *ci, const Item *item );
+
protected:
/**
* Returns the Item for the specified model index. Pure virtual: must be
reimplemented
@@ -211,6 +217,11 @@ protected:
*/
QSize sizeHint( const QStyleOptionViewItem & option, const QModelIndex &
index ) const;
+private slots:
+ /**
+ * Called when the global fonts change (from systemsettings)
+ */
+ void slotGeneralFontChanged();
};
} // namespace Core
Index: kdepim-4.7.2/messagelist/core/theme.cpp
===================================================================
--- kdepim-4.7.2.orig/messagelist/core/theme.cpp
+++ kdepim-4.7.2/messagelist/core/theme.cpp
@@ -167,6 +167,7 @@ bool Theme::ContentItem::applicableToGro
void Theme::ContentItem::setFont( const QFont &font )
{
mFont = font;
+ mFontKey = font.key();
}
void Theme::ContentItem::save( QDataStream &stream ) const
Index: kdepim-4.7.2/messagelist/core/theme.h
===================================================================
--- kdepim-4.7.2.orig/messagelist/core/theme.h
+++ kdepim-4.7.2/messagelist/core/theme.h
@@ -242,6 +242,7 @@ public:
unsigned int mFlags; ///< The flags of the item
QFont mFont; ///< The font to use with this content
item, meaningful only if displaysText() returns true.
+ QString mFontKey; ///< The font key to speedup theme
positioning. QFont.key() is called too many times otherwise.
QColor mCustomColor; ///< The color to use with this content
item, meaningful only if canUseCustomColor() return true.
public:
@@ -420,6 +421,16 @@ public:
{ return mFont; };
/**
+ * Returns the font key used by this item. It may be a custom font key set
by setFont()
+ * or the default application font (returned by
KGlobalSettings::generalFont()).
+ * This setting is valid as long as you have called updateFontMetrics()
+ * with the appropriate paint device.
+ * It is primary used to avoid to calculate the key every time an item is
displayed.
+ */
+ const QString & fontKey() const
+ { return mFontKey; };
+
+ /**
* Returns the custom color set for this item.
* The return value is meaningful only if canUseCustomColor() returns true
* returns true and setUseCustomColor( true ) has been called.
Index: kdepim-4.7.2/messagelist/core/messageitem_p.h
===================================================================
--- kdepim-4.7.2.orig/messagelist/core/messageitem_p.h
+++ kdepim-4.7.2/messagelist/core/messageitem_p.h
@@ -80,6 +80,11 @@ public:
static QFont mFontUnreadMessage;
static QFont mFontImportantMessage;
static QFont mFontToDoMessage;
+ static QString mFontKey;
+ static QString mFontNewMessageKey;
+ static QString mFontUnreadMessageKey;
+ static QString mFontImportantMessageKey;
+ static QString mFontToDoMessageKey;
private:
Index: kdepim-4.7.2/messagelist/core/messageitem.h
===================================================================
--- kdepim-4.7.2.orig/messagelist/core/messageitem.h
+++ kdepim-4.7.2/messagelist/core/messageitem.h
@@ -134,6 +134,8 @@ public:
QFont font() const;
+ QString fontKey() const;
+
SignatureState signatureState() const;
void setSignatureState( SignatureState state );
Index: kdepim-4.7.2/messagelist/core/messageitem.cpp
===================================================================
--- kdepim-4.7.2.orig/messagelist/core/messageitem.cpp
+++ kdepim-4.7.2/messagelist/core/messageitem.cpp
@@ -44,6 +44,7 @@ public:
QColor mTextColor;
QColor mBackgroundColor;
QFont mFont;
+ QString mFontKey;
int mPriority;
};
@@ -123,6 +124,11 @@ QFont MessageItemPrivate::mFont;
QFont MessageItemPrivate::mFontUnreadMessage;
QFont MessageItemPrivate::mFontImportantMessage;
QFont MessageItemPrivate::mFontToDoMessage;
+QString MessageItemPrivate::mFontKey;
+QString MessageItemPrivate::mFontNewMessageKey;
+QString MessageItemPrivate::mFontUnreadMessageKey;
+QString MessageItemPrivate::mFontImportantMessageKey;
+QString MessageItemPrivate::mFontToDoMessageKey;
MessageItemPrivate::MessageItemPrivate( MessageItem* qq )
: ItemPrivate( qq ),
@@ -403,6 +409,35 @@ QFont MessageItem::font() const
return font;
}
+QString MessageItem::fontKey() const
+{
+ Q_D( const MessageItem );
+
+ // for performance reasons we don't want font retrieval to trigger
+ // full tags loading, as the font is used for geometry calculation
+ // and thus this method called for each item
+ if ( d->tagListInitialized() ) {
+ const Tag *bestTag = d->bestTag();
+ if ( bestTag != 0 && bestTag->font() != QFont() ) {
+ return bestTag->font().key();
+ }
+ }
+
+ // from KDE3: "important" overrides "new" overrides "unread" overrides "todo"
+ Akonadi::MessageStatus messageStatus = status();
+ if ( messageStatus.isImportant() ) {
+ return d->mFontImportantMessageKey;
+ } else if ( !messageStatus.isRead() ) {
+ return d->mFontUnreadMessageKey;
+ } else if ( messageStatus.isToAct() ) {
+ return d->mFontToDoMessageKey;
+ } else {
+ return d->mFontKey;
+ }
+
+}
+
+
MessageItem::SignatureState MessageItem::signatureState() const
{
Q_D( const MessageItem );
@@ -572,21 +607,25 @@ void MessageItem::setToDoMessageColor( c
void MessageItem::setGeneralFont( const QFont &font )
{
MessageItemPrivate::mFont = font;
+ MessageItemPrivate::mFontKey = font.key();
}
void MessageItem::setUnreadMessageFont( const QFont &font )
{
MessageItemPrivate::mFontUnreadMessage = font;
+ MessageItemPrivate::mFontUnreadMessageKey = font.key();
}
void MessageItem::setImportantMessageFont( const QFont &font )
{
MessageItemPrivate::mFontImportantMessage = font;
+ MessageItemPrivate::mFontImportantMessageKey = font.key();
}
void MessageItem::setToDoMessageFont( const QFont &font )
{
MessageItemPrivate::mFontToDoMessage = font;
+ MessageItemPrivate::mFontToDoMessageKey = font.key();
}
FakeItemPrivate::FakeItemPrivate( FakeItem *qq ) : MessageItemPrivate( qq )
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |