From d34cc20043c68d0ecabda6a80c167a7480a2c19d Mon Sep 17 00:00:00 2001 From: Alarig Le Lay Date: Mon, 6 Apr 2020 23:51:59 +0200 Subject: [PATCH] net-im/fractal: Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Alarig Le Lay --- net-im/fractal/Manifest | 1 - .../files/fractal-fractal-gtk-cargo.toml.patch | 9 ++++----- net-im/fractal/fractal-4.2.0.ebuild | 15 ++++++--------- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/net-im/fractal/Manifest b/net-im/fractal/Manifest index ed173df..9f6164e 100644 --- a/net-im/fractal/Manifest +++ b/net-im/fractal/Manifest @@ -76,7 +76,6 @@ DIST gdk-pixbuf-sys-0.9.0.crate 8489 BLAKE2B 544a317f1dc9f0f6fbfd8f17068660618e4 DIST gdk-sys-0.9.0.crate 59791 BLAKE2B 8d49e1da1e13c71673d93ac2a907b121ce6592fc283304c0019084a82e5fdff0cbea73023643d302f078bfccc55ae9034f7913f0a69d73c0fae475a141d4130b SHA512 01bb69387a01016b0d7016d3c41e43535b6308358391650fa004e21fca0ef63165358d7ad650c0e1888ef65e18a11139ecef6fdaa60bf104501abcdfae0a5d14 DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8 DIST getrandom-0.1.6.crate 18529 BLAKE2B 11b9f6475686f59ac710705c2ffb3de3e248cc38c4da8c0d00e7ec938adcc4ffdb120a472d5a9416a9093f62c77a1565ef42a9614d7bfbe5a48aa460a16e4ebd SHA512 e4426a90e1a942344568c087b27a7e7f483e715947ddf25b5a2671b7844b646d09033994a810c9bc96c905d75bf0552e217cf93526a6294a73cb3ddc02540801 -DIST gettext-sys-0.19.8.crate 7215851 BLAKE2B 80680f6a27cc61db4db1ebdfb86edda0bfa0bc5b44e3053b8b0e7c01488b5e8715405b2053a685afebd1742f2f00c05c660c9ed3682a08509aac2462946ad7b6 SHA512 aa200f5f43e3ffe26ffea50c1f5e0f1d201c6afc2526ec6289897f321d09beb75a0f43374390185e216b7b54703e9ba5d1e54db5ee6b099c8d6d44ae353683ff DIST gio-0.7.0.crate 123602 BLAKE2B 6f1d4e5f1bcba83495c5c5181d7ac39b437c33ff016d26292763266a49aca4320e2db9ae8dd5c2a1036739a10c709133575e411bcc24f80eda7f294b3df2a61b SHA512 2d46776fc64b9d63fd8dbd485ea3fc80a49bb86ff945628c81f33f877243c747fadae3bbb6ce228ca3e96870655a57c4d2881ee1454da2e310a7ad83d4a0e952 DIST gio-sys-0.9.0.crate 68946 BLAKE2B 498271d0d2b2d03cd23afa006e2f6219756e5f7db81f266f2041da79d6d39c3f4e30fe8bc390be33b051ea06b3fc66c2cbb909b90d334efd255dfba63db765dd SHA512 60011e8128f99bf436df002e020d16b7cbdfee20569b401c9a7a4a23a18204e067fd58cdca911b343e85c28e7363f2158334149536c10360741f988ad3cf4a7f DIST glib-0.8.0.crate 121203 BLAKE2B 164e97709a7326c6bfa67d13731b1b2688016024d6ad88171e63df7b86e4dde9d6b9fad20d45172278fdd497fa6b9e7c2cddb436816c5b7e83445df6c45aa414 SHA512 752f498090b0b8b448fec4437a66d7ba3548881ba5904b0894d7dbdad547b931395f62cdc7b85267d96c4414c91458de3be6f743d7513baf7c1c83a79d102a5b diff --git a/net-im/fractal/files/fractal-fractal-gtk-cargo.toml.patch b/net-im/fractal/files/fractal-fractal-gtk-cargo.toml.patch index f754fe1..b7bccd0 100644 --- a/net-im/fractal/files/fractal-fractal-gtk-cargo.toml.patch +++ b/net-im/fractal/files/fractal-fractal-gtk-cargo.toml.patch @@ -1,14 +1,13 @@ --- a/fractal-gtk/Cargo.toml 2020-04-06 00:04:59.544718620 +0200 +++ b/fractal-gtk/Cargo.toml 2020-04-06 00:06:24.840122493 +0200 -@@ -58,9 +58,8 @@ +@@ -58,8 +58,8 @@ features = ["v0_0_10"] - + [dependencies.gettext-rs] -git = "https://github.com/danigm/gettext-rs" -branch = "no-gettext" --features = ["gettext-system"] +path = "../../cargo_home/gentoo/gettext-rs-0.4.1" +package = "gettext-rs" - + features = ["gettext-system"] + [dependencies.gtk] - version = "0.7.0" diff --git a/net-im/fractal/fractal-4.2.0.ebuild b/net-im/fractal/fractal-4.2.0.ebuild index 346e563..b03473d 100644 --- a/net-im/fractal/fractal-4.2.0.ebuild +++ b/net-im/fractal/fractal-4.2.0.ebuild @@ -81,7 +81,6 @@ gdk-pixbuf-sys-0.9.0 gdk-sys-0.9.0 generic-array-0.12.3 getrandom-0.1.6 -gettext-sys-0.19.8 gio-0.7.0 gio-sys-0.9.0 glib-0.8.0 @@ -334,17 +333,19 @@ src_unpack() { EGIT_REPO_URI="https://github.com/danigm/gettext-rs" EGIT_BRANCH="no-gettext" - EGIT_COMMIT="6b0f498c45bab57081701cf95dadd5e65107de06" + EGIT_COMMIT="c514bbe52ef892e3c0689eb474c564949d15e145" EGIT_CHECKOUT_DIR="${ECARGO_VENDOR}"/gettext-rs-0.4.1 - git-r3_fetch + git-r3_fetch "${EGIT_REPO_URI}" refs/tags/0.4.1.no-gettext git-r3_checkout - cat <<- EOF > ${ECARGO_VENDOR}/gettext-rs-0.4.1/.cargo-checksum.json + cat <<- EOF > "${EGIT_CHECKOUT_DIR}"/.cargo-checksum.json { - "package": "$(tar -zcf - \"${ECARGO_VENDOR}/gettext-rs-0.4.1/\" | \ + "package": "$(tar -zcf - ${EGIT_CHECKOUT_DIR} | \ sha256sum - | cut -d ' ' -f 1)", "files": {} } EOF + touch "${EGIT_CHECKOUT_DIR}"/.cargo.ok + cp -r "${EGIT_CHECKOUT_DIR}" "${ECARGO_VENDOR}"/gettext-sys-0.19.8 } src_configure() { @@ -355,10 +356,6 @@ src_configure() { } src_compile() { - cd fractal-gtk || die - cargo_src_compile - - cd "${S}" meson_src_compile }