Miroirs/csb
1
0
Fork 0
mirror of https://gitlab.com/CinnamonSlackBuilds/csb.git synced 2024-12-25 21:59:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cinnamon: Upgraded to 5.0.1.

Browse source 
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
This commit is contained in:
Willy Sudiarto Raharjo 2021-06-03 01:31:36 +07:00
parent 0e4cd25411
commit a364c10248
No known key found for this signature in database
GPG key ID: 3F617144D7238786
2 changed files with 1 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
cinnamon/7382.patch
View file

@ -1,35 +0,0 @@
From fe2e6947fcad14e8356c96c6fed380824f806c52 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz93@gmail.com>
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)

4
cinnamon/cinnamon.SlackBuild
View file

@ -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" \