diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
commit | deba8115d2c2af26df42966b91ef04ff4dd79cde (patch) | |
tree | 9a48f42594e1a9e6b2020d5535a784314434d7a7 /dev-libs/libjcat/files | |
parent | 38423c67c8a23f6a1bc42038193182e2da3116eb (diff) |
gentoo resync : 14.05.2020
Diffstat (limited to 'dev-libs/libjcat/files')
-rw-r--r-- | dev-libs/libjcat/files/libjcat-0.1.0-disable_installed_tests.patch | 45 | ||||
-rw-r--r-- | dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch | 29 |
2 files changed, 0 insertions, 74 deletions
diff --git a/dev-libs/libjcat/files/libjcat-0.1.0-disable_installed_tests.patch b/dev-libs/libjcat/files/libjcat-0.1.0-disable_installed_tests.patch deleted file mode 100644 index 823d713b7918..000000000000 --- a/dev-libs/libjcat/files/libjcat-0.1.0-disable_installed_tests.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/data/tests/colorhug/meson.build -+++ b/data/tests/colorhug/meson.build -@@ -1,9 +1,11 @@ -+if false - install_data([ - 'firmware.bin', - 'firmware.bin.asc', - ], - install_dir: installed_test_datadir, - ) -+endif - - if get_option('pkcs7') - # generate self-signed detached signature -@@ -16,7 +18,7 @@ - '--load-certificate', pkcs7_certificate, - '--infile', '@INPUT@', - '--outfile', '@OUTPUT@'], -- install: true, -+ install: false, - install_dir: installed_test_datadir, - ) - endif ---- a/data/tests/meson.build -+++ b/data/tests/meson.build -@@ -2,7 +2,7 @@ - input : 'libjcat.test.in', - output : 'libjcat.test', - configuration : conf, -- install: true, -+ install: false, - install_dir: installed_test_datadir, - ) - ---- a/libjcat/meson.build -+++ b/libjcat/meson.build -@@ -225,7 +225,7 @@ - '-DTESTDATADIR_SRC="' + testdatadir_src + '"', - '-DTESTDATADIR_DST="' + testdatadir_dst + '"', - ], -- install : true, -+ install : false, - install_dir : installed_test_bindir - ) - test('jcat-self-test', e) diff --git a/dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch b/dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch deleted file mode 100644 index 9cbc63a08c01..000000000000 --- a/dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch +++ /dev/null @@ -1,29 +0,0 @@ -By default generate-version-script.py uses /usr/bin/python3, whatever -version that may be - which causes problems if the default python3 -installation is one either built without XML support or not included -in PYTHON_TARGETS of dev-python/setuptools. Make sure the script is -invoked using the same interpreter as meson itself, as that one is -already guaranteed to provide both 'xml' and 'pkg_resources'. - ---- a/libjcat/meson.build -+++ b/libjcat/meson.build -@@ -129,6 +129,11 @@ - install : true, - ) - -+ # Make sure generate-version-script.py is invoked by the same python as meson, -+ # as that one must already have both XML support and setuptools. -+ python = import('python') -+ python_interpreter = python.find_installation() -+ - # Verify the map file is correct -- note we can't actually use the generated - # file for two reasons: - # -@@ -141,6 +146,7 @@ - input: jcat_gir[0], - output: 'jcat.map', - command: [ -+ python_interpreter, - join_paths(meson.source_root(), 'contrib', 'generate-version-script.py'), - 'LIBJCAT', - '@INPUT@', |