cinnamon.cinnamon-session: 4.4.1 -> 4.6.1
This commit is contained in:
parent
74b5685bba
commit
bd501a59d9
|
@ -1,38 +0,0 @@
|
||||||
From ddc2c4faeec36675654a2f8f04c3011b807fdf79 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
|
|
||||||
Date: Sun, 22 Mar 2020 07:36:25 +0100
|
|
||||||
Subject: [PATCH] Add dbus_glib dependency
|
|
||||||
|
|
||||||
---
|
|
||||||
cinnamon-session/meson.build | 2 +-
|
|
||||||
meson.build | 1 +
|
|
||||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build
|
|
||||||
index ee8916f..9dd9283 100644
|
|
||||||
--- a/cinnamon-session/meson.build
|
|
||||||
+++ b/cinnamon-session/meson.build
|
|
||||||
@@ -74,7 +74,7 @@ executable('cinnamon-session',
|
|
||||||
xext,
|
|
||||||
xrender,
|
|
||||||
xtest,
|
|
||||||
- # elogind,
|
|
||||||
+ dbus_glib,
|
|
||||||
],
|
|
||||||
link_with: [
|
|
||||||
libegg,
|
|
||||||
diff --git a/meson.build b/meson.build
|
|
||||||
index 231a448..db306dc 100644
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -48,6 +48,7 @@ else
|
|
||||||
gconf = dependency('', required: false)
|
|
||||||
endif
|
|
||||||
conf.set('HAVE_GCONF', gconf.found())
|
|
||||||
+dbus_glib = dependency('dbus-glib-1')
|
|
||||||
|
|
||||||
|
|
||||||
gio_unix = dependency('gio-unix-2.0', required: false)
|
|
||||||
--
|
|
||||||
2.25.1
|
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
From eb4a1eae754f222b1be902c2f050704fb0511cf7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
|
||||||
|
Date: Sat, 5 Sep 2020 23:19:23 +0200
|
||||||
|
Subject: [PATCH] Use dbus_glib instead of elogind
|
||||||
|
|
||||||
|
---
|
||||||
|
cinnamon-session/meson.build | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build
|
||||||
|
index d8428dc..1f15115 100644
|
||||||
|
--- a/cinnamon-session/meson.build
|
||||||
|
+++ b/cinnamon-session/meson.build
|
||||||
|
@@ -56,6 +56,7 @@ cinnamon_session_sources = [
|
||||||
|
gdbus_sources,
|
||||||
|
]
|
||||||
|
|
||||||
|
+dbus_glib = dependency('dbus-glib-1')
|
||||||
|
executable('cinnamon-session',
|
||||||
|
cinnamon_session_sources,
|
||||||
|
dependencies: [
|
||||||
|
@@ -74,7 +75,7 @@ executable('cinnamon-session',
|
||||||
|
xext,
|
||||||
|
xrender,
|
||||||
|
xtest,
|
||||||
|
- elogind,
|
||||||
|
+ dbus_glib,
|
||||||
|
],
|
||||||
|
link_with: [
|
||||||
|
libegg,
|
||||||
|
@@ -98,4 +99,3 @@ foreach unit: units
|
||||||
|
dependencies: unit[2]
|
||||||
|
)
|
||||||
|
endforeach
|
||||||
|
-
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
|
@ -27,17 +27,17 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "cinnamon-session";
|
pname = "cinnamon-session";
|
||||||
version = "4.4.1";
|
version = "4.6.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "linuxmint";
|
owner = "linuxmint";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1bkhzgdinsk4ahp1b4jf50phxwv2da23rh35cmg9fbm5c88701ga";
|
sha256 = "13qqi3zqybz00czh0g5nqjx5iwna54cxd7mk9wkp30kj6raa4qca";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./0001-Add-dbus_glib-dependency.patch
|
./0001-Use-dbus_glib-instead-of-elogind.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
Loading…
Reference in New Issue