| 1 |
commit: 09bdb6811f97dd040d8854c1296580c9bea5a5a8 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 2 13:51:08 2022 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 2 13:52:13 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09bdb681 |
| 7 |
|
| 8 |
dev-cpp/sdbus-c++: Apply Gentoo musl patches to systemd |
| 9 |
|
| 10 |
This downgrades systemd slightly but the precise version isn't too important. |
| 11 |
This is admittedly not tested against musl. Hopefully it's sufficient. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/836414 |
| 14 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 15 |
|
| 16 |
dev-cpp/sdbus-c++/Manifest | 3 ++- |
| 17 |
.../{sdbus-c++-0.9.0.ebuild => sdbus-c++-0.9.0-r1.ebuild} | 13 +++++++++++-- |
| 18 |
.../{sdbus-c++-1.1.0.ebuild => sdbus-c++-1.1.0-r1.ebuild} | 13 +++++++++++-- |
| 19 |
3 files changed, 24 insertions(+), 5 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest |
| 22 |
index fd0c4fb8f9c5..a1645906706d 100644 |
| 23 |
--- a/dev-cpp/sdbus-c++/Manifest |
| 24 |
+++ b/dev-cpp/sdbus-c++/Manifest |
| 25 |
@@ -1,3 +1,4 @@ |
| 26 |
DIST sdbus-c++-0.9.0.tar.gz 198979 BLAKE2B 31cda7ce97aad05f93a015ca0f8bd93aa095f6abb6bc513343767c7221d2aeacc96ee2b6a1b0ecf50850f17506fc97aa3a9fead0332687d57bdbddf806502826 SHA512 8695d3efac5654cb28998cdd69c16f251654b2c95e0dc2a2f5a4b01b24dae7b04e1a1f2e9bc9fb96b99f099dd4a130ca980cb672f74829565fd0d48162a581c5 |
| 27 |
DIST sdbus-c++-1.1.0.tar.gz 201532 BLAKE2B 3dac74cb7fc6717db9d25463ddfb9122db54edcd3bc9d1e71d18c132ede1efaf12b514f335c3978f51277afff7e6ab5533cfd02241759f7e3d24cede8aa29c6d SHA512 ba6230c0d1019875d92a92f793278c528a01692dc70e7acee8bb289af5dae65c1ad7b1c139f859cb7a960c7b48501178bfdf755163c2bc4d3766e67f3aa9b883 |
| 28 |
-DIST systemd-stable-250.4.tar.gz 11132786 BLAKE2B 8fdfe1bad76e572dc1be0955f3d1c4080f2beb81a2f9670f80827899f5406ab8ed8675400c2f5e8ccef44cf1bceff42ceae12a42e1b67d46c0deb523e6495f25 SHA512 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0 |
| 29 |
+DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b |
| 30 |
+DIST systemd-stable-249.5.tar.gz 10597897 BLAKE2B 5c573322ef9bcd9d019776d6e2d8625a741c1535c0d06661b5666c2438a70cfc4dc182919bb419829de27a4d93c16717ce24e668faf9bd6b09e57f8bd88be725 SHA512 d6f1a5a6f03f0ed05b111aee75da509c5868c523af6209f33e630724dd0c7e0d0abf16920795d587e6c31a5915d247ebc613cf26d4aecf39f82ebb0690fab75f |
| 31 |
|
| 32 |
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r1.ebuild |
| 33 |
similarity index 88% |
| 34 |
rename from dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild |
| 35 |
rename to dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r1.ebuild |
| 36 |
index 04f6c85c5a16..fde2a90c6d5e 100644 |
| 37 |
--- a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild |
| 38 |
+++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r1.ebuild |
| 39 |
@@ -6,11 +6,19 @@ EAPI=8 |
| 40 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 41 |
inherit python-any-r1 meson cmake |
| 42 |
|
| 43 |
-SDP="systemd-stable-250.4" |
| 44 |
+SDP="systemd-stable-249.5" |
| 45 |
+MUSL_PATCHSET="249.5-r1" |
| 46 |
+ |
| 47 |
DESCRIPTION="High-level C++ D-Bus library" |
| 48 |
HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp" |
| 49 |
SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz |
| 50 |
- !systemd? ( https://github.com/systemd/systemd/archive/v${SDP##*-}/${SDP}.tar.gz )" |
| 51 |
+ !systemd? ( |
| 52 |
+ https://github.com/systemd/systemd/archive/v${SDP##*-}/${SDP}.tar.gz |
| 53 |
+ elibc_musl? ( |
| 54 |
+ https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz |
| 55 |
+ https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz |
| 56 |
+ ) |
| 57 |
+ )" |
| 58 |
LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same. |
| 59 |
SLOT="0/0" |
| 60 |
KEYWORDS="~amd64" |
| 61 |
@@ -56,6 +64,7 @@ pkg_setup() { |
| 62 |
src_prepare() { |
| 63 |
if ! use systemd; then |
| 64 |
pushd "${SDS}" || die |
| 65 |
+ use elibc_musl && eapply "${WORKDIR}"/musl-patches |
| 66 |
eapply "${FILESDIR}"/${PN}-static-libsystemd.patch |
| 67 |
popd || die |
| 68 |
fi |
| 69 |
|
| 70 |
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r1.ebuild |
| 71 |
similarity index 88% |
| 72 |
rename from dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild |
| 73 |
rename to dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r1.ebuild |
| 74 |
index 7eee346da844..df550152fd34 100644 |
| 75 |
--- a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild |
| 76 |
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r1.ebuild |
| 77 |
@@ -6,11 +6,19 @@ EAPI=8 |
| 78 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 79 |
inherit python-any-r1 meson cmake |
| 80 |
|
| 81 |
-SDP="systemd-stable-250.4" |
| 82 |
+SDP="systemd-stable-249.5" |
| 83 |
+MUSL_PATCHSET="249.5-r1" |
| 84 |
+ |
| 85 |
DESCRIPTION="High-level C++ D-Bus library" |
| 86 |
HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp" |
| 87 |
SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz |
| 88 |
- !systemd? ( https://github.com/systemd/systemd/archive/v${SDP##*-}/${SDP}.tar.gz )" |
| 89 |
+ !systemd? ( |
| 90 |
+ https://github.com/systemd/systemd/archive/v${SDP##*-}/${SDP}.tar.gz |
| 91 |
+ elibc_musl? ( |
| 92 |
+ https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz |
| 93 |
+ https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz |
| 94 |
+ ) |
| 95 |
+ )" |
| 96 |
LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same. |
| 97 |
SLOT="0/1" |
| 98 |
KEYWORDS="~amd64" |
| 99 |
@@ -60,6 +68,7 @@ pkg_setup() { |
| 100 |
src_prepare() { |
| 101 |
if ! use systemd; then |
| 102 |
pushd "${SDS}" || die |
| 103 |
+ use elibc_musl && eapply "${WORKDIR}"/musl-patches |
| 104 |
eapply "${FILESDIR}"/${PN}-static-libsystemd.patch |
| 105 |
popd || die |
| 106 |
fi |
Archives