Hello community,
here is the log from the commit of package libkdepim for openSUSE:Factory checked in at 2016-08-29 15:20:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libkdepim (Old)
and /work/SRC/openSUSE:Factory/.libkdepim.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkdepim"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libkdepim/libkdepim.changes 2016-08-08 13:57:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libkdepim.new/libkdepim.changes 2016-08-29 15:20:31.000000000 +0200
@@ -1,0 +2,21 @@
+Tue Aug 23 13:49:10 UTC 2016 - fabian@ritter-vogt.de
+
+- Build only on architectures supported by libqt5-qtwebengine
+
+-------------------------------------------------------------------
+Fri Aug 12 10:06:28 UTC 2016 - tittiatcoke@gmail.com
+
+- Update to KDE Applications 16.08.0
+ * KDE Applications 16.08.0
+ * https://www.kde.org/announcements/announce-applications-16.08.0.php
+
+
+-------------------------------------------------------------------
+Mon Aug 8 14:40:45 UTC 2016 - tittiatcoke@gmail.com
+
+- Update to KDE Applications 16.07.90
+ * KDE Applications 16.07.90 (16.08-RC)
+ * https://www.kde.org/announcements/announce-applications-16.07.90.php
+
+
+-------------------------------------------------------------------
Old:
----
libkdepim-16.04.3.tar.xz
New:
----
libkdepim-16.08.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libkdepim.spec ++++++
--- /var/tmp/diff_new_pack.JjshxA/_old 2016-08-29 15:20:33.000000000 +0200
+++ /var/tmp/diff_new_pack.JjshxA/_new 2016-08-29 15:20:33.000000000 +0200
@@ -17,7 +17,7 @@
Name: libkdepim
-Version: 16.04.3
+Version: 16.08.0
Release: 0
Summary: Base package of kdepim
License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+
@@ -25,9 +25,11 @@
Group: System/Libraries
Url: http://www.kde.org
Source0: %{name}-%{version}.tar.xz
-BuildRequires: akonadi-contact-devel
-BuildRequires: akonadi-search-devel
-BuildRequires: akonadi-server-devel
+# It can only build on the same platforms as Qt Webengine
+ExclusiveArch: %ix86 x86_64 %arm aarch64 mips mips64
+BuildRequires: akonadi-contact-devel = %{version}
+BuildRequires: akonadi-search-devel = %{version}
+BuildRequires: akonadi-server-devel = %{version}
BuildRequires: extra-cmake-modules
BuildRequires: kcmutils-devel
BuildRequires: kcodecs-devel
++++++ libkdepim-16.04.3.tar.xz -> libkdepim-16.08.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/CMakeLists.txt new/libkdepim-16.08.0/CMakeLists.txt
--- old/libkdepim-16.04.3/CMakeLists.txt 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/CMakeLists.txt 2016-08-10 08:39:07.000000000 +0200
@@ -2,7 +2,8 @@
project(libkdepim)
-find_package(ECM 5.19.0 CONFIG REQUIRED)
+set(KF5_VERSION "5.23.0")
+find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
set(LIBRARY_NAMELINK)
include(GenerateExportHeader)
@@ -18,30 +19,37 @@
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
-set(KF5_VERSION "5.19.0")
-set(LIBKDEPIM_LIB_VERSION "5.2.3")
-set(KDEPIMLIBS_LIB_VERSION "5.2.0")
-set(QT_REQUIRED_VERSION "5.4.0")
-set(KMIME_LIB_VERSION "5.2.0")
-set(KLDAP_LIB_VERSION "5.2.0")
-set(KCONTACTS_LIB_VERSION "5.2.0")
-set(AKONADISEARCH_LIB_VERSION "5.0.42")
-set(AKONADI_VERSION "5.2.0")
+set(PIM_VERSION "5.3.0")
+set(LIBKDEPIM_LIB_VERSION ${PIM_VERSION})
+set(AKONADICONTACT_LIB_VERSION "5.3.0")
+set(QT_REQUIRED_VERSION "5.5.0")
+set(KMIME_LIB_VERSION "5.3.0")
+set(KLDAP_LIB_VERSION "5.3.0")
+set(KCONTACTS_LIB_VERSION "5.3.0")
+set(AKONADISEARCH_LIB_VERSION "5.3.0")
+set(AKONADI_VERSION "5.3.0")
+
+find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test DBus Network)
-find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
-find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test UiTools DBus Network)
-find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
-find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
-find_package(KF5KCMUtils ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Codecs ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED)
-find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
-find_package(KF5ItemViews ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5ConfigWidgets ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5CoreAddons ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5ItemViews ${KF5_VERSION} CONFIG REQUIRED)
-find_package(KF5Ldap ${KLDAP_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5JobWidgets ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5KCMUtils ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5WidgetsAddons ${KF5_VERSION} CONFIG REQUIRED)
+
+find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
+find_package(KF5AkonadiContact ${AKONADICONTACT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
-find_package(KF5AkonadiContact ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5Ldap ${KLDAP_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiSearch ${AKONADISEARCH_LIB_VERSION} CONFIG REQUIRED)
set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
@@ -52,6 +60,10 @@
TYPE OPTIONAL
)
+if (Qt5Designer_FOUND)
+ find_package(KF5DesignerPlugin ${KF5_VERSION} CONFIG REQUIRED)
+endif()
+
ecm_setup_version(${LIBKDEPIM_LIB_VERSION} VARIABLE_PREFIX LIBKDEPIM
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/libkdepim_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5LibkdepimConfigVersion.cmake"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/COPYING new/libkdepim-16.08.0/COPYING
--- old/libkdepim-16.04.3/COPYING 1970-01-01 01:00:00.000000000 +0100
+++ new/libkdepim-16.08.0/COPYING 2016-08-10 08:39:07.000000000 +0200
@@ -0,0 +1,346 @@
+NOTE! The GPL below is copyrighted by the Free Software Foundation, but
+the instance of code that it refers to (the kde programs) are copyrighted
+by the authors who actually wrote it.
+
+---------------------------------------------------------------------------
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C) 19yy <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/COPYING.LIB new/libkdepim-16.08.0/COPYING.LIB
--- old/libkdepim-16.04.3/COPYING.LIB 1970-01-01 01:00:00.000000000 +0100
+++ new/libkdepim-16.08.0/COPYING.LIB 2016-08-10 08:39:07.000000000 +0200
@@ -0,0 +1,510 @@
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations
+below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it
+becomes a de-facto standard. To achieve this, non-free programs must
+be allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control
+compilation and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at least
+ three years, to give the same user the materials specified in
+ Subsection 6a, above, for a charge no more than the cost of
+ performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply, and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library.
+It is safest to attach them to the start of each source file to most
+effectively convey the exclusion of warranty; and each file should
+have at least the "copyright" line and a pointer to where the full
+notice is found.
+
+
+
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or
+your school, if any, to sign a "copyright disclaimer" for the library,
+if necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James
+ Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/KF5LibkdepimConfig.cmake.in new/libkdepim-16.08.0/KF5LibkdepimConfig.cmake.in
--- old/libkdepim-16.04.3/KF5LibkdepimConfig.cmake.in 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/KF5LibkdepimConfig.cmake.in 2016-08-10 08:39:07.000000000 +0200
@@ -1,7 +1,7 @@
@PACKAGE_INIT@
-find_dependency(KF5Akonadi "@KDEPIMLIBS_LIB_VERSION@")
-find_dependency(KF5AkonadiContact "@KDEPIMLIBS_LIB_VERSION@")
+find_dependency(KF5Akonadi "@AKONADI_VERSION@")
+find_dependency(KF5AkonadiContact "@AKONADICONTACT_LIB_VERSION@")
include("${CMAKE_CURRENT_LIST_DIR}/KF5LibkdepimTargets.cmake")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/CMakeLists.txt new/libkdepim-16.08.0/src/CMakeLists.txt
--- old/libkdepim-16.04.3/src/CMakeLists.txt 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/CMakeLists.txt 2016-08-10 08:39:07.000000000 +0200
@@ -339,7 +339,7 @@
target_link_libraries(kcm_ldap KF5::Libkdepim KF5::IconThemes KF5::KCMUtils KF5::I18n KF5::Ldap Qt5::Core)
-kcoreaddons_desktop_to_json(kcm_ldap ldap/kcmldap.desktop)
+kcoreaddons_desktop_to_json(kcm_ldap ldap/kcmldap.desktop DEFAULT_SERVICE_TYPE)
install(TARGETS kcm_ldap DESTINATION ${KDE_INSTALL_PLUGINDIR})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/addressline/addresslineedit/addresseelineedit.cpp new/libkdepim-16.08.0/src/addressline/addresslineedit/addresseelineedit.cpp
--- old/libkdepim-16.04.3/src/addressline/addresslineedit/addresseelineedit.cpp 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/addressline/addresslineedit/addresseelineedit.cpp 2016-08-10 08:39:07.000000000 +0200
@@ -114,6 +114,11 @@
}
}
+void AddresseeLineEdit::setIcon(const QIcon &icon, const QString &tooltip)
+{
+ d->setIcon(icon, tooltip);
+}
+
bool AddresseeLineEdit::expandIntern() const
{
return d->expandIntern();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/addressline/addresslineedit/addresseelineedit.h new/libkdepim-16.08.0/src/addressline/addresslineedit/addresseelineedit.h
--- old/libkdepim-16.04.3/src/addressline/addresslineedit/addresseelineedit.h 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/addressline/addresslineedit/addresseelineedit.h 2016-08-10 08:39:07.000000000 +0200
@@ -69,7 +69,7 @@
* @param parent The parent object.
* @param enableCompletion Whether autocompletion shall be enabled.
*/
- explicit AddresseeLineEdit(QWidget *parent, bool enableCompletion = true);
+ explicit AddresseeLineEdit(QWidget *parent = Q_NULLPTR, bool enableCompletion = true);
/**
* Destroys the addressee line edit.
@@ -140,9 +140,12 @@
KConfig *recentAddressConfig() const;
void configureCompletion();
+ void setIcon(const QIcon &icon, const QString &tooltip = QString());
+
Q_SIGNALS:
void textCompleted();
void addAddress(const QString &address);
+ void iconClicked();
public Q_SLOTS:
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/addressline/addresslineedit/addresseelineedit_p.cpp new/libkdepim-16.08.0/src/addressline/addresslineedit/addresseelineedit_p.cpp
--- old/libkdepim-16.04.3/src/addressline/addresslineedit/addresseelineedit_p.cpp 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/addressline/addresslineedit/addresseelineedit_p.cpp 2016-08-10 08:39:07.000000000 +0200
@@ -32,6 +32,7 @@
#include
#include
#include <QApplication>
+#include <QToolButton>
#include <KConfigGroup>
#include <KLocalizedString>
#include
@@ -119,6 +120,17 @@
void AddresseeLineEditPrivate::init()
{
+ m_toolButton = new QToolButton(q);
+ m_toolButton->setVisible(false);
+ m_toolButton->setCursor(Qt::ArrowCursor);
+ const int size = q->sizeHint().height() - 5;
+ m_toolButton->setFixedSize(size, size);
+ int padding = (q->sizeHint().height() - size) / 2;
+ m_toolButton->move(2, padding);
+ m_toolButton->setStyleSheet(QStringLiteral("QToolButton { border: none; }"));
+ connect(m_toolButton, &QToolButton::clicked, q, &AddresseeLineEdit::iconClicked);
+
+
if (!s_static.exists()) {
s_static->completion->setOrder(KCompletion::Weighted);
s_static->completion->setIgnoreCase(true);
@@ -175,6 +187,22 @@
loadBalooBlackList();
}
+ connect(q, &AddresseeLineEdit::textCompleted, q, &AddresseeLineEdit::slotEditingFinished);
+ connect(q, &AddresseeLineEdit::editingFinished, q, &AddresseeLineEdit::slotEditingFinished);
+}
+
+void AddresseeLineEditPrivate::setIcon(const QIcon &icon, const QString &tooltip)
+{
+ if (icon.isNull()) {
+ m_toolButton->setVisible(false);
+ q->setStyleSheet(QString());
+ } else {
+ m_toolButton->setIcon(icon);
+ m_toolButton->setToolTip(tooltip);
+ const int padding = m_toolButton->width() - q->style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
+ q->setStyleSheet(QStringLiteral("QLineEdit { padding-left: %1px }").arg(padding));
+ m_toolButton->setVisible(true);
+ }
}
void AddresseeLineEditPrivate::startLoadingLDAPEntries()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/addressline/addresslineedit/addresseelineedit_p.h new/libkdepim-16.08.0/src/addressline/addresslineedit/addresseelineedit_p.h
--- old/libkdepim-16.04.3/src/addressline/addresslineedit/addresseelineedit_p.h 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/addressline/addresslineedit/addresseelineedit_p.h 2016-08-10 08:39:07.000000000 +0200
@@ -30,6 +30,7 @@
#include
class KConfig;
+class QToolButton;
namespace KPIM
{
@@ -59,6 +60,8 @@
bool showOU() const;
void setShowOU(bool showOU);
+ void setIcon(const QIcon &icon, const QString &tooltip);
+
bool useCompletion() const;
void setUseCompletion(bool useCompletion);
@@ -133,6 +136,7 @@
private:
AddresseeLineEdit *q;
+ QToolButton *m_toolButton;
QTimer m_delayedQueryTimer;
QColor m_alternateColor;
QStringList m_balooBlackList;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/addressline/completionorder/completionordereditor.cpp new/libkdepim-16.08.0/src/addressline/completionorder/completionordereditor.cpp
--- old/libkdepim-16.04.3/src/addressline/completionorder/completionordereditor.cpp 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/addressline/completionorder/completionordereditor.cpp 2016-08-10 08:39:07.000000000 +0200
@@ -67,29 +67,26 @@
: QDialog(parent), d(new KPIM::CompletionOrderEditorPrivate)
{
setWindowTitle(i18n("Edit Completion Order"));
- QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
- QVBoxLayout *mainLayout = new QVBoxLayout;
- setLayout(mainLayout);
- QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
- okButton->setDefault(true);
- okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
- connect(buttonBox, &QDialogButtonBox::accepted, this, &CompletionOrderEditor::slotOk);
- connect(buttonBox, &QDialogButtonBox::rejected, this, &CompletionOrderEditor::reject);
- okButton->setDefault(true);
-
- QWidget *page = new QWidget(this);
- QHBoxLayout *pageHBoxLayout = new QHBoxLayout(page);
- pageHBoxLayout->setMargin(0);
+ QVBoxLayout *mainLayout = new QVBoxLayout(this);
d->mCompletionOrderWidget = new CompletionOrderWidget(this);
d->mCompletionOrderWidget->setObjectName(QStringLiteral("completionorderwidget"));
mainLayout->addWidget(d->mCompletionOrderWidget);
- mainLayout->addWidget(buttonBox);
d->mCompletionOrderWidget->setLdapClientSearch(ldapSearch);
d->mCompletionOrderWidget->loadCompletionItems();
+
+ QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+ QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
+ okButton->setDefault(true);
+ okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
+ connect(buttonBox, &QDialogButtonBox::accepted, this, &CompletionOrderEditor::slotOk);
+ connect(buttonBox, &QDialogButtonBox::rejected, this, &CompletionOrderEditor::reject);
+ okButton->setDefault(true);
+ mainLayout->addWidget(buttonBox);
+
readConfig();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/addressline/recentaddress/recentaddresswidget.cpp new/libkdepim-16.08.0/src/addressline/recentaddress/recentaddresswidget.cpp
--- old/libkdepim-16.04.3/src/addressline/recentaddress/recentaddresswidget.cpp 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/addressline/recentaddress/recentaddresswidget.cpp 2016-08-10 08:39:07.000000000 +0200
@@ -73,6 +73,7 @@
connect(mListView, &QListWidget::itemSelectionChanged, this, &RecentAddressWidget::slotSelectionChanged);
// maybe supplied lineedit has some text already
slotTypedSomething(mLineEdit->text());
+ mDirty = false;
}
RecentAddressWidget::~RecentAddressWidget()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/job/addemailaddressjob.cpp new/libkdepim-16.08.0/src/job/addemailaddressjob.cpp
--- old/libkdepim-16.04.3/src/job/addemailaddressjob.cpp 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/job/addemailaddressjob.cpp 2016-08-10 08:39:07.000000000 +0200
@@ -47,7 +47,10 @@
{
public:
Private(AddEmailAddressJob *qq, const QString &emailString, QWidget *parentWidget)
- : q(qq), mCompleteAddress(emailString), mParentWidget(parentWidget)
+ : q(qq),
+ mCompleteAddress(emailString),
+ mParentWidget(parentWidget),
+ mInteractive(true)
{
KContacts::Addressee::parseEmailAddress(emailString, mName, mEmail);
}
@@ -76,16 +79,18 @@
const KContacts::Addressee::List contacts = searchJob->contacts();
if (!contacts.isEmpty()) {
- const QString text =
- xi18nc("@info",
- "A contact with the email address <email>%1</email> "
- "is already in your address book.", mCompleteAddress);
-
- KMessageBox::information(
- mParentWidget,
- text,
- QString(),
- QStringLiteral("alreadyInAddressBook"));
+ if (mInteractive) {
+ const QString text =
+ xi18nc("@info",
+ "A contact with the email address <email>%1</email> "
+ "is already in your address book.", mCompleteAddress);
+
+ KMessageBox::information(
+ mParentWidget,
+ text,
+ QString(),
+ QStringLiteral("alreadyInAddressBook"));
+ }
q->setError(UserDefinedError);
q->emitResult();
return;
@@ -215,42 +220,48 @@
const Akonadi::ItemCreateJob *createJob = qobject_cast(job);
mItem = createJob->item();
- const QString text =
- xi18nc("@info",
- "<para>A contact for <email>%1</email> was successfully added "
- "to your address book.</para>"
- "<para>Do you want to edit this new contact now?</para>",
- mCompleteAddress);
-
- if (KMessageBox::questionYesNo(
- mParentWidget,
- text,
- QString(),
- KStandardGuiItem::yes(),
- KStandardGuiItem::no(),
- QStringLiteral("addedtokabc")) == KMessageBox::Yes) {
- QPointerAkonadi::ContactEditorDialog dlg =
- new Akonadi::ContactEditorDialog(Akonadi::ContactEditorDialog::EditMode,
- mParentWidget);
- dlg->setContact(mItem);
- connect(dlg, SIGNAL(contactStored(Akonadi::Item)),
- q, SLOT(contactStored(Akonadi::Item)));
- connect(dlg, SIGNAL(error(QString)),
- q, SLOT(slotContactEditorError(QString)));
- dlg->exec();
- delete dlg;
+ if (mInteractive) {
+ const QString text =
+ xi18nc("@info",
+ "<para>A contact for <email>%1</email> was successfully added "
+ "to your address book.</para>"
+ "<para>Do you want to edit this new contact now?</para>",
+ mCompleteAddress);
+
+ if (KMessageBox::questionYesNo(
+ mParentWidget,
+ text,
+ QString(),
+ KStandardGuiItem::yes(),
+ KStandardGuiItem::no(),
+ QStringLiteral("addedtokabc")) == KMessageBox::Yes) {
+ QPointerAkonadi::ContactEditorDialog dlg =
+ new Akonadi::ContactEditorDialog(Akonadi::ContactEditorDialog::EditMode,
+ mParentWidget);
+ dlg->setContact(mItem);
+ connect(dlg, SIGNAL(contactStored(Akonadi::Item)),
+ q, SLOT(contactStored(Akonadi::Item)));
+ connect(dlg, SIGNAL(error(QString)),
+ q, SLOT(slotContactEditorError(QString)));
+ dlg->exec();
+ delete dlg;
+ }
}
q->emitResult();
}
void slotContactEditorError(const QString &error)
{
- KMessageBox::error(mParentWidget, i18n("Contact cannot be stored: %1", error), i18n("Failed to store contact"));
+ if (mInteractive) {
+ KMessageBox::error(mParentWidget, i18n("Contact cannot be stored: %1", error), i18n("Failed to store contact"));
+ }
}
void contactStored(const Akonadi::Item &)
{
- KPIM::BroadcastStatus::instance()->setStatusMsg(i18n("Contact created successfully"));
+ if (mInteractive) {
+ KPIM::BroadcastStatus::instance()->setStatusMsg(i18n("Contact created successfully"));
+ }
}
AddEmailAddressJob *q;
@@ -259,6 +270,7 @@
QString mName;
QWidget *mParentWidget;
Akonadi::Item mItem;
+ bool mInteractive;
};
AddEmailAddressJob::AddEmailAddressJob(const QString &email,
@@ -287,4 +299,9 @@
return d->mItem;
}
+void AddEmailAddressJob::setInteractive(bool b)
+{
+ d->mInteractive = b;
+}
+
#include "moc_addemailaddressjob.cpp"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/job/addemailaddressjob.h new/libkdepim-16.08.0/src/job/addemailaddressjob.h
--- old/libkdepim-16.04.3/src/job/addemailaddressjob.h 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/job/addemailaddressjob.h 2016-08-10 08:39:07.000000000 +0200
@@ -68,6 +68,7 @@
*/
Akonadi::Item contact() const;
+ void setInteractive(bool b);
private:
//@cond PRIVATE
class Private;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/ldap/kcmldap.desktop new/libkdepim-16.08.0/src/ldap/kcmldap.desktop
--- old/libkdepim-16.04.3/src/ldap/kcmldap.desktop 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/ldap/kcmldap.desktop 2016-08-10 08:39:07.000000000 +0200
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=view-ldap-resource
+Icon=kontact
Type=Service
X-KDE-ServiceTypes=KCModule
@@ -56,7 +56,7 @@
Comment[nl]=De beschikbare LDAP-servers configureren
Comment[nn]=Set opp dei tilgjengelege LDAP-tenarane
Comment[pl]=Ustawienia dostępnych serwerów LDAP
-Comment[pt]=Configura os servidores de LDAP disponíveis
+Comment[pt]=Configurar os servidores de LDAP disponíveis
Comment[pt_BR]=Configura os servidores LDAP disponíveis
Comment[ru]=Настройка доступных серверов LDAP
Comment[sk]=Nastaviť dostupné servery LDAP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/ldap/ldapsearchdialog.cpp new/libkdepim-16.08.0/src/ldap/ldapsearchdialog.cpp
--- old/libkdepim-16.04.3/src/ldap/ldapsearchdialog.cpp 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/ldap/ldapsearchdialog.cpp 2016-08-10 08:39:07.000000000 +0200
@@ -558,6 +558,7 @@
mainLayout->addWidget(buttonBox);
QVBoxLayout *topLayout = new QVBoxLayout(page);
+ topLayout->setMargin(0);
QGroupBox *groupBox = new QGroupBox(i18n("Search for Addresses in Directory"),
page);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/multiplyingline/multiplyingline.h new/libkdepim-16.08.0/src/multiplyingline/multiplyingline.h
--- old/libkdepim-16.04.3/src/multiplyingline/multiplyingline.h 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/multiplyingline/multiplyingline.h 2016-08-10 08:39:07.000000000 +0200
@@ -156,21 +156,6 @@
virtual void setCompletionMode(KCompletion::CompletionMode mode) = 0;
/**
- If the view is resized while the completion popup is open, things might start
- to overlap. This method should hide() then show() the completionBox for any
- currently visible completion boxes.
- (somewhat hacky) Example:
- void YourLine::moveCompletionPopup() {
- if( mLineEdit->completionBox( false ) ) { // check if box is not null without creating it
- if( mLineEdit->completionBox()->isVisible() ) { // check if it is currently being shown
- mLineEdit->completionBox()->hide(); // trigger the moving
- mLineEdit->completionBox()->show();
- }
- }
- */
- virtual void moveCompletionPopup() = 0;
-
- /**
* Re implement this method if you need to do something
* before a line is deleted.
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/multiplyingline/multiplyinglineeditor.h new/libkdepim-16.08.0/src/multiplyingline/multiplyinglineeditor.h
--- old/libkdepim-16.04.3/src/multiplyingline/multiplyinglineeditor.h 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/multiplyingline/multiplyinglineeditor.h 2016-08-10 08:39:07.000000000 +0200
@@ -156,6 +156,8 @@
void setDynamicSizeHint(bool dynamic);
bool dynamicSizeHint() const;
+ virtual QList lines() const;
+
Q_SIGNALS:
void focusUp();
void focusDown();
@@ -170,7 +172,6 @@
void setFocusBottom();
protected:
- virtual QList lines() const;
virtual MultiplyingLine *activeLine() const;
bool mModified;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/multiplyingline/multiplyinglineview_p.cpp new/libkdepim-16.08.0/src/multiplyingline/multiplyinglineview_p.cpp
--- old/libkdepim-16.04.3/src/multiplyingline/multiplyinglineview_p.cpp 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/multiplyingline/multiplyinglineview_p.cpp 2016-08-10 08:39:07.000000000 +0200
@@ -36,7 +36,7 @@
MultiplyingLineView::MultiplyingLineView(MultiplyingLineFactory *factory, MultiplyingLineEditor *parent)
: QScrollArea(parent), mCurDelLine(Q_NULLPTR), mPage(new QWidget(this)), mTopLayout(new QVBoxLayout(this)), mMultiplyingLineFactory(factory),
- mLineHeight(0), mFirstColumnWidth(0),
+ mLineHeight(0), mFirstColumnWidth(0), mCompletionMode(KCompletion::CompletionNone),
mAutoResize(false), mDynamicSizeHint(true), mModified(false)
{
setWidgetResizable(true);
@@ -213,7 +213,6 @@
parentWidget()->layout()->activate();
Q_EMIT sizeHintChanged();
- QTimer::singleShot(0, this, &MultiplyingLineView::moveCompletionPopup);
}
void MultiplyingLineView::activateLine(MultiplyingLine *line)
@@ -384,13 +383,6 @@
return mFirstColumnWidth;
}
-void MultiplyingLineView::moveCompletionPopup()
-{
- foreach (MultiplyingLine *const line, mLines) {
- line->moveCompletionPopup();
- }
-}
-
QList< MultiplyingLine * > MultiplyingLineView::lines() const
{
return mLines;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/multiplyingline/multiplyinglineview_p.h new/libkdepim-16.08.0/src/multiplyingline/multiplyinglineview_p.h
--- old/libkdepim-16.04.3/src/multiplyingline/multiplyinglineview_p.h 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/multiplyingline/multiplyinglineview_p.h 2016-08-10 08:39:07.000000000 +0200
@@ -119,7 +119,6 @@
void slotUpPressed(KPIM::MultiplyingLine *);
void slotDecideLineDeletion(KPIM::MultiplyingLine *);
void slotDeleteLine();
- void moveCompletionPopup();
void moveScrollBarToEnd();
private:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/progresswidget/progressstatusbarwidget.cpp new/libkdepim-16.08.0/src/progresswidget/progressstatusbarwidget.cpp
--- old/libkdepim-16.04.3/src/progresswidget/progressstatusbarwidget.cpp 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/progresswidget/progressstatusbarwidget.cpp 2016-08-10 08:39:07.000000000 +0200
@@ -1,20 +1,21 @@
/*
- Copyright (c) 2014-2016 Montel Laurent
+ Copyright (C) 2014-2016 Laurent Montel
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License, version 2, as
- published by the Free Software Foundation.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
-
#include "progressstatusbarwidget.h"
#include "statusbarprogresswidget.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/progresswidget/progressstatusbarwidget.h new/libkdepim-16.08.0/src/progresswidget/progressstatusbarwidget.h
--- old/libkdepim-16.04.3/src/progresswidget/progressstatusbarwidget.h 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/progresswidget/progressstatusbarwidget.h 2016-08-10 08:39:07.000000000 +0200
@@ -1,20 +1,21 @@
/*
- Copyright (c) 2014-2016 Montel Laurent
+ Copyright (C) 2014-2016 Laurent Montel
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License, version 2, as
- published by the Free Software Foundation.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
-
#ifndef PROGRESSSTATUSBARWIDGET_H
#define PROGRESSSTATUSBARWIDGET_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/widgets/customlogwidget.cpp new/libkdepim-16.08.0/src/widgets/customlogwidget.cpp
--- old/libkdepim-16.04.3/src/widgets/customlogwidget.cpp 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/widgets/customlogwidget.cpp 2016-08-10 08:39:07.000000000 +0200
@@ -1,20 +1,21 @@
/*
- Copyright (c) 2012-2016 Montel Laurent
+ Copyright (C) 2012-2016 Laurent Montel
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License, version 2, as
- published by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
-
#include "customlogwidget.h"
#include <QTextDocument>
#include <QPainter>
@@ -41,7 +42,7 @@
QTextDocument *document = new QTextDocument(Q_NULLPTR);
document->setDocumentMargin(1);
const QColor textColor = index.data(Qt::ForegroundRole).value<QColor>();
- QStyleOptionViewItemV4 option4 = option;
+ QStyleOptionViewItem option4 = option;
QStyledItemDelegate::initStyleOption(&option4, index);
QString text = option4.text;
@@ -70,7 +71,7 @@
QPen pen = painter->pen();
- QStyleOptionViewItemV4 opt(option);
+ QStyleOptionViewItem opt(option);
opt.showDecorationSelected = true;
QApplication::style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &opt, painter);
painter->save();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-16.04.3/src/widgets/customlogwidget.h new/libkdepim-16.08.0/src/widgets/customlogwidget.h
--- old/libkdepim-16.04.3/src/widgets/customlogwidget.h 2016-06-15 06:41:11.000000000 +0200
+++ new/libkdepim-16.08.0/src/widgets/customlogwidget.h 2016-08-10 08:39:07.000000000 +0200
@@ -1,20 +1,21 @@
/*
- Copyright (c) 2012-2016 Montel Laurent
+ Copyright (C) 2012-2016 Laurent Montel
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License, version 2, as
- published by the Free Software Foundation.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
-
#ifndef IMPORTLOGWIDGET_H
#define IMPORTLOGWIDGET_H