diff options
| author | Dmytro Aleksandrov | 2020-08-02 12:28:35 +0300 |
|---|---|---|
| committer | Dmytro Aleksandrov | 2020-08-02 12:29:13 +0300 |
| commit | 59e4ad644e5c3118d3801f7052ed2b0d70878cec (patch) | |
| tree | ae500c2f87ec5949d3094bfb5b5de19658a691f0 | |
| parent | 704a29edb576301866407491d0f50a8ee13e873f (diff) | |
| download | aur-59e4ad644e5c3118d3801f7052ed2b0d70878cec.tar.gz | |
Fix cmake find_package arguments order
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | fix_find_package_arguments_order.patch | 13 |
4 files changed, 30 insertions, 5 deletions
@@ -1,7 +1,7 @@ pkgbase = rpi-imager pkgdesc = Raspberry Pi Imaging Utility pkgver = 1.4 - pkgrel = 1 + pkgrel = 2 url = https://github.com/raspberrypi/rpi-imager arch = x86_64 license = Apache @@ -16,7 +16,9 @@ pkgbase = rpi-imager depends = qt5-svg depends = qt5-tools source = rpi-imager-1.4.tar.gz::https://github.com/raspberrypi/rpi-imager/archive/v1.4.tar.gz + source = fix_find_package_arguments_order.patch sha256sums = f42359fca67a61fa37f0dfd0167749b7d758263b8501c07473d416542d78e004 + sha256sums = 4be37532c38419b6ac25c54ba22618c17ad26bae8fee40dc95f8a63e7381eb2e pkgname = rpi-imager diff --git a/.gitignore b/.gitignore index f2f9c8e7d603..dcb1af397301 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ # But not these files... !.gitignore !.SRCINFO -!PKGBUILD
\ No newline at end of file +!PKGBUILD +!*.patch
\ No newline at end of file @@ -2,15 +2,24 @@ pkgname=rpi-imager pkgver=1.4 -pkgrel=1 +pkgrel=2 pkgdesc="Raspberry Pi Imaging Utility" depends=('curl' 'libarchive' 'qt5-base' 'qt5-declarative' 'qt5-quickcontrols2' 'qt5-svg' 'qt5-tools') makedepends=('gcc' 'make' 'cmake') arch=('x86_64') url="https://github.com/raspberrypi/rpi-imager" -source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz") license=("Apache") -sha256sums=('f42359fca67a61fa37f0dfd0167749b7d758263b8501c07473d416542d78e004') + +source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz" + "fix_find_package_arguments_order.patch") + +sha256sums=('f42359fca67a61fa37f0dfd0167749b7d758263b8501c07473d416542d78e004' + '4be37532c38419b6ac25c54ba22618c17ad26bae8fee40dc95f8a63e7381eb2e') + +prepare() { + cd "${pkgname}-${pkgver}" + patch --forward < "${srcdir}/fix_find_package_arguments_order.patch" +} build() { rm -rf build diff --git a/fix_find_package_arguments_order.patch b/fix_find_package_arguments_order.patch new file mode 100644 index 000000000000..18784de5fa7d --- /dev/null +++ b/fix_find_package_arguments_order.patch @@ -0,0 +1,13 @@ +--- CMakeLists.txt 2020-07-06 01:42:44.000000000 +0300 ++++ CMakeLists.txt 2020-08-02 12:15:41.678725791 +0300 +@@ -220,8 +220,8 @@ + COMMAND "${MACDEPLOYQT}" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.app" -qmldir="${CMAKE_CURRENT_SOURCE_DIR}") + + else() +- find_package(CURL REQUIRED 7.32.0) +- find_package(LibArchive REQUIRED 3.2.0) ++ find_package(CURL 7.32.0 REQUIRED) ++ find_package(LibArchive 3.2.0 REQUIRED) + find_package(OpenSSL REQUIRED) + if (NOT CMAKE_CROSSCOMPILING) + find_program(LSBLK "lsblk") |