summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmytro Aleksandrov2020-12-23 10:22:11 +0200
committerDmytro Aleksandrov2020-12-23 10:22:11 +0200
commit6e11e9b1ac5e490f165e25f637fd5cbb3334df57 (patch)
tree57ef08505d7bf7d6cfb720ffe195897c9f61c03c
parent10a5d234e6180493365575acaa1434cc951d5339 (diff)
downloadaur-6e11e9b1ac5e490f165e25f637fd5cbb3334df57.tar.gz
update v1.5
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD15
-rw-r--r--fix_find_package_arguments_order.patch13
3 files changed, 8 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 51ac03101f85..e9ac7504c45e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = rpi-imager
pkgdesc = Raspberry Pi Imaging Utility
- pkgver = 1.4
- pkgrel = 3
+ pkgver = 1.5
+ pkgrel = 1
url = https://github.com/raspberrypi/rpi-imager
arch = any
license = Apache
@@ -15,10 +15,8 @@ pkgbase = rpi-imager
depends = qt5-quickcontrols2
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
+ source = rpi-imager-1.5.tar.gz::https://github.com/raspberrypi/rpi-imager/archive/v1.5.tar.gz
+ sha256sums = 972592886b4ff448b34bd420817f7b019c40fdab6ccef7acbc69986c1904e39c
pkgname = rpi-imager
diff --git a/PKGBUILD b/PKGBUILD
index 27091ed94627..f53296e0eb96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
#Maintainer: Dmytro Aleksandrov <alkersan@gmail.com>
pkgname=rpi-imager
-pkgver=1.4
-pkgrel=3
+pkgver=1.5
+pkgrel=1
pkgdesc="Raspberry Pi Imaging Utility"
depends=('curl' 'libarchive' 'qt5-base' 'qt5-declarative' 'qt5-quickcontrols2' 'qt5-svg' 'qt5-tools')
makedepends=('gcc' 'make' 'cmake')
@@ -10,16 +10,9 @@ arch=('any')
url="https://github.com/raspberrypi/rpi-imager"
license=("Apache")
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
- "fix_find_package_arguments_order.patch")
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz")
-sha256sums=('f42359fca67a61fa37f0dfd0167749b7d758263b8501c07473d416542d78e004'
- '4be37532c38419b6ac25c54ba22618c17ad26bae8fee40dc95f8a63e7381eb2e')
-
-prepare() {
- cd "${pkgname}-${pkgver}"
- patch --forward < "${srcdir}/fix_find_package_arguments_order.patch"
-}
+sha256sums=('972592886b4ff448b34bd420817f7b019c40fdab6ccef7acbc69986c1904e39c')
build() {
rm -rf build
diff --git a/fix_find_package_arguments_order.patch b/fix_find_package_arguments_order.patch
deleted file mode 100644
index 18784de5fa7d..000000000000
--- a/fix_find_package_arguments_order.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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")