diff options
Diffstat (limited to 'sci-libs/oce')
| -rw-r--r-- | sci-libs/oce/Manifest | 3 | ||||
| -rw-r--r-- | sci-libs/oce/files/oce-0.18.3-test-fix.patch | 13 | ||||
| -rw-r--r-- | sci-libs/oce/oce-0.18.3-r1.ebuild (renamed from sci-libs/oce/oce-0.18.3.ebuild) | 4 |
3 files changed, 18 insertions, 2 deletions
diff --git a/sci-libs/oce/Manifest b/sci-libs/oce/Manifest index a752ebf3f6ce..fe29e968db28 100644 --- a/sci-libs/oce/Manifest +++ b/sci-libs/oce/Manifest @@ -1,3 +1,4 @@ +AUX oce-0.18.3-test-fix.patch 1273 BLAKE2B 40c3fec8e3d5b703c39a2eee32d663e6dc7c6a1bad6a9885608679cb86f8047d6a50e1f625beac50dca045393f0d0290b5ca9d56a7498ba869a4af5028eb1fa0 SHA512 822bee12ee259801a3a242d3877fa3c6dd07043f65857d635a4790cdfd936be4016d1441e4dd3b8e7ff1cd1d187d1ab8fc7634e39376e91d06d8666d38632689 DIST OCE-0.18.3.tar.gz 24633768 BLAKE2B c1923fb6310ea30318251fedac371655a575bf4dfcc4c38e7c748d316416e08c33a3f27bd5db7f5b437265cf2f518651d69a6920f9f487dc7e0065a6406c653f SHA512 6fdeb6ca4ce25361379872ccc465799d4a43407974c4f626b32df695e582b9e553cce17af6a6a7ff46ebed9b813d910ad23eb308a5356dabb9b9bbd4f42a8636 -EBUILD oce-0.18.3.ebuild 1763 BLAKE2B 13ffa2330159736666b46f07fb2592fc03a26d07d9f7bde82b28a735f552dde34cf84aba642b04dddd69862c2c25a1d1bec0b273953cdc8f2e346e75b301ab84 SHA512 934ce2c83353e8879b8b104fef7fb6c0aad2f688ac86279921b2c605edaf3c94aab1f0552fa157018ccd79e547dae6158a6cf6edf5d5a9768ec62d39303fbcf5 +EBUILD oce-0.18.3-r1.ebuild 1809 BLAKE2B d2c1de828d9b1845077f114fe78af3061bcb3d30d15217144c21c6b7f2cadade1b0b3370f8802602ef6397c39956c58f7a0a933e237955afbb197fe2486b3369 SHA512 9537e2bf8ff0234ddbb87c9e4ac42021545167e544f10f947b8f24cdf90bbb319247f213d75ffdf36419e5a8df111d302d44f57586442184f1b124e3d2d23dfe MISC metadata.xml 900 BLAKE2B aec66b3c98aaaadf1727f4522a79ad01e8d195ac62799a5112a2d61ca9d916635ff110f99840f97ebad81a1324780d15218757c1b982536ae9e14945699e6b5b SHA512 86a44a573579df2416b949b62fe931172681f36bf7af9f90f7224e3fc433cb7091c3ef757581337aa87d80962a4800fa03e005e5360233f570f7d926553735ba diff --git a/sci-libs/oce/files/oce-0.18.3-test-fix.patch b/sci-libs/oce/files/oce-0.18.3-test-fix.patch new file mode 100644 index 000000000000..bec55d9d36b4 --- /dev/null +++ b/sci-libs/oce/files/oce-0.18.3-test-fix.patch @@ -0,0 +1,13 @@ +diff --git a/test/OCAFExport_test/CMakeLists.txt b/test/OCAFExport_test/CMakeLists.txt +index f81798a3a4..8d9f6ad86c 100644 +--- a/test/OCAFExport_test/CMakeLists.txt ++++ b/test/OCAFExport_test/CMakeLists.txt +@@ -5,6 +5,6 @@ if (OCE_OCAF AND NOT OCE_DISABLE_X11) + file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../src/StdResource" BuildPluginDir) + # Semi-colon is a delimiter in SET_TESTS_PROPERTIES and have to be escaped + string(REPLACE ";" "\\;" BuildPluginDir "${BuildPluginDir}") +- set_tests_properties(OCAFExportTestSuite.testExportAscii PROPERTIES ENVIRONMENT "CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir}") +- set_tests_properties(OCAFExportTestSuite.testExportNonAscii PROPERTIES ENVIRONMENT "CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir}") ++ set_tests_properties(OCAFExportTestSuite.testExportAscii PROPERTIES ENVIRONMENT "CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir};LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}") ++ set_tests_properties(OCAFExportTestSuite.testExportNonAscii PROPERTIES ENVIRONMENT "CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir};LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}") + endif () diff --git a/sci-libs/oce/oce-0.18.3.ebuild b/sci-libs/oce/oce-0.18.3-r1.ebuild index 69c85c7057f2..0835a64d2bf5 100644 --- a/sci-libs/oce/oce-0.18.3.ebuild +++ b/sci-libs/oce/oce-0.18.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -37,6 +37,8 @@ RDEPEND="${DEPEND}" CHECKREQS_MEMORY="256M" CHECKREQS_DISK_BUILD="3584M" +PATCHES=( "${FILESDIR}"/"${P}-test-fix.patch" ) + pkg_setup() { check-reqs_pkg_setup } |