Hello community, here is the log from the commit of package apper for openSUSE:Factory checked in at 2015-03-30 19:10:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apper (Old) and /work/SRC/openSUSE:Factory/.apper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apper" Changes: -------- --- /work/SRC/openSUSE:Factory/apper/apper.changes 2014-10-02 14:13:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apper.new/apper.changes 2015-03-30 19:10:53.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Mar 27 16:51:05 UTC 2015 - [email protected] + +- Added the following upstream patches: + * Let-the-backend-return-an-error.patch: prevents erroneous + "Your current backend does not support..." errors and fixes the + installation of local rpm packages (boo#901067) + * fix-plasmoid-status-messages.patch: fixes the plasmoid's status + display (boo#908194) + * fix-german-translation.patch: the string "The following + package(s) is/were found" was incorrectly translated with "The + following package(s) is/were _not_ found" in the german + translation (bko#344935) + * fix-reviewchanges-dialog.patch: fixes layout of the "Review Changes" + dialog + * fix-typo-in-TransactionProgressDelegate.qml.patch: fixes a typo + that causes the plasmoid's layout to break with big fonts + +------------------------------------------------------------------- New: ---- Let-the-backend-return-an-error.patch fix-german-translation.patch fix-plasmoid-status-messages.patch fix-reviewchanges-dialog.patch fix-typo-in-TransactionProgressDelegate.qml.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apper.spec ++++++ --- /var/tmp/diff_new_pack.pOcggn/_old 2015-03-30 19:10:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pOcggn/_new 2015-03-30 19:10:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package apper # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,16 @@ Patch3: no-popup-for-background-actions.patch # PATCH-FIX-UPSTREAM Update Apper to reflect the latest PackageKit-Qt. Patch4: apper-adjust-to-latest-packagekitqt.diff +# PATCH-FIX-UPSTREAM Let-the-backend-return-an-error.patch boo#901067, brc#1167018 -- let the Backend to return an error if it doesn't support the features we need -- prevents erroneous "Your current backend does not support..." errors +Patch5: Let-the-backend-return-an-error.patch +# PATCH-FIX-UPSTREAM fix-plasmoid-status-messages.patch boo#908194, bko#344639 -- fixes the plasmoid's status messages +Patch6: fix-plasmoid-status-messages.patch +# PATCH-FIX-UPSTREAM bko#344935 -- fixes a wrong german translation +Patch7: fix-german-translation.patch +# PATCH-FIX-UPSTREAM fix-reviewchanges-dialog.patch -- fixes a layout problem in the "Review Changes" dialog +Patch8: fix-reviewchanges-dialog.patch +# PATCH-FIX-UPSTREAM fix-typo-in-TransactionProgressDelegate.qml.patch -- fixes a typo that causes the plasmoid's layout to break with big fonts +Patch9: fix-typo-in-TransactionProgressDelegate.qml.patch Url: http://kde-apps.org/content/show.php/Apper?content=84745 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: PackageKit-Qt-devel >= 0.9.0 @@ -55,6 +65,11 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %build %cmake_kde4 -d build -- -DSCREENSHOT_PROVIDER=openSUSE ++++++ Let-the-backend-return-an-error.patch ++++++ From: Daniel Nicoletti <[email protected]> Date: Mon, 15 Dec 2014 20:03:40 +0000 Subject: Let the Backend to return an error if it doesn't support the fetures we need X-Git-Url: http://quickgit.kde.org/?p=apper.git&a=commitdiff&h=21d93baaf5b89a076cb128566e1ff004153f1e6a --- Let the Backend to return an error if it doesn't support the fetures we need --- --- a/libapper/PkTransaction.cpp +++ b/libapper/PkTransaction.cpp @@ -108,47 +108,47 @@ void PkTransaction::installFiles(const QStringList &files) { - if (Daemon::global()->roles() & Transaction::RoleInstallFiles) { +// if (Daemon::global()->roles() & Transaction::RoleInstallFiles) { d->originalRole = Transaction::RoleInstallFiles; d->files = files; d->flags = Transaction::TransactionFlagOnlyTrusted | Transaction::TransactionFlagSimulate; setupTransaction(Daemon::installFiles(files, d->flags)); - } else { - showError(i18n("Current backend does not support installing files."), i18n("Error")); - } +// } else { +// showError(i18n("Current backend does not support installing files."), i18n("Error")); +// } } void PkTransaction::installPackages(const QStringList &packages) { - if (Daemon::global()->roles() & Transaction::RoleInstallPackages) { +// if (Daemon::global()->roles() & Transaction::RoleInstallPackages) { d->originalRole = Transaction::RoleInstallPackages; d->packages = packages; d->flags = Transaction::TransactionFlagOnlyTrusted | Transaction::TransactionFlagSimulate; setupTransaction(Daemon::installPackages(d->packages, d->flags)); - } else { - showError(i18n("Current backend does not support installing packages."), i18n("Error")); - } +// } else { +// showError(i18n("Current backend does not support installing packages."), i18n("Error")); +// } } void PkTransaction::removePackages(const QStringList &packages) { - if (Daemon::global()->roles() & Transaction::RoleRemovePackages) { +// if (Daemon::global()->roles() & Transaction::RoleRemovePackages) { d->originalRole = Transaction::RoleRemovePackages; d->allowDeps = false; // Default to avoid dependencies removal unless simulate says so d->packages = packages; d->flags = Transaction::TransactionFlagOnlyTrusted | Transaction::TransactionFlagSimulate; setupTransaction(Daemon::removePackages(d->packages, d->allowDeps, AUTOREMOVE, d->flags)); - } else { - showError(i18n("The current backend does not support removing packages."), i18n("Error")); - } +// } else { +// showError(i18n("The current backend does not support removing packages."), i18n("Error")); +// } } void PkTransaction::updatePackages(const QStringList &packages, bool downloadOnly) { - if (Daemon::global()->roles() & Transaction::RoleUpdatePackages) { +// if (Daemon::global()->roles() & Transaction::RoleUpdatePackages) { d->originalRole = Transaction::RoleUpdatePackages; d->packages = packages; if (downloadOnly) { @@ -159,9 +159,9 @@ } setupTransaction(Daemon::updatePackages(d->packages, d->flags)); - } else { - showError(i18n("The current backend does not support updating packages."), i18n("Error")); - } +// } else { +// showError(i18n("The current backend does not support updating packages."), i18n("Error")); +// } } void PkTransaction::refreshCache(bool force) From: Wolfgang Bauer <[email protected]> Date: Fri, 27 Mar 2015 15:38:59 +0000 Subject: Fix package file installation X-Git-Url: http://quickgit.kde.org/?p=apper.git&a=commitdiff&h=4895fb0323afd4fd57adaf53a9172ca4c5dd5752 --- Fix package file installation This is a followup to commit 21d93baaf5b89a076cb128566e1ff004153f1e6a. Even with that commit, installing downloaded package files (by openening them with "Apper Installer" from dolphin e.g.) still fails (on openSUSE at least) with the message "Your current backend does not support installing files" if apper-pk-session is not running yet. See also https://bugzilla.opensuse.org/show_bug.cgi?id=901067. This patch also disables the check whether installing package files is supported, similar to the above commit. The backend should return an error anyway if it doesn't support this feature. REVIEW: 123151 --- --- a/PkSession/PkInstallPackageFiles.cpp +++ b/PkSession/PkInstallPackageFiles.cpp @@ -37,7 +37,7 @@ { setWindowTitle(i18n("Install Packages Files")); - if (Daemon::global()->roles() & Transaction::RoleInstallFiles) { +// if (Daemon::global()->roles() & Transaction::RoleInstallFiles) { m_introDialog = new IntroDialog(this); m_introDialog->acceptDrops(i18n("You can drop more files in here")); @@ -48,10 +48,10 @@ setMainWidget(m_introDialog); modelChanged(); - } else { - setError(i18n("Not Supported"), - i18n("Your current backend does not support installing files")); - } +// } else { +// setError(i18n("Not Supported"), +// i18n("Your current backend does not support installing files")); +// } } PkInstallPackageFiles::~PkInstallPackageFiles() ++++++ fix-german-translation.patch ++++++ diff -ur apper-0.9.1.orig/po/de/apper.po apper-0.9.1/po/de/apper.po --- apper-0.9.1.orig/po/de/apper.po 2014-08-25 20:56:18.000000000 +0200 +++ apper-0.9.1/po/de/apper.po 2015-03-07 12:36:45.629697792 +0100 @@ -3886,8 +3886,8 @@ #: PkSession/ReviewChanges.cpp:50 msgid "The following package was found" msgid_plural "The following packages were found" -msgstr[0] "Das folgende Paket ist nicht auffindbar" -msgstr[1] "Die folgenden Pakete sind nicht auffindbar" +msgstr[0] "Das folgende Paket wurde gefunden" +msgstr[1] "Die folgenden Pakete wurden gefunden" #: PkSession/SessionTask.cpp:367 msgid "There are no packages to Install or Remove" ++++++ fix-plasmoid-status-messages.patch ++++++ From: Wolfgang Bauer <[email protected]> Date: Fri, 27 Mar 2015 15:28:51 +0000 Subject: Fix display of status/role messages in the plasmoid X-Git-Url: http://quickgit.kde.org/?p=apper.git&a=commitdiff&h=4fb5409e8304e01d536fb03df4a1001879ec3574 --- Fix display of status/role messages in the plasmoid The QML plasmoid calls a C++ function to get the message strings for the current status/role. But due to a limitation in Qt4, Enum parameters can only be used when the Enum is defined in the same class as the C++ function, which is not the case here (the Enums come from PackageKit). See also https://bugreports.qt.io/browse/QTBUG-19741 So the functions always get passed 0, which means "Unknown", and the plasmoid always displays "Unknown state"/"Unknown role type". This patch overloads the necessary functions to accept int parameters as well to fix this. BUG: 344639 REVIEW: 123150 --- --- a/libapper/PkStrings.cpp +++ b/libapper/PkStrings.cpp @@ -158,6 +158,11 @@ return QString(); } +QString PkStrings::status(int status, uint speed, qulonglong downloadRemaining) +{ + return PkStrings::status(static_cast<Transaction::Status>(status), speed, downloadRemaining); +} + QString PkStrings::statusPast(Transaction::Status status) { switch (status) { @@ -269,6 +274,11 @@ } kWarning() << "action unrecognised: " << role; return QString(); +} + +QString PkStrings::action(int role, int flags) +{ + return PkStrings::action(static_cast<Transaction::Role>(role), static_cast<Transaction::TransactionFlags>(flags)); } QString PkStrings::actionPast(Transaction::Role action) --- a/libapper/PkStrings.h +++ b/libapper/PkStrings.h @@ -49,6 +49,9 @@ static QString prettyFormatDuration(unsigned long mSec); static QString lastCacheRefreshTitle(uint lastTime); static QString lastCacheRefreshSubTitle(uint lastTime); +// the following are needed to be able to use the functions from QML (bug#344639) + static QString status(int status, uint speed = 0, qulonglong downloadRemaining = 0); + static QString action(int role, int flags); }; #endif ++++++ fix-reviewchanges-dialog.patch ++++++ From: Wolfgang Bauer <[email protected]> Date: Fri, 27 Mar 2015 15:52:28 +0000 Subject: Fix the layout of the "Review Changes" dialog X-Git-Url: http://quickgit.kde.org/?p=apper.git&a=commitdiff&h=d8e4d58cb6546a9763c0b24e3563940b195bbfd8 --- Fix the layout of the "Review Changes" dialog When e.g. running "apper --install-package-name", the user gets presented with a dialog that allows to review the changes (and select/deselect packages). Currently the layout is completely broken there. This patch fixes it by not specifying a fixed grid size at all. REVIEW: 123152 --- --- a/libapper/CategorizedView.cpp +++ b/libapper/CategorizedView.cpp @@ -37,6 +37,8 @@ void CategorizedView::setModel(QAbstractItemModel *model) { KCategorizedView::setModel(model); +// Don't set a fixed grid as this breaks the layout. Let Qt figure out the size itself +#if 0 // KFileItemDelegate *delegate = qobject_cast<KFileItemDelegate*>(itemDelegate()); // kDebug() << delegate->maximumSize(); // if (delegate) { @@ -53,4 +55,5 @@ setGridSize(QSize(maxWidth, maxHeight )); // delegate->setMaximumSize(QSize(maxWidth, maxHeight)); // // } +#endif } ++++++ fix-typo-in-TransactionProgressDelegate.qml.patch ++++++ From: Wolfgang Bauer <[email protected]> Date: Wed, 04 Mar 2015 15:28:11 +0000 Subject: Fix typo in TransactionProgressDelegate.qml X-Git-Url: http://quickgit.kde.org/?p=apper.git&a=commitdiff&h=9838382d9e2ff05ac9a0a7b45e987adf0862c4be --- Fix typo in TransactionProgressDelegate.qml Label does not have a property named "paitedHeight". This should rather be "paintedHeight" I suppose. This fixes the layout with big fonts. REVIEW: 122801 --- --- a/plasmoid/package/contents/ui/TransactionProgressDelegate.qml +++ b/plasmoid/package/contents/ui/TransactionProgressDelegate.qml @@ -38,7 +38,7 @@ PlasmaComponents.ProgressBar { id: itemProgress width: progressWidth - height: itemStatusLabel.paitedHeight + 4 + height: itemStatusLabel.paintedHeight + 4 minimumValue: 0 maximumValue: 100 PlasmaComponents.Label {
