From a364c1024851b6318deda3c464fe808c144090a3 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Thu, 3 Jun 2021 01:31:36 +0700 Subject: [PATCH] cinnamon: Upgraded to 5.0.1. Signed-off-by: Willy Sudiarto Raharjo --- cinnamon/7382.patch | 35 ----------------------------------- cinnamon/cinnamon.SlackBuild | 4 +--- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 cinnamon/7382.patch diff --git a/cinnamon/7382.patch b/cinnamon/7382.patch deleted file mode 100644 index 098c45f..0000000 --- a/cinnamon/7382.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fe2e6947fcad14e8356c96c6fed380824f806c52 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Tue, 20 Mar 2018 14:11:02 -0400 -Subject: [PATCH] cinanmon-settings: don't rely on the presence of - cinnamon-control-center - -The existence of the cinnamon-control-center binary does not even tell -us what control center libraries are available. So instead, do the same -thing we did for cinnamon-settings modules, and check if the library -exists. ---- - files/usr/bin/cinnamon-settings | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/files/usr/bin/cinnamon-settings b/files/usr/bin/cinnamon-settings -index e01541227..1113e4b93 100755 ---- a/files/usr/bin/cinnamon-settings -+++ b/files/usr/bin/cinnamon-settings -@@ -7,6 +7,7 @@ Usage: cinnamon-settings [optional module name] - - import os - import sys -+import sysconfig - - if len(sys.argv) > 1: - module = sys.argv[1] -@@ -14,7 +15,7 @@ if len(sys.argv) > 1: - os.execvp("/usr/share/cinnamon/cinnamon-settings/xlet-settings.py", (" ", module[0:-1]) + tuple(sys.argv[2:])) - if os.path.exists("/usr/share/cinnamon/cinnamon-settings/modules/cs_%s.py" % module): - os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) -- elif os.path.exists("/usr/bin/cinnamon-control-center"): -+ elif os.path.exists(os.path.join(sysconfig.get_config_var("LIBDIR"), "cinnamon-control-center-1/panels/lib%s.so" % module)): - os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) - elif os.path.exists("/usr/bin/gnome-control-center"): - print ("Unknown module %s, calling gnome-control-center" % module) diff --git a/cinnamon/cinnamon.SlackBuild b/cinnamon/cinnamon.SlackBuild index 389bf11..f999175 100644 --- a/cinnamon/cinnamon.SlackBuild +++ b/cinnamon/cinnamon.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cinnamon -VERSION=${VERSION:-4.8.5} +VERSION=${VERSION:-5.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_csb} @@ -77,8 +77,6 @@ find -L . \ # Patch to use Slackware Logo, thanks to Skaendo patch -p1 < $CWD/logo.patch -patch -p1 < $CWD/7382.patch - mkdir build cd build CFLAGS="$SLKCFLAGS" \