ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 04:57:56 +03:00
Code Issues Projects Releases Wiki Activity

pantheon.granite: 5.2.2 -> 5.2.3

Browse Source
This commit is contained in:
worldofpeace 2019-02-16 02:57:21 -05:00
parent 5aea8bb6d9
commit 19fcdfa356
2 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/desktops/pantheon/granite/02-datetime-clock-format-gsettings.patch
View File

@ -1,7 +1,7 @@
From 698e34dd6e8d98a1818ae00d3313b69a86340771 Mon Sep 17 00:00:00 2001 From 61e0d02c054367007e156c9ac3a084dbd6de8278 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com> From: Fabio Valentini <decathorpe@gmail.com>
Date: Mon, 17 Dec 2018 14:58:14 +0100 Date: Fri, 15 Feb 2019 13:53:11 +0100
Subject: DateTime: include "clock-format" gsettings key here Subject: [PATCH] DateTime: include "clock-format" gsettings key here
--- ---
data/io.elementary.granite.gschema.xml | 15 +++++++++++++++ data/io.elementary.granite.gschema.xml | 15 +++++++++++++++
@ -45,7 +45,7 @@ index 0000000..96cc3b1
+ install_dir: schema_dir + install_dir: schema_dir
+) +)
diff --git a/lib/DateTime.vala b/lib/DateTime.vala diff --git a/lib/DateTime.vala b/lib/DateTime.vala
index aea2ec6..3d81191 100644 index 2069e1f..5e9075d 100644
--- a/lib/DateTime.vala --- a/lib/DateTime.vala
+++ b/lib/DateTime.vala +++ b/lib/DateTime.vala
@@ -104,13 +104,13 @@ namespace Granite.DateTime { @@ -104,13 +104,13 @@ namespace Granite.DateTime {
@ -65,11 +65,11 @@ index aea2ec6..3d81191 100644
return (format.contains ("12h")); return (format.contains ("12h"));
} }
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 8b98eeb..f0abcdf 100644 index 8c886be..5f95055 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -4,6 +4,8 @@ project( @@ -5,6 +5,8 @@ project(
version: '5.2.2' version: '5.2.3'
) )
+rdnn = 'io.elementary.' + meson.project_name() +rdnn = 'io.elementary.' + meson.project_name()
@ -77,7 +77,7 @@ index 8b98eeb..f0abcdf 100644
if meson.get_compiler('vala').version().version_compare('<0.40.0') if meson.get_compiler('vala').version().version_compare('<0.40.0')
error('vala compiler version 0.40.0 or newer is required.') error('vala compiler version 0.40.0 or newer is required.')
endif endif
@@ -52,10 +54,18 @@ icons_dir = join_paths( @@ -53,10 +55,18 @@ icons_dir = join_paths(
'hicolor' 'hicolor'
) )
@ -96,7 +96,7 @@ index 8b98eeb..f0abcdf 100644
subdir('demo') subdir('demo')
subdir('icons') subdir('icons')
subdir('po') subdir('po')
@@ -68,5 +78,6 @@ endif @@ -69,5 +79,6 @@ endif
meson.add_install_script( meson.add_install_script(
join_paths(meson.current_source_dir(), 'meson', 'post_install.py'), join_paths(meson.current_source_dir(), 'meson', 'post_install.py'),
'--iconsdir', icons_dir, '--iconsdir', icons_dir,

13
pkgs/desktops/pantheon/granite/default.nix
View File

@ -2,25 +2,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "granite"; pname = "granite";
version = "5.2.2"; version = "5.2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1zp0pp5v3j8k6ail724p7h5jj2zmznj0a2ybwfw5sspfdw5bfydh"; sha256 = "10ddq1s2w4jvpzq813cylmqhh8pggzaz890fy3kzg07275i98gah";
}; };
patches = [ patches = [
# Add Meson support that hit after 5.2.2
(fetchpatch {
url = "https://github.com/elementary/granite/commit/2066b377226cf327cb2d5399b6b40a2d36d47b11.patch";
sha256 = "1bxjgq8wvl1sb79cwhmh9kwawnkkfn7c5q67cyz1fjxmamwyyi85";
})
(fetchpatch {
url = "https://github.com/elementary/granite/commit/f1b29f52e3aaf0f5d6bba44c42617da265f679c8.patch";
sha256 = "0cdp9ny6fj1lpcirab641p1qn1rbsvnsaa03hnr6zsdpim96jlvs";
})
# Resolve the circular dependency between granite and the datetime wingpanel indicator # Resolve the circular dependency between granite and the datetime wingpanel indicator
# See: https://github.com/elementary/granite/pull/242 # See: https://github.com/elementary/granite/pull/242
./02-datetime-clock-format-gsettings.patch ./02-datetime-clock-format-gsettings.patch