summaryrefslogtreecommitdiff
path: root/sys-fs/udisks
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-05-12 16:42:50 +0300
committerV3n3RiX <venerix@koprulu.sector>2022-05-12 16:42:50 +0300
commit752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree330d16e6362a49cbed8875a777fe641a43376cd3 /sys-fs/udisks
parent0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
gentoo resync : 12.05.2022
Diffstat (limited to 'sys-fs/udisks')
-rw-r--r--sys-fs/udisks/Manifest3
-rw-r--r--sys-fs/udisks/files/udisks-2.9.4-undefined.patch30
-rw-r--r--sys-fs/udisks/udisks-2.9.4.ebuild11
3 files changed, 41 insertions, 3 deletions
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 4a19d9486874..ace68ee5038a 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,5 +1,6 @@
+AUX udisks-2.9.4-undefined.patch 1330 BLAKE2B b8ac0d5b7944f9ef6312472009720fa096209bcd912ddf8d43b6fc8ba9b0c6ae5e93701fd320fd008d73ae0f4cd348ffbded76d9c63c356230a440792191e60b SHA512 c4ab8c083d95fa1f3d6dfa8f1dddb7dd1ce04c42d40314d1ef32148aaf3f8454c9a09b9c3bfd000a07af9a692d4a95ede43e9c650d7b28134debe62570e772f6
DIST udisks-2.9.3.tar.bz2 1778637 BLAKE2B 77352e2beb081486586587e3d7bdc5047662b27a246424bb995188c9da784e464681d9307dd0c4ca22a21da66d04dbdc9c945cc926b219a80682acfa60de04fe SHA512 1ee6e982e599c6872183068dd64f9259a522dea7a91ddc3119f9bc436c9c6bf2911e61f7ae339d67d4851cb6f55ec05b6d9a4cc8c1a9f7c5d35c66b80d5ada42
DIST udisks-2.9.4.tar.bz2 1699288 BLAKE2B 913f6dd02988c0bded13ae15a5f05e5b3c6404f0b0d58a493601a0762c7534403f89e9fb46ec6a536b85d5f9ca1f788c7a308f5563a897b324d212da0e7bab4b SHA512 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5
EBUILD udisks-2.9.3.ebuild 3645 BLAKE2B 580c9a49011e943f5a43f192fc40e6198149b90e19d2afe332163d6f932e90b25e4f8753fed3bbbc1dcacef956cf51eb35ffab376ad03e40476fc60ffba0af1c SHA512 e017cf2556064678567cf4556baeb56bbfbc5b3d9d3ce070c6f3ecf3ff6672029053f6ae48e6bd8193e9557901327b428a00b1b1ed9f6449e3ca337e9602638a
-EBUILD udisks-2.9.4.ebuild 3645 BLAKE2B 580c9a49011e943f5a43f192fc40e6198149b90e19d2afe332163d6f932e90b25e4f8753fed3bbbc1dcacef956cf51eb35ffab376ad03e40476fc60ffba0af1c SHA512 e017cf2556064678567cf4556baeb56bbfbc5b3d9d3ce070c6f3ecf3ff6672029053f6ae48e6bd8193e9557901327b428a00b1b1ed9f6449e3ca337e9602638a
+EBUILD udisks-2.9.4.ebuild 3753 BLAKE2B 361c1d5a03298570a4abf9c324ac667c1a890d514482cb8271cfb5e21ad7b9b8b4eb6d6a625dd77569e47ffc10bc3c64da4efd0759a578761a0fe8f102cca7b2 SHA512 dd93ba3c032fd1a527535c8329b221bfa4870f7fb8f1dbf299b58bbb97e9ba1ba84fa0f68829e1cd481d8502ddeb44f860695b5ed6edab633b67db6fb9f29d0c
MISC metadata.xml 729 BLAKE2B 21d1e33721c8a7abd2975d78821962dbc8c94f5f51458e02d405a44951ca76571bc37122ca996c52dbeada744cb660920a5d8205b1d3085dbc2d7c3966afb22e SHA512 020c530139c38d3d984a49a3aae799fb417e84523b3d927792844bcc11471e7d23a694db6cc75b6b6f6682a36c996cb3b011da5228c54cc0cf8b62e65c1f6671
diff --git a/sys-fs/udisks/files/udisks-2.9.4-undefined.patch b/sys-fs/udisks/files/udisks-2.9.4-undefined.patch
new file mode 100644
index 000000000000..f87e145e82aa
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-2.9.4-undefined.patch
@@ -0,0 +1,30 @@
+Upstream-PR: https://github.com/storaged-project/udisks/pull/978
+From 362cc8f1613193f8e68d13a416421bb36fd7f713 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 10 May 2022 09:29:10 -0700
+Subject: [PATCH] modules/btrfs: Add missing dependency
+
+When building udisks with --enable-btrfs using slibtool instead of GNU
+libtool the build will fail with undefined references.
+
+This is because of a missing dependency for libudisks2_btrfs_la_LIBADD
+and GNU libtool will hide this issue by silently ignoring -no-undefined
+while slibtool does not.
+
+Gentoo Bug: https://bugs.gentoo.org/782061
+---
+ modules/btrfs/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/btrfs/Makefile.am b/modules/btrfs/Makefile.am
+index ac8c941849..f96cd16186 100644
+--- a/modules/btrfs/Makefile.am
++++ b/modules/btrfs/Makefile.am
+@@ -73,6 +73,7 @@ libudisks2_btrfs_la_LDFLAGS = \
+ $(NULL)
+
+ libudisks2_btrfs_la_LIBADD = \
++ $(top_builddir)/src/libudisks-daemon.la \
+ $(GLIB_LIBS) \
+ $(GIO_LIBS) \
+ $(GUDEV_LIBS) \
diff --git a/sys-fs/udisks/udisks-2.9.4.ebuild b/sys-fs/udisks/udisks-2.9.4.ebuild
index 3112d930e977..1de00194813c 100644
--- a/sys-fs/udisks/udisks-2.9.4.ebuild
+++ b/sys-fs/udisks/udisks-2.9.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
+inherit autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
DESCRIPTION="Daemon providing interfaces to work with storage devices"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
@@ -61,6 +61,10 @@ BDEPEND="
DOCS=( AUTHORS HACKING NEWS README.md )
+PATCHES=(
+ "${FILESDIR}/${P}-undefined.patch" # 782061
+)
+
pkg_setup() {
# Listing only major arch's here to avoid tracking kernel's defconfig
if use amd64 || use arm || use ppc || use ppc64 || use x86; then
@@ -79,6 +83,9 @@ src_prepare() {
if ! use systemd ; then
sed -i -e 's:libsystemd-login:&disable:' configure || die
fi
+
+ # Added for bug # 782061
+ eautoreconf
}
src_configure() {