From 2198f8593ae0312add1bdccb49edfcb935e5f8a6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Dec 2024 02:07:26 +0000 Subject: gentoo auto-resync : 07:12:2024 - 02:07:26 --- dev-build/meson/Manifest | 3 +- .../meson-1.6.0-generate_git-both-libraries.patch | 345 +++++++++++++++++++++ dev-build/meson/meson-1.6.0-r1.ebuild | 191 ++++++++++++ dev-build/meson/meson-1.6.0.ebuild | 190 ------------ 4 files changed, 538 insertions(+), 191 deletions(-) create mode 100644 dev-build/meson/files/meson-1.6.0-generate_git-both-libraries.patch create mode 100644 dev-build/meson/meson-1.6.0-r1.ebuild delete mode 100644 dev-build/meson/meson-1.6.0.ebuild (limited to 'dev-build/meson') diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest index 36f2ddf34e68..a9cf3ca494a2 100644 --- a/dev-build/meson/Manifest +++ b/dev-build/meson/Manifest @@ -1,6 +1,7 @@ AUX 0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch 12301 BLAKE2B 44875bf6aa6e18de99e9c7202cd931f95a43dc29dac69a83cfa1cefbdf5442bc292920bd46b2479e39f150a534afe9f8db72022eb029c344b4c3e5f59a7274a6 SHA512 f106bf93bdedb82d079061715178bb0cbdf333113555ca0f61da0d0112ca6eff08135585d7e442d16a85b65232ff501a33e5ad208d230ea6d9fa10b30271f247 AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d4f9d30e26695b125aa895ec8a48ee0f7355c7692845c0d9bbb59eb452fc0cd8b634bd2a90d8918efa0b65ef4759b56d8e SHA512 725b193afe229690b6ef0d7a2a832695b7c09ca3376512097baec597a84df6e8e18791e9f29221e8a4a3537ad2371672e74041aa05ec6a218ed9b6218ea2ab61 AUX meson-1.2.1-python-path.patch 1233 BLAKE2B 0e40fae6cbb9a66929d7f8d5d4e73f6e0105730722ec8db0236fc5376ad58fb4ef961531bf459d69eb4521efa3d26d74332a97fa0012b6107a49b20a86667c33 SHA512 0f072ff2eb310c9884db2fa255a6b7634d69e28f3a1e9ec3782fe63aeec1b544ff0208c5c087bb29ce08dc28a998482a5d3854bcaac372e958b483830d3c8c08 +AUX meson-1.6.0-generate_git-both-libraries.patch 15642 BLAKE2B e8fcb1edd52d58d532096a8354b3c8e41df9bc5f82949825c73d539653fc51eed2758638f9c02c44207e77581938a268f45f6d30304c7fe2bbeb0d1040216b53 SHA512 a009b36fc8dba8fd5eaa504a69b88d19171b19e0dd5f28d62cecd475afabb9669c1b6db46a6670cbfe6eaf5598dd620c8470b7fe411603ae69ec77f2529e91e8 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a SHA512 c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb DIST meson-1.1.1.tar.gz.asc 833 BLAKE2B 165f3a0e8093995e82efcdea78b8cf0d2479505aeec145cf0c4bf3448dd74f0b5d1631e574e7d945d5b5976e11c065043ab0a6efe5646484a5bcd6386050a073 SHA512 004ec7e530ad21b012e461c8d50322295e4ec96a1a3197dbcbeb24b8bd6465a34008541e6fc547e451a50dce53f7ce170ec1bfd8c465ded56a5924e880aa0539 DIST meson-1.2.3.tar.gz 2184484 BLAKE2B 7d76c54bddba249ab97ebd5dd0afc448177ff9fa70812a8ca0cc9fe308c9b145b3fbc3ee068acae0fdc73edff42134b7a0b618cd80a05347a424aca7bc8bbef8 SHA512 cdcadc731effc1ffb2de98b795ba37955f934ed9b54b9f7f3ac5fe96ab33268d4de4fce734a4c2ef7d2ecc5051616df127e1f8665e197ff954310bf1483b81fc @@ -25,6 +26,6 @@ EBUILD meson-1.3.2.ebuild 3411 BLAKE2B 71d25e070379acab0e87c57fab8226afb5f7939e7 EBUILD meson-1.4.2.ebuild 5079 BLAKE2B 71538d46f5f2d0f34ae4ae2082ff5fa1d37413b769642aa577211502792a234fbdda2c119adcc4e2bab81c64b86bdb9721050c64d2cb3db4083bf403d1e38354 SHA512 d19349b37b49c7c131e89ed3c6f17c52be298295cf9d99d2245cc50dc4d51707fe738b96bea13411f3c4b553c84c6af685c978377526ff3aab4c5706b9e06b3b EBUILD meson-1.5.1.ebuild 4924 BLAKE2B 47ed021c4efbd4192172b27ae7dba70df733f426d068e774e9b0552d26c5c8e6e41fb3e97d1282c3b3543e59225a18a468fb9902bae96efa329ec34955288612 SHA512 597247bf8102f8b8891e17a565c67a9edcb379b8db6bc05f097ae934d27342622474e2ae77ff26306684e7caec487429e57a4c236721dab000afeca7b21fde83 EBUILD meson-1.5.2.ebuild 4927 BLAKE2B 187df2e74851a788fcda20d5d23751287644b3fcccd583101ce5fb2ce65757ad44d90766ee43781332517d6b4f7c6051068044871984262d3bd9aea68c7909f7 SHA512 03e0c192979ddbbbca9d43f6bcfb1cda6e6c1c81c8a50bb41b7468e107de2e66635176708a5b0962cd77c7b3bade9c37a14d5196d0f5cfd2b55b3dcb7a83da2c -EBUILD meson-1.6.0.ebuild 4932 BLAKE2B bf5e036f3addab796648e9bdf5c7062103962530d10cd584a626a915ac10a32d12139504b47daf5e87e3bf7b63e7ded742f8cca0b4b01ec1e702c8ba41cd51e9 SHA512 80cff3afa1c0735ab06bc0747eace6d166286330fb599a090fc64397f772593df0f73540079170bc7956cab7795c696a1debcb7dd5adbb4ca37180c71fb6bdcc +EBUILD meson-1.6.0-r1.ebuild 4986 BLAKE2B ed603f35e0b81a00cbde98062752c4850590271d7543d96685e8764460b94379e7c79c87f6f4116dd6625a63c39a4a8bb69a98a3ea5d06196a2961d3b31861d3 SHA512 b8e71c9ed86f82de2645ccee830bb2b076f89d53dacfe58ad68f3f1c803b873f141e00b835099f38139290807efa5b4fa8bc48de52cf7a3a68a24554a32e8443 EBUILD meson-9999.ebuild 4932 BLAKE2B bf5e036f3addab796648e9bdf5c7062103962530d10cd584a626a915ac10a32d12139504b47daf5e87e3bf7b63e7ded742f8cca0b4b01ec1e702c8ba41cd51e9 SHA512 80cff3afa1c0735ab06bc0747eace6d166286330fb599a090fc64397f772593df0f73540079170bc7956cab7795c696a1debcb7dd5adbb4ca37180c71fb6bdcc MISC metadata.xml 457 BLAKE2B 65bcd07bc76772c13ef3f5cf602206330c3b7456180d140b82ee1ad759762a9d0066b4c60001862ce8e2f99150bea411eb804e5df65ef3f7824dc790626319f3 SHA512 aacb863efe3f8548eb8e97a4be3c013ad8d351c0a6173f6204ac4df46054bddf934bdd6ea5673fbf4671b7aa83405847626393ac012c0db3bbc062c234eec1f3 diff --git a/dev-build/meson/files/meson-1.6.0-generate_git-both-libraries.patch b/dev-build/meson/files/meson-1.6.0-generate_git-both-libraries.patch new file mode 100644 index 000000000000..ed4d4ef7303f --- /dev/null +++ b/dev-build/meson/files/meson-1.6.0-generate_git-both-libraries.patch @@ -0,0 +1,345 @@ +https://bugs.gentoo.org/945770 +https://bugs.gentoo.org/945769 +https://github.com/mesonbuild/meson/issues/13850 +https://github.com/mesonbuild/meson/commit/d8ea5c4d8875bf198f088c603868edf66a3c7c65 + +From d8ea5c4d8875bf198f088c603868edf66a3c7c65 Mon Sep 17 00:00:00 2001 +From: Charles Brunet +Date: Tue, 29 Oct 2024 16:51:36 -0400 +Subject: [PATCH] fix generate_gir with BothLibraries dependency + +Co-authored-by: Xavier Claessens +--- + mesonbuild/build.py | 52 ++++++++++++------- + mesonbuild/interpreter/interpreter.py | 22 ++++---- + mesonbuild/interpreter/interpreterobjects.py | 10 ++-- + .../frameworks/38 gir both_libraries/bar.c | 7 +++ + .../frameworks/38 gir both_libraries/bar.h | 1 + + .../frameworks/38 gir both_libraries/foo.c | 6 +++ + .../frameworks/38 gir both_libraries/foo.h | 1 + + .../38 gir both_libraries/meson.build | 42 +++++++++++++++ + .../38 gir both_libraries/test.json | 3 ++ + 9 files changed, 111 insertions(+), 33 deletions(-) + create mode 100644 test cases/frameworks/38 gir both_libraries/bar.c + create mode 100644 test cases/frameworks/38 gir both_libraries/bar.h + create mode 100644 test cases/frameworks/38 gir both_libraries/foo.c + create mode 100644 test cases/frameworks/38 gir both_libraries/foo.h + create mode 100644 test cases/frameworks/38 gir both_libraries/meson.build + create mode 100644 test cases/frameworks/38 gir both_libraries/test.json + +diff --git a/mesonbuild/build.py b/mesonbuild/build.py +index a00209ad45a8..35f1f24a42f8 100644 +--- a/mesonbuild/build.py ++++ b/mesonbuild/build.py +@@ -774,6 +774,7 @@ def __init__( + } + self.pic = False + self.pie = False ++ self.both_lib: T.Optional[T.Union[StaticLibrary, SharedLibrary]] = None + # Track build_rpath entries so we can remove them at install time + self.rpath_dirs_to_remove: T.Set[bytes] = set() + self.process_sourcelist(sources) +@@ -1740,16 +1741,20 @@ def process_vs_module_defs_kw(self, kwargs: T.Dict[str, T.Any]) -> None: + def extract_targets_as_list(self, kwargs: T.Dict[str, T.Union[LibTypes, T.Sequence[LibTypes]]], key: T.Literal['link_with', 'link_whole']) -> T.List[LibTypes]: + bl_type = self.environment.coredata.get_option(OptionKey('default_both_libraries')) + if bl_type == 'auto': +- bl_type = 'static' if isinstance(self, StaticLibrary) else 'shared' +- +- def _resolve_both_libs(lib: LibTypes) -> LibTypes: +- if isinstance(lib, BothLibraries): +- return lib.get(bl_type) +- return lib ++ if isinstance(self, StaticLibrary): ++ bl_type = 'static' ++ elif isinstance(self, SharedLibrary): ++ bl_type = 'shared' + + self_libs: T.List[LibTypes] = self.link_targets if key == 'link_with' else self.link_whole_targets +- lib_list = listify(kwargs.get(key, [])) + self_libs +- return [_resolve_both_libs(t) for t in lib_list] ++ ++ lib_list = [] ++ for lib in listify(kwargs.get(key, [])) + self_libs: ++ if isinstance(lib, (Target, BothLibraries)): ++ lib_list.append(lib.get(bl_type)) ++ else: ++ lib_list.append(lib) ++ return lib_list + + def get(self, lib_type: T.Literal['static', 'shared', 'auto']) -> LibTypes: + """Base case used by BothLibraries""" +@@ -2204,6 +2209,14 @@ def is_linkable_target(self): + def is_internal(self) -> bool: + return not self.install + ++ def set_shared(self, shared_library: SharedLibrary) -> None: ++ self.both_lib = shared_library ++ ++ def get(self, lib_type: T.Literal['static', 'shared', 'auto']) -> LibTypes: ++ if lib_type == 'shared': ++ return self.both_lib or self ++ return self ++ + class SharedLibrary(BuildTarget): + known_kwargs = known_shlib_kwargs + +@@ -2470,6 +2483,14 @@ def type_suffix(self): + def is_linkable_target(self): + return True + ++ def set_static(self, static_library: StaticLibrary) -> None: ++ self.both_lib = static_library ++ ++ def get(self, lib_type: T.Literal['static', 'shared']) -> LibTypes: ++ if lib_type == 'static': ++ return self.both_lib or self ++ return self ++ + # A shared library that is meant to be used with dlopen rather than linking + # into something else. + class SharedModule(SharedLibrary): +@@ -2506,7 +2527,7 @@ def get_default_install_dir(self) -> T.Union[T.Tuple[str, str], T.Tuple[None, No + return self.environment.get_shared_module_dir(), '{moduledir_shared}' + + class BothLibraries(SecondLevelHolder): +- def __init__(self, shared: SharedLibrary, static: StaticLibrary, preferred_library: Literal['shared', 'static', 'auto']) -> None: ++ def __init__(self, shared: SharedLibrary, static: StaticLibrary, preferred_library: Literal['shared', 'static']) -> None: + self._preferred_library = preferred_library + self.shared = shared + self.static = static +@@ -2914,23 +2935,14 @@ class AliasTarget(RunTarget): + + typename = 'alias' + +- def __init__(self, name: str, dependencies: T.Sequence[T.Union[Target, BothLibraries]], ++ def __init__(self, name: str, dependencies: T.Sequence[Target], + subdir: str, subproject: str, environment: environment.Environment): +- super().__init__(name, [], list(self._deps_generator(dependencies)), subdir, subproject, environment) ++ super().__init__(name, [], dependencies, subdir, subproject, environment) + + def __repr__(self): + repr_str = "<{0} {1}>" + return repr_str.format(self.__class__.__name__, self.get_id()) + +- @staticmethod +- def _deps_generator(dependencies: T.Sequence[T.Union[Target, BothLibraries]]) -> T.Iterator[Target]: +- for dep in dependencies: +- if isinstance(dep, BothLibraries): +- yield dep.shared +- yield dep.static +- else: +- yield dep +- + class Jar(BuildTarget): + known_kwargs = known_jar_kwargs + +diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py +index 58385c58c5f7..10ca3e6bb2e8 100644 +--- a/mesonbuild/interpreter/interpreter.py ++++ b/mesonbuild/interpreter/interpreter.py +@@ -31,7 +31,7 @@ + from ..interpreterbase import Disabler, disablerIfNotFound + from ..interpreterbase import FeatureNew, FeatureDeprecated, FeatureBroken, FeatureNewKwargs + from ..interpreterbase import ObjectHolder, ContextManagerObject +-from ..interpreterbase import stringifyUserArguments, resolve_second_level_holders ++from ..interpreterbase import stringifyUserArguments + from ..modules import ExtensionModule, ModuleObject, MutableModuleObject, NewExtensionModule, NotFoundExtensionModule + from ..optinterpreter import optname_regex + +@@ -681,7 +681,6 @@ def func_files(self, node: mparser.FunctionNode, args: T.Tuple[T.List[str]], kwa + KwargInfo('version', (str, NoneType)), + KwargInfo('objects', ContainerTypeInfo(list, build.ExtractedObjects), listify=True, default=[], since='1.1.0'), + ) +- @noSecondLevelHolderResolving + def func_declare_dependency(self, node: mparser.BaseNode, args: T.List[TYPE_var], + kwargs: kwtypes.FuncDeclareDependency) -> dependencies.Dependency: + deps = kwargs['dependencies'] +@@ -1906,15 +1905,12 @@ def func_jar(self, node: mparser.BaseNode, + @permittedKwargs(known_build_target_kwargs) + @typed_pos_args('build_target', str, varargs=SOURCES_VARARGS) + @typed_kwargs('build_target', *BUILD_TARGET_KWS, allow_unknown=True) +- @noSecondLevelHolderResolving + def func_build_target(self, node: mparser.BaseNode, + args: T.Tuple[str, SourcesVarargsType], + kwargs: kwtypes.BuildTarget + ) -> T.Union[build.Executable, build.StaticLibrary, build.SharedLibrary, + build.SharedModule, build.BothLibraries, build.Jar]: + target_type = kwargs['target_type'] +- if target_type not in {'both_libraries', 'library'}: +- args, kwargs = resolve_second_level_holders(args, kwargs) + + if target_type == 'executable': + return self.build_target(node, args, kwargs, build.Executable) +@@ -2176,13 +2172,19 @@ def func_run_target(self, node: mparser.FunctionNode, args: T.Tuple[str], + @FeatureNew('alias_target', '0.52.0') + @typed_pos_args('alias_target', str, varargs=(build.Target, build.BothLibraries), min_varargs=1) + @noKwargs +- @noSecondLevelHolderResolving + def func_alias_target(self, node: mparser.BaseNode, args: T.Tuple[str, T.List[T.Union[build.Target, build.BothLibraries]]], + kwargs: TYPE_kwargs) -> build.AliasTarget: + name, deps = args + if any(isinstance(d, build.RunTarget) for d in deps): + FeatureNew.single_use('alias_target that depends on run_targets', '0.60.0', self.subproject) +- tg = build.AliasTarget(name, deps, self.subdir, self.subproject, self.environment) ++ real_deps: T.List[build.Target] = [] ++ for d in deps: ++ if isinstance(d, build.BothLibraries): ++ real_deps.append(d.shared) ++ real_deps.append(d.static) ++ else: ++ real_deps.append(d) ++ tg = build.AliasTarget(name, real_deps, self.subdir, self.subproject, self.environment) + self.add_target(name, tg) + return tg + +@@ -3286,16 +3288,18 @@ def build_both_libraries(self, node: mparser.BaseNode, args: T.Tuple[str, Source + # Keep only compilers used for linking + static_lib.compilers = {k: v for k, v in static_lib.compilers.items() if k in compilers.clink_langs} + ++ # Cross reference them to implement as_shared() and as_static() methods. ++ shared_lib.set_static(static_lib) ++ static_lib.set_shared(shared_lib) ++ + return build.BothLibraries(shared_lib, static_lib, preferred_library) + + def build_library(self, node: mparser.BaseNode, args: T.Tuple[str, SourcesVarargsType], kwargs: kwtypes.Library): + default_library = self.coredata.get_option(OptionKey('default_library', subproject=self.subproject)) + assert isinstance(default_library, str), 'for mypy' + if default_library == 'shared': +- args, kwargs = resolve_second_level_holders(args, kwargs) + return self.build_target(node, args, T.cast('kwtypes.StaticLibrary', kwargs), build.SharedLibrary) + elif default_library == 'static': +- args, kwargs = resolve_second_level_holders(args, kwargs) + return self.build_target(node, args, T.cast('kwtypes.SharedLibrary', kwargs), build.StaticLibrary) + elif default_library == 'both': + return self.build_both_libraries(node, args, kwargs) +diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py +index a919102607be..f4a2b4107ed3 100644 +--- a/mesonbuild/interpreter/interpreterobjects.py ++++ b/mesonbuild/interpreter/interpreterobjects.py +@@ -1001,8 +1001,6 @@ class SharedLibraryHolder(BuildTargetHolder[build.SharedLibrary]): + + class BothLibrariesHolder(BuildTargetHolder[build.BothLibraries]): + def __init__(self, libs: build.BothLibraries, interp: 'Interpreter'): +- # FIXME: This build target always represents the shared library, but +- # that should be configurable. + super().__init__(libs, interp) + self.methods.update({'get_shared_lib': self.get_shared_lib_method, + 'get_static_lib': self.get_static_lib_method, +@@ -1017,12 +1015,16 @@ def __repr__(self) -> str: + @noPosargs + @noKwargs + def get_shared_lib_method(self, args: T.List[TYPE_var], kwargs: TYPE_kwargs) -> build.SharedLibrary: +- return self.held_object.shared ++ lib = copy.copy(self.held_object.shared) ++ lib.both_lib = None ++ return lib + + @noPosargs + @noKwargs + def get_static_lib_method(self, args: T.List[TYPE_var], kwargs: TYPE_kwargs) -> build.StaticLibrary: +- return self.held_object.static ++ lib = copy.copy(self.held_object.static) ++ lib.both_lib = None ++ return lib + + class SharedModuleHolder(BuildTargetHolder[build.SharedModule]): + pass +diff --git a/test cases/frameworks/38 gir both_libraries/bar.c b/test cases/frameworks/38 gir both_libraries/bar.c +new file mode 100644 +index 000000000000..4cb41f798294 +--- /dev/null ++++ b/test cases/frameworks/38 gir both_libraries/bar.c +@@ -0,0 +1,7 @@ ++#include "bar.h" ++#include "foo.h" ++ ++int bar_func(void) ++{ ++ return foo_func() + 42; ++} +diff --git a/test cases/frameworks/38 gir both_libraries/bar.h b/test cases/frameworks/38 gir both_libraries/bar.h +new file mode 100644 +index 000000000000..d22827b837f7 +--- /dev/null ++++ b/test cases/frameworks/38 gir both_libraries/bar.h +@@ -0,0 +1 @@ ++int bar_func(void); +diff --git a/test cases/frameworks/38 gir both_libraries/foo.c b/test cases/frameworks/38 gir both_libraries/foo.c +new file mode 100644 +index 000000000000..b88aa91dabb4 +--- /dev/null ++++ b/test cases/frameworks/38 gir both_libraries/foo.c +@@ -0,0 +1,6 @@ ++#include "foo.h" ++ ++int foo_func(void) ++{ ++ return 42; ++} +diff --git a/test cases/frameworks/38 gir both_libraries/foo.h b/test cases/frameworks/38 gir both_libraries/foo.h +new file mode 100644 +index 000000000000..2a0867249307 +--- /dev/null ++++ b/test cases/frameworks/38 gir both_libraries/foo.h +@@ -0,0 +1 @@ ++int foo_func(void); +diff --git a/test cases/frameworks/38 gir both_libraries/meson.build b/test cases/frameworks/38 gir both_libraries/meson.build +new file mode 100644 +index 000000000000..cb9cdd31f3ed +--- /dev/null ++++ b/test cases/frameworks/38 gir both_libraries/meson.build +@@ -0,0 +1,42 @@ ++project('gir both libraries', 'c') ++ ++gir = dependency('gobject-introspection-1.0', required: false) ++if not gir.found() ++ error('MESON_SKIP_TEST gobject-introspection not found.') ++endif ++ ++if host_machine.system() == 'cygwin' ++ # FIXME: g-ir-scanner seems broken on cygwin: ++ # ERROR: can't resolve libraries to shared libraries: foo++ ++ error('MESON_SKIP_TEST g-ir-scanner is broken on cygwin.') ++endif ++ ++gnome = import('gnome') ++ ++# Regression test simulating how GStreamer generate its GIRs. ++# Generated gobject-introspection binaries for every GStreamer libraries must ++# first call gst_init() defined in the main libgstreamer, which means they need ++# to link on that lib. ++# A regression caused by https://github.com/mesonbuild/meson/pull/12632 made ++# Meson not link the binary generated for bar with libfoo in the case it uses ++# both_libraries(). ++ ++libfoo = both_libraries('foo', 'foo.c') ++foo_gir = gnome.generate_gir(libfoo, ++ namespace: 'foo', ++ nsversion: '1.0', ++ sources: ['foo.c', 'foo.h'], ++) ++foo_dep = declare_dependency( ++ link_with: libfoo, ++ sources: foo_gir, ++) ++ ++libbar = both_libraries('bar', 'bar.c', dependencies: foo_dep) ++gnome.generate_gir(libbar, ++ namespace: 'bar', ++ nsversion: '1.0', ++ sources: ['bar.c', 'bar.h'], ++ extra_args: '--add-init-section=extern void foo_func(void);foo_func();', ++ dependencies: foo_dep, ++) +diff --git a/test cases/frameworks/38 gir both_libraries/test.json b/test cases/frameworks/38 gir both_libraries/test.json +new file mode 100644 +index 000000000000..82ac42a293b3 +--- /dev/null ++++ b/test cases/frameworks/38 gir both_libraries/test.json +@@ -0,0 +1,3 @@ ++{ ++ "expect_skip_on_jobname": ["azure", "macos", "msys2", "cygwin"] ++} +\ No newline at end of file + diff --git a/dev-build/meson/meson-1.6.0-r1.ebuild b/dev-build/meson/meson-1.6.0-r1.ebuild new file mode 100644 index 000000000000..22ac4ec4621b --- /dev/null +++ b/dev-build/meson/meson-1.6.0-r1.ebuild @@ -0,0 +1,191 @@ +# Copyright 2016-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} pypy3 ) +DISTUTILS_USE_PEP517=setuptools + +inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://github.com/mesonbuild/meson" + inherit ninja-utils git-r3 + + BDEPEND=" + ${NINJA_DEPEND} + $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + " + +else + inherit verify-sig + + MY_PV=${PV/_/} + MY_P=${P/_/} + S=${WORKDIR}/${MY_P} + + SRC_URI=" + https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz + verify-sig? ( https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc ) + https://github.com/mesonbuild/meson/releases/download/${MY_PV}/meson-reference.3 -> meson-reference-${MY_PV}.3 + " + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi +fi + +DESCRIPTION="Open source build system" +HOMEPAGE="https://mesonbuild.com/" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" + test? ( + dev-libs/glib:2 + dev-libs/gobject-introspection + app-alternatives/ninja + dev-vcs/git + sys-libs/zlib[static-libs(+)] + virtual/pkgconfig + ) +" +RDEPEND=" + !/dev/null) + + ${EPYTHON} -u run_tests.py + ) || die "Testing failed with ${EPYTHON}" +} + +python_install_all() { + distutils-r1_python_install_all + + insinto /usr/share/vim/vimfiles + doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax} + + insinto /usr/share/zsh/site-functions + doins data/shell-completions/zsh/_meson + + dobashcomp data/shell-completions/bash/meson + + if [[ ${PV} = *9999* ]]; then + DESTDIR="${ED}" eninja -C docs/builddir install + else + newman "${DISTDIR}"/meson-reference-${MY_PV}.3 meson-reference.3 + fi +} diff --git a/dev-build/meson/meson-1.6.0.ebuild b/dev-build/meson/meson-1.6.0.ebuild deleted file mode 100644 index 70a2f51176dd..000000000000 --- a/dev-build/meson/meson-1.6.0.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 2016-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} pypy3 ) -DISTUTILS_USE_PEP517=setuptools - -inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/mesonbuild/meson" - inherit ninja-utils git-r3 - - BDEPEND=" - ${NINJA_DEPEND} - $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - " - -else - inherit verify-sig - - MY_PV=${PV/_/} - MY_P=${P/_/} - S=${WORKDIR}/${MY_P} - - SRC_URI=" - https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz - verify-sig? ( https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc ) - https://github.com/mesonbuild/meson/releases/download/${MY_PV}/meson-reference.3 -> meson-reference-${MY_PV}.3 - " - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )" - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - fi -fi - -DESCRIPTION="Open source build system" -HOMEPAGE="https://mesonbuild.com/" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - test? ( - dev-libs/glib:2 - dev-libs/gobject-introspection - app-alternatives/ninja - dev-vcs/git - sys-libs/zlib[static-libs(+)] - virtual/pkgconfig - ) -" -RDEPEND=" - !/dev/null) - - ${EPYTHON} -u run_tests.py - ) || die "Testing failed with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - - insinto /usr/share/vim/vimfiles - doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax} - - insinto /usr/share/zsh/site-functions - doins data/shell-completions/zsh/_meson - - dobashcomp data/shell-completions/bash/meson - - if [[ ${PV} = *9999* ]]; then - DESTDIR="${ED}" eninja -C docs/builddir install - else - newman "${DISTDIR}"/meson-reference-${MY_PV}.3 meson-reference.3 - fi -} -- cgit v1.2.3