diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:19:36 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-14 23:22:23 +0100 |
| commit | 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch) | |
| tree | 76e74807bc479502e13866b581b6bf86734ec634 /dev-libs/rlottie | |
| parent | 30d6f67c98d149508509d5e86f176d558793acc0 (diff) | |
gentoo resync : 13.10.2019
Diffstat (limited to 'dev-libs/rlottie')
| -rw-r--r-- | dev-libs/rlottie/Manifest | 7 | ||||
| -rw-r--r-- | dev-libs/rlottie/files/rlottie-0.0.1_pre20190920-disable-werror.patch | 11 | ||||
| -rw-r--r-- | dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild | 8 |
3 files changed, 16 insertions, 10 deletions
diff --git a/dev-libs/rlottie/Manifest b/dev-libs/rlottie/Manifest index af0834de785b..20a03f5052b4 100644 --- a/dev-libs/rlottie/Manifest +++ b/dev-libs/rlottie/Manifest @@ -1,7 +1,4 @@ +AUX rlottie-0.0.1_pre20190920-disable-werror.patch 420 BLAKE2B 3b3173c4514227de44f1f953678dcce871b3df07ccbb617d0f8a18763f66dadf584fdacd8eeb31a8391a5b8a8a1c00a05137790ad09662e093eb7888f8f0bb4d SHA512 893b5a658a63e8fe4f62e72e967d9e89eaef8184680c1b753fbc0c0893078bbf963967dd4dadff6a94150b7b15c0b6c7ee7cd54631b6874aa3cf3d21989746ed DIST rlottie-0.0.1_pre20190920.tar.gz 7891127 BLAKE2B bc9e37e74f21f681fffae3e6140662782ebce7bee58c4205cdb9f927f5246aedc83efc516adecf6c61fb5fc06aff58d1c65bfe3cca18d02bf4e9f2d71890869e SHA512 8d903e877cb83fd0af8cb7b6dd96e09a423201c0b88b2c8c733e54bb873a7b48377e5eb8eeefa620e284c2d1b61fcfe0aa309d180c88428aaccdb0f1ac4a48ed -<<<<<<< HEAD -EBUILD rlottie-0.0.1_pre20190920.ebuild 770 BLAKE2B 7d5f3d0524d229d83c8d235c07fb3b075936cdb5358a4690645de10ecdfb9cf646c39ed3a4a1ca2bde1c794ec6f765f44305a903833beee931165afbc021706d SHA512 e20d113e017d1eff974438a21da357a2d3ac04e01b527f3b14f7f8a2e27ece11126c02282e6a88ed7d20d20beedeb33418652bdd78c24b5f8bfd5f7fe0f6c423 -======= -EBUILD rlottie-0.0.1_pre20190920.ebuild 787 BLAKE2B 9c04e9b288dd3d812847bcd7b199fd8bb914e282c198011896eaf1736fc387b3b6736f0cf45d95d87b1a2644340a4c4171b345388fd3d4fbc630e2d6928ca04f SHA512 cdd841c441cfd93432323195515adfdcb79ed6945400e76ccbadbbab9ff456058d47dcacbda3a33091a5af84556cf36011efd974d87d4615643563365c3b71a1 ->>>>>>> next +EBUILD rlottie-0.0.1_pre20190920.ebuild 880 BLAKE2B bd576d345fe17ffdf201b25a1f10dcc1bbcb9c4eb821f619e5d4c770b5a78505a224e34cf82e83dc1dcde2d82263697d0804306d2338ecd506957d2bceb41ff4 SHA512 409b2f0314d061550124f8952dba66594c2291c3c232803acf46fba765d8a01a79ce2d8b19da65c297f27692b7b4108c3e272170a0e02d8ae9537d153ea77f5a MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c diff --git a/dev-libs/rlottie/files/rlottie-0.0.1_pre20190920-disable-werror.patch b/dev-libs/rlottie/files/rlottie-0.0.1_pre20190920-disable-werror.patch new file mode 100644 index 000000000000..60676f7f8e32 --- /dev/null +++ b/dev-libs/rlottie/files/rlottie-0.0.1_pre20190920-disable-werror.patch @@ -0,0 +1,11 @@ +diff -Naur a/meson.build b/meson.build +--- a/meson.build 2019-09-28 08:38:12.810010842 +0300 ++++ b/meson.build 2019-09-28 08:38:47.812649483 +0300 +@@ -1,6 +1,6 @@ + project('rlottie', + 'cpp', +- default_options : ['warning_level=3', 'werror=true', 'cpp_std=c++14', 'optimization=s'], ++ default_options : ['cpp_std=c++14', 'optimization=s'], + version : '0.0.1', + license : 'Apache') + diff --git a/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild b/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild index e7c6b6951e12..24a7d66d956d 100644 --- a/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild +++ b/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild @@ -13,11 +13,7 @@ SRC_URI="https://github.com/Samsung/rlottie/archive/${MY_COMMIT}.tar.gz -> ${P}. LICENSE="BSD FTL LGPL-2.1 MIT" SLOT="0" -<<<<<<< HEAD -KEYWORDS="~amd64 ~x86" -======= -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" ->>>>>>> next +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="test" RESTRICT="!test? ( test )" @@ -26,6 +22,8 @@ DEPEND="test? ( dev-cpp/gtest )" S="${WORKDIR}/rlottie-${MY_COMMIT}" +PATCHES=( "${FILESDIR}"/rlottie-0.0.1_pre20190920-disable-werror.patch ) + src_configure() { local emesonargs=( $(meson_use test) |