Summary: | kde-base/kdelibs-4.10 (from 4.9.98) should have udisks rdep under USE=udisks | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Duncan <1i5t5.duncan> |
Component: | [OLD] KDE | Assignee: | Gentoo KDE team <kde> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | carlphilippreh, erikdenstore+gbugs, franz.trischberger, handgranaten-herbert, josef64 |
Priority: | Normal | ||
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- | |
Attachments: |
[PATCH 1/2] kdelibs-4.10.0: make udisks2 optional
[PATCH 2/2] kdelibs-4.10.0: Make udisks optional |
Description
Duncan
2013-02-06 05:26:35 UTC
This change was introduced due to upstream changes: if ( WITH_SOLID_UDISKS2 ) message(STATUS "Building Solid UDisks2 backend." ) add_definitions(-DWITH_SOLID_UDISKS2) set(solid_LIB_SRCS ${solid_LIB_SRCS} backends/udisks2/udisksmanager.cpp backends/udisks2/udisksdevice.cpp backends/udisks2/udisksdevicebackend.cpp backends/udisks2/udisksblock.cpp backends/udisks2/udisksstoragevolume.cpp backends/udisks2/udisksdeviceinterface.cpp backends/udisks2/udisksopticaldisc.cpp backends/udisks2/udisksopticaldrive.cpp backends/udisks2/udisksstoragedrive.cpp backends/udisks2/udisksstorageaccess.cpp backends/udisks2/udisksgenericinterface.cpp backends/udisks2/dbus/manager.cpp ) else ( WITH_SOLID_UDISKS2 ) message(STATUS "Building Solid UDisks backend." ) set(solid_LIB_SRCS ${solid_LIB_SRCS} backends/udisks/udisksmanager.cpp backends/udisks/udisksdevice.cpp backends/udisks/udisksblock.cpp backends/udisks/udisksstoragevolume.cpp backends/udisks/udisksdeviceinterface.cpp backends/udisks/udisksopticaldisc.cpp backends/udisks/udisksopticaldrive.cpp backends/udisks/udisksstoragedrive.cpp backends/udisks/udisksstorageaccess.cpp backends/udisks/udisksgenericinterface.cpp ) endif ( WITH_SOLID_UDISKS2 ) We can try to patch it but please complain upstream too and let us know. Just added a patched kdelibs to my overlay: https://github.com/ff2000/gentoo-overlay It completely removes the ability to build with udisks1. Created attachment 338252 [details, diff]
[PATCH 1/2] kdelibs-4.10.0: make udisks2 optional
udisks:0 has way less intrusive dependencies than udisks:2 , and AFAICT kdelibs has no trouble using it. There's a use mask on udisks2 somewhere though (which suits me fine), but might not be desired.
I have only tested this by building and running the kde-based applications I normally use. (I don't use kwin & c.) I observed no problems.
Created attachment 338258 [details, diff]
[PATCH 2/2] kdelibs-4.10.0: Make udisks optional
This combines Franz' patches with my previous ebuild suggestion, giving a similar hierarchy of use flags as previous kdelibs versions.
Testing is like the above. Both udisks,-udisks2 and -udisks,-udisks2 seem to work fine for me.
I'm not sure about the required_use part, but both Franz' and the previous ebuild had it.
+ 07 Feb 2013; Michael Palimaka <kensington@gentoo.org> + +files/kdelibs-4.10.0-udisks.patch, kdelibs-4.10.0.ebuild: + Add patch by Franz Fellner <alpine.art.de@googlemail.com> to make udisks + support optional, wrt bug #455792. Seems to be working here, but please test! (In reply to comment #3) > udisks:0 has way less intrusive dependencies than udisks:2 I'd disagree. They both have heavy deps, but different heavy deps. (udisks-1 aka udisks:0 at least used to pull in device-mapper, part of lvm2, which I'd consider a heavy dep for folks not using it already. Naturally you'd not be as likely to consider that a "heavy" dep if you're already using it for something else.) This bug is related to bugs 424157 and 456010, but I'll let someone else figure out whether/how to mark the bug-deps. (In reply to comment #7) > This bug is related to bugs 424157 and 456010, but I'll let someone else > figure out whether/how to mark the bug-deps. 424157 is about updating the udisks:2-patch (to get udisks:0 out of portage). With 4.10.0 this is obsolete, as udisks:2-backend comes with the kdelibs-tarball. 456010 seems to be caused by the non-optional dep on udisks:2 but offer USE="udev". This imho is an upstream bug, as building udisks2-backend needs their udev-lib and should NOT be built if udev is not found. At least it should throw an error when running cmake. This looks to be working fine now, closing. Thanks to everyone for patches and testing. |