From 8737f59bf1b1a891661c452f206f7309172fe067 Mon Sep 17 00:00:00 2001
From: "Satadru Pramanik, DO, MPH, MEng" <satadru@gmail.com>
Date: Mon, 10 Jul 2023 11:16:30 -0400
Subject: [PATCH] Meson buildsystem fix (#8465)

* Using meson without 'setup' is deprecated

* fixup packages
---
 lib/buildsystems/meson.rb | 2 +-
 lib/const.rb              | 2 +-
 packages/fragments.rb     | 8 ++++----
 packages/fuse3.rb         | 2 +-
 packages/libdecor.rb      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/buildsystems/meson.rb b/lib/buildsystems/meson.rb
index 3a329bece..bf2ae6da9 100644
--- a/lib/buildsystems/meson.rb
+++ b/lib/buildsystems/meson.rb
@@ -12,7 +12,7 @@ class Meson < Package
   def self.build
     puts "Additional meson_options being used: #{@meson_options.nil? || @meson_options.empty? ? '<no meson_options>' : @meson_options}".orange
     @crew_meson_options = no_lto ? CREW_MESON_FNO_LTO_OPTIONS : CREW_MESON_OPTIONS
-    system "meson #{@crew_meson_options} #{@meson_options} builddir"
+    system "meson setup #{@crew_meson_options} #{@meson_options} builddir"
     system 'meson configure builddir'
     system "#{CREW_NINJA} -C builddir"
   end
diff --git a/lib/const.rb b/lib/const.rb
index e4a7bcc0c..fd2831904 100644
--- a/lib/const.rb
+++ b/lib/const.rb
@@ -1,5 +1,5 @@
 # Defines common constants used in different parts of crew
-CREW_VERSION = '1.34.9'
+CREW_VERSION = '1.35.0'
 
 # kernel architecture
 KERN_ARCH = `uname -m`.chomp
diff --git a/packages/fragments.rb b/packages/fragments.rb
index 797646de0..774f80642 100644
--- a/packages/fragments.rb
+++ b/packages/fragments.rb
@@ -41,16 +41,16 @@ class Fragments < Package
   gnome
 
   def self.build
-    system "meson #{CREW_MESON_OPTIONS} builddir"
+    system "meson setup #{CREW_MESON_OPTIONS} builddir"
     system 'meson configure builddir'
-    system 'samu -C builddir'
+    system "#{CREW_NINJA} -C builddir"
   end
 
   def self.install
-    system "DESTDIR=#{CREW_DEST_DIR} samu -C builddir install"
+    system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install"
   end
 
   def self.check
-    system 'samu -C builddir test || true'
+    system "#{CREW_NINJA} -C builddir test || true"
   end
 end
diff --git a/packages/fuse3.rb b/packages/fuse3.rb
index f3d38799f..439fab831 100644
--- a/packages/fuse3.rb
+++ b/packages/fuse3.rb
@@ -27,7 +27,7 @@ class Fuse3 < Package
   depends_on 'glibc' # R
 
   def self.build
-    system "meson #{CREW_MESON_OPTIONS} \
+    system "meson setup #{CREW_MESON_OPTIONS} \
       -Ddisable-mtab=true \
       -Dudevrulesdir=#{CREW_PREFIX}/etc/udev/rules.d/ \
       -Dexamples=true \
diff --git a/packages/libdecor.rb b/packages/libdecor.rb
index 20b2b9eec..914f4802b 100644
--- a/packages/libdecor.rb
+++ b/packages/libdecor.rb
@@ -33,7 +33,7 @@ class Libdecor < Package
   depends_on 'wayland' # R
 
   def self.build
-    system "meson #{CREW_MESON_OPTIONS} \
+    system "meson setup #{CREW_MESON_OPTIONS} \
       -Dlocalstatedir=#{CREW_PREFIX}/var \
       -Dsharedstatedir=#{CREW_PREFIX}/var/lib \
       builddir"