[packages/steam-launcher] up to 1.0.0.72
atler
atler at pld-linux.org
Sat Sep 11 13:18:00 CEST 2021
commit a7ac95a28001337b0ded760e0110fd2ee4af8b5d
Author: Jan Palus <atler at pld-linux.org>
Date: Sat Sep 11 13:17:28 2021 +0200
up to 1.0.0.72
steam-launcher.spec | 4 ++--
steamdeps.patch | 23 +++++++++++++----------
2 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/steam-launcher.spec b/steam-launcher.spec
index 9ce080c..f89d692 100644
--- a/steam-launcher.spec
+++ b/steam-launcher.spec
@@ -2,12 +2,12 @@
Summary: Launcher for the Steam software distribution service
Name: steam-launcher
-Version: 1.0.0.71
+Version: 1.0.0.72
Release: 1
License: distributable
Group: Applications
Source0: https://repo.steampowered.com/steam/pool/steam/s/steam/steam_%{version}.tar.gz
-# Source0-md5: 02be920816bc369c8ac6579942535910
+# Source0-md5: 53c8ec53d0efd81490f9a2827af6366a
Source1: %{name}.sysconfig
Patch0: steamdeps.patch
Patch1: desktop_path.patch
diff --git a/steamdeps.patch b/steamdeps.patch
index c4ff2ee..342e3fa 100644
--- a/steamdeps.patch
+++ b/steamdeps.patch
@@ -213,7 +213,7 @@
# If your host file is misconfigured in certain circumstances this
# can cause sudo to block for a while, which causes gksudo to go into
# limbo and never return.
-@@ -347,31 +440,30 @@
+@@ -347,33 +440,32 @@
else
return 0
fi
@@ -239,8 +239,10 @@
+{sudo} poldek {poldek_options} --up
echo
- # Install the packages!
--sudo apt-get install %s
+ # Install the packages using the option "--no-remove" to avoid
+ # unexpected dependencies cycle that end up removing packages that are
+ # essential for the OS to run
+-sudo apt-get install --no-remove %s
-echo $? >%s
+{sudo} poldek {poldek_options} -u --pset={pset}
+echo $? >{status_file}
@@ -355,7 +357,7 @@
packages[name].set_installed(match.group(2))
# See which ones need to be installed
-- needed = []
+- needed = set()
+ consider_installed = pld_config_get("INSTALLED", "").split()
+ needed = set()
for row in dependencies:
@@ -365,7 +367,7 @@
satisfied = True
break
if not satisfied:
-- needed.append(row[0])
+- needed.add(row[0])
+ if row[0].name not in consider_installed:
+ needed.add( row[0] )
+ else:
@@ -373,11 +375,12 @@
# If we have anything to install, do it!
if len(needed) > 0:
-@@ -587,7 +706,12 @@
- if args.dry_run:
- return 1
- else:
-- return update_packages(needed)
+@@ -587,8 +706,12 @@
+ # ones listed in "ensure_installed_packages". If they were already
+ # installed, this forces apt to keep them into consideration when
+ # it evaluates the new packages dependencies.
+- needed.update(ensure_installed_packages)
+- return update_packages(sorted(needed, key=lambda x: x.name))
+ if pld_config_enabled("INSTALL_PACKAGES", True):
+ print("Installing packages as configured through {0}...".format(PLD_CONFIG_FN))
+ return updatePackages( needed )
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/steam-launcher.git/commitdiff/a7ac95a28001337b0ded760e0110fd2ee4af8b5d
More information about the pld-cvs-commit
mailing list