* [gentoo-commits] repo/gentoo:master commit in: gnome-base/librsvg/files/, gnome-base/librsvg/
@ 2024-11-09 11:07 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-11-09 11:07 UTC (permalink / raw
To: gentoo-commits
commit: 61a8461e75af245b425895765e23dc7a241ef5e7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 9 11:05:51 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 9 11:06:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61a8461e
gnome-base/librsvg: backport time crate update to 2.57.3, 2.58.2
Backport the changes from 5c3fde3d2ed0b76356131adfa7ba6ed8fd29cf1f so
that people don't need 3 Rust slots installed.
Signed-off-by: Sam James <sam <AT> gentoo.org>
gnome-base/librsvg/Manifest | 4 --
.../files/librsvg-2.57.3-time-rust-1.80.patch | 46 ++++++++++++++++++++++
gnome-base/librsvg/librsvg-2.57.3-r2.ebuild | 10 +++--
gnome-base/librsvg/librsvg-2.58.2-r2.ebuild | 9 +++--
4 files changed, 59 insertions(+), 10 deletions(-)
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 93b89f47b303..31a2300c35c4 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -309,12 +309,8 @@ DIST thiserror-1.0.56.crate 20592 BLAKE2B e98c8bba8d21342c981646e88b72a7cbc146c6
DIST thiserror-impl-1.0.50.crate 15357 BLAKE2B 41309507014a2c628b7e91d250335070e4cca6c6c452c90ee7e6173bed049df83ca197b37c16537cf15415550919c248e0f6c798aead760e7bbcd25eab701d50 SHA512 8555e010f94390e93ba757bce9ef25d066ed542f23b843db431a66fbab722584ea0ce6c9d4b6f4d92cea3d91c190336abd567c4a0aa4a27893db25720c5b89c9
DIST thiserror-impl-1.0.56.crate 15367 BLAKE2B 6fad787eb1e2c0f25fee7bef160be794fb8000a0aa292ec0d2d66d7a4d1fcb226c3e2e690ff6a61ba2d8704208014eea84044dba27523d4b2c26d2f7d4ba64d5 SHA512 da66f4674cf699083f7142f3a60c1c9334767b4de3690b4c7af460ffda787fab2089f5bca231e92b6e71724d46fe7dbdcaa19073f5d8100838536d10971efbde
DIST tiff-0.9.1.crate 1423953 BLAKE2B d01949cc3a76a32f2e802a151a4c1d4bbe47c7f217f198f940293d02fd6a1a6d3087c66b3fbc099da3e155f959774d2a9d4d8c5f5f00cd6486f5f44571a1dedd SHA512 82419e671c6a896f1d639d46a3c5a019e3bff6c75d961b838f5311e5ecb31c3baafc5f88fe928e88f6b3b31881a867ea4ca9905f43e3e24f77f183260dc27b93
-DIST time-0.3.30.crate 120289 BLAKE2B 917b71ea8362ca14f2564706919e7e62ebd3e8024d48ebcd9ac9799368a12f425b982a7739a73c025155d5dd0650ef8c9fd4642c60a9111294cad7ac2e30672c SHA512 268f0c779e2a44431932aa407f39878ff1412e287f9678574537fe7185f12faf7605c5ef433aa6d364bf77894e819ff3953f870ef7ad208b7203f1c58eccc4e5
-DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116
DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
-DIST time-macros-0.2.15.crate 23568 BLAKE2B ed16207f302e03095e726f0087f9f7c1514cd71b68a17ac804424c526349838171f3bda62d442b8429a89adb084cca1a4117828c3d66d20f2ff8272d7cb2d3a6 SHA512 d6da54996ab99a46b2b2cef83cec62eca2462490db439ba9814502f7d5ecc3018eb266b29453d601677a0ef39797da77a106d407e0e5de3b110ec1c5ae2f3c6b
-DIST time-macros-0.2.17.crate 24443 BLAKE2B 5045af9352961db0c97cae2f6ca3e8d2c4f89a129c7ac2ec1d8d20804292aa9f2901a61f910a564954614b68f39311bd381deeb66fed8bdac423227d077f3d14 SHA512 c81747f0b74e68d3b3f36d378ac5911dece8c6b511e5ac793807f854cc31c812b927d0df941f55ff90d3d67512d0ac6a5f63f2de4322c81b05da42f46b4a661c
DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
diff --git a/gnome-base/librsvg/files/librsvg-2.57.3-time-rust-1.80.patch b/gnome-base/librsvg/files/librsvg-2.57.3-time-rust-1.80.patch
new file mode 100644
index 000000000000..0cd4fb77f0da
--- /dev/null
+++ b/gnome-base/librsvg/files/librsvg-2.57.3-time-rust-1.80.patch
@@ -0,0 +1,46 @@
+Needed for compat w/ >=rust-1.80. The time crate is only used for tests.
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1217,6 +1217,12 @@ dependencies = [
+ "num-traits",
+ ]
+
++[[package]]
++name = "num-conv"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
++
+ [[package]]
+ name = "num-integer"
+ version = "0.1.45"
+@@ -2109,12 +2115,13 @@ dependencies = [
+
+ [[package]]
+ name = "time"
+-version = "0.3.30"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+ "deranged",
+ "itoa",
++ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+@@ -2129,10 +2136,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+ [[package]]
+ name = "time-macros"
+-version = "0.2.15"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
++ "num-conv",
+ "time-core",
+ ]
+
diff --git a/gnome-base/librsvg/librsvg-2.57.3-r2.ebuild b/gnome-base/librsvg/librsvg-2.57.3-r2.ebuild
index c5a49fa7c29d..92a57c008000 100644
--- a/gnome-base/librsvg/librsvg-2.57.3-r2.ebuild
+++ b/gnome-base/librsvg/librsvg-2.57.3-r2.ebuild
@@ -131,6 +131,7 @@ CRATES="
nom@7.1.3
normalize-line-endings@0.3.0
num-complex@0.4.4
+ num-conv@0.1.0
num-integer@0.1.45
num-rational@0.4.1
num-traits@0.2.17
@@ -220,8 +221,8 @@ CRATES="
thiserror-impl@1.0.50
thiserror@1.0.50
time-core@0.1.2
- time-macros@0.2.15
- time@0.3.30
+ time-macros@0.2.18
+ time@0.3.36
tinytemplate@1.2.1
tinyvec@1.6.0
tinyvec_macros@0.1.1
@@ -277,7 +278,6 @@ CRATES="
yeslogic-fontconfig-sys@4.0.1
"
-RUST_MAX_VER="1.79.0"
RUST_USEDEP='${MULTILIB_USEDEP}'
inherit multilib-minimal cargo gnome2 python-any-r1 rust-toolchain vala
@@ -327,6 +327,10 @@ BDEPEND="
"
# dev-libs/gobject-introspection-common, dev-libs/vala-common needed by eautoreconf
+PATCHES=(
+ "${FILESDIR}"/librsvg-2.57.3-time-rust-1.80.patch
+)
+
QA_FLAGS_IGNORED="
usr/bin/rsvg-convert
usr/lib.*/librsvg.*
diff --git a/gnome-base/librsvg/librsvg-2.58.2-r2.ebuild b/gnome-base/librsvg/librsvg-2.58.2-r2.ebuild
index d29d3b02aa5c..494eefff7652 100644
--- a/gnome-base/librsvg/librsvg-2.58.2-r2.ebuild
+++ b/gnome-base/librsvg/librsvg-2.58.2-r2.ebuild
@@ -230,8 +230,8 @@ CRATES="
thiserror@1.0.56
tiff@0.9.1
time-core@0.1.2
- time-macros@0.2.17
- time@0.3.34
+ time-macros@0.2.18
+ time@0.3.36
tinytemplate@1.2.1
tinyvec@1.6.0
tinyvec_macros@0.1.1
@@ -288,7 +288,6 @@ CRATES="
zune-inflate@0.2.54
"
-RUST_MAX_VER="1.79.0"
RUST_MIN_VER="1.71.1"
RUST_USEDEP='${MULTILIB_USEDEP}'
@@ -344,6 +343,10 @@ QA_FLAGS_IGNORED="
usr/lib.*/librsvg.*
"
+PATCHES=(
+ "${FILESDIR}"/librsvg-2.58.5-time-rust-1.80.patch
+)
+
pkg_setup() {
rust_pkg_setup
python-any-r1_pkg_setup
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/librsvg/files/, gnome-base/librsvg/
@ 2024-11-09 10:11 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-11-09 10:11 UTC (permalink / raw
To: gentoo-commits
commit: 5c3fde3d2ed0b76356131adfa7ba6ed8fd29cf1f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 9 10:09:11 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 9 10:10:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c3fde3d
gnome-base/librsvg: add 2.58.5
01ba4dc61965ef7658a24728841c04c9a1ce4871 added a max version of rust-1.79.0
because tests were using an old version of the 'time' crate which broke
w/ >=rust-1.80.
Bump to 2.58.5 and while here, patch Cargo.lock to update the crate
so we can drop the cap.
Signed-off-by: Sam James <sam <AT> gentoo.org>
gnome-base/librsvg/Manifest | 5 +
.../files/librsvg-2.58.5-time-rust-1.80.patch | 27 ++
gnome-base/librsvg/librsvg-2.58.5.ebuild | 426 +++++++++++++++++++++
3 files changed, 458 insertions(+)
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 4a744eb33dcb..93b89f47b303 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -28,6 +28,7 @@ DIST bstr-1.9.0.crate 380170 BLAKE2B 06ae5065a5d566b6333e911a5b97e3999ad2f0bc19b
DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b
DIST bytemuck-1.14.0.crate 44933 BLAKE2B afd34f2becc41484e7bf71fb4a9f0925870a4f2d9d59daff9e91bada000462baeced4314e469a508d4413a8f2442d83a5f3082193653403fbee1340ab5c3f6c5 SHA512 f072a97e5de93228435bb362363ac1af0738b7927832b02a837f44eb21b0b089589b61e73004a06c5e4d4601e66bb42e67b9f707bbf13429a40b6250a0f05ae5
DIST bytemuck-1.14.2.crate 46935 BLAKE2B 945d537ce392946eec903abfc05af15f40dd599e785a5da75b7626476b73ab1983720b5398839fcca124e97ce2966117a1a1d07d381b79f43eac055a3abeb6a1 SHA512 6e586b46517065f0ea9454ffceb99ccaee8368458741d3b077ea7390b931beb3c7d66e881e6e16d61dcbcf9188f695b3a83c92f2d15aacd7cbf14d68fd4d9d3f
+DIST bytemuck-1.16.3.crate 49539 BLAKE2B 5e9a4c9e5bb1ec5398670edad455fa54b08955b48390d784c29c7ba153db4d0fb25c4d14f445ed28c443379a761354b1d9eb8c9c6e2a2930f5fb3f9085ad45b2 SHA512 17bf35d082c8009ce6ae24ae681715d8fd303f728f9bb2a0702096fd8635b5e7294eeea5375217a8276ba6136a16f94eb670c5d5baba9020674dc958173342f8
DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
DIST cairo-rs-0.18.3.crate 54190 BLAKE2B cdd1136972174462334142c0ecada99fab75a20883fd8ed99295d6f2196b35e75f7c44463a587beb1310e4aaaec64f23ccf82125617bcec5a71fdabb5bf547bd SHA512 14164ac540f69fb685004be09e30a68e7d5af6ad4e553e720cb975cfc2a8e7c86df9446dd811f8ce0993be1dab838e14a60f2737457939a93f81ab58e1ec6b63
DIST cairo-rs-0.19.1.crate 52239 BLAKE2B b833b2b9d9f1b5a60f817489b9e6a54a405e537b647c3216a5f7a70a67cece39396d48f6c6b99b509ddc7bc07c6b28a7dc5570ad9b509e4d6e7af78cd0046b3d SHA512 ab6eede387c9c802bc6bdfbcd25e703c2d4eacfbd54463ed2c0476bec9d4995d373a62cce01e610d73ab9b8cfbb6b297ea4f5d05557e9099a28f67c8161653c3
@@ -160,6 +161,7 @@ DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6
DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
DIST librsvg-2.57.3.tar.xz 5688408 BLAKE2B cf7a56874c235fed8ddd32cb49573bd73ca5f875891b37a7ba029e92133eb698d896a18e62b66f8f56cb62840302a78a27977c95b3809853399e418c6973340b SHA512 d85e085fe7546812aaa58670fa9690aad81736394b69c8c3050bd2f215727430b29055204fc721b4514c000cf8dad0e7785d6d5b57623ce0528900b8ad0cdde7
DIST librsvg-2.58.2.tar.xz 6218136 BLAKE2B 51540ced23e379d7a0f2a0676b1b6a7ac68ce38c77c321789ed345da64966e25977112e1866a20c69014b90451c11efa0c7f4f6fa263db89273c8ecf6f19cda9 SHA512 4aaa04b6a488895344232487cee7945c4feedf29f756252e05656d9362c7d799dfa8157b57f1299646eec438c3d712f01ab873e9f9b4efe540a817802c70c668
+DIST librsvg-2.58.5.tar.xz 6194788 BLAKE2B 59ba9c58a595458bb985dc632aa4ab8ae7e204cd5d546a70884a5c4ecf7e28a7216eff9c03e5f9bb7848a775a8ffafe61f3ab5ba9ae5365cfc2f6333fc41e750 SHA512 3ae72f90ea2d696902120d7100fd5681906b1e732f0d59caaef84a6858060614438be461ecb80cce6f6144bccb2058fd184af360387fd35a070e8b12ea2e94a9
DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707
DIST linux-raw-sys-0.4.12.crate 1465800 BLAKE2B 2f70a344c427093fd55732b68239f771cf6563edfe2db4b2f50cdbc904dfc7565b30bf06454b91482eaeea787b9cd4214979665bfa32f3c1c586551333cf4d2e SHA512 d9564d02d5f41356478066592e438629adb3275df0e5a1a44030cc99bf8856b8af64f18f27371f84122a828b34712aae16495a1a16050fbdbece6d95e9cdace9
DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62
@@ -309,9 +311,11 @@ DIST thiserror-impl-1.0.56.crate 15367 BLAKE2B 6fad787eb1e2c0f25fee7bef160be794f
DIST tiff-0.9.1.crate 1423953 BLAKE2B d01949cc3a76a32f2e802a151a4c1d4bbe47c7f217f198f940293d02fd6a1a6d3087c66b3fbc099da3e155f959774d2a9d4d8c5f5f00cd6486f5f44571a1dedd SHA512 82419e671c6a896f1d639d46a3c5a019e3bff6c75d961b838f5311e5ecb31c3baafc5f88fe928e88f6b3b31881a867ea4ca9905f43e3e24f77f183260dc27b93
DIST time-0.3.30.crate 120289 BLAKE2B 917b71ea8362ca14f2564706919e7e62ebd3e8024d48ebcd9ac9799368a12f425b982a7739a73c025155d5dd0650ef8c9fd4642c60a9111294cad7ac2e30672c SHA512 268f0c779e2a44431932aa407f39878ff1412e287f9678574537fe7185f12faf7605c5ef433aa6d364bf77894e819ff3953f870ef7ad208b7203f1c58eccc4e5
DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116
+DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
DIST time-macros-0.2.15.crate 23568 BLAKE2B ed16207f302e03095e726f0087f9f7c1514cd71b68a17ac804424c526349838171f3bda62d442b8429a89adb084cca1a4117828c3d66d20f2ff8272d7cb2d3a6 SHA512 d6da54996ab99a46b2b2cef83cec62eca2462490db439ba9814502f7d5ecc3018eb266b29453d601677a0ef39797da77a106d407e0e5de3b110ec1c5ae2f3c6b
DIST time-macros-0.2.17.crate 24443 BLAKE2B 5045af9352961db0c97cae2f6ca3e8d2c4f89a129c7ac2ec1d8d20804292aa9f2901a61f910a564954614b68f39311bd381deeb66fed8bdac423227d077f3d14 SHA512 c81747f0b74e68d3b3f36d378ac5911dece8c6b511e5ac793807f854cc31c812b927d0df941f55ff90d3d67512d0ac6a5f63f2de4322c81b05da42f46b4a661c
+DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
@@ -380,4 +384,5 @@ DIST winnow-0.5.28.crate 150758 BLAKE2B 10ea6c613e474b48da3af7fd2b6459e6ac1bd75f
DIST winnow-0.5.39.crate 159300 BLAKE2B 671f588b28d6a11919967d03227395cafd4b2d9afe5e76fb947e4a90937d25c1e8a486d228dd1a6de4ee99e8ff4ffd515b9e8b14fb54a6136b0c9cb3eb4be388 SHA512 76d4762a0258719c2212f0ba1e2a91098548d18b12dc79cf90e99a847eec3eae05e821effd7f5b2e68f482ccebc6ae8d7877e91b3db863886e007631e8af2c83
DIST xml5ever-0.17.0.crate 41208 BLAKE2B 42be2b72566bf44d3cf70b365aee45a6c8034c20e4e18c5f71ed51be3a02dc63ccd2545bd41cdb9c019ea34e8419dbb93888ee41bd9b38f2a41c7bf63e27c323 SHA512 0c67244411811a3e82fe58d341b371b938ce6e45ec1af2bd8615c0f0a9628fa662ec0eb130de2ae199d32c7778f0c2d2b80221812dc33831b93333dcde5a682e
DIST yeslogic-fontconfig-sys-4.0.1.crate 6694 BLAKE2B a78e56725245af764e31dbfc7e337dae5ab50e0af8d23a6f2ab5f5744b15208567bbaa742876d76fede07f7313fcce8e9c0c06aa9936cee16b902d8e7a641395 SHA512 b1626e259d8535c0189535eb240b92c798330c01866f33231ca9baba07b3da792cc5390221c826c67df9c6e6c0ae64568f1dbd70b9841750e233dab2bd27f506
+DIST yeslogic-fontconfig-sys-5.0.0.crate 6718 BLAKE2B 949fa4eab74fca63b0bd110a9c8f96707d8e924ca7ec29e6a07c463d70f25ea3ba5f28614bff09e4aa78295f5f00b62bd39f8ac10c5cbb384711d19384828eaf SHA512 a956133ce286502032746e7c37ad9532f011d911deafd2e5d108827bdbe0765068c013fa0c08eaf7410317596302487dbbbe2878915ca08e0f71e3156c32c5bd
DIST zune-inflate-0.2.54.crate 37973 BLAKE2B 8bdb532fae0da1d61fc9fc72ea72a9339116e1952e76ba7376f0ba0ea65101b88cd1e4766f516f21028a5ea3459e5590e7a54175a47f136cc572ed9abec2da2f SHA512 0de30f310121c1fed42612b7bcb50631d699195a77c7ce4094729f502e63d1ae38034d6054d95b6825e7e9a2afb7bb614ff123e12736163fee04a46ef1dc56bd
diff --git a/gnome-base/librsvg/files/librsvg-2.58.5-time-rust-1.80.patch b/gnome-base/librsvg/files/librsvg-2.58.5-time-rust-1.80.patch
new file mode 100644
index 000000000000..6003a5a67cec
--- /dev/null
+++ b/gnome-base/librsvg/files/librsvg-2.58.5-time-rust-1.80.patch
@@ -0,0 +1,27 @@
+Needed for compat w/ >=rust-1.80. The time crate is only used for tests.
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -2177,9 +2177,9 @@ dependencies = [
+
+ [[package]]
+ name = "time"
+-version = "0.3.34"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+ "deranged",
+ "itoa",
+@@ -2198,9 +2198,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+ [[package]]
+ name = "time-macros"
+-version = "0.2.17"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
+ "num-conv",
+ "time-core",
diff --git a/gnome-base/librsvg/librsvg-2.58.5.ebuild b/gnome-base/librsvg/librsvg-2.58.5.ebuild
new file mode 100644
index 000000000000..ca992d8e036d
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.58.5.ebuild
@@ -0,0 +1,426 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
+CRATES="
+ adler@1.0.2
+ aho-corasick@1.1.2
+ android-tzdata@0.1.1
+ android_system_properties@0.1.5
+ anes@0.1.6
+ anstream@0.6.11
+ anstyle-parse@0.2.3
+ anstyle-query@1.0.2
+ anstyle-wincon@3.0.2
+ anstyle@1.0.6
+ anyhow@1.0.79
+ approx@0.5.1
+ assert_cmd@2.0.13
+ autocfg@1.1.0
+ bit-set@0.5.3
+ bit-vec@0.6.3
+ bit_field@0.10.2
+ bitflags@1.3.2
+ bitflags@2.4.2
+ block@0.1.6
+ bstr@1.9.0
+ bumpalo@3.14.0
+ bytemuck@1.16.3
+ byteorder@1.5.0
+ cairo-rs@0.19.1
+ cairo-sys-rs@0.19.1
+ cast@0.3.0
+ cc@1.0.83
+ cfg-expr@0.15.6
+ cfg-if@1.0.0
+ chrono@0.4.33
+ ciborium-io@0.2.2
+ ciborium-ll@0.2.2
+ ciborium@0.2.2
+ clap@4.4.18
+ clap_builder@4.4.18
+ clap_complete@4.4.10
+ clap_derive@4.4.7
+ clap_lex@0.6.0
+ color_quant@1.1.0
+ colorchoice@1.0.0
+ core-foundation-sys@0.8.6
+ crc32fast@1.3.2
+ criterion-plot@0.5.0
+ criterion@0.5.1
+ crossbeam-deque@0.8.5
+ crossbeam-epoch@0.9.18
+ crossbeam-utils@0.8.19
+ crunchy@0.2.2
+ cssparser-macros@0.6.1
+ cssparser@0.31.2
+ cstr@0.2.11
+ data-url@0.3.1
+ deranged@0.3.11
+ derive_more@0.99.17
+ difflib@0.4.0
+ dlib@0.5.2
+ doc-comment@0.3.3
+ dtoa-short@0.3.4
+ dtoa@1.0.9
+ either@1.9.0
+ encoding_rs@0.8.33
+ equivalent@1.0.1
+ errno@0.3.8
+ exr@1.72.0
+ fastrand@2.0.1
+ fdeflate@0.3.4
+ flate2@1.0.28
+ float-cmp@0.9.0
+ flume@0.11.0
+ fnv@1.0.7
+ form_urlencoded@1.2.1
+ futf@0.1.5
+ futures-channel@0.3.30
+ futures-core@0.3.30
+ futures-executor@0.3.30
+ futures-io@0.3.30
+ futures-macro@0.3.30
+ futures-task@0.3.30
+ futures-util@0.3.30
+ fxhash@0.2.1
+ gdk-pixbuf-sys@0.19.0
+ gdk-pixbuf@0.19.0
+ getrandom@0.2.12
+ gif@0.12.0
+ gio-sys@0.19.0
+ gio@0.19.0
+ glib-macros@0.19.0
+ glib-sys@0.19.0
+ glib@0.19.0
+ gobject-sys@0.19.0
+ half@2.3.1
+ hashbrown@0.14.3
+ heck@0.4.1
+ hermit-abi@0.3.5
+ iana-time-zone-haiku@0.1.2
+ iana-time-zone@0.1.60
+ idna@0.5.0
+ image@0.24.8
+ indexmap@2.2.2
+ is-terminal@0.4.10
+ itertools@0.10.5
+ itertools@0.12.1
+ itoa@1.0.10
+ jpeg-decoder@0.3.1
+ js-sys@0.3.68
+ language-tags@0.3.2
+ lazy_static@1.4.0
+ lebe@0.5.2
+ libc@0.2.153
+ libloading@0.8.1
+ libm@0.2.8
+ linked-hash-map@0.5.6
+ linux-raw-sys@0.4.13
+ locale_config@0.3.0
+ lock_api@0.4.11
+ log@0.4.20
+ lopdf@0.32.0
+ mac@0.1.1
+ malloc_buf@0.0.6
+ markup5ever@0.11.0
+ matches@0.1.10
+ matrixmultiply@0.3.8
+ md5@0.7.0
+ memchr@2.7.1
+ minimal-lexical@0.2.1
+ miniz_oxide@0.7.2
+ nalgebra-macros@0.2.1
+ nalgebra@0.32.3
+ new_debug_unreachable@1.0.4
+ nom@7.1.3
+ normalize-line-endings@0.3.0
+ num-complex@0.4.5
+ num-conv@0.1.0
+ num-integer@0.1.46
+ num-rational@0.4.1
+ num-traits@0.2.18
+ objc-foundation@0.1.1
+ objc@0.2.7
+ objc_id@0.1.1
+ once_cell@1.19.0
+ oorandom@11.1.3
+ pango-sys@0.19.0
+ pango@0.19.0
+ pangocairo-sys@0.19.0
+ pangocairo@0.19.1
+ parking_lot@0.12.1
+ parking_lot_core@0.9.9
+ paste@1.0.14
+ percent-encoding@2.3.1
+ phf@0.10.1
+ phf@0.11.2
+ phf_codegen@0.10.0
+ phf_generator@0.10.0
+ phf_generator@0.11.2
+ phf_macros@0.11.2
+ phf_shared@0.10.0
+ phf_shared@0.11.2
+ pin-project-lite@0.2.13
+ pin-utils@0.1.0
+ pkg-config@0.3.29
+ plotters-backend@0.3.5
+ plotters-svg@0.3.5
+ plotters@0.3.5
+ png@0.17.11
+ powerfmt@0.2.0
+ ppv-lite86@0.2.17
+ precomputed-hash@0.1.1
+ predicates-core@1.0.6
+ predicates-tree@1.0.9
+ predicates@3.1.0
+ proc-macro-crate@3.1.0
+ proc-macro2@1.0.78
+ proptest@1.4.0
+ qoi@0.4.1
+ quick-error@1.2.3
+ quick-error@2.0.1
+ quote@1.0.35
+ rand@0.8.5
+ rand_chacha@0.3.1
+ rand_core@0.6.4
+ rand_xorshift@0.3.0
+ rawpointer@0.2.1
+ rayon-core@1.12.1
+ rayon@1.8.1
+ rctree@0.6.0
+ redox_syscall@0.4.1
+ regex-automata@0.4.5
+ regex-syntax@0.8.2
+ regex@1.10.3
+ rgb@0.8.37
+ rustix@0.38.31
+ rusty-fork@0.3.0
+ ryu@1.0.16
+ safe_arch@0.7.1
+ same-file@1.0.6
+ scopeguard@1.2.0
+ selectors@0.25.0
+ serde@1.0.196
+ serde_derive@1.0.196
+ serde_json@1.0.113
+ serde_spanned@0.6.5
+ servo_arc@0.3.0
+ simba@0.8.1
+ simd-adler32@0.3.7
+ siphasher@0.3.11
+ slab@0.4.9
+ smallvec@1.13.1
+ spin@0.9.8
+ stable_deref_trait@1.2.0
+ string_cache@0.8.7
+ string_cache_codegen@0.5.2
+ strsim@0.10.0
+ syn@1.0.109
+ syn@2.0.48
+ system-deps@6.2.0
+ target-lexicon@0.12.13
+ tempfile@3.10.0
+ tendril@0.4.3
+ termtree@0.4.1
+ thiserror-impl@1.0.56
+ thiserror@1.0.56
+ tiff@0.9.1
+ time-core@0.1.2
+ time-macros@0.2.18
+ time@0.3.36
+ tinytemplate@1.2.1
+ tinyvec@1.6.0
+ tinyvec_macros@0.1.1
+ toml@0.8.10
+ toml_datetime@0.6.5
+ toml_edit@0.21.1
+ toml_edit@0.22.4
+ typenum@1.17.0
+ unarray@0.1.4
+ unicode-bidi@0.3.15
+ unicode-ident@1.0.12
+ unicode-normalization@0.1.22
+ url@2.5.0
+ utf-8@0.7.6
+ utf8parse@0.2.1
+ version-compare@0.1.1
+ wait-timeout@0.2.0
+ walkdir@2.4.0
+ wasi@0.11.0+wasi-snapshot-preview1
+ wasm-bindgen-backend@0.2.91
+ wasm-bindgen-macro-support@0.2.91
+ wasm-bindgen-macro@0.2.91
+ wasm-bindgen-shared@0.2.91
+ wasm-bindgen@0.2.91
+ web-sys@0.3.68
+ weezl@0.1.8
+ wide@0.7.15
+ winapi-i686-pc-windows-gnu@0.4.0
+ winapi-util@0.1.6
+ winapi-x86_64-pc-windows-gnu@0.4.0
+ winapi@0.3.9
+ windows-core@0.52.0
+ windows-sys@0.48.0
+ windows-sys@0.52.0
+ windows-targets@0.48.5
+ windows-targets@0.52.0
+ windows_aarch64_gnullvm@0.48.5
+ windows_aarch64_gnullvm@0.52.0
+ windows_aarch64_msvc@0.48.5
+ windows_aarch64_msvc@0.52.0
+ windows_i686_gnu@0.48.5
+ windows_i686_gnu@0.52.0
+ windows_i686_msvc@0.48.5
+ windows_i686_msvc@0.52.0
+ windows_x86_64_gnu@0.48.5
+ windows_x86_64_gnu@0.52.0
+ windows_x86_64_gnullvm@0.48.5
+ windows_x86_64_gnullvm@0.52.0
+ windows_x86_64_msvc@0.48.5
+ windows_x86_64_msvc@0.52.0
+ winnow@0.5.39
+ xml5ever@0.17.0
+ yeslogic-fontconfig-sys@5.0.0
+ zune-inflate@0.2.54
+"
+
+RUST_MIN_VER="1.71.1"
+RUST_USEDEP='${MULTILIB_USEDEP}'
+
+inherit multilib-minimal cargo gnome2 python-any-r1 rust-toolchain vala
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
+SRC_URI+=" ${CARGO_CRATE_URIS}"
+
+LICENSE="LGPL-2.1+"
+# Dependent crate licenses
+LICENSE+="
+ Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0
+ Unicode-DFS-2016
+"
+
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+IUSE="gtk-doc +introspection +vala"
+REQUIRED_USE="
+ gtk-doc? ( introspection )
+ vala? ( introspection )
+"
+
+RDEPEND="
+ >=x11-libs/cairo-1.17.0[glib,svg(+),${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
+ >=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
+ >=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.50.0[${MULTILIB_USEDEP}]
+
+ introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ x11-libs/gdk-pixbuf
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+ gtk-doc? ( dev-util/gi-docgen )
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+
+ dev-libs/gobject-introspection-common
+ dev-libs/vala-common
+"
+# dev-libs/gobject-introspection-common, dev-libs/vala-common needed by eautoreconf
+
+QA_FLAGS_IGNORED="
+ usr/bin/rsvg-convert
+ usr/lib.*/librsvg.*
+"
+
+PATCHES=(
+ "${FILESDIR}"/librsvg-2.58.5-time-rust-1.80.patch
+)
+
+pkg_setup() {
+ rust_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ use vala && vala_setup
+ gnome2_src_prepare
+}
+
+src_configure() {
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --disable-static
+ --disable-debug
+ $(multilib_native_use_enable gtk-doc)
+ $(multilib_native_use_enable introspection)
+ $(multilib_native_use_enable vala)
+ --enable-pixbuf-loader
+ )
+
+ if ! multilib_is_native_abi; then
+ myconf+=(
+ # Set the rust target, which can differ from CHOST
+ RUST_TARGET="$(rust_abi)"
+ # RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
+ # far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
+ cross_compiling=yes
+ )
+ fi
+
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure "${myconf[@]}"
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/doc/html doc/html || die
+ fi
+}
+
+src_compile() {
+ multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+ gnome2_src_compile
+}
+
+src_test() {
+ multilib-minimal_src_test
+}
+
+src_install() {
+ multilib-minimal_src_install
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ find "${ED}" -name '*.la' -delete || die
+
+ if use gtk-doc; then
+ mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+ mv "${ED}"/usr/share/doc/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
+ fi
+}
+
+pkg_postinst() {
+ multilib_foreach_abi gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ multilib_foreach_abi gnome2_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/librsvg/files/, gnome-base/librsvg/
@ 2023-06-19 15:30 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2023-06-19 15:30 UTC (permalink / raw
To: gentoo-commits
commit: 1bf5d48785e4d98a96c9a1e63d4edfc381d3e261
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 19 15:09:53 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 19 15:29:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bf5d487
gnome-base/librsvg: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../files/librsvg-2.56.0-gc-sections-shrink.patch | 53 ---
gnome-base/librsvg/librsvg-2.56.0-r1.ebuild | 420 ---------------------
2 files changed, 473 deletions(-)
diff --git a/gnome-base/librsvg/files/librsvg-2.56.0-gc-sections-shrink.patch b/gnome-base/librsvg/files/librsvg-2.56.0-gc-sections-shrink.patch
deleted file mode 100644
index d20909f4eaa5..000000000000
--- a/gnome-base/librsvg/files/librsvg-2.56.0-gc-sections-shrink.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://gitlab.gnome.org/GNOME/librsvg/-/issues/965
-https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/832
-https://github.com/rust-lang/rust/issues/111593
-
-From 61bba147f65019eab2a42148065798bc568169ab Mon Sep 17 00:00:00 2001
-From: Federico Mena Quintero <federico@gnome.org>
-Date: Thu, 18 May 2023 17:57:01 -0600
-Subject: [PATCH] (#965): Shrink the shared library by telling the linker to
- omit unused code
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Thanks to Sebastian Dröge for spotting this.
-
-Fixes https://gitlab.gnome.org/GNOME/librsvg/-/issues/965
-
-Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/832>
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -217,12 +217,24 @@ librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = $(AM_CPPFLAGS)
-
- librsvg_@RSVG_API_MAJOR_VERSION@_la_CFLAGS = $(AM_CFLAGS)
-
--librsvg_@RSVG_API_MAJOR_VERSION@_la_LDFLAGS = \
-- $(BSYMBOLIC_LDFLAG) \
-- -version-info @RSVG_LT_VERSION_INFO@ \
-- -export-dynamic \
-- -no-undefined \
-- -export-symbols-regex "^rsvg_.*" \
-+# This is not strictly needed, but since we are telling Cargo to build a staticlib, it puts in
-+# all of Rust's standard library and code from dependencies even when it is not needed.
-+# With the following, we shrink the final .so size; see issue #965.
-+#
-+# This will no longer be needed when we switch to cargo-cbuild, which does this automatically.
-+if OS_DARWIN
-+gc_linked_library_args="-Wl,-dead_strip"
-+else
-+gc_linked_library_args="-Wl,--gc-sections"
-+endif
-+
-+librsvg_@RSVG_API_MAJOR_VERSION@_la_LDFLAGS = \
-+ $(BSYMBOLIC_LDFLAG) \
-+ -version-info @RSVG_LT_VERSION_INFO@ \
-+ -export-dynamic \
-+ -no-undefined \
-+ -export-symbols-regex "^rsvg_.*" \
-+ $(gc_linked_library_args) \
- $(AM_LDFLAGS)
-
- if OS_DARWIN
---
-GitLab
diff --git a/gnome-base/librsvg/librsvg-2.56.0-r1.ebuild b/gnome-base/librsvg/librsvg-2.56.0-r1.ebuild
deleted file mode 100644
index 97ec78965d8c..000000000000
--- a/gnome-base/librsvg/librsvg-2.56.0-r1.ebuild
+++ /dev/null
@@ -1,420 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-# Drop eautoreconf after 2.56.0-r1 (once -Wl,--gc-sections patch is in a release)
-GNOME2_EAUTORECONF=yes
-CRATES="
- adler-1.0.2
- aho-corasick-0.7.20
- android_system_properties-0.1.5
- anes-0.1.6
- anstyle-0.3.4
- anyhow-1.0.69
- approx-0.5.1
- assert_cmd-2.0.10
- atty-0.2.14
- autocfg-1.1.0
- base-x-0.2.11
- bit-set-0.5.3
- bit-vec-0.6.3
- bitflags-1.3.2
- block-0.1.6
- bstr-1.3.0
- bumpalo-3.12.0
- bytemuck-1.13.1
- byteorder-1.4.3
- cc-1.0.79
- cairo-rs-0.17.0
- cairo-sys-rs-0.17.0
- cast-0.3.0
- cfg-expr-0.11.0
- cfg-if-1.0.0
- chrono-0.4.23
- chrono-0.4.24
- ciborium-0.2.0
- ciborium-io-0.2.0
- ciborium-ll-0.2.0
- clap-2.34.0
- clap-3.2.23
- clap-4.1.9
- clap_complete-4.1.5
- clap_derive-4.1.9
- clap_lex-0.2.4
- clap_lex-0.3.3
- codespan-reporting-0.11.1
- const-cstr-0.3.0
- const_fn-0.4.9
- convert_case-0.4.0
- core-foundation-sys-0.8.3
- crc32fast-1.3.2
- criterion-0.4.0
- criterion-plot-0.5.0
- crossbeam-channel-0.5.7
- crossbeam-deque-0.8.3
- crossbeam-epoch-0.9.14
- crossbeam-utils-0.8.15
- cssparser-0.29.6
- cssparser-macros-0.6.0
- cxx-1.0.92
- cxx-build-1.0.92
- cxxbridge-flags-1.0.92
- cxxbridge-macro-1.0.92
- data-url-0.2.0
- derive_more-0.99.17
- difflib-0.4.0
- discard-1.0.4
- dlib-0.5.0
- doc-comment-0.3.3
- dtoa-0.4.8
- dtoa-short-0.3.3
- either-1.8.1
- encoding-0.2.33
- encoding-index-japanese-1.20141219.5
- encoding-index-korean-1.20141219.5
- encoding-index-simpchinese-1.20141219.5
- encoding-index-singlebyte-1.20141219.5
- encoding-index-tradchinese-1.20141219.5
- encoding_index_tests-0.1.4
- errno-0.2.8
- errno-dragonfly-0.1.2
- fastrand-1.9.0
- flate2-1.0.25
- float-cmp-0.9.0
- fnv-1.0.7
- form_urlencoded-1.1.0
- futf-0.1.5
- futures-channel-0.3.27
- futures-core-0.3.27
- futures-executor-0.3.27
- futures-io-0.3.27
- futures-macro-0.3.27
- futures-task-0.3.27
- futures-util-0.3.27
- fxhash-0.2.1
- gdk-pixbuf-0.17.0
- gdk-pixbuf-sys-0.17.0
- getrandom-0.1.16
- getrandom-0.2.8
- gio-0.17.4
- gio-sys-0.17.4
- glib-0.17.5
- glib-macros-0.17.5
- glib-sys-0.17.4
- gobject-sys-0.17.4
- half-1.8.2
- hashbrown-0.12.3
- heck-0.4.1
- hermit-abi-0.1.19
- hermit-abi-0.2.6
- hermit-abi-0.3.1
- iana-time-zone-0.1.53
- iana-time-zone-haiku-0.1.1
- idna-0.3.0
- indexmap-1.9.2
- instant-0.1.12
- io-lifetimes-1.0.7
- is-terminal-0.4.4
- itertools-0.10.5
- itoa-1.0.6
- js-sys-0.3.61
- language-tags-0.3.2
- lazy_static-1.4.0
- libc-0.2.140
- libloading-0.7.4
- libm-0.2.6
- link-cplusplus-1.0.8
- linked-hash-map-0.5.6
- linux-raw-sys-0.1.4
- locale_config-0.3.0
- lock_api-0.4.9
- log-0.4.17
- lopdf-0.29.0
- mac-0.1.1
- malloc_buf-0.0.6
- markup5ever-0.10.1
- markup5ever-0.11.0
- matches-0.1.10
- matrixmultiply-0.3.2
- memchr-2.5.0
- memoffset-0.8.0
- miniz_oxide-0.6.2
- nalgebra-0.32.2
- nalgebra-macros-0.2.0
- new_debug_unreachable-1.0.4
- nodrop-0.1.14
- normalize-line-endings-0.3.0
- num-complex-0.4.3
- num-integer-0.1.45
- num-rational-0.4.1
- num-traits-0.2.15
- num_cpus-1.15.0
- objc-0.2.7
- objc-foundation-0.1.1
- objc_id-0.1.1
- once_cell-1.17.1
- oorandom-11.1.3
- os_str_bytes-6.4.1
- pango-0.17.4
- pango-sys-0.17.0
- pangocairo-0.17.0
- pangocairo-sys-0.17.3
- parking_lot-0.12.1
- parking_lot_core-0.9.7
- paste-1.0.12
- percent-encoding-2.2.0
- phf-0.8.0
- phf-0.10.1
- phf_codegen-0.8.0
- phf_codegen-0.10.0
- phf_generator-0.8.0
- phf_generator-0.10.0
- phf_macros-0.10.0
- phf_shared-0.8.0
- phf_shared-0.10.0
- pin-project-lite-0.2.9
- pin-utils-0.1.0
- pkg-config-0.3.26
- plotters-0.3.4
- plotters-backend-0.3.4
- plotters-svg-0.3.3
- png-0.17.7
- pom-3.2.0
- ppv-lite86-0.2.17
- precomputed-hash-0.1.1
- predicates-2.1.5
- predicates-3.0.1
- predicates-core-1.0.6
- predicates-tree-1.0.9
- proc-macro-crate-1.3.1
- proc-macro-error-1.0.4
- proc-macro-error-attr-1.0.4
- proc-macro-hack-0.5.20+deprecated
- proc-macro2-0.4.30
- proc-macro2-1.0.52
- proptest-1.1.0
- quick-error-1.2.3
- quick-error-2.0.1
- quote-1.0.26
- rand-0.7.3
- rand-0.8.5
- rand_chacha-0.2.2
- rand_chacha-0.3.1
- rand_core-0.5.1
- rand_core-0.6.4
- rand_hc-0.2.0
- rand_pcg-0.2.1
- rand_xorshift-0.3.0
- rawpointer-0.2.1
- rayon-1.7.0
- rayon-core-1.11.0
- rctree-0.5.0
- redox_syscall-0.2.16
- regex-1.7.1
- regex-automata-0.1.10
- regex-syntax-0.6.28
- remove_dir_all-0.5.3
- rgb-0.8.36
- rustc_version-0.2.3
- rustc_version-0.4.0
- rusty-fork-0.3.0
- rustix-0.36.9
- ryu-1.0.13
- safe_arch-0.6.0
- same-file-1.0.6
- scratch-1.0.5
- scopeguard-1.1.0
- selectors-0.24.0
- semver-0.9.0
- semver-1.0.17
- semver-parser-0.7.0
- serde-1.0.156
- serde_derive-1.0.156
- serde_json-1.0.94
- servo_arc-0.2.0
- sha1-0.6.1
- sha1_smol-1.0.0
- simba-0.8.0
- siphasher-0.3.10
- slab-0.4.8
- smallvec-1.10.0
- stable_deref_trait-1.2.0
- standback-0.2.17
- stdweb-0.4.20
- stdweb-derive-0.5.3
- stdweb-internal-macros-0.2.9
- stdweb-internal-runtime-0.1.5
- string_cache-0.8.7
- string_cache_codegen-0.5.2
- strsim-0.10.0
- syn-1.0.109
- system-deps-6.0.3
- tempfile-3.4.0
- tendril-0.4.3
- termcolor-1.2.0
- termtree-0.4.1
- textwrap-0.16.0
- thiserror-1.0.39
- thiserror-impl-1.0.39
- time-0.1.44
- time-0.2.27
- time-macros-0.1.1
- time-macros-impl-0.1.2
- tinytemplate-1.2.1
- tinyvec-1.6.0
- tinyvec_macros-0.1.1
- toml-0.5.11
- toml_edit-0.19.7
- toml_datetime-0.6.1
- typenum-1.16.0
- unarray-0.1.4
- unicode-bidi-0.3.11
- unicode-ident-1.0.8
- unicode-normalization-0.1.22
- unicode-width-0.1.10
- url-2.3.1
- utf-8-0.7.6
- version-compare-0.1.1
- version_check-0.9.4
- wait-timeout-0.2.0
- walkdir-2.3.3
- wasi-0.9.0+wasi-snapshot-preview1
- wasi-0.11.0+wasi-snapshot-preview1
- wasm-bindgen-0.2.84
- wasm-bindgen-backend-0.2.84
- wasm-bindgen-macro-0.2.84
- wasm-bindgen-macro-support-0.2.84
- wasm-bindgen-shared-0.2.84
- web-sys-0.3.61
- weezl-0.1.7
- wide-0.7.8
- winapi-0.3.9
- winapi-i686-pc-windows-gnu-0.4.0
- winapi-util-0.1.5
- winapi-x86_64-pc-windows-gnu-0.4.0
- windows-sys-0.42.0
- windows-sys-0.45.0
- windows-targets-0.42.2
- windows_aarch64_gnullvm-0.42.2
- windows_aarch64_msvc-0.42.2
- windows_i686_gnu-0.42.2
- windows_i686_msvc-0.42.2
- windows_x86_64_gnu-0.42.2
- windows_x86_64_gnullvm-0.42.2
- windows_x86_64_msvc-0.42.2
- winnow-0.3.6
- xml5ever-0.17.0
- yeslogic-fontconfig-sys-4.0.1
-"
-
-inherit cargo gnome2 multilib-minimal python-any-r1 rust-toolchain vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
-SRC_URI+=" $(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 BSD CC0-1.0 LGPL-2.1+ MIT MPL-2.0 Unicode-DFS-2016"
-
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="gtk-doc +introspection +vala"
-REQUIRED_USE="
- gtk-doc? ( introspection )
- vala? ( introspection )
-"
-RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
-
-RDEPEND="
- >=x11-libs/cairo-1.16.0[glib,svg(+),${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
- >=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
- >=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.48.11[${MULTILIB_USEDEP}]
-
- introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=virtual/rust-1.64.0[${MULTILIB_USEDEP}]
- x11-libs/gdk-pixbuf
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
- gtk-doc? ( dev-util/gi-docgen )
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-
- dev-libs/gobject-introspection-common
- dev-libs/vala-common
-"
-# dev-libs/gobject-introspection-common, dev-libs/vala-common needed by eautoreconf
-
-QA_FLAGS_IGNORED="
- usr/bin/rsvg-convert
- usr/lib.*/librsvg.*
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.56.0-gc-sections-shrink.patch
-)
-
-src_prepare() {
- use vala && vala_setup
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=(
- --disable-static
- --disable-debug
- $(multilib_native_use_enable gtk-doc)
- $(multilib_native_use_enable introspection)
- $(multilib_native_use_enable vala)
- --enable-pixbuf-loader
- )
-
- if ! multilib_is_native_abi; then
- myconf+=(
- # Set the rust target, which can differ from CHOST
- RUST_TARGET="$(rust_abi)"
- # RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
- # far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
- cross_compiling=yes
- )
- fi
-
- ECONF_SOURCE=${S} \
- gnome2_src_configure "${myconf[@]}"
-
- if multilib_is_native_abi; then
- ln -s "${S}"/doc/html doc/html || die
- fi
-}
-
-multilib_src_compile() {
- gnome2_src_compile
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-multilib_src_install_all() {
- find "${ED}" -name '*.la' -delete || die
-
- if use gtk-doc; then
- mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
- mv "${ED}"/usr/share/doc/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
- fi
-}
-
-pkg_postinst() {
- multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- multilib_foreach_abi gnome2_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/librsvg/files/, gnome-base/librsvg/
@ 2022-04-27 3:27 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2022-04-27 3:27 UTC (permalink / raw
To: gentoo-commits
commit: 8e34d7323f299be727450ce19abad08e27bedda6
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 03:27:00 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 03:27:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e34d732
gnome-base/librsvg: Version bump to 2.54.1
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
gnome-base/librsvg/Manifest | 1 +
...rsvg-2.54.1-build-Add-enable-gtk-doc-flag.patch | 62 +++++++++++
gnome-base/librsvg/librsvg-2.54.1.ebuild | 113 +++++++++++++++++++++
3 files changed, 176 insertions(+)
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index a98cc44df5bb..52fc031b8e2f 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -2,3 +2,4 @@ DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef
DIST librsvg-2.52.6.tar.xz 23662708 BLAKE2B 21108297aa4f87a852d0decb9cc7b8a5cdb546e00075d16f0f86502752adc176a67b56607eb90b034ca4e2dddbf8f82a3d81727496a5ae1a2b94715cdbbd87ac SHA512 be4830fb34c4859bdbe0c86da7b5de0807f28bb63fc124b4405ca8f9ef6ee45add77b4c43b9031d00157870eceb458df30cf5ee25e73d3894797d622b465f38d
DIST librsvg-2.52.7.tar.xz 23709632 BLAKE2B 4eb83d71b77b851c408ddba711fe39ed23863aa6466634020a19ffc30e00c12f7dea81f11fdc09eb53c0c72efb35adc4528568b3c27e5dc0e886426d145d347f SHA512 15c075d696ebba35555f93456be088e6398da5b7992119edc78f1ee1d376a70425248e36b138dc86234aec13cb139fded11d6d74523c44f9a49eb19c2151fcb7
DIST librsvg-2.54.0.tar.xz 23489972 BLAKE2B 04fcbb688b18e98dcbef81e84106a99280d45f242152a355ac6f202410c13b289b281bd10f9e77854997362b7d3e88832d3274d7d63ace8adc05613da99e2aab SHA512 3357ca8cf7537fe2792ee2d9a1719622656f3e1d7f30da062799a4b3ca8788cc07333a00e1c9da53a53da2b67a2aa5895a4c8fce35003da659fb7f98048b68eb
+DIST librsvg-2.54.1.tar.xz 28181768 BLAKE2B 86e1cf01febce55acadc9b05f5e08fda69423ab267ab8330bbf892d63f475d5ddd163099346f3cf1e63bf2807d847440cf48d8b24f3c32b3ab14a35c0c54d96e SHA512 d1ea8a49988fed1d7a2ba21540a6c10084cd78f8b6db3534882d086a09f3a0d96ec80c59b3744a6eeef8ae511f0b0152eaf18cc9a134f4b871a993418cae09a6
diff --git a/gnome-base/librsvg/files/librsvg-2.54.1-build-Add-enable-gtk-doc-flag.patch b/gnome-base/librsvg/files/librsvg-2.54.1-build-Add-enable-gtk-doc-flag.patch
new file mode 100644
index 000000000000..ee5c3bce0a5c
--- /dev/null
+++ b/gnome-base/librsvg/files/librsvg-2.54.1-build-Add-enable-gtk-doc-flag.patch
@@ -0,0 +1,62 @@
+https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/692
+
+From 1c53068cbcfccb9c663dea2d1a61c8d7b24d317a Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Tue, 26 Apr 2022 15:01:55 -0700
+Subject: [PATCH] build: Add --enable-gtk-doc flag
+
+gtk-doc documentation relies on introspection, and introspection doesn't
+cross compile well, so it's nice to be able to disable documentation.
+---
+ Makefile.am | 2 +-
+ configure.ac | 19 ++++++++++++++-----
+ 2 files changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 83e73c38..1e1ce856 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-if HAVE_GI_DOCGEN
++if ENABLE_GTK_DOC
+ RSVG_DOC = doc
+ endif
+
+diff --git a/configure.ac b/configure.ac
+index 9abc587e..6cced25c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -123,11 +123,19 @@ AM_CONDITIONAL(HAVE_RST2MAN, [test "x$RST2MAN" != "xno"])
+
+ dnl Gi-docgen
+
+-AC_CHECK_TOOL(GI_DOCGEN, [gi-docgen], [no])
+-AS_IF(test x$GI_DOCGEN = xno,
+- AC_MSG_WARN([gi-docgen not found - not building docs])
+-)
+-AM_CONDITIONAL(HAVE_GI_DOCGEN, [test "x$GI_DOCGEN" != "xno"])
++AC_ARG_ENABLE([gtk-doc],
++ [AS_HELP_STRING([--disable-gtk-doc],[Disable building documentation (requires introspection)])],
++ [enable_gtk_doc=$enableval],[enable_gtk_doc=auto])
++
++AS_IF([test "x$enable_gtk_doc" != xno],
++ [AC_CHECK_TOOL(GI_DOCGEN, [gi-docgen], [no])
++ AS_IF([test "x$GI_DOCGEN" = no],
++ [AS_CASE(["$enable_gtk_doc"],
++ [yes], [AC_MSG_ERROR([gi-docgen not found - cannot build docs])],
++ [auto], [AC_MSG_WARN([gi-docgen not found - not building docs])])
++ enable_gtk_doc=no]
++ [enable_gtk_doc=yes])])
++AM_CONDITIONAL(ENABLE_GTK_DOC, [test "x$enable_gtk_doc" = xyes])
+
+ dnl ===========================================================================
+
+@@ -359,4 +367,5 @@ librsvg-$VERSION
+ Build introspectable bindings: ${found_introspection}
+ Build Vala bindings: ${enable_vala}
+ Build GdkPixbuf loader: ${enable_pixbuf_loader}
++ Build developer documentation: ${enable_gtk_doc}
+ "
+--
+2.35.1
+
diff --git a/gnome-base/librsvg/librsvg-2.54.1.ebuild b/gnome-base/librsvg/librsvg-2.54.1.ebuild
new file mode 100644
index 000000000000..656e02c638ae
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.54.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF=yes # for patching configure.ac
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome2 multilib-minimal python-any-r1 rust-toolchain vala
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="gtk-doc +introspection +vala"
+REQUIRED_USE="
+ gtk-doc? ( introspection )
+ vala? ( introspection )
+"
+RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
+
+RDEPEND="
+ >=x11-libs/cairo-1.16.0[glib,svg,${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
+ >=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
+ >=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.48.11[${MULTILIB_USEDEP}]
+
+ introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+"
+DEPEND="${RDEPEND}
+ >=virtual/rust-1.56[${MULTILIB_USEDEP}]
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+ gtk-doc? ( dev-util/gi-docgen )
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+
+ dev-libs/gobject-introspection-common
+ dev-libs/vala-common
+"
+# dev-libs/gobject-introspection-common, dev-libs/vala-common needed by eautoreconf
+
+QA_FLAGS_IGNORED="
+ usr/bin/rsvg-convert
+ usr/lib.*/librsvg.*
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-build-Add-enable-gtk-doc-flag.patch
+)
+
+src_prepare() {
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --disable-static
+ --disable-debug
+ $(multilib_native_use_enable gtk-doc)
+ $(multilib_native_use_enable introspection)
+ $(multilib_native_use_enable vala)
+ --enable-pixbuf-loader
+ )
+
+ if ! multilib_is_native_abi; then
+ myconf+=(
+ # Set the rust target, which can differ from CHOST
+ RUST_TARGET="$(rust_abi)"
+ # RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
+ # far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
+ cross_compiling=yes
+ )
+ fi
+
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure "${myconf[@]}"
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/doc/html doc/html || die
+ fi
+}
+
+multilib_src_compile() {
+ gnome2_src_compile
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ find "${ED}" -name '*.la' -delete || die
+
+ if use gtk-doc; then
+ mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+ mv "${ED}"/usr/share/doc/${PF}/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
+ fi
+}
+
+pkg_postinst() {
+ multilib_foreach_abi gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ multilib_foreach_abi gnome2_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/librsvg/files/, gnome-base/librsvg/
@ 2016-07-02 13:31 Pacho Ramos
0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2016-07-02 13:31 UTC (permalink / raw
To: gentoo-commits
commit: 8cdc8c876e8dd460e7749511d8c5478104e14246
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 2 12:48:05 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jul 2 13:30:33 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cdc8c87
gnome-base/librsvg: Drop old
Package-Manager: portage-2.3.0_rc1
gnome-base/librsvg/Manifest | 1 -
.../files/librsvg-2.40.13-filters-crash.patch | 53 -----------
gnome-base/librsvg/librsvg-2.40.13-r1.ebuild | 102 ---------------------
gnome-base/librsvg/librsvg-2.40.13.ebuild | 99 --------------------
4 files changed, 255 deletions(-)
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index e6b127b..659fa99 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,3 +1,2 @@
DIST librsvg-2.40.11.tar.xz 539428 SHA256 611ac0f544debd0c9bf1ef5509c990d218e83dd1d8c83297075c4b29796a2e02 SHA512 89fc4f94150ab47665ab1b6c26979c8072efe40dd74ff13284598cb63de8594e7cfe4b73a151e54002a4811b5de56b93f5d52215ef0862b994d230fafe04b4fc WHIRLPOOL 7c9a0292faf42dd396a59b38c6900a1b78a254c8bd8c724b5636d506c41934d19c924fbf86c2faab7151c065dd134252b78adfd94940b09acd601ef2dc86a5cc
-DIST librsvg-2.40.13.tar.xz 552900 SHA256 4d6ea93ec05f5dabe7262d711d246a0a99b2311e215360dd3dcabd6afe3b9804 SHA512 7549f78d25c3319b5b74803c46cc0d1bd5c53a425b632a5b306eb238080df0da2b4bcefb159064988bd56cb1d69e0c94ecd0a073315acff14abb187ba6d4c788 WHIRLPOOL 9113a1ae41a8f2146dd55f9d3a9d47f4f45c7926434d91cf94387ab054b6585371a6d6175699588481f331f0dba98ffccd7597c7792c73d8ba009ce5b1cfa8c8
DIST librsvg-2.40.15.tar.xz 554608 SHA256 d9cac4a123eec6e553a26e120979bab7425def9ae7ce7c079eba5e4a45db05f4 SHA512 1169c02247dbf3d71d3d4bfb1aa2580a4b1e243e1c2c6d1c86aaa09c54c66857b959df4358a1ca6a34ec5fbb34b9529963b993fc978ec1fe401dbc56ac460101 WHIRLPOOL 687e9afc6c1c46079fa9005c94ed329ff6f681a9fb784df999efca36ba1fac05a05f3d6413105993ff4af60a62a36b647e2f1335ab1245c621de2ff76ccef479
diff --git a/gnome-base/librsvg/files/librsvg-2.40.13-filters-crash.patch b/gnome-base/librsvg/files/librsvg-2.40.13-filters-crash.patch
deleted file mode 100644
index f5503d1..0000000
--- a/gnome-base/librsvg/files/librsvg-2.40.13-filters-crash.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From d937c691678803ceda6be701587d997ccd03a1da Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Fri, 29 Jan 2016 12:49:55 +0100
-Subject: Don't crash when filters don't exist
-
-We put a new surface on the stack if a filter existed by name but we
-didn't pop it if the name didn't resolve to a real filter.
-
-New test: crash/bug759084.svg
-
-https://bugzilla.gnome.org/show_bug.cgi?id=759084
----
- rsvg-cairo-draw.c | 6 +++---
- tests/fixtures/crash/bug759084.svg | 9 +++++++++
- 2 files changed, 12 insertions(+), 3 deletions(-)
- create mode 100644 tests/fixtures/crash/bug759084.svg
-
-diff --git a/rsvg-cairo-draw.c b/rsvg-cairo-draw.c
-index 4d8fbc2..4152cb7 100644
---- a/rsvg-cairo-draw.c
-+++ b/rsvg-cairo-draw.c
-@@ -819,10 +819,10 @@ rsvg_cairo_pop_render_stack (RsvgDrawingCtx * ctx)
- cairo_surface_t *output;
-
- filter = rsvg_acquire_node (ctx, state->filter);
-- if (filter && RSVG_NODE_TYPE (filter) == RSVG_NODE_TYPE_FILTER) {
-- output = render->surfaces_stack->data;
-- render->surfaces_stack = g_list_delete_link (render->surfaces_stack, render->surfaces_stack);
-+ output = render->surfaces_stack->data;
-+ render->surfaces_stack = g_list_delete_link (render->surfaces_stack, render->surfaces_stack);
-
-+ if (filter && RSVG_NODE_TYPE (filter) == RSVG_NODE_TYPE_FILTER) {
- needs_destroy = TRUE;
- surface = rsvg_filter_render ((RsvgFilter *) filter, output, ctx, &render->bbox, "2103");
- /* Don't destroy the output surface, it's owned by child_cr */
-diff --git a/tests/fixtures/crash/bug759084.svg b/tests/fixtures/crash/bug759084.svg
-new file mode 100644
-index 0000000..9e8f8f1
---- /dev/null
-+++ b/tests/fixtures/crash/bug759084.svg
-@@ -0,0 +1,9 @@
-+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
-+ <defs>
-+ <filter id="filter">
-+ </filter>
-+ </defs>
-+ <g filter="url(#filter)">
-+ <rect fill="red" width="10" height="10" filter="url(#doesnotexist)" />
-+ </g>
-+</svg>
---
-cgit v0.12
-
diff --git a/gnome-base/librsvg/librsvg-2.40.13-r1.ebuild b/gnome-base/librsvg/librsvg-2.40.13-r1.ebuild
deleted file mode 100644
index 7a0f5bc..0000000
--- a/gnome-base/librsvg/librsvg-2.40.13-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools gnome2 multilib-minimal vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="+introspection vala tools"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
- >=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
- tools? ( >=x11-libs/gtk+-3.10.0:3 )
-"
-DEPEND="${RDEPEND}
- dev-libs/gobject-introspection-common
- dev-libs/vala-common
- >=dev-util/gtk-doc-am-1.13
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- vala? ( $(vala_depend) )
-"
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=653323
- epatch "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch"
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=731826
- epatch "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch"
-
- # Don't crash when filters don't exist (included in next release)
- epatch "${FILESDIR}/${P}-filters-crash.patch"
-
- eautoreconf
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=()
-
- # -Bsymbolic is not supported by the Darwin toolchain
- if [[ ${CHOST} == *-darwin* ]]; then
- myconf+=( --disable-Bsymbolic )
- fi
-
- # --disable-tools even when USE=tools; the tools/ subdirectory is useful
- # only for librsvg developers
- ECONF_SOURCE=${S} \
- gnome2_src_configure \
- --disable-static \
- --disable-tools \
- $(multilib_native_use_enable introspection) \
- $(multilib_native_use_with tools gtk3) \
- $(multilib_native_use_enable vala) \
- --enable-pixbuf-loader \
- "${myconf[@]}"
-
- if multilib_is_native_abi; then
- ln -s "${S}"/doc/html doc/html || die
- fi
-}
-
-multilib_src_compile() {
- # causes segfault if set, see bug #411765
- unset __GL_NO_DSO_FINALIZER
- gnome2_src_compile
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-pkg_postinst() {
- # causes segfault if set, see bug 375615
- unset __GL_NO_DSO_FINALIZER
- multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- # causes segfault if set, see bug 375615
- unset __GL_NO_DSO_FINALIZER
- multilib_foreach_abi gnome2_pkg_postrm
-}
diff --git a/gnome-base/librsvg/librsvg-2.40.13.ebuild b/gnome-base/librsvg/librsvg-2.40.13.ebuild
deleted file mode 100644
index 54d2a19..0000000
--- a/gnome-base/librsvg/librsvg-2.40.13.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools gnome2 multilib-minimal vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="+introspection vala tools"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
- >=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
- tools? ( >=x11-libs/gtk+-3.10.0:3 )
-"
-DEPEND="${RDEPEND}
- dev-libs/gobject-introspection-common
- dev-libs/vala-common
- >=dev-util/gtk-doc-am-1.13
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- vala? ( $(vala_depend) )
-"
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=653323
- epatch "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch"
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=731826
- epatch "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch"
-
- eautoreconf
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=()
-
- # -Bsymbolic is not supported by the Darwin toolchain
- if [[ ${CHOST} == *-darwin* ]]; then
- myconf+=( --disable-Bsymbolic )
- fi
-
- # --disable-tools even when USE=tools; the tools/ subdirectory is useful
- # only for librsvg developers
- ECONF_SOURCE=${S} \
- gnome2_src_configure \
- --disable-static \
- --disable-tools \
- $(multilib_native_use_enable introspection) \
- $(multilib_native_use_with tools gtk3) \
- $(multilib_native_use_enable vala) \
- --enable-pixbuf-loader \
- "${myconf[@]}"
-
- if multilib_is_native_abi; then
- ln -s "${S}"/doc/html doc/html || die
- fi
-}
-
-multilib_src_compile() {
- # causes segfault if set, see bug #411765
- unset __GL_NO_DSO_FINALIZER
- gnome2_src_compile
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-pkg_postinst() {
- # causes segfault if set, see bug 375615
- unset __GL_NO_DSO_FINALIZER
- multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- # causes segfault if set, see bug 375615
- unset __GL_NO_DSO_FINALIZER
- multilib_foreach_abi gnome2_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/librsvg/files/, gnome-base/librsvg/
@ 2015-09-05 12:51 Pacho Ramos
0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2015-09-05 12:51 UTC (permalink / raw
To: gentoo-commits
commit: 6651098bd8430ddcd90bf1be7cf59edd89a6ba90
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 12:51:14 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 12:51:14 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6651098b
gnome-base/librsvg: Drop old
Package-Manager: portage-2.2.20.1
gnome-base/librsvg/Manifest | 2 -
.../files/librsvg-2.40.1-gtk-optional.patch | 58 ------------
gnome-base/librsvg/librsvg-2.40.6.ebuild | 101 ---------------------
gnome-base/librsvg/librsvg-2.40.8.ebuild | 101 ---------------------
4 files changed, 262 deletions(-)
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 512d865..e107a5b 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,4 +1,2 @@
DIST librsvg-2.40.10.tar.xz 522668 SHA256 965c807438ce90b204e930ff80c92eba1606a2f6fd5ccfd09335c99896dd3479 SHA512 e6b630e8332587df414ac5e4e597a4c93ed6f805f378228b7f882f42d03cba68c952e9c1627b3c57dc105cd5ac739a0f6bbe61595c211de0f9e3bd7867904c96 WHIRLPOOL 96b37494e8fd37242371e1e7f10bcf616993f172fd75ab86b65a0743a432dad9e201975281625fcb70baad697c615c5624fc97a2783e2356c9fbd0365f5072ad
-DIST librsvg-2.40.6.tar.xz 512500 SHA256 8af349f241677b04b7a1ea6b9b33a6343e781bcccc8a09d00208a47342584f06 SHA512 8d901d5d6dde2721db9cb05740ce42fa2520f2f6cc8136a8cb0306b5e6e630166d25da917d169c8d4e11fcfb7834ccb1fe93188f5e9c02c4cddff989d0cf3c51 WHIRLPOOL 99a335a76f31f7474780958d30eb4fe9a950b725d9559c8825e9a268248a56ce9c5048cac2914a99cb3ea9a5787b3de63e32e4b97c09880c994e19845a7f3768
-DIST librsvg-2.40.8.tar.xz 515512 SHA256 0af42ec79ebfc70f980a9adf63f1b63d8150457dc7140dd041484e8c60d5387a SHA512 7d94ad5b03c6f597dcaff3523e32d171a823d340c73505f5b839c0c0fb6c1bae866569062981fa9c712982003d340e9b04ef25cbb2f4c049c4d81488d3813b39 WHIRLPOOL 590ba0b62314d217bc1faa99b28bebcc99d24243819005cbc96cee0303c1ab65f8295b35c750e6cd5d1a248b406a88354497da3f084cd76d7f7a7af480762b9f
DIST librsvg-2.40.9.tar.xz 519172 SHA256 13964c5d35357552b47d365c34215eee0a63bf0e6059b689f048648c6bf5f43a SHA512 17b72b509b0d38b1291a2a0594739fd650622ab2a913a5e0c864e5060b15093fc49e436c9e2494d57b475572183d1059ae50b7a1d44a1d4d071ac5ef3bcbeaf6 WHIRLPOOL 59bc56631a212893566fb8ed90e45b3e954f7522c21ee1d7b56987a2cc527c6ea8c43238786b159ab0df43e661108b3b089b4b43845f7d9effb4f064cfde7d12
diff --git a/gnome-base/librsvg/files/librsvg-2.40.1-gtk-optional.patch b/gnome-base/librsvg/files/librsvg-2.40.1-gtk-optional.patch
deleted file mode 100644
index 86b8fec..0000000
--- a/gnome-base/librsvg/files/librsvg-2.40.1-gtk-optional.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Tue, 19 Nov 2013 16:00:29 +0000
-Subject: [PATCH] configure: add option to enable/disable use of GTK+
-
-Distro packagers like predictability and automatically detected optional
-dependencies are not predicable. Add a --with-gtk3 option (default to "auto")
-for forcibly controlling whether GTK+ will be used or not.
-
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-https://bugzilla.gnome.org/show_bug.cgi?id=712693
----
- configure.in | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index f7a89dc..1498f72 100644
---- a/configure.in
-+++ b/configure.in
-@@ -119,17 +119,22 @@ AC_CHECK_FUNCS(strtok_r)
- # GTK
- # ===========================================================================
-
--PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no])
--
- GTK3_BINARY_VERSION=
-
--if test "$have_gtk_3" = "yes"; then
-- GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`"
-+AC_MSG_CHECKING([whether to use GTK+ 3])
-+AC_ARG_WITH([gtk3],
-+ [AS_HELP_STRING([--without-gtk3],[Don't build GTK+3 tools (default=auto)])],
-+ [],[PKG_CHECK_EXISTS([gtk+-3.0 >= $GTK3_REQUIRED],[with_gtk3=yes],[with_gtk3=no])])
-+AC_MSG_RESULT([$with_gtk3])
-+
-+if test "$with_gtk3" = "yes"; then
-+ PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED])
-+ GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`"
- fi
-
- AC_SUBST([GTK3_BINARY_VERSION])
-
--AM_CONDITIONAL([HAVE_GTK_3],[test "$have_gtk_3" = "yes"])
-+AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk3" = "yes"])
-
- dnl ===========================================================================
- dnl GDK-Pixbuf SVG loader
-@@ -305,6 +310,6 @@ librsvg-$VERSION
- Build introspectable bindings: ${found_introspection}
- Build Vala bindings: ${enable_vala}
- Build GdkPixbuf loader: ${enable_pixbuf_loader}
-- GTK 3.0: ${have_gtk_3}
-+ GTK 3.0: ${with_gtk3}
- Build miscellaenous tools: ${build_misc_tools}
- "
---
-1.7.10.4
\ No newline at end of file
diff --git a/gnome-base/librsvg/librsvg-2.40.6.ebuild b/gnome-base/librsvg/librsvg-2.40.6.ebuild
deleted file mode 100644
index 76a8c24..0000000
--- a/gnome-base/librsvg/librsvg-2.40.6.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools gnome2 multilib-minimal vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+introspection vala tools"
-REQUIRED_USE="
- vala? ( introspection )
-"
-
-RDEPEND="
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
- >=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.10.8 )
- tools? ( >=x11-libs/gtk+-3.2.0:3 )
-"
-DEPEND="${RDEPEND}
- dev-libs/gobject-introspection-common
- dev-libs/vala-common
- >=dev-util/gtk-doc-am-1.13
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- vala? ( $(vala_depend) )
-"
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=712693
- epatch "${FILESDIR}/${PN}-2.40.1-gtk-optional.patch"
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=731826
- epatch "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch"
-
- eautoreconf
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=()
-
- # -Bsymbolic is not supported by the Darwin toolchain
- if [[ ${CHOST} == *-darwin* ]]; then
- myconf+=( --disable-Bsymbolic )
- fi
-
- # --disable-tools even when USE=tools; the tools/ subdirectory is useful
- # only for librsvg developers
- ECONF_SOURCE=${S} \
- gnome2_src_configure \
- --disable-static \
- --disable-tools \
- $(multilib_native_use_enable introspection) \
- $(multilib_native_use_with tools gtk3) \
- $(multilib_native_use_enable vala) \
- --enable-pixbuf-loader \
- "${myconf[@]}"
-
- if multilib_is_native_abi; then
- ln -s "${S}"/doc/html doc/html || die
- fi
-}
-
-multilib_src_compile() {
- # causes segfault if set, see bug #411765
- unset __GL_NO_DSO_FINALIZER
- gnome2_src_compile
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-pkg_postinst() {
- # causes segfault if set, see bug 375615
- unset __GL_NO_DSO_FINALIZER
- multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- # causes segfault if set, see bug 375615
- unset __GL_NO_DSO_FINALIZER
- multilib_foreach_abi gnome2_pkg_postrm
-}
diff --git a/gnome-base/librsvg/librsvg-2.40.8.ebuild b/gnome-base/librsvg/librsvg-2.40.8.ebuild
deleted file mode 100644
index e000c92..0000000
--- a/gnome-base/librsvg/librsvg-2.40.8.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools gnome2 multilib-minimal vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+introspection vala tools"
-REQUIRED_USE="
- vala? ( introspection )
-"
-
-RDEPEND="
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
- >=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.10.8 )
- tools? ( >=x11-libs/gtk+-3.2.0:3 )
-"
-DEPEND="${RDEPEND}
- dev-libs/gobject-introspection-common
- dev-libs/vala-common
- >=dev-util/gtk-doc-am-1.13
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- vala? ( $(vala_depend) )
-"
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=653323
- epatch "${FILESDIR}/${PN}-2.40.7-gtk-optional.patch"
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=731826
- epatch "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch"
-
- eautoreconf
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=()
-
- # -Bsymbolic is not supported by the Darwin toolchain
- if [[ ${CHOST} == *-darwin* ]]; then
- myconf+=( --disable-Bsymbolic )
- fi
-
- # --disable-tools even when USE=tools; the tools/ subdirectory is useful
- # only for librsvg developers
- ECONF_SOURCE=${S} \
- gnome2_src_configure \
- --disable-static \
- --disable-tools \
- $(multilib_native_use_enable introspection) \
- $(multilib_native_use_with tools gtk3) \
- $(multilib_native_use_enable vala) \
- --enable-pixbuf-loader \
- "${myconf[@]}"
-
- if multilib_is_native_abi; then
- ln -s "${S}"/doc/html doc/html || die
- fi
-}
-
-multilib_src_compile() {
- # causes segfault if set, see bug #411765
- unset __GL_NO_DSO_FINALIZER
- gnome2_src_compile
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-pkg_postinst() {
- # causes segfault if set, see bug 375615
- unset __GL_NO_DSO_FINALIZER
- multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- # causes segfault if set, see bug 375615
- unset __GL_NO_DSO_FINALIZER
- multilib_foreach_abi gnome2_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-11-09 11:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-09 11:07 [gentoo-commits] repo/gentoo:master commit in: gnome-base/librsvg/files/, gnome-base/librsvg/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-11-09 10:11 Sam James
2023-06-19 15:30 Matt Turner
2022-04-27 3:27 Matt Turner
2016-07-02 13:31 Pacho Ramos
2015-09-05 12:51 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox