From ceedbf92c095f2d1943b966f0816a5e85bd82b9a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 17 Jul 2021 15:37:19 +0800
Subject: [PATCH] pantheon.gala: 3.3.2 -> 6.0.1

---
 .../desktops/pantheon/desktop/gala/default.nix | 18 ++++++++++--------
 .../pantheon/desktop/gala/plugins-dir.patch    | 11 ++++++-----
 .../gala/use-new-notifications-default.patch   | 13 -------------
 3 files changed, 16 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/desktops/pantheon/desktop/gala/use-new-notifications-default.patch

diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index c4467c53a2bf..9e0229be5b23 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -23,18 +23,20 @@
 , elementary-dock
 , elementary-icon-theme
 , elementary-settings-daemon
+, gnome-settings-daemon
 , wrapGAppsHook
+, gexiv2
 }:
 
 stdenv.mkDerivation rec {
   pname = "gala";
-  version = "3.3.2";
+  version = "6.0.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-BOarHUEgWqQM6jmVMauJi0JnsM+jE45MnPNnAqz1qOE=";
+    sha256 = "0xp9vviamzdwlcnx4836sxaz2pyfkxswgvjm73ppn7fkdm0zjpzx";
   };
 
   passthru = {
@@ -61,6 +63,8 @@ stdenv.mkDerivation rec {
     elementary-dock
     elementary-icon-theme
     elementary-settings-daemon
+    gnome-settings-daemon
+    gexiv2
     gnome-desktop
     granite
     gtk3
@@ -71,15 +75,13 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
-    # https://github.com/elementary/gala/pull/869
-    # build failure in vala 0.48.7
-    # https://github.com/elementary/gala/pull/869#issuecomment-657147695
+    # Upstream code not respecting our localedir
+    # https://github.com/elementary/gala/pull/1205
     (fetchpatch {
-      url = "https://github.com/elementary/gala/commit/85d290c75eaa147b704ad34e6c67498071707ee8.patch";
-      sha256 = "19jkvmxidf453qfrxkvi35igxzfz2cm8srwkabvyn9wyd1yhiw0l";
+      url = "https://github.com/elementary/gala/commit/605aa10ea2a78650e001b2a247c5f7afce478b05.patch";
+      sha256 = "0bg67wzrnmx8nlw93i35vhyfx8al0bj0lacgci98vwlp2m1jgbd2";
     })
     ./plugins-dir.patch
-    ./use-new-notifications-default.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch b/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch
index f08652e9f630..b0e72bbe1ab7 100644
--- a/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch
+++ b/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch
@@ -1,16 +1,17 @@
 diff --git a/meson.build b/meson.build
-index 78113d6..926596c 100644
+index d0f00e5..977d2e2 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -24,13 +24,14 @@ vapi_dir = meson.current_source_dir() / 'vapi'
-
+@@ -25,6 +25,7 @@ vapi_dir = meson.current_source_dir() / 'vapi'
+ locale_dir = join_paths(get_option('prefix'), get_option('localedir'))
  data_dir = join_paths(get_option('prefix'), get_option('datadir'))
  plugins_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins')
 +plugins_dir_for_build = join_paths('/run/current-system/sw/lib/', meson.project_name(), 'plugins')
  pkgdata_dir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
  pkglib_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name())
-
- conf = configuration_data()
+ 
+@@ -33,7 +34,7 @@ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+ conf.set_quoted('LOCALEDIR', locale_dir)
  conf.set_quoted('DATADIR', data_dir)
  conf.set_quoted('PKGDATADIR', pkgdata_dir)
 -conf.set_quoted('PLUGINDIR', plugins_dir)
diff --git a/pkgs/desktops/pantheon/desktop/gala/use-new-notifications-default.patch b/pkgs/desktops/pantheon/desktop/gala/use-new-notifications-default.patch
deleted file mode 100644
index dc256bcff3aa..000000000000
--- a/pkgs/desktops/pantheon/desktop/gala/use-new-notifications-default.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/data/gala.gschema.xml b/data/gala.gschema.xml
-index 8032583..7f4f03c 100644
---- a/data/gala.gschema.xml
-+++ b/data/gala.gschema.xml
-@@ -58,7 +58,7 @@
- 			<description>If enabled, dropping windows on vertical screen edges maximizes them vertically and resizes them horizontally to cover half of the available area. Dropping windows on the top screen edge maximizes them completely.</description>
- 		</key>
- 		<key type="b" name="use-new-notifications">
--			<default>false</default>
-+			<default>true</default>
- 			<summary>If new notifications should be used</summary>
- 			<description>If new notifications UI should be used, requires io.elemenetary.notifications to be present and running</description>
- 		</key>