summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Jolly <Matt.Jolly@footclan.ninja>2023-05-14 22:48:45 +1000
committerSam James <sam@gentoo.org>2023-05-17 02:33:27 +0100
commit2d2b2b2d6a2438e04b93e40d38935bcb569bee7b (patch)
tree0e38ecdf051a6d3df2b7d26b72969937ec955dce /sys-libs/libmodulemd/files/libmodulemd-2.14.0-meson-version.patch
parentsys-libs/libmodulemd: add 2.15.0 (diff)
downloadgentoo-2d2b2b2d6a2438e04b93e40d38935bcb569bee7b.tar.gz
gentoo-2d2b2b2d6a2438e04b93e40d38935bcb569bee7b.tar.bz2
gentoo-2d2b2b2d6a2438e04b93e40d38935bcb569bee7b.zip
sys-libs/libmodulemd: drop 2.14.0
Signed-off-by: Matt Jolly <Matt.Jolly@footclan.ninja> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-libs/libmodulemd/files/libmodulemd-2.14.0-meson-version.patch')
-rw-r--r--sys-libs/libmodulemd/files/libmodulemd-2.14.0-meson-version.patch61
1 files changed, 0 insertions, 61 deletions
diff --git a/sys-libs/libmodulemd/files/libmodulemd-2.14.0-meson-version.patch b/sys-libs/libmodulemd/files/libmodulemd-2.14.0-meson-version.patch
deleted file mode 100644
index bd006f66310c..000000000000
--- a/sys-libs/libmodulemd/files/libmodulemd-2.14.0-meson-version.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-https://github.com/fedora-modularity/libmodulemd/pull/604
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Fri, 27 Jan 2023 16:03:09 +1100
-Subject: [PATCH] Meson build tidyup
-
-- Set meson_version to actual required version
-- Update deprecated functions to supported equivalents
---- a/meson.build
-+++ b/meson.build
-@@ -15,7 +15,7 @@ project(
- version : '2.14.1',
- default_options : ['buildtype=debugoptimized', 'c_std=c11', 'warning_level=1', 'b_asneeded=true'],
- license : 'MIT',
--meson_version : '>=0.47.0'
-+meson_version : '>=0.58.0'
- )
-
- libmodulemd_version = meson.project_version()
-@@ -58,7 +58,7 @@ rpm = dependency('rpm', required : with_rpmio)
- magic = cc.find_library('magic', required : with_libmagic)
-
- glib = dependency('glib-2.0')
--glib_prefix = glib.get_pkgconfig_variable('prefix')
-+glib_prefix = glib.get_variable(pkgconfig: 'prefix')
-
- bash = find_program('bash')
- sed = find_program('sed')
---- a/modulemd/meson.build
-+++ b/modulemd/meson.build
-@@ -286,9 +286,9 @@ endif
- # Test env with release values
- test_release_env = environment()
- test_release_env.set('LC_ALL', 'C')
--test_release_env.set ('MESON_SOURCE_ROOT', meson.source_root())
--test_release_env.set ('MESON_BUILD_ROOT', meson.build_root())
--test_release_env.set ('TEST_DATA_PATH', meson.source_root() + '/modulemd/tests/test_data')
-+test_release_env.set ('MESON_SOURCE_ROOT', meson.project_source_root())
-+test_release_env.set ('MESON_BUILD_ROOT', meson.project_build_root())
-+test_release_env.set ('TEST_DATA_PATH', meson.project_source_root() + '/modulemd/tests/test_data')
-
- # Test env with fatal warnings and criticals
- test_env = test_release_env
-@@ -304,9 +304,9 @@ py_test_env = test_env
- if not test_installed_lib
- # If we're testing an installed version, we want to use the default
- # locations for these paths.
-- py_test_env.set ('GI_TYPELIB_PATH', meson.build_root() + '/modulemd')
-- py_test_env.set ('LD_LIBRARY_PATH', meson.build_root() + '/modulemd')
-- py_test_env.set ('PYTHONPATH', meson.source_root())
-+ py_test_env.set ('GI_TYPELIB_PATH', meson.project_build_root() + '/modulemd')
-+ py_test_env.set ('LD_LIBRARY_PATH', meson.project_build_root() + '/modulemd')
-+ py_test_env.set ('PYTHONPATH', meson.project_source_root())
-
- # This test is just to catch whether we are accidentally not testing
- # the built version.
-@@ -558,5 +558,3 @@ test('test_import_headers', import_header_script,
- args : modulemd_hdrs,
- timeout : 300,
- suite : ['smoketest', 'ci'])
--
--