Accepting request 1056384 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/1056384
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/PackageKit?expand=0&rev=232

PackageKit-zypp-fix-ambiguous-filesystem-reference.patch

@@ -0,0 +1,80 @@
+From bb1409a71a4872f3f13ca565c98a8be0b2dc77eb Mon Sep 17 00:00:00 2001
+From: Jonathan Kang <jonathankang@gnome.org>
+Date: Fri, 6 Jan 2023 09:41:42 +0800
+Subject: [PATCH] zypp: Fix ambiguous reference to 'filesystem' class
+
+https://bugzilla.suse.com/show_bug.cgi?id=1206687
+---
+ backends/zypp/pk-backend-zypp.cpp | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
+index bf9a7feca..67ea9abf7 100644
+--- a/backends/zypp/pk-backend-zypp.cpp
++++ b/backends/zypp/pk-backend-zypp.cpp
+@@ -611,7 +611,7 @@ ZyppJob::get_zypp()
+ 		/* TODO: we need to lifecycle manage this, detect changes
+ 		   in the requested 'root' etc. */
+ 		if (!initialized) {
+-			filesystem::Pathname pathname("/");
++			zypp::filesystem::Pathname pathname("/");
+ 			zypp->initializeTarget (pathname);
+ 
+ 			initialized = TRUE;
+@@ -1669,7 +1669,7 @@ zypp_refresh_cache (PkBackendJob *job, ZYpp::Ptr zypp, gboolean force)
+ 
+ 	if (zypp == NULL)
+ 		return  FALSE;
+-	filesystem::Pathname pathname("/");
++	zypp::filesystem::Pathname pathname("/");
+ 
+ 	bool poolIsClean = sat::Pool::instance ().reposEmpty ();
+ 	// Erase and reload all if pool is too holey (densyity [100: good | 0 bad])
+@@ -1855,7 +1855,7 @@ pk_backend_destroy (PkBackend *backend)
+ {
+ 	g_debug ("zypp_backend_destroy");
+ 
+-	filesystem::recursive_rmdir (zypp::myTmpDir ());
++	zypp::filesystem::recursive_rmdir (zypp::myTmpDir ());
+ 
+ 	g_free (_repoName);
+ 	delete priv;
+@@ -2538,7 +2538,7 @@ backend_install_files_thread (PkBackendJob *job, GVariant *params, gpointer user
+ 	}
+ 
+ 	// create a temporary directory
+-	filesystem::TmpDir tmpDir;
++	zypp::filesystem::TmpDir tmpDir;
+ 	if (tmpDir == NULL) {
+ 		zypp_backend_finished_error (
+ 			job, PK_ERROR_ENUM_LOCAL_INSTALL_FAILED,
+@@ -2561,7 +2561,7 @@ backend_install_files_thread (PkBackendJob *job, GVariant *params, gpointer user
+ 
+ 		// copy the rpm into tmpdir
+ 		string tempDest = tmpDir.path ().asString () + "/" + rpmHeader->tag_name () + ".rpm";
+-		if (filesystem::copy (full_paths[i], tempDest) != 0) {
++		if (zypp::filesystem::copy (full_paths[i], tempDest) != 0) {
+ 			zypp_backend_finished_error (
+ 				job, PK_ERROR_ENUM_LOCAL_INSTALL_FAILED,
+ 				"Could not copy the rpm-file into the temp-dir");
+@@ -3924,7 +3924,7 @@ backend_download_packages_thread (PkBackendJob *job, GVariant *params, gpointer
+ 			PoolItem item(solvable);
+ 			size += 2 * make<ResObject>(solvable)->downloadSize();
+ 
+-			filesystem::Pathname repo_dir = solvable.repository().info().packagesPath();
++			zypp::filesystem::Pathname repo_dir = solvable.repository().info().packagesPath();
+ 			struct statfs stat;
+ 			statfs(repo_dir.c_str(), &stat);
+ 			if (size > stat.f_bavail * 4) {
+@@ -3949,7 +3949,7 @@ backend_download_packages_thread (PkBackendJob *job, GVariant *params, gpointer
+ 			// be sure it ends with /
+ 			target += "/";
+ 			target += tmp_file->basename();
+-			filesystem::hardlinkCopy(tmp_file, target);
++			zypp::filesystem::hardlinkCopy(tmp_file, target);
+ 			const gchar *to_strv[] = { NULL, NULL };
+ 			to_strv[0] =  target.c_str();
+ 			pk_backend_job_files (job, package_ids[i],(gchar **) to_strv);
+-- 
+2.38.1
+

PackageKit.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan  6 02:22:16 UTC 2023 - Jonathan Kang <songchuan.kang@suse.com>
+
+- Add PackageKit-zypp-fix-ambiguous-filesystem-reference.patch:
+  zypp: Fix ambiguous reference to 'filesystem' class
+  (gh#PackageKit/PackageKit/commit/bb1409a71, bsc#1206687).
+
 -------------------------------------------------------------------
 Mon Sep 26 03:12:44 UTC 2022 - Jonathan Kang <songchuan.kang@suse.com>
 

PackageKit.spec

@@ -70,6 +70,8 @@ Patch11:        PackageKit-zypp-dont-refresh-before-searching.patch
 Patch12:        PackageKit-zypp-dont-remove-locked-packages.patch
 # PATCH-FIX-UPSTREAM PackageKit-zypp-fix-package-id.patch gh#PackageKit/PackageKit/commit/8eb2ef0ae, bsc#1202585 sckang@suse.com -- zypp: add repository data in package id
 Patch13:        PackageKit-zypp-add-repo-in-packageid.patch
+# PATCH-FIX-UPSTREAM PackageKit-zypp-fix-ambiguous-filesystem-reference.patch gh#PackageKit/PackageKit/commit/bb1409a71, bsc#1206687 sckang@suse.com -- zypp: Fix ambiguous reference to 'filesystem' class
+Patch14:        PackageKit-zypp-fix-ambiguous-filesystem-reference.patch
 
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++