[file-roller/wip/jtojnar/nautilus-gtk4: 7/7] wip: Port extension to Nautilus 43




commit 3a6cdfe30acb1cadbbf0d4c3743def537761d58b
Author: Jan Tojnar <jtojnar gmail com>
Date:   Fri Jul 15 14:37:58 2022 +0200

    wip: Port extension to Nautilus 43

 default.nix          | 24 +++++++++++++++++++++++-
 meson.build          |  3 ++-
 nautilus/meson.build |  2 +-
 nix/sources.json     | 42 +++++++++++++++++++++++++++++++++++++++---
 4 files changed, 65 insertions(+), 6 deletions(-)
---
diff --git a/default.nix b/default.nix
index 655416a7..138f1cb1 100644
--- a/default.nix
+++ b/default.nix
@@ -109,8 +109,30 @@ makeDerivation rec {
     file
     glib
     gnome.adwaita-icon-theme
-    gnome.nautilus
+    (let
+      gnome-desktop-master = gnome-desktop.overrideAttrs (attrs: {
+        src = sources.gnome-desktop;
+        # Remove removed flags
+        mesonFlags = builtins.filter (flag: builtins.match "-D(date_in_gnome_version|gnome_distributor).+" 
flag == null) attrs.mesonFlags;
+      });
+      libadwaita-master = libadwaita.overrideAttrs (attrs: {
+        src = sources.libadwaita;
+      });
+      nautilus-master = gnome.nautilus.overrideAttrs (attrs: {
+        patches = [
+          # Some no longer apply and are not necessary for building the extension.
+        ];
+        src = sources.nautilus;
+        buildInputs = [
+          gtk4
+          gnome-desktop-master
+          libadwaita-master
+          libportal-gtk4
+        ] ++ attrs.buildInputs;
+      });
+    in nautilus-master)
     gtk3
+    gtk4
     json-glib
     libarchive
     libhandy
diff --git a/meson.build b/meson.build
index d917869f..b4af4295 100644
--- a/meson.build
+++ b/meson.build
@@ -7,7 +7,7 @@ project('file-roller', 'c',
 glib_version = '>=2.38'
 gtk_version = '>=3.22.0'
 hdy_version = '>=1.5.0'
-nautilus_version = '>=3.28.0'
+nautilus_version = '>=43'
 json_glib_version = '>=0.14.0'
 libarchive_version = '>=3.1.900a'
 
@@ -30,6 +30,7 @@ thread_dep = dependency('threads')
 glib_dep = dependency('glib-2.0', version : glib_version)
 gthread_dep = dependency('gthread-2.0')
 gtk_dep = dependency('gtk+-3.0', version : gtk_version)
+gtk4_dep = dependency('gtk4')
 hdy_dep = dependency('libhandy-1', version: hdy_version)
 libportal_dep = dependency('libportal', version: '>= 0.5', required: use_native_appchooser)
 libportal_gtk3_dep = dependency('libportal-gtk3', version: '>= 0.5', required: use_native_appchooser)
diff --git a/nautilus/meson.build b/nautilus/meson.build
index 5d989033..d0467410 100644
--- a/nautilus/meson.build
+++ b/nautilus/meson.build
@@ -8,7 +8,7 @@ shared_module('nautilus-fileroller',
     thread_dep,
     glib_dep, 
     gthread_dep, 
-    gtk_dep, 
+    gtk4_dep, 
     libnautilus_extension_dep,
     use_json_glib ? libjson_glib_dep : [],
   ],  
diff --git a/nix/sources.json b/nix/sources.json
index 7434121b..f164b978 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -1,4 +1,40 @@
 {
+    "gnome-desktop": {
+        "branch": "master",
+        "description": "Read-only mirror of https://gitlab.gnome.org/GNOME/gnome-desktop";,
+        "homepage": "https://gitlab.gnome.org/GNOME/gnome-desktop";,
+        "owner": "GNOME",
+        "repo": "gnome-desktop",
+        "rev": "2c5aae5234b32ec8616e2c93516815440253fd5e",
+        "sha256": "0xygsbyhpc8gharrhhgj33crjnhdx1zjzhsj7aklzqq88pxyli33",
+        "type": "tarball",
+        "url": 
"https://github.com/GNOME/gnome-desktop/archive/2c5aae5234b32ec8616e2c93516815440253fd5e.tar.gz";,
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "libadwaita": {
+        "branch": "main",
+        "description": "Read-only mirror of https://gitlab.gnome.org/GNOME/libadwaita";,
+        "homepage": "https://gitlab.gnome.org/GNOME/libadwaita";,
+        "owner": "GNOME",
+        "repo": "libadwaita",
+        "rev": "33c9492aae088c84491fd0a280ec98f7c06ceb01",
+        "sha256": "1gxbji8z8icvcapkb2j5pj7k5mgzp4sp60z5qcr2720d7jinna3p",
+        "type": "tarball",
+        "url": "https://github.com/GNOME/libadwaita/archive/33c9492aae088c84491fd0a280ec98f7c06ceb01.tar.gz";,
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "nautilus": {
+        "branch": "master",
+        "description": "Read-only mirror of https://gitlab.gnome.org/GNOME/nautilus";,
+        "homepage": "https://gitlab.gnome.org/GNOME/nautilus";,
+        "owner": "GNOME",
+        "repo": "nautilus",
+        "rev": "2521be59efa3db7b5477b97ebab2593a0a1e03c2",
+        "sha256": "1qqvkcmkj66qmqnpaz5ig62s7kswy6kgbfc0gqa1yzr95d5gda5y",
+        "type": "tarball",
+        "url": "https://github.com/GNOME/nautilus/archive/2521be59efa3db7b5477b97ebab2593a0a1e03c2.tar.gz";,
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
     "niv": {
         "branch": "master",
         "description": "Easy dependency management for Nix projects",
@@ -17,10 +53,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "68c63e60b8413260605efbe1ac5addaa099cdfb3",
-        "sha256": "1bwzlaz49s2z73bxyz7dmhd42sfjghl4j1519yj1fxzz8lrlslmc",
+        "rev": "a65b5b3f5504b8b89c196aba733bdf2b0bd13c16",
+        "sha256": "0y54qgwcnd38rf4d34d6fvvn109ls9zw7713cr7mqnhax28sf6qc",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/68c63e60b8413260605efbe1ac5addaa099cdfb3.tar.gz";,
+        "url": "https://github.com/NixOS/nixpkgs/archive/a65b5b3f5504b8b89c196aba733bdf2b0bd13c16.tar.gz";,
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]