From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9A69E15806E for ; Sun, 21 May 2023 07:23:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 347E6E081A; Sun, 21 May 2023 07:23:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A4E6E081A for ; Sun, 21 May 2023 07:23:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 56BC5340D2E for ; Sun, 21 May 2023 07:23:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C3D8A76 for ; Sun, 21 May 2023 07:23:32 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1684538169.c3ed1fb2c6272fb331514c75b11e14bca94e461a.ceamac@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: app-shells/silver/files/, app-shells/silver/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-shells/silver/Manifest app-shells/silver/files/2.0.0-update-openssl-sys.patch app-shells/silver/files/add-gentoo-support.patch app-shells/silver/silver-2.0.0-r1.ebuild app-shells/silver/silver-2.0.0.ebuild X-VCS-Directories: app-shells/silver/ app-shells/silver/files/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: c3ed1fb2c6272fb331514c75b11e14bca94e461a X-VCS-Branch: master Date: Sun, 21 May 2023 07:23:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6a80c0b5-0cb6-43dc-838c-c70ee99489fc X-Archives-Hash: 4de639a3f8d1fc62ca0262d2d79ec97e commit: c3ed1fb2c6272fb331514c75b11e14bca94e461a Author: Leonardo Hernández Hernández proton me> AuthorDate: Fri May 19 23:11:28 2023 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Fri May 19 23:16:09 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c3ed1fb2 app-shells/silver: update openssl-sys crate add missing deps filter LTO if not using clang Closes: https://bugs.gentoo.org/887311 Closes: https://bugs.gentoo.org/901123 Signed-off-by: Leonardo Hernández Hernández proton.me> app-shells/silver/Manifest | 4 +- .../silver/files/2.0.0-update-openssl-sys.patch | 49 ++++++++++++++++++++++ app-shells/silver/files/add-gentoo-support.patch | 11 +---- ...{silver-2.0.0.ebuild => silver-2.0.0-r1.ebuild} | 36 ++++++++++------ 4 files changed, 75 insertions(+), 25 deletions(-) diff --git a/app-shells/silver/Manifest b/app-shells/silver/Manifest index eab3cc2b5..00a10d4e5 100644 --- a/app-shells/silver/Manifest +++ b/app-shells/silver/Manifest @@ -8,7 +8,7 @@ DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434 DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a -DIST cc-1.0.58.crate 52896 BLAKE2B 118619bbe306aef5cb83350ea04a7660a4af2c365a5f0c30d045cdca73f7d68d6646889295590dff29cbf003b44f9b00d5eab22fcde8a57483aec615278dfbb8 SHA512 0a208c4dd7700ba92337ad0044c0ae1614b105d6e799fc660d07e7745c60d8e4c8d3688af7ced77734a2a695ac2e7c565c2f2b7a886d71714c2f7675ea2a22f7 +DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 DIST chrono-0.4.13.crate 144286 BLAKE2B 6ff59ebcd58761852a38fe490a1b2c407d1ca07b046a0980bd1ead9973091de0518e49f4777c8b132e4f82e68b51b4a3624d90e2e09fbc5214df7f2a8a8b9e00 SHA512 02933602df1964df8e91dbab8d1b5baead493ec73d1da4a4e090eeabb3e37b818f0b800a580c13a14aae9c20df83c9f66a713bed02800f5022b2999881dc2f23 DIST clap-3.0.0-beta.2.crate 141105 BLAKE2B 9668e2cc9b2d2f3f063659e45df5e01a3f7c163b21f7d0cc1e8a1a65fe620ff5c1356b2beae71987aced55d58f36c961515e020a87ffdbd1cd2763196437c2f1 SHA512 bb51ab2dfe06eb11023d3933ca7a657e3c9e6fa064cba81e2436450036dca3dcc2ca5a9b90785a0042dd823e57ad1e7dc765b788928c249fd10906329b33cdb7 @@ -54,7 +54,7 @@ DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f DIST once_cell-1.4.0.crate 24625 BLAKE2B 6cfb6ffa2326fb53c4381d4b6a462928f96ad4133c653335c34265a1475c4f50067fcd2a6d9bb0660aab4406401edf02776ceff8d2b43c9d6b443998d2e3cdb7 SHA512 8debf21169653719820c4892ebceda67fedcc3c86e958aec42ade0d38247e12265a0152846f9284c37faa183e452ddf666b117e7ec5c066893cd33ec407dfaa6 DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a -DIST openssl-sys-0.9.58.crate 47014 BLAKE2B a66f90a5cd9fc82ff22ad7481ca9e4a92c78852d25ee4151c09d5a4d23823942c28bed5d96d5130eeae005573d7120e7e5187a071ae81ff10572cebcc7db8b3f SHA512 098993619ea8effaa03ab61a0eaebc938d23cb8e5284b2dd45499972ae4c79abc36cbeeb51f34861a36816de9d02e2cece673f32fd042880669e99cfff181481 +DIST openssl-sys-0.9.87.crate 65702 BLAKE2B 578cab5b9bb3cb4dde866f3492aa3ca36fef7eb5d367ca46f3f93f388121ce131cd85b0b59a703e9bf989a7b891784fb54270027acc00f217356b3d2d9a60bd6 SHA512 b2f8fdd679aac50b2f830db32ca09e203c7d40a6bc0d83dcf66efe641a38a65e86d8ba9881b4fb073069fa54a7ff206e24d28b29788a2cce0c60e5e1e3d3ac39 DIST ordered-multimap-0.2.4.crate 19365 BLAKE2B e8ccbb8b4e49a8848a9ee7433ebf4614ce198908b6b9adcdd3455e0db7607f3c8bb301bd0a919efacd4f6295c4dd23f86aa2ce76c620bd390bf067dff7c7d688 SHA512 46616c3889b3a9d3d294aa858567e38aa736f7e5b8edc55b53401ebba758a5f74c9a2c498b74773a2c7ac52471988a3e6ab954300f753b1633aa8c32c4e67660 DIST os_str_bytes-2.4.0.crate 14657 BLAKE2B 57f8fa434237c9ded24ef10f225b0c46825308c526a523cffa4c334d43c54c4f678beb7eea9fcf8bc246ccb1ee7d72f428a40acf271964fc4d26cd9ab6eb1b0f SHA512 4e06a2c7f5470c56bdf5e06afb5fcaa4001a29c2cd79db6ed9ffb762154ba20bf11dab97ed7cb2f50f53b2e12241b0988bb220b60f4210d4f01fb2f0e1d186e6 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a diff --git a/app-shells/silver/files/2.0.0-update-openssl-sys.patch b/app-shells/silver/files/2.0.0-update-openssl-sys.patch new file mode 100644 index 000000000..dcca5db8e --- /dev/null +++ b/app-shells/silver/files/2.0.0-update-openssl-sys.patch @@ -0,0 +1,49 @@ +From f11431a3c34861cade580f43cefb6d1f1d98335f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= + +Date: Fri, 19 May 2023 16:23:15 -0600 +Subject: [PATCH] Upgraded openssl-sys version on Cargo.lock +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Leonardo Hernández Hernández +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,5 +1,7 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. ++version = 3 ++ + [[package]] + name = "ahash" + version = "0.3.8" +@@ -75,9 +77,9 @@ dependencies = [ + + [[package]] + name = "cc" +-version = "1.0.58" ++version = "1.0.79" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" ++checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + dependencies = [ + "jobserver", + ] +@@ -511,11 +513,10 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" + + [[package]] + name = "openssl-sys" +-version = "0.9.58" ++version = "0.9.87" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" ++checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" + dependencies = [ +- "autocfg", + "cc", + "libc", + "pkg-config", +-- +2.40.1 + diff --git a/app-shells/silver/files/add-gentoo-support.patch b/app-shells/silver/files/add-gentoo-support.patch index f57153779..66d2dc380 100644 --- a/app-shells/silver/files/add-gentoo-support.patch +++ b/app-shells/silver/files/add-gentoo-support.patch @@ -1,15 +1,8 @@ From f379762f622724890693f63b0ab994978f51ef11 Mon Sep 17 00:00:00 2001 -From: Leonardo Hernandez Hernandez +From: Leonardo Hernández Hernández Date: Wed, 15 Sep 2021 23:04:13 -0500 Subject: [PATCH 2/2] Add gentoo support ---- - src/icons.rs | 1 + - src/modules/os.rs | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/icons.rs b/src/icons.rs -index 71f342b..f24ea0e 100644 --- a/src/icons.rs +++ b/src/icons.rs @@ -16,6 +16,7 @@ pub fn get(id: &str) -> String { @@ -20,8 +13,6 @@ index 71f342b..f24ea0e 100644 "elementary" => "\u{f309}", // Font Linux "linux" => "\u{f31a}", // Font Linux "windows" => "\u{f17a}", // Font Awesome; windows -diff --git a/src/modules/os.rs b/src/modules/os.rs -index 57090e8..2d22fe9 100644 --- a/src/modules/os.rs +++ b/src/modules/os.rs @@ -22,6 +22,7 @@ pub fn segment(segment: &mut Segment, _: &[&str]) { diff --git a/app-shells/silver/silver-2.0.0.ebuild b/app-shells/silver/silver-2.0.0-r1.ebuild similarity index 82% rename from app-shells/silver/silver-2.0.0.ebuild rename to app-shells/silver/silver-2.0.0-r1.ebuild index 61280aaa0..b2149218f 100644 --- a/app-shells/silver/silver-2.0.0.ebuild +++ b/app-shells/silver/silver-2.0.0-r1.ebuild @@ -1,6 +1,8 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Autogenerated by pycargoebuild 0.6.3 + EAPI=8 CRATES=" @@ -14,7 +16,7 @@ CRATES=" base64-0.11.0 bitflags-1.2.1 blake2b_simd-0.5.10 - cc-1.0.58 + cc-1.0.79 cfg-if-0.1.10 chrono-0.4.13 clap-3.0.0-beta.2 @@ -60,7 +62,7 @@ CRATES=" num_cpus-1.13.0 once_cell-1.4.0 openssl-probe-0.1.2 - openssl-sys-0.9.58 + openssl-sys-0.9.87 ordered-multimap-0.2.4 os_str_bytes-2.4.0 percent-encoding-2.1.0 @@ -112,36 +114,44 @@ CRATES=" winapi-x86_64-pc-windows-gnu-0.4.0 " -inherit cargo flag-o-matic +inherit cargo flag-o-matic toolchain-funcs DESCRIPTION="A cross-shell customizable powerline-like prompt with icons" -# Double check the homepage as the cargo_metadata crate -# does not provide this value so instead repository is used HOMEPAGE="https://github.com/reujab/silver" -SRC_URI="https://github.com/reujab/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" $(cargo_crate_uris ${CRATES})" +SRC_URI=" + https://github.com/reujab/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + $(cargo_crate_uris) +" -LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 CC0-1.0 MIT Unlicense ZLIB" +LICENSE="MIT" +# Dependent crate licenses +LICENSE+=" BSD-2 CC0-1.0 MIT ZLIB" SLOT="0" KEYWORDS="~amd64" BDEPEND="virtual/pkgconfig" -DEPEND=" - >=dev-libs/libgit2-1.1.0:=[threads] +RDEPEND=" + >=dev-libs/libgit2-1.1.0:=[ssh,threads] + dev-libs/openssl:0= " +DEPEND="${RDEPEND}" DOCS="readme.md" QA_FLAGS_IGNORED="/usr/bin/silver" -PATCHES=( "$FILESDIR/add-gentoo-support.patch" ) +PATCHES=( + "${FILESDIR}"/"${PV}"-update-openssl-sys.patch + "${FILESDIR}"/add-gentoo-support.patch + +) src_configure() { export LIBGIT2_SYS_USE_PKG_CONFIG=1 export PKG_CONFIG_ALLOW_CROSS=1 # Breaks compilation - filter-flags '-flto*' + tc-is-clang || filter-lto } src_install() {