Hello community, here is the log from the commit of package kcoreaddons for openSUSE:Factory checked in at 2020-09-18 14:38:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcoreaddons (Old) and /work/SRC/openSUSE:Factory/.kcoreaddons.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcoreaddons" Fri Sep 18 14:38:13 2020 rev:85 rq:834390 version:5.74.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcoreaddons/kcoreaddons.changes 2020-08-12 12:25:08.612159959 +0200 +++ /work/SRC/openSUSE:Factory/.kcoreaddons.new.4249/kcoreaddons.changes 2020-09-18 14:39:24.247895440 +0200 @@ -1,0 +2,16 @@ +Sun Sep 6 12:48:56 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.74.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.74.0 +- Changes since 5.73.0: + * Add *.kcrash glob pattern to KCrash Report MIME type + * Use Q_DECLARE_OPERATORS_FOR_FLAGS in same namespace as flags definition + * do not wait for fam events indefinitely (kde#423818) + * Remove obsolete COPYING files + * [KFormat] Allow formatting values to arbitrary binary units + * Make it possible to KPluginMetadata from QML + * [KFormat] Fix binary example + +------------------------------------------------------------------- Old: ---- kcoreaddons-5.73.0.tar.xz kcoreaddons-5.73.0.tar.xz.sig New: ---- kcoreaddons-5.74.0.tar.xz kcoreaddons-5.74.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcoreaddons.spec ++++++ --- /var/tmp/diff_new_pack.F1PiJb/_old 2020-09-18 14:39:25.111896211 +0200 +++ /var/tmp/diff_new_pack.F1PiJb/_new 2020-09-18 14:39:25.115896215 +0200 @@ -17,14 +17,14 @@ %define lname libKF5CoreAddons5 -%define _tar_path 5.73 +%define _tar_path 5.74 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kcoreaddons -Version: 5.73.0 +Version: 5.74.0 Release: 0 Summary: Utilities for core application functionality and accessing the OS License: LGPL-2.1-or-later ++++++ kcoreaddons-5.73.0.tar.xz -> kcoreaddons-5.74.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.73.0/CMakeLists.txt new/kcoreaddons-5.74.0/CMakeLists.txt --- old/kcoreaddons-5.73.0/CMakeLists.txt 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/CMakeLists.txt 2020-09-06 12:18:36.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.73.0") # handled by release scripts +set(KF5_VERSION "5.74.0") # handled by release scripts project(KCoreAddons VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.73.0 NO_MODULE) +find_package(ECM 5.74.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.73.0/COPYING-CMAKE-SCRIPTS new/kcoreaddons-5.74.0/COPYING-CMAKE-SCRIPTS --- old/kcoreaddons-5.73.0/COPYING-CMAKE-SCRIPTS 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/COPYING-CMAKE-SCRIPTS 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.73.0/COPYING.LGPL-2 new/kcoreaddons-5.74.0/COPYING.LGPL-2 --- old/kcoreaddons-5.73.0/COPYING.LGPL-2 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/COPYING.LGPL-2 1970-01-01 01:00:00.000000000 +0100 @@ -1,482 +0,0 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 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. - -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - - 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 Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, 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 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 a program 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. - - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal -permission to copy, distribute and/or modify the library. - - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, 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 companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. - - 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, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. - - GNU LIBRARY GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -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 compile 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) 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. - - c) 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. - - d) 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 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. - - 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 to -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 Library 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. - - <one line to give the library's name and a brief idea of what it does.> - 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 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 Street, 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/kcoreaddons-5.73.0/COPYING.LIB new/kcoreaddons-5.74.0/COPYING.LIB --- old/kcoreaddons-5.73.0/COPYING.LIB 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/COPYING.LIB 1970-01-01 01:00:00.000000000 +0100 @@ -1,510 +0,0 @@ - - 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. - - - <one line to give the library's name and a brief idea of what it does.> - 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/kcoreaddons-5.73.0/autotests/klistopenfilesjobtest_unix.cpp new/kcoreaddons-5.74.0/autotests/klistopenfilesjobtest_unix.cpp --- old/kcoreaddons-5.73.0/autotests/klistopenfilesjobtest_unix.cpp 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/autotests/klistopenfilesjobtest_unix.cpp 2020-09-06 12:18:36.000000000 +0200 @@ -30,9 +30,11 @@ if (!hasLsofInstalled()) { QSKIP("lsof is not installed - skipping test"); } - QDir path(QCoreApplication::applicationDirPath()); - auto job = new KListOpenFilesJob(path.path()); - job->exec(); + QTemporaryDir tempDir; + QFile tempFile(tempDir.path() + QStringLiteral("/file")); + QVERIFY(tempFile.open(QIODevice::WriteOnly)); + auto job = new KListOpenFilesJob(tempDir.path()); + QVERIFY2(job->exec(), qPrintable(job->errorString())); QCOMPARE(job->error(), KJob::NoError); auto processInfoList = job->processInfoList(); QVERIFY(!processInfoList.empty()); @@ -54,7 +56,7 @@ } QTemporaryDir tempDir; auto job = new KListOpenFilesJob(tempDir.path()); - job->exec(); + QVERIFY2(job->exec(), qPrintable(job->errorString())); QCOMPARE(job->error(), KJob::NoError); QVERIFY(job->processInfoList().empty()); } @@ -66,7 +68,7 @@ } QString nonExistingDir(QStringLiteral("/does/not/exist")); auto job = new KListOpenFilesJob(nonExistingDir); - job->exec(); + QVERIFY(!job->exec()); QCOMPARE(job->error(), static_cast<int>(KListOpenFilesJob::Error::DoesNotExist)); QCOMPARE(job->errorText(), QStringLiteral("Path %1 doesn't exist").arg(nonExistingDir)); QVERIFY(job->processInfoList().empty()); @@ -99,7 +101,7 @@ ScopedEnvVariable emptyPathEnvironment(QLatin1String("PATH"), QByteArray()); QDir path(QCoreApplication::applicationDirPath()); auto job = new KListOpenFilesJob(path.path()); - job->exec(); + QVERIFY(!job->exec()); QCOMPARE(job->error(), static_cast<int>(KListOpenFilesJob::Error::InternalError)); QVERIFY(job->processInfoList().empty()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.73.0/po/ca/kde5_xml_mimetypes.po new/kcoreaddons-5.74.0/po/ca/kde5_xml_mimetypes.po --- old/kcoreaddons-5.73.0/po/ca/kde5_xml_mimetypes.po 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/po/ca/kde5_xml_mimetypes.po 2020-09-06 12:18:36.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: kde5_xml_mimetypes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-07-20 02:01+0200\n" -"PO-Revision-Date: 2020-07-14 00:25+0200\n" +"PO-Revision-Date: 2020-08-06 00:29+0200\n" "Last-Translator: Antoni Bella Pérez <antonibel...@yahoo.com>\n" "Language-Team: Catalan <kde-i18n...@kde.org>\n" "Language: ca\n" @@ -43,7 +43,7 @@ #: kde5.xml.podir/kde5.xml.in.h:6 msgid "KDE color scheme" -msgstr "Esquema de colors del KDE" +msgstr "Esquema de color del KDE" #: kde5.xml.podir/kde5.xml.in.h:7 msgid "KNewStuff package" @@ -127,7 +127,7 @@ #: kde5.xml.podir/kde5.xml.in.h:32 msgid "Windows server" -msgstr "Servidor Windows" +msgstr "Servidor de Windows" #: kde5.xml.podir/kde5.xml.in.h:33 msgid "Windows workgroup" @@ -207,7 +207,7 @@ #: kde5.xml.podir/kde5.xml.in.h:53 msgid "Windows link" -msgstr "Enllaç del Windows" +msgstr "Enllaç de Windows" #: kde5.xml.podir/kde5.xml.in.h:54 msgid "KGet download list" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.73.0/po/nb/kde5_xml_mimetypes.po new/kcoreaddons-5.74.0/po/nb/kde5_xml_mimetypes.po --- old/kcoreaddons-5.73.0/po/nb/kde5_xml_mimetypes.po 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/po/nb/kde5_xml_mimetypes.po 2020-09-06 12:18:36.000000000 +0200 @@ -1,11 +1,11 @@ -# Translation of xml_mimetypes5 to Norwegian Bokmål +# Translation of kde5_xml_mimetypes to Norwegian Bokmål # # Bjørn Steensrud <bjor...@skogkatt.homelinux.org>, 2009, 2010, 2011, 2012, 2014. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2020-01-17 02:56+0100\n" +"POT-Creation-Date: 2020-07-20 02:01+0200\n" "PO-Revision-Date: 2014-03-16 10:59+0100\n" "Last-Translator: Bjørn Steensrud <bjor...@skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokmål <l10n...@lister.huftis.org>\n" @@ -16,8 +16,8 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" -"X-Accelerator-Marker: \n" -"X-Text-Markup: \n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" #: kde5.xml.podir/kde5.xml.in.h:1 msgid "RELAX NG" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.73.0/po/nn/kde5_xml_mimetypes.po new/kcoreaddons-5.74.0/po/nn/kde5_xml_mimetypes.po --- old/kcoreaddons-5.73.0/po/nn/kde5_xml_mimetypes.po 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/po/nn/kde5_xml_mimetypes.po 2020-09-06 12:18:36.000000000 +0200 @@ -1,11 +1,11 @@ -# Translation of xml_mimetypes5 to Norwegian Nynorsk +# Translation of kde5_xml_mimetypes to Norwegian Nynorsk # # Karl Ove Hufthammer <k...@huftis.org>, 2009, 2015, 2018, 2019, 2020. msgid "" msgstr "" "Project-Id-Version: xml_mimetypes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2020-01-17 02:56+0100\n" +"POT-Creation-Date: 2020-07-20 02:01+0200\n" "PO-Revision-Date: 2020-02-16 14:36+0100\n" "Last-Translator: Karl Ove Hufthammer <k...@huftis.org>\n" "Language-Team: Norwegian Nynorsk <l10n...@lister.huftis.org>\n" @@ -16,8 +16,8 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 19.12.2\n" "X-Environment: kde\n" -"X-Accelerator-Marker: \n" -"X-Text-Markup: \n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" #: kde5.xml.podir/kde5.xml.in.h:1 msgid "RELAX NG" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.73.0/po/zh_CN/kcoreaddons5_qt.po new/kcoreaddons-5.74.0/po/zh_CN/kcoreaddons5_qt.po --- old/kcoreaddons-5.73.0/po/zh_CN/kcoreaddons5_qt.po 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/po/zh_CN/kcoreaddons5_qt.po 2020-09-06 12:18:36.000000000 +0200 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2020-07-31 15:00\n" +"PO-Revision-Date: 2020-09-05 05:17\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.73.0/po/zh_CN/kde5_xml_mimetypes.po new/kcoreaddons-5.74.0/po/zh_CN/kde5_xml_mimetypes.po --- old/kcoreaddons-5.73.0/po/zh_CN/kde5_xml_mimetypes.po 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/po/zh_CN/kde5_xml_mimetypes.po 2020-09-06 12:18:36.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-07-20 02:01+0200\n" -"PO-Revision-Date: 2020-07-31 15:00\n" +"PO-Revision-Date: 2020-09-05 05:17\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.73.0/src/lib/io/kdirwatch.cpp new/kcoreaddons-5.74.0/src/lib/io/kdirwatch.cpp --- old/kcoreaddons-5.73.0/src/lib/io/kdirwatch.cpp 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/src/lib/io/kdirwatch.cpp 2020-09-06 12:18:36.000000000 +0200 @@ -4,6 +4,7 @@ SPDX-FileCopyrightText: 2007 Flavio Castelli <flavio.caste...@gmail.com> SPDX-FileCopyrightText: 2008 Rafal Rzepecki <divided.m...@gmail.com> SPDX-FileCopyrightText: 2010 David Faure <fa...@kde.org> + SPDX-FileCopyrightText: 2020 Harald Sitter <sit...@kde.org> SPDX-License-Identifier: LGPL-2.0-only */ @@ -668,14 +669,21 @@ // handle FAM events to avoid deadlock // (FAM sends back all files in a directory when monitoring) - do { - famEventReceived(); - if (startedFAMMonitor && !e->m_famReportedSeen) { - // 50 is ~half the time it takes to setup a watch. If gamin's latency - // gets better, this can be reduced. - QThread::msleep(50); - } - } while (startedFAMMonitor &&!e->m_famReportedSeen); + const int iterationCap = 80; + for (int i = 0; i <= iterationCap; ++i) { // we'll not wait forever; blocking for 4s seems plenty + famEventReceived(); + // NB: check use_fam, if fam is defunct event receiving might disable fam support! + if (use_fam && startedFAMMonitor && !e->m_famReportedSeen) { + // 50 is ~half the time it takes to setup a watch. If gamin's latency + // gets better, this can be reduced. + QThread::msleep(50); + } else if (use_fam && i == iterationCap) { + disableFAM(); + return false; + } else { + break; + } + } return true; } @@ -1588,17 +1596,7 @@ while (use_fam && FAMPending(&fc)) { if (FAMNextEvent(&fc, &fe) == -1) { - qCWarning(KCOREADDONS_DEBUG) << "FAM connection problem, switching to polling."; - use_fam = false; - delete sn; sn = nullptr; - - // Replace all FAMMode entries with INotify/Stat - EntryMap::Iterator it = m_mapEntries.begin(); - for (; it != m_mapEntries.end(); ++it) - if ((*it).m_mode == FAMMode && !(*it).m_clients.empty()) { - Entry *e = &(*it); - addWatch(e); - } + disableFAM(); } else { checkFAMEvent(&fe); } @@ -1607,6 +1605,22 @@ QTimer::singleShot(0, this, SLOT(slotRemoveDelayed())); } +void KDirWatchPrivate::disableFAM() +{ + qCWarning(KCOREADDONS_DEBUG) << "FAM connection problem, switching to a different system."; + use_fam = false; + delete sn; + sn = nullptr; + + // Replace all FAMMode entries with another system (INotify/QFSW/Stat) + for (auto it = m_mapEntries.begin(); it != m_mapEntries.end(); ++it) { + if ((*it).m_mode == FAMMode && !(*it).m_clients.empty()) { + Entry *e = &(*it); + addWatch(e); + } + } +} + void KDirWatchPrivate::checkFAMEvent(FAMEvent *fe) { //qCDebug(KDIRWATCH); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.73.0/src/lib/io/kdirwatch_p.h new/kcoreaddons-5.74.0/src/lib/io/kdirwatch_p.h --- old/kcoreaddons-5.73.0/src/lib/io/kdirwatch_p.h 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/src/lib/io/kdirwatch_p.h 2020-09-06 12:18:36.000000000 +0200 @@ -204,6 +204,7 @@ void checkFAMEvent(FAMEvent *fe); bool useFAM(Entry *e); + void disableFAM(); #endif #if HAVE_SYS_INOTIFY_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.73.0/src/lib/plugin/kpluginmetadata.cpp new/kcoreaddons-5.74.0/src/lib/plugin/kpluginmetadata.cpp --- old/kcoreaddons-5.73.0/src/lib/plugin/kpluginmetadata.cpp 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/src/lib/plugin/kpluginmetadata.cpp 2020-09-06 12:18:36.000000000 +0200 @@ -265,6 +265,11 @@ return rootObject()[QStringLiteral("License")].toString(); } +QString KPluginMetaData::licenseText() const +{ + return KAboutLicense::byKeyword(license()).text(); +} + QString KPluginMetaData::name() const { return readTranslatedString(rootObject(), QStringLiteral("Name")); @@ -389,3 +394,29 @@ return QPluginLoader(m_fileName).instance(); } +template <class T> +QVariantList listToVariant(const QList<T>& values) +{ + QVariantList ret; + ret.reserve(values.count()); + for(const auto &license: values) { + ret << QVariant::fromValue(license); + } + return ret; +} + +QVariantList KPluginMetaData::authorsVariant() const +{ + return listToVariant(authors()); +} + +QVariantList KPluginMetaData::translatorsVariant() const +{ + return listToVariant(translators()); +} + +QVariantList KPluginMetaData::otherContributorsVariant() const +{ + return listToVariant(otherContributors()); +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.73.0/src/lib/plugin/kpluginmetadata.h new/kcoreaddons-5.74.0/src/lib/plugin/kpluginmetadata.h --- old/kcoreaddons-5.73.0/src/lib/plugin/kpluginmetadata.h 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/src/lib/plugin/kpluginmetadata.h 2020-09-06 12:18:36.000000000 +0200 @@ -87,6 +87,33 @@ */ class KCOREADDONS_EXPORT KPluginMetaData { + Q_GADGET + Q_PROPERTY(bool isValid READ isValid CONSTANT) + Q_PROPERTY(bool isHidden READ isHidden CONSTANT) + Q_PROPERTY(QString fileName READ fileName CONSTANT) + Q_PROPERTY(QString metaDataFileName READ metaDataFileName CONSTANT) + Q_PROPERTY(QJsonObject rawData READ rawData CONSTANT) + Q_PROPERTY(QString name READ name CONSTANT) + Q_PROPERTY(QString description READ description CONSTANT) + Q_PROPERTY(QString extraInformation READ extraInformation CONSTANT) + Q_PROPERTY(QVariantList authors READ authorsVariant CONSTANT) + Q_PROPERTY(QVariantList translators READ translatorsVariant CONSTANT) + Q_PROPERTY(QVariantList otherContributors READ otherContributorsVariant CONSTANT) + Q_PROPERTY(QString category READ category CONSTANT) + Q_PROPERTY(QString iconName READ iconName CONSTANT) + Q_PROPERTY(QString license READ license CONSTANT) + Q_PROPERTY(QString licenseText READ licenseText CONSTANT) + Q_PROPERTY(QString copyrightText READ copyrightText CONSTANT) + Q_PROPERTY(QString pluginId READ pluginId CONSTANT) + Q_PROPERTY(QString version READ version CONSTANT) + Q_PROPERTY(QString website READ website CONSTANT) + Q_PROPERTY(QStringList dependencies READ dependencies CONSTANT) + Q_PROPERTY(QStringList serviceTypes READ serviceTypes CONSTANT) + Q_PROPERTY(QStringList mimeTypes READ mimeTypes CONSTANT) + Q_PROPERTY(QStringList formFactors READ formFactors CONSTANT) + Q_PROPERTY(bool isEnabledByDefault READ isEnabledByDefault CONSTANT) + Q_PROPERTY(int initialPreference READ isEnabledByDefault CONSTANT) + public: /** Creates an invalid KPluginMetaData instance */ @@ -278,6 +305,12 @@ QString license() const; /** + * @return the text of the license, equivalent to KAboutLicense::byKeyword(license()).text() + * @since 5.73 + */ + QString licenseText() const; + + /** * @return a short copyright statement * * @since 5.18 @@ -405,6 +438,10 @@ QJsonObject rootObject() const; void loadFromDesktopFile(const QString &file, const QStringList &serviceTypes); private: + QVariantList authorsVariant() const; + QVariantList translatorsVariant() const; + QVariantList otherContributorsVariant() const; + QJsonObject m_metaData; QString m_fileName; QExplicitlySharedDataPointer<KPluginMetaDataPrivate> d; // for future binary compatible extensions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.73.0/src/lib/text/ktexttohtml.h new/kcoreaddons-5.74.0/src/lib/text/ktexttohtml.h --- old/kcoreaddons-5.73.0/src/lib/text/ktexttohtml.h 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/src/lib/text/ktexttohtml.h 2020-09-06 12:18:36.000000000 +0200 @@ -59,6 +59,7 @@ * Stores a combination of #Option values. */ Q_DECLARE_FLAGS(Options, Option) +Q_DECLARE_OPERATORS_FOR_FLAGS(Options) /** * Converts plaintext into html. The following characters are converted @@ -86,6 +87,4 @@ } -Q_DECLARE_OPERATORS_FOR_FLAGS(KTextToHTML::Options) - #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.73.0/src/lib/util/kformat.cpp new/kcoreaddons-5.74.0/src/lib/util/kformat.cpp --- old/kcoreaddons-5.73.0/src/lib/util/kformat.cpp 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/src/lib/util/kformat.cpp 2020-09-06 12:18:36.000000000 +0200 @@ -56,6 +56,16 @@ return d->formatValue(value, KFormat::Unit::Other, unit, precision, prefix, MetricBinaryDialect); } +// TODO KF6 Merge both methods +QString KFormat::formatValue(double value, + const QString& unit, + int precision, + KFormat::UnitPrefix prefix, + KFormat::BinaryUnitDialect dialect) const +{ + return d->formatValue(value, KFormat::Unit::Other, unit, precision, prefix, dialect); +} + QString KFormat::formatDuration(quint64 msecs, KFormat::DurationFormatOptions options) const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.73.0/src/lib/util/kformat.h new/kcoreaddons-5.74.0/src/lib/util/kformat.h --- old/kcoreaddons-5.73.0/src/lib/util/kformat.h 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/src/lib/util/kformat.h 2020-09-06 12:18:36.000000000 +0200 @@ -220,8 +220,8 @@ * @code * QString metric, iec, jedec, small; * metric = formatByteSize(1000, 1, KFormat::MetricBinaryDialect, KFormat::UnitKiloByte); - * iec = formatByteSize(1000, 1, KFormat::IECBinaryDialect, KFormat::UnitKiloByte); - * jedec = formatByteSize(1000, 1, KFormat::JEDECBinaryDialect, KFormat::UnitKiloByte); + * iec = formatByteSize(1024, 1, KFormat::IECBinaryDialect, KFormat::UnitKiloByte); + * jedec = formatByteSize(1024, 1, KFormat::JEDECBinaryDialect, KFormat::UnitKiloByte); * small = formatByteSize(100); * // metric == "1.0 kB", iec == "1.0 KiB", jedec == "1.0 KB", small == "100 B" * @endcode @@ -391,6 +391,38 @@ const QString& unit, int precision = 1, KFormat::UnitPrefix prefix = KFormat::UnitPrefix::AutoAdjust) const; + /** + * Converts @p value to the appropriate string representation. + * + * Example: + * @code + * QString iec, jedec, metric; + * // Sets iec to "1.0 KiB/s", jedec to "1.0 KB/s" and metric to "1.0 kB/s" + * iec = format.formatValue(1024, QStringLiteral("B/s"), 1, KFormat::UnitPrefix::AutoAdjust, KFormat::IECBinaryDialect); + * jedec = format.formatValue(1024, QStringLiteral("B/s"), 1, KFormat::UnitPrefix::AutoAdjust, KFormat::JEDECBinaryDialect); + * metric = format.formatValue(1000, QStringLiteral("B/s"), 1, KFormat::UnitPrefix::AutoAdjust, KFormat::MetricBinaryDialect); + * @endcode + * + * @param value value to be formatted + * @param precision number of places after the decimal point to use. 1 is used by default; when + * in doubt use 1 + * @param unit unit to use in result + * @param prefix specific prefix to use in result. Use UnitPrefix::AutoAdjust + * to automatically select an appropriate prefix + * @param dialect prefix standard to use. Use DefaultBinaryDialect to + * use the localized user selection unless you need to use a specific + * unit type + * @return converted size as a translated string including prefix and unit. + * E.g. "1.2 kbit", "2.4 kB", "12.3 Mbit/s" + * @see UnitPrefix + * @since 5.74 + */ + QString formatValue(double value, + const QString& unit, + int precision, + KFormat::UnitPrefix prefix, + KFormat::BinaryUnitDialect dialect) const; + private: QSharedDataPointer<KFormatPrivate> d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.73.0/src/lib/util/kshell.h new/kcoreaddons-5.74.0/src/lib/util/kshell.h --- old/kcoreaddons-5.73.0/src/lib/util/kshell.h 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/src/lib/util/kshell.h 2020-09-06 12:18:36.000000000 +0200 @@ -71,6 +71,7 @@ * Stores a combination of #Option values. */ Q_DECLARE_FLAGS(Options, Option) +Q_DECLARE_OPERATORS_FOR_FLAGS(Options) /** * Status codes from splitArgs() @@ -195,6 +196,4 @@ KCOREADDONS_EXPORT QString tildeCollapse(const QString &path); } -Q_DECLARE_OPERATORS_FOR_FLAGS(KShell::Options) - #endif /* KSHELL_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.73.0/src/mimetypes/kde5.xml new/kcoreaddons-5.74.0/src/mimetypes/kde5.xml --- old/kcoreaddons-5.73.0/src/mimetypes/kde5.xml 2020-08-01 21:42:45.000000000 +0200 +++ new/kcoreaddons-5.74.0/src/mimetypes/kde5.xml 2020-09-06 12:18:36.000000000 +0200 @@ -337,7 +337,7 @@ <comment xml:lang="az">KDE rəng sxemi</comment> <comment xml:lang="bg">Цветова схема за KDE</comment> <comment xml:lang="bs">KDE šema boja</comment> - <comment xml:lang="ca">Esquema de colors del KDE</comment> + <comment xml:lang="ca">Esquema de color del KDE</comment> <comment xml:lang="ca@valencia">Esquema de color del KDE</comment> <comment xml:lang="cs">Barevné schéma KDE</comment> <comment xml:lang="da">KDE farvetema</comment> @@ -1648,7 +1648,7 @@ <comment xml:lang="ar">خادم ويندوز</comment> <comment xml:lang="az">Windows serveri</comment> <comment xml:lang="bs">windows server</comment> - <comment xml:lang="ca">Servidor Windows</comment> + <comment xml:lang="ca">Servidor de Windows</comment> <comment xml:lang="ca@valencia">Servidor Windows</comment> <comment xml:lang="cs">Windows server</comment> <comment xml:lang="da">Windows-server</comment> @@ -2902,7 +2902,7 @@ <comment xml:lang="ar">وصلة ويندوز</comment> <comment xml:lang="az">Windows yarlığı</comment> <comment xml:lang="bs">windows veza</comment> - <comment xml:lang="ca">Enllaç del Windows</comment> + <comment xml:lang="ca">Enllaç de Windows</comment> <comment xml:lang="ca@valencia">Enllaç del Windows</comment> <comment xml:lang="cs">Odkaz Windows</comment> <comment xml:lang="da">Windows-link</comment> @@ -3606,6 +3606,7 @@ <comment xml:lang="zh_TW">KCrash 報告</comment> <generic-icon name="text-plain"/> <sub-class-of type="text/plain"/> + <glob pattern="*.kcrash"/> <glob pattern="*.kcrash.txt"/> </mime-type> </mime-info>
