Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2020-01-14 21:03:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kservice (Old) and /work/SRC/openSUSE:Factory/.kservice.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Tue Jan 14 21:03:25 2020 rev:79 rq:763485 version:5.66.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2019-12-18 14:43:26.905804966 +0100 +++ /work/SRC/openSUSE:Factory/.kservice.new.6675/kservice.changes 2020-01-14 21:05:30.350713503 +0100 @@ -1,0 +2,17 @@ +Sun Jan 5 09:02:20 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.66.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.66.0.php +- Changes since 5.65.0: + * Remove endl in qDebug, it already adds "\n" + port to Qt::endl when using qt5.15 + * Deprecate KServiceTypeProfile + * Update the obsolete projects.kde.org URL + * autotests: remove <QtTest> which includes all of <QtCore> + * autotests: make ksycoca_xdgdirstest work without /etc/xdg/menus + * Fix kmimeassociationstest in case of symlinks in the paths + * Remove dead code in KCTimeFactory and KBuildSycoca + * Port KPluginTrader away from Q_GLOBAL_STATIC. + +------------------------------------------------------------------- Old: ---- kservice-5.65.0.tar.xz kservice-5.65.0.tar.xz.sig New: ---- kservice-5.66.0.tar.xz kservice-5.66.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.z6dSDd/_old 2020-01-14 21:05:31.034713819 +0100 +++ /var/tmp/diff_new_pack.z6dSDd/_new 2020-01-14 21:05:31.034713819 +0100 @@ -1,7 +1,7 @@ # # spec file for package kservice # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,14 @@ # -%define _tar_path 5.65 +%define _tar_path 5.66 # 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: kservice -Version: 5.65.0 +Version: 5.66.0 Release: 0 Summary: Plugin framework for desktop services License: LGPL-2.1-or-later ++++++ kservice-5.65.0.tar.xz -> kservice-5.66.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/CMakeLists.txt new/kservice-5.66.0/CMakeLists.txt --- old/kservice-5.65.0/CMakeLists.txt 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/CMakeLists.txt 2020-01-04 11:12:46.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.65.0") # handled by release scripts -set(KF5_DEP_VERSION "5.65.0") # handled by release scripts +set(KF5_VERSION "5.66.0") # handled by release scripts +set(KF5_DEP_VERSION "5.66.0") # handled by release scripts project(KService VERSION ${KF5_VERSION}) # Disallow in-source build @@ -11,8 +11,8 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.65.0 NO_MODULE) -set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) +find_package(ECM 5.66.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) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) @@ -41,7 +41,7 @@ CACHE STRING "Name to install the applications.menu file as.") # Dependencies -set(REQUIRED_QT_VERSION 5.11.0) +set(REQUIRED_QT_VERSION 5.12.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Xml) if (NOT ANDROID) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) @@ -74,7 +74,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kservice5\") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x053f00) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054000) add_definitions(-DQT_NO_FOREACH) if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ki18n_install(po) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/COPYING.LGPL-2 new/kservice-5.66.0/COPYING.LGPL-2 --- old/kservice-5.65.0/COPYING.LGPL-2 1970-01-01 01:00:00.000000000 +0100 +++ new/kservice-5.66.0/COPYING.LGPL-2 2020-01-04 11:12:46.000000000 +0100 @@ -0,0 +1,481 @@ + 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 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; 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/kservice-5.65.0/COPYING.LGPL-3 new/kservice-5.66.0/COPYING.LGPL-3 --- old/kservice-5.65.0/COPYING.LGPL-3 1970-01-01 01:00:00.000000000 +0100 +++ new/kservice-5.66.0/COPYING.LGPL-3 2020-01-04 11:12:46.000000000 +0100 @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + 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 that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU 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 as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/autotests/CMakeLists.txt new/kservice-5.66.0/autotests/CMakeLists.txt --- old/kservice-5.65.0/autotests/CMakeLists.txt 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/autotests/CMakeLists.txt 2020-01-04 11:12:46.000000000 +0100 @@ -21,7 +21,7 @@ ksycocadicttest ksycocathreadtest kservicetest - pluginlocatortest + kplugintradertest kplugininfotest ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/autotests/kmimeassociationstest.cpp new/kservice-5.66.0/autotests/kmimeassociationstest.cpp --- old/kservice-5.65.0/autotests/kmimeassociationstest.cpp 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/autotests/kmimeassociationstest.cpp 2020-01-04 11:12:46.000000000 +0100 @@ -73,18 +73,22 @@ const QString &entryPath, bool expected /* if set, show error if not found */) { + // ksycoca resolves to canonical paths, so do it here as well + const QString realPath = QFileInfo(entryPath).canonicalFilePath(); + Q_ASSERT(!realPath.isEmpty()); + bool found = false; for (const KService::Ptr &serv : offers) { - if (serv->entryPath() == entryPath) { + if (serv->entryPath() == realPath) { if (found) { // should be there only once - qWarning("ERROR: %s was found twice in the list", qPrintable(entryPath)); + qWarning("ERROR: %s was found twice in the list", qPrintable(realPath)); return false; // make test fail } found = true; } } if (!found && expected) { - qWarning() << "ERROR:" << entryPath << "not found in offer list. Here's the full list:"; + qWarning() << "ERROR:" << realPath << "not found in offer list. Here's the full list:"; for (const KService::Ptr &serv : offers) { qDebug() << serv->entryPath(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/autotests/kplugintradertest.cpp new/kservice-5.66.0/autotests/kplugintradertest.cpp --- old/kservice-5.65.0/autotests/kplugintradertest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kservice-5.66.0/autotests/kplugintradertest.cpp 2020-01-04 11:12:46.000000000 +0100 @@ -0,0 +1,84 @@ +/****************************************************************************** +* Copyright 2013 Sebastian Kügler <[email protected]> * +* * +* 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 "kplugintradertest.h" +#include "nsaplugin.h" + +#include <QTest> + +#include <kplugininfo.h> +#include <kplugintrader.h> + + +QTEST_MAIN(PluginTraderTest) + +void PluginTraderTest::initTestCase() +{ + QCoreApplication::setLibraryPaths(QStringList() << QCoreApplication::applicationDirPath()); +} + +void PluginTraderTest::findPlugin_data() +{ + QTest::addColumn<QString>("serviceType"); + QTest::addColumn<QString>("constraint"); + QTest::addColumn<int>("expectedResult"); + + const QString _st = QStringLiteral("KService/NSA"); + QString _c = ""; + QTest::newRow("no constraints") << _st << _c << 1; + + _c = QStringLiteral("[X-KDE-PluginInfo-Name] == '%1'").arg(QStringLiteral("fakeplugin")); + QTest::newRow("by pluginname") << _st << _c << 1; + + _c = QStringLiteral("[X-KDE-PluginInfo-Category] == '%1'").arg(QStringLiteral("Examples")); + QTest::newRow("by category") << _st << _c << 1; + + _c = QStringLiteral("([X-KDE-PluginInfo-Category] == 'Examples') AND ([X-KDE-PluginInfo-Email] == '[email protected]')"); + QTest::newRow("complex query") << _st << _c << 1; + + _c = QStringLiteral("([X-KDE-PluginInfo-Category] == 'Examples') AND ([X-KDE-PluginInfo-Email] == 'prrrrt')"); + QTest::newRow("empty query") << _st << _c << 0; +} + +void PluginTraderTest::findPlugin() +{ + QFETCH(QString, serviceType); + QFETCH(QString, constraint); + QFETCH(int, expectedResult); + const KPluginInfo::List res = KPluginTrader::self()->query(QString(), serviceType, constraint); + QCOMPARE(res.count(), expectedResult); +} + +void PluginTraderTest::findSomething() +{ + const KPluginInfo::List res = KPluginTrader::self()->query(QString()); + QVERIFY(res.count() > 0); +} + +void PluginTraderTest::loadPlugin() +{ + const QString pluginName("fakeplugin"); + const QString serviceType("KService/NSA"); + const QString constraint = QStringLiteral("[X-KDE-PluginInfo-Name] == '%1'").arg(pluginName); + + QObject *plugin = KPluginTrader::createInstanceFromQuery<QObject>(QString(), serviceType, constraint, this); + QVERIFY(plugin != nullptr); + QCOMPARE(plugin->objectName(), QStringLiteral("Test Plugin Spy")); +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/autotests/kplugintradertest.h new/kservice-5.66.0/autotests/kplugintradertest.h --- old/kservice-5.65.0/autotests/kplugintradertest.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kservice-5.66.0/autotests/kplugintradertest.h 2020-01-04 11:12:46.000000000 +0100 @@ -0,0 +1,39 @@ +/****************************************************************************** +* Copyright 2013 Sebastian Kügler <[email protected]> * +* * +* 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. * +*******************************************************************************/ + +#ifndef PLUGINTRADERTEST_H +#define PLUGINTRADERTEST_H + +#include <QCoreApplication> + +class PluginTraderTest : public QObject +{ + Q_OBJECT +public: + PluginTraderTest() {} + +private Q_SLOTS: + void initTestCase(); + void findPlugin_data(); + void findPlugin(); + void findSomething(); + void loadPlugin(); +}; + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/autotests/ksycoca_xdgdirstest.cpp new/kservice-5.66.0/autotests/ksycoca_xdgdirstest.cpp --- old/kservice-5.65.0/autotests/ksycoca_xdgdirstest.cpp 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/autotests/ksycoca_xdgdirstest.cpp 2020-01-04 11:12:46.000000000 +0100 @@ -93,6 +93,14 @@ const QString appDir = dataDir + "/applications"; + // Copy applications.menus into GenericConfigLocation/menus, so we don't rely on /etc/xdg + qputenv("XDG_CONFIG_DIRS", "/doesnexist"); + const QString menuFile = QFINDTESTDATA("../src/applications.menu"); + QVERIFY(!menuFile.isEmpty()); + const QString menuDir = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/menus"; + QVERIFY(QDir().mkpath(menuDir)); + QFile::copy(menuFile, menuDir + QLatin1String("/applications.menu")); + // test_app_other: live in a different application directory const QString testAppOther = appDir + "/test_app_other.desktop"; KDesktopFile file(testAppOther); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/autotests/ksycocadicttest.cpp new/kservice-5.66.0/autotests/ksycocadicttest.cpp --- old/kservice-5.65.0/autotests/ksycocadicttest.cpp 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/autotests/ksycocadicttest.cpp 2020-01-04 11:12:46.000000000 +0100 @@ -18,7 +18,8 @@ */ #include <ksycoca.h> -#include <QtTest> +#include <QTest> +#include <QSignalSpy> #include <QDebug> #include <kservicetype.h> #include <kdesktopfile.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/autotests/pluginlocatortest.cpp new/kservice-5.66.0/autotests/pluginlocatortest.cpp --- old/kservice-5.65.0/autotests/pluginlocatortest.cpp 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/autotests/pluginlocatortest.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,85 +0,0 @@ -/****************************************************************************** -* Copyright 2013 Sebastian Kügler <[email protected]> * -* * -* 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 "pluginlocatortest.h" -#include "nsaplugin.h" - -#include <QtTest> - -#include <kplugininfo.h> -#include <kplugintrader.h> - - -QTEST_MAIN(PluginTest) - -void PluginTest::initTestCase() -{ - QCoreApplication::setLibraryPaths(QStringList() << QCoreApplication::applicationDirPath()); -} - -void PluginTest::findPlugin_data() -{ - QTest::addColumn<QString>("serviceType"); - QTest::addColumn<QString>("constraint"); - QTest::addColumn<int>("expectedResult"); - - const QString _st = QStringLiteral("KService/NSA"); - QString _c = ""; - QTest::newRow("no constraints") << _st << _c << 1; - - _c = QStringLiteral("[X-KDE-PluginInfo-Name] == '%1'").arg(QStringLiteral("fakeplugin")); - QTest::newRow("by pluginname") << _st << _c << 1; - - _c = QStringLiteral("[X-KDE-PluginInfo-Category] == '%1'").arg(QStringLiteral("Examples")); - QTest::newRow("by category") << _st << _c << 1; - - _c = QStringLiteral("([X-KDE-PluginInfo-Category] == 'Examples') AND ([X-KDE-PluginInfo-Email] == '[email protected]')"); - QTest::newRow("complex query") << _st << _c << 1; - - _c = QStringLiteral("([X-KDE-PluginInfo-Category] == 'Examples') AND ([X-KDE-PluginInfo-Email] == 'prrrrt')"); - QTest::newRow("empty query") << _st << _c << 0; -} - -void PluginTest::findPlugin() -{ - QFETCH(QString, serviceType); - QFETCH(QString, constraint); - QFETCH(int, expectedResult); - const KPluginInfo::List res = KPluginTrader::self()->query(QString(), serviceType, constraint); - QCOMPARE(res.count(), expectedResult); -} - -void PluginTest::findSomething() -{ - const KPluginInfo::List res = KPluginTrader::self()->query(QString()); - QVERIFY(res.count() > 0); -} - -void PluginTest::loadPlugin() -{ - const QString pluginName("fakeplugin"); - const QString serviceType("KService/NSA"); - const QString constraint = QStringLiteral("[X-KDE-PluginInfo-Name] == '%1'").arg(pluginName); - - QObject *plugin = KPluginTrader::createInstanceFromQuery<QObject>(QString(), serviceType, constraint, this); - QVERIFY(plugin != nullptr); - QCOMPARE(plugin->objectName(), QStringLiteral("Test Plugin Spy")); -} - -#include "moc_pluginlocatortest.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/autotests/pluginlocatortest.h new/kservice-5.66.0/autotests/pluginlocatortest.h --- old/kservice-5.65.0/autotests/pluginlocatortest.h 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/autotests/pluginlocatortest.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -/****************************************************************************** -* Copyright 2013 Sebastian Kügler <[email protected]> * -* * -* 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. * -*******************************************************************************/ - -#ifndef PLUGINLOCATORTEST_H -#define PLUGINLOCATORTEST_H - -#include <QCoreApplication> - -class PluginTest : public QObject -{ - Q_OBJECT -public: - PluginTest() {} - -private Q_SLOTS: - void initTestCase(); - void findPlugin_data(); - void findPlugin(); - void findSomething(); - void loadPlugin(); -}; - -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/po/ml/kservice5.po new/kservice-5.66.0/po/ml/kservice5.po --- old/kservice-5.65.0/po/ml/kservice5.po 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/po/ml/kservice5.po 2020-01-04 11:12:46.000000000 +0100 @@ -12,15 +12,15 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-10-13 02:52+0200\n" -"PO-Revision-Date: 2010-12-29 15:32+0530\n" -"Last-Translator: \n" -"Language-Team: <[email protected]>\n" +"PO-Revision-Date: 2019-12-12 20:56+0000\n" +"Last-Translator: Vivek KJ Pazhedath <[email protected]>\n" +"Language-Team: <[email protected]>\n" "Language: ml\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Weblate 3.9.1\n" "X-Poedit-Country: INDIA\n" #, kde-format @@ -31,9 +31,7 @@ #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "" -"[email protected], [email protected], [email protected], gnuanu@gmail." -"com, [email protected]" +msgstr "[email protected],[email protected],[email protected]" #: kbuildsycoca/kbuildsycoca_main.cpp:58 #, fuzzy, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/CMakeLists.txt new/kservice-5.66.0/src/CMakeLists.txt --- old/kservice-5.65.0/src/CMakeLists.txt 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/CMakeLists.txt 2020-01-04 11:12:46.000000000 +0100 @@ -87,7 +87,7 @@ GROUP_BASE_NAME KF VERSION ${KF5_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 5.0 5.15 5.61 5.63 + DEPRECATION_VERSIONS 5.0 5.15 5.61 5.63 5.66 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) set(kservice_includes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/plugin/kplugintrader.cpp new/kservice-5.66.0/src/plugin/kplugintrader.cpp --- old/kservice-5.65.0/src/plugin/kplugintrader.cpp 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/plugin/kplugintrader.cpp 2020-01-04 11:12:46.000000000 +0100 @@ -27,17 +27,10 @@ using namespace KTraderParse; -class KPluginTraderSingleton -{ -public: - KPluginTrader instance; -}; - -Q_GLOBAL_STATIC(KPluginTraderSingleton, s_globalPluginTrader) - KPluginTrader *KPluginTrader::self() { - return &s_globalPluginTrader()->instance; + static KPluginTrader trader; + return &trader; } KPluginTrader::KPluginTrader() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/plugin/kplugintrader.h new/kservice-5.66.0/src/plugin/kplugintrader.h --- old/kservice-5.65.0/src/plugin/kplugintrader.h 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/plugin/kplugintrader.h 2020-01-04 11:12:46.000000000 +0100 @@ -261,8 +261,6 @@ KPluginTrader &operator=(const KPluginTrader &rhs); KPluginTraderPrivate *const d; - - friend class KPluginTraderSingleton; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/services/kmimetypefactory.cpp new/kservice-5.66.0/src/services/kmimetypefactory.cpp --- old/kservice-5.65.0/src/services/kmimetypefactory.cpp 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/services/kmimetypefactory.cpp 2020-01-04 11:12:46.000000000 +0100 @@ -4,7 +4,8 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public - * License version 2 as published by the Free Software Foundation; + * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/services/kmimetypefactory_p.h new/kservice-5.66.0/src/services/kmimetypefactory_p.h --- old/kservice-5.65.0/src/services/kmimetypefactory_p.h 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/services/kmimetypefactory_p.h 2020-01-04 11:12:46.000000000 +0100 @@ -4,7 +4,8 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public - * License version 2 as published by the Free Software Foundation; + * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/services/kmimetypetrader.cpp new/kservice-5.66.0/src/services/kmimetypetrader.cpp --- old/kservice-5.65.0/src/services/kmimetypetrader.cpp 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/services/kmimetypetrader.cpp 2020-01-04 11:12:46.000000000 +0100 @@ -4,7 +4,8 @@ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. + 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/services/kservicefactory.cpp new/kservice-5.66.0/src/services/kservicefactory.cpp --- old/kservice-5.65.0/src/services/kservicefactory.cpp 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/services/kservicefactory.cpp 2020-01-04 11:12:46.000000000 +0100 @@ -1,9 +1,11 @@ /* This file is part of the KDE libraries * Copyright (C) 1999-2006 David Faure <[email protected]> * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library 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 Lesser General Public License as published by + * the Free Software Foundation; either version 2 of the License or ( at + * your option ) version 3 or, at the discretion of KDE e.V. ( which shall + * act as a proxy as in section 14 of the GPLv3 ), 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/services/kservicegroupfactory.cpp new/kservice-5.66.0/src/services/kservicegroupfactory.cpp --- old/kservice-5.65.0/src/services/kservicegroupfactory.cpp 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/services/kservicegroupfactory.cpp 2020-01-04 11:12:46.000000000 +0100 @@ -3,7 +3,8 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public - * License version 2 as published by the Free Software Foundation; + * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/services/kservicegroupfactory_p.h new/kservice-5.66.0/src/services/kservicegroupfactory_p.h --- old/kservice-5.65.0/src/services/kservicegroupfactory_p.h 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/services/kservicegroupfactory_p.h 2020-01-04 11:12:46.000000000 +0100 @@ -3,7 +3,8 @@ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. + 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/services/kserviceoffer.cpp new/kservice-5.66.0/src/services/kserviceoffer.cpp --- old/kservice-5.65.0/src/services/kserviceoffer.cpp 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/services/kserviceoffer.cpp 2020-01-04 11:12:46.000000000 +0100 @@ -4,7 +4,8 @@ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. + 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/services/kserviceoffer.h new/kservice-5.66.0/src/services/kserviceoffer.h --- old/kservice-5.65.0/src/services/kserviceoffer.h 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/services/kserviceoffer.h 2020-01-04 11:12:46.000000000 +0100 @@ -4,7 +4,8 @@ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. + 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/services/kservicetypeprofile.cpp new/kservice-5.66.0/src/services/kservicetypeprofile.cpp --- old/kservice-5.65.0/src/services/kservicetypeprofile.cpp 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/services/kservicetypeprofile.cpp 2020-01-04 11:12:46.000000000 +0100 @@ -166,6 +166,7 @@ return offers; } +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 66) bool KServiceTypeProfile::hasProfile(const QString &serviceType) { return s_serviceTypeProfiles()->hasProfile(serviceType); @@ -227,3 +228,4 @@ delete s_serviceTypeProfiles()->take(serviceType); } } +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/services/kservicetypeprofile.h new/kservice-5.66.0/src/services/kservicetypeprofile.h --- old/kservice-5.65.0/src/services/kservicetypeprofile.h 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/services/kservicetypeprofile.h 2020-01-04 11:12:46.000000000 +0100 @@ -38,6 +38,7 @@ * @see KServiceTypeTrader * @short Represents the user's preferences for services of a service type */ +#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 66) namespace KServiceTypeProfile { /** @@ -47,7 +48,9 @@ * @param services Ordered list of services, from the preferred one to the least preferred one. * @param disabledServices List of services which are normally associated with this serviceType, * but which should be disabled, i.e. trader queries will not return them. + * @deprecated since 5.66, unused. */ +KSERVICE_DEPRECATED_VERSION(5, 66, "Unused") KSERVICE_EXPORT void writeServiceTypeProfile(const QString &serviceType, const KService::List &services, const KService::List &disabledServices = KService::List()); @@ -59,11 +62,13 @@ * Do not use this for mimetypes. * @param serviceType The name of the servicetype. */ +KSERVICE_DEPRECATED_VERSION(5, 66, "Unused") KSERVICE_EXPORT void deleteServiceTypeProfile(const QString &serviceType); /** * @internal, for KServiceTypeTrader */ +KSERVICE_DEPRECATED_VERSION(5, 66, "Unused") KSERVICE_EXPORT bool hasProfile(const QString &serviceType); /** @@ -73,5 +78,6 @@ void clearCache(); } +#endif #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/services/kservicetypeprofile_p.h new/kservice-5.66.0/src/services/kservicetypeprofile_p.h --- old/kservice-5.65.0/src/services/kservicetypeprofile_p.h 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/services/kservicetypeprofile_p.h 2020-01-04 11:12:46.000000000 +0100 @@ -4,7 +4,8 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public - * License version 2 as published by the Free Software Foundation; + * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/services/kservicetypetrader.cpp new/kservice-5.66.0/src/services/kservicetypetrader.cpp --- old/kservice-5.65.0/src/services/kservicetypetrader.cpp 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/services/kservicetypetrader.cpp 2020-01-04 11:12:46.000000000 +0100 @@ -4,7 +4,8 @@ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. + 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/services/kserviceutil_p.h new/kservice-5.66.0/src/services/kserviceutil_p.h --- old/kservice-5.65.0/src/services/kserviceutil_p.h 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/services/kserviceutil_p.h 2020-01-04 11:12:46.000000000 +0100 @@ -3,7 +3,8 @@ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. + 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/sycoca/kbuildsycoca.cpp new/kservice-5.66.0/src/sycoca/kbuildsycoca.cpp --- old/kservice-5.65.0/src/sycoca/kbuildsycoca.cpp 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/sycoca/kbuildsycoca.cpp 2020-01-04 11:12:46.000000000 +0100 @@ -249,10 +249,6 @@ } } } - if (m_changed || !m_allEntries) { - //qCDebug(SYCOCA) << "CHANGED:" << m_resource; - m_changedResources.append(QString::fromLatin1(m_resource)); - } } bool result = true; @@ -292,10 +288,6 @@ } } - if (m_changed || !m_allEntries) { - //qCDebug(SYCOCA) << "CHANGED:" << m_resource; - m_changedResources.append(QString::fromLatin1(m_resource)); - } if (m_menuTest) { result = false; } @@ -304,11 +296,6 @@ if (m_ctimeDict && !m_ctimeDict->isEmpty()) { qCDebug(SYCOCA) << "Still in time dict:"; m_ctimeDict->dump(); - - // Get the list of resources from which some files were deleted - QStringList resources = m_ctimeDict->remainingResourceList(); - qCDebug(SYCOCA) << "Still in the time dict (i.e. deleted files)" << resources; - m_changedResources += resources; } qDeleteAll(entryDictList); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/sycoca/kbuildsycoca_p.h new/kservice-5.66.0/src/sycoca/kbuildsycoca_p.h --- old/kservice-5.65.0/src/sycoca/kbuildsycoca_p.h 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/sycoca/kbuildsycoca_p.h 2020-01-04 11:12:46.000000000 +0100 @@ -57,11 +57,6 @@ m_menuTest = b; } - QStringList changedResources() const - { - return m_changedResources; - } - static QStringList factoryResourceDirs(); static QStringList existingResourceDirs(); @@ -126,7 +121,6 @@ return true; } - QStringList m_changedResources; QMap<QString, qint64> m_allResourceDirs; // dir, mtime in ms since epoch QString m_trackId; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/sycoca/kctimefactory.cpp new/kservice-5.66.0/src/sycoca/kctimefactory.cpp --- old/kservice-5.65.0/src/sycoca/kctimefactory.cpp 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/sycoca/kctimefactory.cpp 2020-01-04 11:12:46.000000000 +0100 @@ -24,10 +24,7 @@ #include <assert.h> -// NOTE: the storing of "resource" here is now completely useless (since everything is under GenericDataLocation), -// except for remainingResourceList() which is used for the compat signal databaseChanged(...) -// We could possibly replace this with a subdir->old_resource mapping (applications -> apps, kservices5 -> services, etc.) -// Alternatively, we could use an enum in the signal... +// NOTE: the storing of "resource" here is now completely useless (since everything is under GenericDataLocation) static inline QString key(const QString &path, const QByteArray &resource) { @@ -56,19 +53,6 @@ qCDebug(SYCOCA) << m_hash.keys(); } -QStringList KCTimeDict::remainingResourceList() const -{ - QSet<QString> resources; - Hash::const_iterator it = m_hash.constBegin(); - const Hash::const_iterator end = m_hash.constEnd(); - for (; it != end; ++it) { - const QString key = it.key(); - const QString res = key.left(key.indexOf(QLatin1Char('|'))); - resources.insert(res); - } - return resources.toList(); -} - void KCTimeDict::load(QDataStream &str) { QString key; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/sycoca/kctimefactory_p.h new/kservice-5.66.0/src/sycoca/kctimefactory_p.h --- old/kservice-5.65.0/src/sycoca/kctimefactory_p.h 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/sycoca/kctimefactory_p.h 2020-01-04 11:12:46.000000000 +0100 @@ -36,7 +36,6 @@ { return m_hash.isEmpty(); } - QStringList remainingResourceList() const; void load(QDataStream &str); void save(QDataStream &str) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/src/sycoca/vfolder_menu.cpp new/kservice-5.66.0/src/sycoca/vfolder_menu.cpp --- old/kservice-5.65.0/src/sycoca/vfolder_menu.cpp 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/src/sycoca/vfolder_menu.cpp 2020-01-04 11:12:46.000000000 +0100 @@ -814,7 +814,7 @@ if (m_doc.isNull()) { if (m_docInfo.path.isEmpty()) { - qCritical() << fileName << " not found in " << m_allDirectories << endl; + qCritical() << fileName << " not found in " << m_allDirectories; } else { qCWarning(SYCOCA) << "Load error (" << m_docInfo.path << ")"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/tests/pluginlocator/main.cpp new/kservice-5.66.0/tests/pluginlocator/main.cpp --- old/kservice-5.65.0/tests/pluginlocator/main.cpp 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/tests/pluginlocator/main.cpp 2020-01-04 11:12:46.000000000 +0100 @@ -27,7 +27,7 @@ QCoreApplication app(argc, argv); QCommandLineParser parser; - const QString description = QStringLiteral("PluginLocator test app"); + const QString description = QStringLiteral("KPluginTrader test app"); const char version[] = "1.0"; app.setApplicationVersion(version); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.65.0/tests/pluginlocator/plugintest.cpp new/kservice-5.66.0/tests/pluginlocator/plugintest.cpp --- old/kservice-5.65.0/tests/pluginlocator/plugintest.cpp 2019-12-07 22:47:35.000000000 +0100 +++ new/kservice-5.66.0/tests/pluginlocator/plugintest.cpp 2020-01-04 11:12:46.000000000 +0100 @@ -57,7 +57,13 @@ int runs = 1; QList<qint64> timings; - cout << "-- PluginLocator Test --" << endl; + cout << "-- KPluginTrader Test --" + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + << endl + #else + << Qt::endl + #endif + ; bool ok = true; // KSycoca querying @@ -108,7 +114,7 @@ i++; } QString av = QString::number((totalTime / timings.count() / unitDiv), 'f', 1); - qDebug() << " Average: " << av << " " << unit << " (" << msg << ")" << endl; + qDebug() << " Average: " << av << " " << unit << " (" << msg << ")"; } bool PluginTest::loadFromKService(const QString &name) @@ -126,10 +132,10 @@ allArgs << offers.first()->storageId(); const QString _n = offers.first()->property(QStringLiteral("Name")).toString(); if (!_n.isEmpty()) { - qDebug() << "Found Dataengine: " << _n << endl; + qDebug() << "Found Dataengine: " << _n; ok = true; } else { - qDebug() << "Nothing found. " << endl; + qDebug() << "Nothing found. "; } }
