File fix-meson-warning.patch of Package epic-asset-manager

Overview Repositories Revisions Requests Users Attributes Meta

File fix-meson-warning.patch of Package epic-asset-manager (Revision 7a91b68a79af924ff821e4d1545fc5fe)

Currently displaying revision 7a91b68a79af924ff821e4d1545fc5fe , Show latest

From 7994b9ac986fb8bb7aa54fc9921c8bffd1c281fd Mon Sep 17 00:00:00 2001
From: AFCMS <afcm.contact@gmail.com>
Date: Wed, 26 Jul 2023 13:38:25 +0200
Subject: [PATCH 1/2] Replace deprecated meson build functions

---
 meson.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index b4a7f1f..a14b119 100644
--- a/meson.build
+++ b/meson.build
@@ -34,7 +34,7 @@ if get_option('windows')
     datadir = 'data'
     pkgdatadir = datadir
     iconsdir = datadir / 'icons'
-    podir = meson.source_root() / 'po'
+    podir = meson.project_source_root() / 'po'
 else
     prefix = get_option('prefix')
     bindir = prefix / get_option('bindir')
@@ -43,7 +43,7 @@ else
     datadir = prefix / get_option('datadir')
     pkgdatadir = datadir / meson.project_name()
     iconsdir = datadir / 'icons'
-    podir = meson.source_root() / 'po'
+    podir = meson.project_source_root() / 'po'
 endif
 gettext_package = meson.project_name()
 
@@ -64,8 +64,8 @@ endif
 
 meson.add_dist_script(
   'build-aux/dist-vendor.sh',
-  meson.build_root() / 'meson-dist' / meson.project_name() + '-' + version,
-  meson.source_root()
+  meson.project_build_root() / 'meson-dist' / meson.project_name() + '-' + version,
+  meson.project_source_root()
 )
 
 if get_option('profile') == 'development'

From 80fb9d433b7a300e1218af3f840e3ebff8577fbe Mon Sep 17 00:00:00 2001
From: AFCMS <afcm.contact@gmail.com>
Date: Wed, 26 Jul 2023 14:24:36 +0200
Subject: [PATCH 2/2] Set run_command check parameter to true in Meson build

---
 meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index a14b119..d1ece81 100644
--- a/meson.build
+++ b/meson.build
@@ -49,7 +49,7 @@ gettext_package = meson.project_name()
 
 if get_option('profile') == 'development'
   profile = 'Devel'
-  vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
+  vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD', check: true).stdout().strip()
   if vcs_tag == ''
     version_suffix = '-devel'
   else
@@ -71,7 +71,7 @@ meson.add_dist_script(
 if get_option('profile') == 'development'
   # Setup pre-commit hook for ensuring coding style is always consistent
   message('Setting up git pre-commit hook..')
-  run_command('cp', '-f', 'hooks/pre-commit.hook', '.git/hooks/pre-commit')
+  run_command('cp', '-f', 'hooks/pre-commit.hook', '.git/hooks/pre-commit', check: true)
 endif
 
 subdir('data')

Places

File fix-meson-warning.patch of Package epic-asset-manager (Revision 7a91b68a79af924ff821e4d1545fc5fe)

Places