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

cinnamon-session: Upgraded to 3.8.2.

Browse source 
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
This commit is contained in:
Willy Sudiarto Raharjo 2018-07-06 04:00:19 +07:00
parent 7b8e05aa2e
commit 46596e6916
No known key found for this signature in database
GPG key ID: 887B8374D7333381
2 changed files with 1 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
cinnamon-session/be5e7380ae.patch
View file

@ -1,42 +0,0 @@
From be5e7380ae69a2620ecf488250ce7e48d51c6338 Mon Sep 17 00:00:00 2001
From: itzexor <itzexor@gmail.com>
Date: Fri, 20 Apr 2018 20:01:56 -0700
Subject: [PATCH] build: fix PKGDATADIR define / use only one define
we need to prepend the prefix to get a full path, and there's
no reason to have 3 names for the same thing.
---
cinnamon-session/csm-inhibit-dialog.c | 2 +-
meson.build | 6 +-----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/cinnamon-session/csm-inhibit-dialog.c b/cinnamon-session/csm-inhibit-dialog.c
index 15d2f8d..aec31e4 100644
--- a/cinnamon-session/csm-inhibit-dialog.c
+++ b/cinnamon-session/csm-inhibit-dialog.c
@@ -1075,7 +1075,7 @@ csm_inhibit_dialog_init (CsmInhibitDialog *dialog)
error = NULL;
if (!gtk_builder_add_from_file (dialog->priv->xml,
- GTKBUILDER_DIR "/" GTKBUILDER_FILE,
+ PKGDATADIR "/" GTKBUILDER_FILE,
&error)) {
if (error) {
g_warning ("Could not load inhibitor UI file: %s",
diff --git a/meson.build b/meson.build
index 4761c6e..b56c544 100644
--- a/meson.build
+++ b/meson.build
@@ -143,11 +143,7 @@ conf.set('ENABLE_IPV6', have_ipv6)
rootInclude = include_directories('.')
-pkgdatadir = join_paths(get_option('datadir'), meson.project_name())
-
-conf.set_quoted('GTKBUILDER_DIR', pkgdatadir)
-conf.set_quoted('DATA_DIR', pkgdatadir)
-conf.set_quoted('PKGDATADIR', pkgdatadir)
+conf.set_quoted('PKGDATADIR', join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()))
conf.set_quoted('LIBEXECDIR', get_option('libexecdir'))
conf.set_quoted('LOCALE_DIR', join_paths(get_option('prefix'), get_option('localedir')))

3
cinnamon-session/cinnamon-session.SlackBuild
View file

@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=cinnamon-session
VERSION=${VERSION:-3.8.1}
VERSION=${VERSION:-3.8.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_csb}
@ -72,7 +72,6 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
patch -p1 < $CWD/timeout.patch
patch -p1 < $CWD/be5e7380ae.patch
patch -p1 < $CWD/meson.patch
sed -i "s|<upower.h>|<libupower-glib/upower.h>|g" cinnamon-session/csm-consolekit.c
sed -i "s|<upower.h>|<libupower-glib/upower.h>|g" cinnamon-session/csm-logout-dialog.c