Git commit 20d254e5afe4a88c180d4050c4e1bbb0c24f795d by Yuri Chornoivan.
Committed on 11/09/2018 at 18:03.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M  +1    -1    KF5PackageMacros.cmake
M  +1    -1    src/kpackage/package.cpp
M  +1    -1    src/kpackage/package.h
M  +1    -1    src/kpackage/packageloader.cpp
M  +2    -2    src/kpackage/private/package_p.h
M  +1    -1    src/kpackage/private/packagejobthread.cpp
M  +1    -1    src/kpackage/private/packagejobthread_p.h

https://commits.kde.org/kpackage/20d254e5afe4a88c180d4050c4e1bbb0c24f795d

diff --git a/KF5PackageMacros.cmake b/KF5PackageMacros.cmake
index c3e7cb8..761eab3 100644
--- a/KF5PackageMacros.cmake
+++ b/KF5PackageMacros.cmake
@@ -159,7 +159,7 @@ function(kpackage_install_bundled_package dir component)
                       COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=3D${install_d=
ir} -DROOT=3D${root} -DCOMPONENT=3D${component} -DDIRECTORY=3D${DIRECTORY} =
-D OUTPUTFILE=3D${OUTPUTFILE} -P ${kpackagedir}/qrc.cmake
                       DEPENDS ${component}-${root}-metadata-json)
     set(GENERATED_RCC_CONTENTS "${CMAKE_CURRENT_BINARY_DIR}/${component}-c=
ontents.rcc")
-    # add_custom_target depends on ALL target so qrc is run everytime
+    # add_custom_target depends on ALL target so qrc is run every time
     # it doesn't have OUTPUT property so it's considered out-of-date every=
 build
     add_custom_target(${component}-${root}-contents-rcc ALL
                       COMMENT "Generating ${component}-contents.rcc"
diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
index 6cfe82c..cb2bf8a 100644
--- a/src/kpackage/package.cpp
+++ b/src/kpackage/package.cpp
@@ -367,7 +367,7 @@ QString Package::filePath(const QByteArray &fileType, c=
onst QString &filename) c
         //We are an installed package
         if (d->tempRoot.isEmpty()) {
             prefix =3D fileType =3D=3D "metadata" ? d->path : (d->path + c=
ontentsPrefix);
-        //We are a compressed package temporarly uncompressed in /tmp
+        //We are a compressed package temporarily uncompressed in /tmp
         } else {
             prefix =3D fileType =3D=3D "metadata" ? d->tempRoot : (d->temp=
Root + contentsPrefix);
         }
diff --git a/src/kpackage/package.h b/src/kpackage/package.h
index af30d30..cd89af0 100644
--- a/src/kpackage/package.h
+++ b/src/kpackage/package.h
@@ -91,7 +91,7 @@ public:
         PackageOpenError, /**< Can't open the package file for reading */
         MetadataFileMissingError, /**< The package doesn't have a metadata=
.desktop file */
         PluginNameMissingError, /**< The metadata.desktop file doesn't spe=
cify a plugin name */
-        PluginNameInvalidError, /**< The plugin name contains charaters di=
fferent from letters, digits, dots and underscores */
+        PluginNameInvalidError, /**< The plugin name contains characters d=
ifferent from letters, digits, dots and underscores */
         UpdatePackageTypeMismatchError, /**< A package with this plugin na=
me was already installed, but has a different type in the metadata.desktop =
file */
         OldVersionRemovalError, /**< Failed to remove the old version of t=
he package during an upgrade */
         NewerVersionAlreadyInstalledError, /**< We tried to update, but th=
e same version or a newer one is already installed */
diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp
index 33d763b..aa30484 100644
--- a/src/kpackage/packageloader.cpp
+++ b/src/kpackage/packageloader.cpp
@@ -51,7 +51,7 @@ QSet<QString> PackageLoaderPrivate::s_customCategories;
 =

 QSet<QString> PackageLoaderPrivate::knownCategories()
 {
-    // this is to trick the tranlsation tools into making the correct
+    // this is to trick the translation tools into making the correct
     // strings for translation
     QSet<QString> categories =3D s_customCategories;
     categories << QStringLiteral(I18N_NOOP("Accessibility")).toLower()
diff --git a/src/kpackage/private/package_p.h b/src/kpackage/private/packag=
e_p.h
index c151cc4..5b4d0a7 100644
--- a/src/kpackage/private/package_p.h
+++ b/src/kpackage/private/package_p.h
@@ -35,11 +35,11 @@ namespace KPackage
 //leaving the PackageJob with a dangling pointer
 //we need some way to invalidate the Package* pointer if it gets deleted
 =

-//we can't just take a copy in the packagejob as we need to detatch and up=
date the *original* KPackage object
+//we can't just take a copy in the packagejob as we need to detach and upd=
ate the *original* KPackage object
 //without changing anything else which happened to share the same KPackage=
::d
 =

 //TODO KF6 - make KPackage::install()'s KJob return a new Package copy rat=
her than modify
-//an existing opbject.
+//an existing object.
 class PackageDeletionNotifier : public QObject
 {
 Q_OBJECT
diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/priva=
te/packagejobthread.cpp
index a2cc2b1..6ad6c8d 100644
--- a/src/kpackage/private/packagejobthread.cpp
+++ b/src/kpackage/private/packagejobthread.cpp
@@ -347,7 +347,7 @@ bool PackageJobThread::installPackage(const QString &sr=
c, const QString &dest, O
             KPluginMetaData oldMeta(targetName + QLatin1String("/metadata.=
desktop"));
 =

             if (oldMeta.serviceTypes() !=3D meta.serviceTypes()) {
-                d->errorMessage =3D i18n("The new package has a different =
type from the old version already installed.", meta.version(), meta.pluginI=
d(), oldMeta.version());
+                d->errorMessage =3D i18n("The new package has a different =
type from the old version already installed.");
                 d->errorCode =3D Package::JobError::UpdatePackageTypeMisma=
tchError;
             } else if (isVersionNewer(oldMeta.version(), meta.version())) {
                 const bool ok =3D uninstallPackage(targetName);
diff --git a/src/kpackage/private/packagejobthread_p.h b/src/kpackage/priva=
te/packagejobthread_p.h
index d6010f8..61346a9 100644
--- a/src/kpackage/private/packagejobthread_p.h
+++ b/src/kpackage/private/packagejobthread_p.h
@@ -65,7 +65,7 @@ Q_SIGNALS:
     void installPathChanged(const QString &installPath);
 =

 private:
-    //OperationType says wether we want to install, update or any
+    //OperationType says whether we want to install, update or any
     //new similar operation it will be expanded
     bool installDependency(const QUrl &src);
     bool installPackage(const QString &src, const QString &dest, Operation=
Type operation);