author | Antonio Rojas
<arojas@archlinux.org> 2020-11-14 10:31:48 UTC |
committer | Antonio Rojas
<arojas@archlinux.org> 2020-11-14 10:31:48 UTC |
parent | 4daf656d18357332657804d84d929f3881c328d4 |
PKGBUILD | +10 | -4 |
solid-find-imobiledevice.patch | +26 | -0 |
diff --git a/PKGBUILD b/PKGBUILD index deb3231..4cfbb7e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=solid -pkgver=5.75.0 +pkgver=5.76.0 pkgrel=1 pkgdesc='Hardware integration and detection' arch=(x86_64) @@ -13,11 +13,17 @@ depends=(qt5-base media-player-info upower udisks2) makedepends=(extra-cmake-modules qt5-tools qt5-doc doxygen qt5-declarative) optdepends=('qt5-declarative: QML bindings') groups=(kf5) -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig}) -sha256sums=('471bb76ca0971ab945f2270490b1f72300d86b2b36094ac610e5af69df738a77' - 'SKIP') +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig} + solid-find-imobiledevice.patch) +sha256sums=('7958d047c8bd7622f91541acbe2d554c222218419ee18f395059a09fb90d264d' + 'SKIP' + '0209d2415cc1c43c789878284b95d5e6d9e45ec59dc20193adcdf9e444cdb65b') validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure@kde.org> +prepare() { + patch -d $pkgname-$pkgver -p1 -i ../solid-find-imobiledevice.patch # Fix plist and imobiledevice detection +} + build() { cmake -B build -S $pkgname-$pkgver \ -DBUILD_TESTING=OFF \ diff --git a/solid-find-imobiledevice.patch b/solid-find-imobiledevice.patch new file mode 100644 index 0000000..70ac7a9 --- /dev/null +++ b/solid-find-imobiledevice.patch @@ -0,0 +1,26 @@ +diff --git a/cmake/FindIMobileDevice.cmake b/cmake/FindIMobileDevice.cmake +index 5168fc4..d86fd95 100644 +--- a/cmake/FindIMobileDevice.cmake ++++ b/cmake/FindIMobileDevice.cmake +@@ -33,7 +33,7 @@ find_package(PkgConfig QUIET) + pkg_check_modules(PC_libimobiledevice QUIET libimobiledevice-1.0) + + find_path(IMobileDevice_INCLUDE_DIRS NAMES libimobiledevice/libimobiledevice.h HINTS ${PC_libimobiledevice_INCLUDE_DIRS}) +-find_library(IMobileDevice_LIBRARIES NAMES imobiledevice HINTS ${PC_libimobiledevice_LIBRARY_DIRS}) ++find_library(IMobileDevice_LIBRARIES NAMES imobiledevice-1.0 imobiledevice HINTS ${PC_libimobiledevice_LIBRARY_DIRS}) + + set(IMobileDevice_VERSION ${PC_libimobiledevice_VERSION}) + +diff --git a/cmake/FindPList.cmake b/cmake/FindPList.cmake +index 363981e..e13db6b 100644 +--- a/cmake/FindPList.cmake ++++ b/cmake/FindPList.cmake +@@ -33,7 +33,7 @@ find_package(PkgConfig QUIET) + pkg_search_module(PC_libplist QUIET libplist-2.0 libplist) + + find_path(PList_INCLUDE_DIRS NAMES plist/plist.h HINTS ${PC_libplist_INCLUDE_DIRS}) +-find_library(PList_LIBRARIES NAMES plist HINTS ${PC_libplist_LIBRARY_DIRS}) ++find_library(PList_LIBRARIES NAMES plist-2.0 plist HINTS ${PC_libplist_LIBRARY_DIRS}) + + set(PList_VERSION ${PC_libplist_VERSION}) +