Hello community,
here is the log from the commit of package PackageKit for openSUSE:11.4
checked in at Wed May 4 21:47:52 CEST 2011.
--------
--- old-versions/11.4/all/PackageKit/PackageKit.changes 2011-02-26
11:58:01.000000000 +0100
+++ 11.4/PackageKit/PackageKit.changes 2011-04-29 13:16:57.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Apr 27 13:05:48 UTC 2011 - dmacvi...@suse.de
+
+- Report the download speed (bnc#663069)
+
+-------------------------------------------------------------------
+Wed Apr 27 10:14:01 UTC 2011 - dmacvi...@suse.de
+
+- Fix for crash on get-updates (bnc#685831)
+
+-------------------------------------------------------------------
Package does not exist at destination yet. Using Fallback
old-versions/11.4/all/PackageKit
Destination is old-versions/11.4/UPDATES/all/PackageKit
calling whatdependson for 11.4-i586
New:
----
0001-Report-download-speed-bnc-663069.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ PackageKit.spec ++++++
--- /var/tmp/diff_new_pack.5uCips/_old 2011-05-04 21:45:10.000000000 +0200
+++ /var/tmp/diff_new_pack.5uCips/_new 2011-05-04 21:45:10.000000000 +0200
@@ -35,7 +35,7 @@
Name: PackageKit
Version: 0.6.12
-Release: 1.<RELEASE2>
+Release: 1.<RELEASE6>
License: GPLv2+
BuildRequires: NetworkManager-devel
BuildRequires: dbus-1-glib-devel
@@ -69,6 +69,7 @@
Patch1: PackageKit-use-system-solve.patch
# PATCH-FIX-UPSTREAM PackageKit-fix-endless-recursion.patch co...@opensuse.org
-- use correct variable to avoid endless recusion
Patch2: PackageKit-fix-endless-recursion.patch
+Patch3: 0001-Report-download-speed-bnc-663069.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-branding = %{version}
Recommends: %{name}-lang
@@ -245,6 +246,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%configure \
++++++ 0001-Report-download-speed-bnc-663069.patch ++++++
>From 57bedddc2d0eec1c6efd7ff6305431b5b9000e6b Mon Sep 17 00:00:00 2001
From: Duncan Mac-Vicar P <dmacvi...@suse.de>
Date: Wed, 27 Apr 2011 15:03:39 +0200
Subject: [PATCH] Report download speed (bnc#663069)
---
backends/zypp/zypp-events.h | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/backends/zypp/zypp-events.h b/backends/zypp/zypp-events.h
index cd8f4f3..5877f8d 100644
--- a/backends/zypp/zypp-events.h
+++ b/backends/zypp/zypp-events.h
@@ -30,7 +30,7 @@
#include <pk-backend.h>
#include <zypp/ZYppCallbacks.h>
#include <zypp/Digest.h>
-#include <zypp/KeyRing.h>
+#include <zypp/KeyRing.h>
#include "zypp-utils.h"
@@ -163,6 +163,12 @@ struct ZyppBackendReceiver
pk_backend_set_sub_percentage (_backend, _sub_percentage);
}
+ inline void
+ update_speed (guint speed)
+ {
+ pk_backend_set_speed (_backend, speed);
+ }
+
void
reset_sub_percentage ()
{
@@ -310,8 +316,10 @@ struct DownloadProgressReportReceiver : public
zypp::callback::ReceiveReport<zyp
virtual bool progress (int value, const zypp::Url &file, double
dbps_avg, double dbps_current)
{
//fprintf (stderr, "\n\n---->
DownloadProgressReportReceiver::progress(), %s:%d\n\n", _package_id == NULL ?
"unknown" : _package_id, value);
- if (_package_id != NULL)
+ if (_package_id != NULL) {
update_sub_percentage (value);
+ update_speed (static_cast<guint>(dbps_current));
+ }
return true;
}
--
1.7.3.4
++++++ PackageKit-use-system-solve.patch ++++++
--- /var/tmp/diff_new_pack.5uCips/_old 2011-05-04 21:45:10.000000000 +0200
+++ /var/tmp/diff_new_pack.5uCips/_new 2011-05-04 21:45:10.000000000 +0200
@@ -1,7 +1,6 @@
-diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp
-index b7574ad..f7e03e2 100644
---- a/backends/zypp/zypp-utils.cpp
-+++ b/backends/zypp/zypp-utils.cpp
+diff -u -r PackageKit-0.6.12.orig/backends/zypp/zypp-utils.cpp
PackageKit-0.6.12/backends/zypp/zypp-utils.cpp
+--- PackageKit-0.6.12.orig/backends/zypp/zypp-utils.cpp 2011-04-27
10:33:54.000000000 +0200
++++ PackageKit-0.6.12/backends/zypp/zypp-utils.cpp 2011-04-27
10:36:49.000000000 +0200
@@ -43,12 +43,15 @@
#include <zypp/Pathname.h>
#include <zypp/Patch.h>
@@ -30,13 +29,13 @@
-{
- public:
- zypp::PoolItem best;
-
+-
- bool operator() (zypp::PoolItem provider)
- {
- if (!provider.status ().isLocked () && (!best || best->edition
().compare (provider->edition ()) < 0)) {
- best = provider;
- }
--
+
- return true;
- }
-};
@@ -45,7 +44,7 @@
/**
* Initialize Zypp (Factory method)
-@@ -161,22 +149,22 @@ zypp_is_development_repo (PkBackend *backend,
zypp::RepoInfo repo)
+@@ -161,22 +149,22 @@
std::string repo_debug("-debug");
std::string repo_development("-development");
std::string repo_source ("-source");
@@ -73,7 +72,7 @@
repo_name.compare(repo_name.length() - repo_source.length(),
repo_source.length(), repo_source) == 0)
return TRUE;
-@@ -257,39 +245,6 @@ warn_outdated_repos(PkBackend *backend, const
zypp::ResPool & pool)
+@@ -257,39 +245,6 @@
}
}
@@ -113,7 +112,7 @@
zypp::target::rpm::RpmHeader::constPtr
zypp_get_rpmHeader (std::string name, zypp::Edition edition)
{
-@@ -495,7 +450,7 @@ gboolean
+@@ -495,7 +450,7 @@
zypp_refresh_meta_and_cache (zypp::RepoManager &manager, zypp::RepoInfo
&repo, bool force)
{
try {
@@ -122,7 +121,7 @@
zypp::RepoManager::RefreshIfNeededIgnoreDelay)
!= zypp::RepoManager::REFRESH_NEEDED)
return TRUE;
-@@ -661,7 +616,7 @@ zypp_filter_solvable (PkBitfield filters, const
zypp::sat::Solvable &item)
+@@ -661,7 +616,7 @@
return TRUE;
// FIXME: add more enums - cf. libzif logic and pk-enum.h
@@ -131,7 +130,7 @@
// PK_FILTER_ENUM_NOT_SUPPORTED,
}
-@@ -702,7 +657,7 @@ zypp_emit_filtered_packages_in_list (PkBackend *backend,
const std::vector<zypp:
+@@ -702,7 +657,7 @@
match = FALSE;
for (sat_it_t i = installed.begin (); !match && i !=
installed.end (); i++) {
@@ -140,7 +139,7 @@
!(!zypp::isKind<zypp::SrcPackage>(*it) ^
!zypp::isKind<zypp::SrcPackage>(*i));
}
-@@ -724,34 +679,6 @@ zypp_backend_package (PkBackend *backend, PkInfoEnum info,
+@@ -724,34 +679,6 @@
}
/**
@@ -175,7 +174,7 @@
* Returns a set of all packages the could be updated
* (you're able to exclude a single (normally the 'patch' repo)
*/
-@@ -765,35 +692,16 @@ zypp_get_package_updates (std::string repo)
+@@ -765,35 +692,16 @@
zypp::ResPool::byKind_iterator it = pool.byKindBegin (kind);
zypp::ResPool::byKind_iterator e = pool.byKindEnd (kind);
@@ -221,7 +220,7 @@
}
/**
-@@ -850,38 +758,54 @@ zypp_get_updates (PkBackend *backend)
+@@ -850,38 +758,55 @@
patchRepo = candidates->begin ()->resolvable
()->repoInfo ().alias ();
}
@@ -256,19 +255,11 @@
- zypp::Patch::constPtr patch =
zypp::asKind<zypp::Patch>(ci->resolvable());
+ zypp::Patch::constPtr patch =
zypp::asKind<zypp::Patch>(ci->resolvable());
-+
-+ // Remove contained packages from list of
packages to add
-+ zypp::sat::SolvableSet::const_iterator pki;
-+ for (pki = patch->contents().begin(); pki !=
patch->contents().end(); pki++) {
- // Remove contained packages from list of packages to
add
- zypp::sat::SolvableSet::const_iterator pki;
- for (pki = patch->contents().begin(); pki !=
patch->contents().end(); pki++) {
-+ pi_it_t pb = packages->begin (), pe =
packages->end (), pi;
-+ for (pi = pb; pi != pe; ++pi) {
-+ if (pi->satSolvable() ==
zypp::sat::Solvable::noSolvable)
-+ continue;
-
+-
- pi_it_t pb = packages->begin (), pe =
packages->end (), pi;
- for (pi = pb; pi != pe; ++pi) {
- if (pi->satSolvable() ==
zypp::sat::Solvable::noSolvable)
@@ -277,6 +268,16 @@
- if (pi->satSolvable().identical (*pki))
{
- packages->erase (pi);
- break;
++ // Remove contained packages from list of
packages to add
++ zypp::sat::SolvableSet::const_iterator pki;
++ zypp::Patch::Contents content(patch->contents());
++ for (pki = content.begin(); pki != content.end(); ++pki) {
++
++ pi_it_t pb = packages->begin (), pe =
packages->end (), pi;
++ for (pi = pb; pi != pe; ++pi) {
++ if (pi->satSolvable() ==
zypp::sat::Solvable::noSolvable)
++ continue;
++
+ if (pi->satSolvable().identical
(*pki)) {
+ packages->erase (pi);
+ break;
@@ -298,7 +299,7 @@
return candidates;
}
-@@ -1205,7 +1129,7 @@ zypp_backend_finished_error (PkBackend *backend,
PkErrorEnum err_code,
+@@ -1205,7 +1130,7 @@
va_end (args);
pk_backend_error_code (backend, err_code, "%s", buffer);
@@ -307,7 +308,7 @@
g_free (buffer);
pk_backend_finished (backend);
-@@ -1273,7 +1197,7 @@ zypp_ver_and_arch_equal (const zypp::sat::Solvable &pkg,
+@@ -1273,7 +1198,7 @@
{
const std::string &ver = pkg.edition ().asString();
if (g_strcmp0 (ver.c_str (), name))
@@ -316,11 +317,10 @@
if (arch && !strcmp (arch, "source")) {
return zypp::isKind<zypp::SrcPackage>(pkg);
-diff --git a/backends/zypp/zypp-utils.h b/backends/zypp/zypp-utils.h
-index 815f594..71cd955 100644
---- a/backends/zypp/zypp-utils.h
-+++ b/backends/zypp/zypp-utils.h
-@@ -229,7 +229,6 @@ gboolean zypp_backend_pool_item_notify (PkBackend
*backend,
+diff -u -r PackageKit-0.6.12.orig/backends/zypp/zypp-utils.h
PackageKit-0.6.12/backends/zypp/zypp-utils.h
+--- PackageKit-0.6.12.orig/backends/zypp/zypp-utils.h 2011-04-27
10:33:54.000000000 +0200
++++ PackageKit-0.6.12/backends/zypp/zypp-utils.h 2011-04-27
10:36:20.000000000 +0200
+@@ -229,7 +229,6 @@
gboolean zypp_ver_and_arch_equal (const zypp::sat::Solvable &pkg,
const char *name, const char *arch);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
