pyrox.dev
pantheon.granite: 5.2.2 -> 5.2.3
+19
-19
pkgs/desktops/pantheon/granite/02-datetime-clock-format-gsettings.patch
+19
-19
pkgs/desktops/pantheon/granite/02-datetime-clock-format-gsettings.patch
···
1
-
From 698e34dd6e8d98a1818ae00d3313b69a86340771 Mon Sep 17 00:00:00 2001
1
+
From 61e0d02c054367007e156c9ac3a084dbd6de8278 Mon Sep 17 00:00:00 2001
2
2
From: Fabio Valentini <decathorpe@gmail.com>
3
-
Date: Mon, 17 Dec 2018 14:58:14 +0100
4
-
Subject: DateTime: include "clock-format" gsettings key here
3
+
Date: Fri, 15 Feb 2019 13:53:11 +0100
4
+
Subject: [PATCH] DateTime: include "clock-format" gsettings key here
5
5
6
6
---
7
7
data/io.elementary.granite.gschema.xml | 15 +++++++++++++++
···
45
45
+ install_dir: schema_dir
46
46
+)
47
47
diff --git a/lib/DateTime.vala b/lib/DateTime.vala
48
-
index aea2ec6..3d81191 100644
48
+
index 2069e1f..5e9075d 100644
49
49
--- a/lib/DateTime.vala
50
50
+++ b/lib/DateTime.vala
51
51
@@ -104,13 +104,13 @@ namespace Granite.DateTime {
52
52
}
53
-
53
+
54
54
/**
55
55
- * Gets the //clock-format// key from //org.gnome.desktop.interface// schema
56
56
+ * Gets the //clock-format// key from //io.elementary.granite// schema
···
65
65
return (format.contains ("12h"));
66
66
}
67
67
diff --git a/meson.build b/meson.build
68
-
index 8b98eeb..f0abcdf 100644
68
+
index 8c886be..5f95055 100644
69
69
--- a/meson.build
70
70
+++ b/meson.build
71
-
@@ -4,6 +4,8 @@ project(
72
-
version: '5.2.2'
71
+
@@ -5,6 +5,8 @@ project(
72
+
version: '5.2.3'
73
73
)
74
-
74
+
75
75
+rdnn = 'io.elementary.' + meson.project_name()
76
76
+
77
77
if meson.get_compiler('vala').version().version_compare('<0.40.0')
78
78
error('vala compiler version 0.40.0 or newer is required.')
79
79
endif
80
-
@@ -52,10 +54,18 @@ icons_dir = join_paths(
80
+
@@ -53,10 +55,18 @@ icons_dir = join_paths(
81
81
'hicolor'
82
82
)
83
-
83
+
84
84
+schema_dir = join_paths(
85
85
+ get_option('prefix'),
86
86
+ get_option('datadir'),
···
90
90
+
91
91
pkgconfig = import('pkgconfig')
92
92
i18n = import('i18n')
93
-
93
+
94
94
subdir('lib')
95
95
+subdir('data')
96
96
subdir('demo')
97
97
subdir('icons')
98
98
subdir('po')
99
-
@@ -68,5 +78,6 @@ endif
99
+
@@ -69,5 +79,6 @@ endif
100
100
meson.add_install_script(
101
101
join_paths(meson.current_source_dir(), 'meson', 'post_install.py'),
102
102
'--iconsdir', icons_dir,
103
103
+ '--schemadir', schema_dir,
104
104
)
105
-
105
+
106
106
diff --git a/meson/post_install.py b/meson/post_install.py
107
107
index 1864515..5313f96 100755
108
108
--- a/meson/post_install.py
109
109
+++ b/meson/post_install.py
110
110
@@ -6,11 +6,16 @@ import subprocess
111
-
111
+
112
112
parser = argparse.ArgumentParser()
113
113
parser.add_argument("--iconsdir", action="store", required=True)
114
114
+parser.add_argument("--schemadir", action="store", required=True)
115
115
args = vars(parser.parse_args())
116
-
116
+
117
117
icons_dir = args["iconsdir"]
118
118
+schema_dir = args["schemadir"]
119
-
119
+
120
120
if not os.environ.get('DESTDIR'):
121
121
print('Compiling icon cache ...')
122
122
subprocess.run(['gtk-update-icon-cache', icons_dir])
123
-
123
+
124
124
+ print('Compiling GSettings schemas ...')
125
125
+ subprocess.run(['glib-compile-schemas', schema_dir])
126
126
+
127
-
--
127
+
--
128
128
2.20.1
129
129
+2
-11
pkgs/desktops/pantheon/granite/default.nix
+2
-11
pkgs/desktops/pantheon/granite/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "granite";
5
-
version = "5.2.2";
5
+
version = "5.2.3";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "elementary";
9
9
repo = pname;
10
10
rev = version;
11
-
sha256 = "1zp0pp5v3j8k6ail724p7h5jj2zmznj0a2ybwfw5sspfdw5bfydh";
11
+
sha256 = "10ddq1s2w4jvpzq813cylmqhh8pggzaz890fy3kzg07275i98gah";
12
12
};
13
13
14
14
patches = [
15
-
# Add Meson support that hit after 5.2.2
16
-
(fetchpatch {
17
-
url = "https://github.com/elementary/granite/commit/2066b377226cf327cb2d5399b6b40a2d36d47b11.patch";
18
-
sha256 = "1bxjgq8wvl1sb79cwhmh9kwawnkkfn7c5q67cyz1fjxmamwyyi85";
19
-
})
20
-
(fetchpatch {
21
-
url = "https://github.com/elementary/granite/commit/f1b29f52e3aaf0f5d6bba44c42617da265f679c8.patch";
22
-
sha256 = "0cdp9ny6fj1lpcirab641p1qn1rbsvnsaa03hnr6zsdpim96jlvs";
23
-
})
24
15
# Resolve the circular dependency between granite and the datetime wingpanel indicator
25
16
# See: https://github.com/elementary/granite/pull/242
26
17
./02-datetime-clock-format-gsettings.patch