diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2023-05-17 07:04:43 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2023-05-17 07:04:43 +0000 |
| commit | ddb6772e475a63f2fb190192cb10cb9990ed89f5 (patch) | |
| tree | 9c6181daa4caa0aefff8c2c1b007d5e589869b03 /sys-libs/libmodulemd | |
| parent | e57ff46413c1333f51a460fd1856946a87f82db3 (diff) | |
| download | baldeagleos-repo-ddb6772e475a63f2fb190192cb10cb9990ed89f5.tar.gz baldeagleos-repo-ddb6772e475a63f2fb190192cb10cb9990ed89f5.tar.xz baldeagleos-repo-ddb6772e475a63f2fb190192cb10cb9990ed89f5.zip | |
Adding metadata
Diffstat (limited to 'sys-libs/libmodulemd')
| -rw-r--r-- | sys-libs/libmodulemd/Manifest | 2 | ||||
| -rw-r--r-- | sys-libs/libmodulemd/files/libmodulemd-2.14.0-meson-version.patch | 61 | ||||
| -rw-r--r-- | sys-libs/libmodulemd/libmodulemd-2.15.0.ebuild (renamed from sys-libs/libmodulemd/libmodulemd-2.14.0.ebuild) | 2 |
3 files changed, 1 insertions, 64 deletions
diff --git a/sys-libs/libmodulemd/Manifest b/sys-libs/libmodulemd/Manifest index 4fb43efeb856..a287407d75ca 100644 --- a/sys-libs/libmodulemd/Manifest +++ b/sys-libs/libmodulemd/Manifest @@ -1 +1 @@ -DIST libmodulemd-2.14.0.tar.gz 531166 BLAKE2B 18c3693ef9f74c57c71c7bd80b16d60d0fc2c8732994acae9b8461af5776bfcf8b856eef65222470d070fd256c6ee1468f961ba20b4425502f946d3368e5708c SHA512 dee8e08ada4e246179f88342cd3d3d6736f430b362e36ab1a3605971033ad306a5bf415141a09180a7ea6e70d1532d63d815ca07f208222447b455b9ff0e6f75 +DIST libmodulemd-2.15.0.tar.gz 572396 BLAKE2B 39e9240deb4e1a3278bf323e111b137b980ac5a3069598b7306390d27623730ac1bc826c91ed049257c0d5de8c6a05c3bbc22ac8e9435b5c38c147f0f077ec41 SHA512 6e890952bf6b6fe3ee5790ff71866938627134eaa2d6c6e3bf1940dcf21203dc0101f487801d62f3698e5a50402eb089665c99723aeffd831e5f0b341a63aace 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']) -- -- diff --git a/sys-libs/libmodulemd/libmodulemd-2.14.0.ebuild b/sys-libs/libmodulemd/libmodulemd-2.15.0.ebuild index 610b7280e965..3d9a8472688d 100644 --- a/sys-libs/libmodulemd/libmodulemd-2.14.0.ebuild +++ b/sys-libs/libmodulemd/libmodulemd-2.15.0.ebuild @@ -48,8 +48,6 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}"/${P}-meson-version.patch ) - src_configure() { local emesonargs=( $(meson_use gtk-doc with_docs) |
