Compare commits
1 commit
main
...
feature/fi
| Author | SHA1 | Date | |
|---|---|---|---|
1d58570419
|
4 changed files with 51 additions and 7 deletions
File diff suppressed because one or more lines are too long
|
|
@ -1,3 +1,4 @@
|
|||
AUX 00_Cargo.toml-3.0.2.patch 1181 BLAKE2B f06fbebc44caf51b31184e16e3ed3eb1f166a37f31c1df9c494b8f5c5c7926dd8601b59885b6a06c475f40d1a66fbbbab049023f95435201e8e90ce7176a9b34 SHA512 b5a469276f15b24592c4e16b6dbc626aa1aaa78804979aff80d289985a1a60086dedabeb566ff9c82a5fd6ebd28b8af2b45217ba225d90aec72904f9c8b94505
|
||||
DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b
|
||||
DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
|
||||
DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
|
||||
|
|
@ -255,9 +256,9 @@ DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353c
|
|||
DIST mio-0.8.8.crate 94264 BLAKE2B f70334d3daa8794079c865c5e91d9b32fee2b90af95a6690f7cbe0765818ed9a0f5d539f3390119565c3ed47025979657e30ee2e871760a776829dcddb59783c SHA512 448a05f19a147fe119965f7f1aaf24c2a40ed816ddf2e5c95ba3bdaded5e2812314c64a50dc7baada93bb005b65159cb6597f82a407936885ea376bb128b0c9a
|
||||
DIST native-tls-0.2.11.crate 29008 BLAKE2B 594511c364e639e309f32f37ae20ecfc5ddeeb39c3f7180c5f3f2cf304d8c323b977af933ffe70cce696a5a63e17c5fa7ddb119d46fc3db819a28e31a388640b SHA512 7e77959932f2859757f1aeb37b78fdd459b7b6fd02424f4b7399525b94c21d1f499a718775503b8f3dfe3b4b740e1cfbee77052a2ebd0994468addb3fa665e6c
|
||||
DIST new_debug_unreachable-1.0.4.crate 2561 BLAKE2B 5c9831b04e2a44b2dd27816df0a331a8108991a84ebdfefe4e42f325ec3519ee50e89a99d490020a65a3d75acc371316c2253d2c6382453a0b15f4c3d5b96520 SHA512 6f964bb322aa8f2ff92078381dd720527600c6449e237b703278cbcf47b39a2581fddfc2f34ebb7cf31229e33d58de48bb5050e083fec6dad9aefddc1d771c85
|
||||
DIST news-flash-2.2.2.crate 149836 BLAKE2B 2f18a0d8e142a51729e4504720ddb4d601f8b8725cb6cc93e97931ac2b5317d67588c55029d4c4cdc18d9f7f950abe9a777020deb8b705ade0c211d6e03c42a2 SHA512 d733685b2cc859b25a45ce7bc3b7c3cd9c7872f8b7e8f4a6ee34380519b7c4a502dbd5363cf2ab6b03a66f6dbef44f0d86dddac182a583f086dab4d14bcceec6
|
||||
DIST news-flash-2.3.0.tar.bz2 2405788 BLAKE2B 27b9f03e1a0712b723c66ddfd4db6b5f9cc30d8872c85229989ccb30e91833fc5703574282c195350f70949c36acc24b4be845cb484a70725bf26f1985578d96 SHA512 a2c69099b9b336b2b537d73bcf4ac2b4062014b1c2e0b07777f7c7e19b126d06235d0d3a1dcdf07670842ae1f4521099499a1ca383299dbca3131c3f01374707
|
||||
DIST news-flash-3.0.2.tar.bz2 3225430 BLAKE2B fa1c19e2836c4f80c4cdb0e229771319a7fc9a42cfc1120f2f2dce639caef7cda8d5911b1d8881505d49e37617cf496a4fb98677d17f2bb6b3ae84d0c5ad3c30 SHA512 e7efcf66afe42dddc460da378e4058b65513078d4850adf475429e00cfac12afa47a188e327412d076cf63e29c70368d09035e013b68a0d2b7452041b2e13a4c
|
||||
DIST news_flash-1e1ae1d7a8750ba23053de7bef84110bca805725.gl.tar.gz 152344 BLAKE2B f05f2ad771f3ac3543e77f20ed12ab921565653e91d090205aa97c3879f861bd275cdb734c9eac21da02fa9914887b3aba48c57a0efec05a2a6e9476344f8045 SHA512 2af6e06d650073c66051b8822bff819b94fdcba37a768cf6f4a09b5e246435a3f8a1c7f3d0e67a85ddc743f15f0eed778849f3fc98698c2e2928f1588c800888
|
||||
DIST newsblur_api-0.1.2.crate 16497 BLAKE2B c0e1c26879efd3668020d49d3307fa5a9e034422fac489aa016f2277567c698e1cb3d16657bda853516dc9eb80facd48054d57856cd48ed24aa5ca1f1a18db8c SHA512 a317ff402fb6deca653f2a90165e0775751f8a61b011a558ff0b0ee020d657e7622d92bf04eddffb0a76fb759e72cdccd6996d6944ef56e61e181dfbaa669f4f
|
||||
DIST nextcloud_news_api-0.1.1.crate 5130 BLAKE2B ee6eadda1c03fbd16397b6096a44de7969d500545c7f830f412a59b173606c3cf9edaf4806cde2419535023f5ff10785affc6e8dbb211e7a5b992ca13b986f22 SHA512 ad6ce44931133826bb9c578f8fc30a0e887424efdbef6d3166e1d59213484285971c318a3ab0d09d3e668d334c4d413dd22bb84d4b557e1a8410a8ff07f39904
|
||||
DIST nix-0.26.4.crate 279099 BLAKE2B 41debf1f21427ad6c25c6cd26b7867feb8ba46366028c4b74073307e902e526543f536fc0a66db2cdc5a52fbbf9166a6a4843aba57e5e5caada3d914286ddd60 SHA512 cc68ff8e3e8ea8635c6fd4c0a866cf42121aa3e25165666ef3b97b5b2c1d9273cba6f689e80eb812b55b5ee513390924a926d95fce45de0a74b98764dd1fa27d
|
||||
|
|
@ -487,5 +488,5 @@ DIST zvariant-3.15.0.crate 72221 BLAKE2B d2bea9c05edfda4a3c27a813a2d5274d3e7e35f
|
|||
DIST zvariant_derive-3.15.0.crate 10943 BLAKE2B e75d5feb9a76b74c7b77d0be8552c06a2323337884c5cae60827bf7c470d0875d2c3d40c393fc84c63789206650100b6726da7e57446958ae07d5c20605905c6 SHA512 262009179f7c5d6b559709be69c89697eccc0202fbe52575f116894390b4443986edf6bf51ad83177423d5713217ec8f0fb9ecd3382960120055666124afabf8
|
||||
DIST zvariant_utils-1.0.1.crate 6223 BLAKE2B ea304bac65493168f1be268192829d5a666a267b1f69533a9d2da2b2d2447d7a9f0f70164d60ab02afd90134e37060f86706bc7047c23aedb198d0834f987d15 SHA512 3cf364d53f1169d5274998c3f06ef1a9371071644b256223441deb004553d4eccbb564305ddc0693cf1b7a595e8c1b989df0f8b4eb8447a72782d7d200120f36
|
||||
EBUILD news-flash-2.3.0-r1.ebuild 816 BLAKE2B 94825dba84a8910f716936b7e0fc4bfd24c07f783ef703788274a2f85a13c7b0a53fb0454521412d4237c4343fd9aa5fba035e5b9349223fc8962eb32afd4f42 SHA512 b927e57454cb7b5d51a9c593b1ea67bf157930856b02a5b3db9c87127751d3eb0bc4dac980b08d75037eab5407a9ca1c61bc8fb24bb2d684a89a51ae5e681685
|
||||
EBUILD news-flash-3.0.2.ebuild 10282 BLAKE2B 80df4db8ce1000b9a5339bf0f031fae13d55fdbd84e83973d541543bd56b1224156591a7475abb63af1c31ffaf70582308c4744d4a59524cd29271dd0dd6218b SHA512 73b0dbd96e062d0324fbb794093601b980fed2e139751ecc0d867cb0f27d04181a77df2d0ba938b2d56a0a79452023407695ccafde50567e9eb5f04366537368
|
||||
EBUILD news-flash-3.0.2.ebuild 10357 BLAKE2B e3126c36bc9ee62b8f21ac93a9d1fa7a2af95ecf3484734d6bbce16cd8aec5e04eaa077a45bee92e00c59fdfa6846877a4cf7d29878b4c36279d1b8352c4bf82 SHA512 90d79853d0d9c804cad1470ec41ee6b4559d06f0a0fd106a8055dcfd28d1bbecb97dac76f83fe03f528008e4a0bc713129a8b984309c1feec5e1c56e6705b07d
|
||||
MISC metadata.xml 338 BLAKE2B e475cd45da0d012d422b50afa024fd65f8987fd8f405b76001fc9d8eb93a97a4460a2f857fec4003fe15fbd43b38c2a8f43fb210f8f192e5d078e47d0f71e489 SHA512 20e088cd3096f52c8c99fb6fa163717cafda08bfd3105aa7d98b176ed39486ca4d9bb9ebdb9306e9512a0c432f4b97de18b16c2fbc86a8b6deca133f3f775979
|
||||
|
|
|
|||
38
net-news/news-flash/files/00_Cargo.toml-3.0.2.patch
Normal file
38
net-news/news-flash/files/00_Cargo.toml-3.0.2.patch
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index cdbff82..be53c4e 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -37,8 +37,9 @@ futures = { version = "0.3", features = ["thread-pool"] }
|
||||
futures-util = "0.3"
|
||||
regex = "1.9"
|
||||
feedly_api = "0.5"
|
||||
-news-flash = { git = "https://gitlab.com/news_flash/news_flash.git" }
|
||||
-#news-flash = { path = "../news_flash_base/" }
|
||||
+#news-flash = { git = "https://gitlab.com/news_flash/news_flash.git" }
|
||||
+#news-flash = { path = "../news_flash-1e1ae1d7a8750ba23053de7bef84110bca805725/" }
|
||||
+news-flash = "2.2.2"
|
||||
clap = { version = "4.4", features = ["derive"] }
|
||||
diffus = { version = "0.10", features = [ "derive" ] }
|
||||
xmltree = "0.10"
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index 492b529..b579b26 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -31,8 +31,6 @@ else
|
||||
message('Building in debug mode')
|
||||
endif
|
||||
|
||||
-cargo_env = [ 'CARGO_HOME=' + meson.project_build_root() / 'cargo-home' ]
|
||||
-
|
||||
cargo_build = custom_target(
|
||||
'cargo-build',
|
||||
build_by_default: true,
|
||||
@@ -42,8 +40,6 @@ cargo_build = custom_target(
|
||||
install: true,
|
||||
install_dir: bindir,
|
||||
command: [
|
||||
- 'env',
|
||||
- cargo_env,
|
||||
cargo, 'build',
|
||||
cargo_options,
|
||||
'&&',
|
||||
|
|
@ -263,6 +263,7 @@ CRATES="
|
|||
mio@0.8.8
|
||||
native-tls@0.2.11
|
||||
new_debug_unreachable@1.0.4
|
||||
news-flash@2.2.2
|
||||
newsblur_api@0.1.2
|
||||
nextcloud_news_api@0.1.1
|
||||
nix@0.26.4
|
||||
|
|
@ -493,9 +494,9 @@ CRATES="
|
|||
zvariant_utils@1.0.1
|
||||
"
|
||||
|
||||
declare -A GIT_CRATES=(
|
||||
[news-flash]="https://gitlab.com/news-flash/news_flash;1e1ae1d7a8750ba23053de7bef84110bca805725;news_flash-%commit%/"
|
||||
)
|
||||
#declare -A GIT_CRATES=(
|
||||
# [news-flash]="https://gitlab.com/news-flash/news_flash;f49e48f7f6def364c0895ca38bf83262fcd6f8ed;news_flash-%commit%/"
|
||||
#)
|
||||
|
||||
inherit cargo meson xdg-utils
|
||||
|
||||
|
|
@ -520,6 +521,10 @@ DEPEND=">=dev-libs/glib-2.70
|
|||
>=net-libs/webkit-gtk-2.42:6"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/00_Cargo.toml-3.0.2.patch"
|
||||
)
|
||||
|
||||
# rust does not use *FLAGS from make.conf, silence portage warning
|
||||
# update with proper path to binaries this crate installs, omit leading /
|
||||
QA_FLAGS_IGNORED="usr/bin/${PN}"
|
||||
|
|
|
|||
Loading…
Reference in a new issue