summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmytro Aleksandrov2021-03-30 16:40:51 +0300
committerDmytro Aleksandrov2021-03-30 16:40:51 +0300
commit5bf62d4cc7a929d5a518d6cd74a392613fdfb010 (patch)
tree2b4016291718af731fc6f9b1b974255587fe6f3c
parent5c1ba77c30e77b4779461d4ea80c9262cf075939 (diff)
downloadaur-5bf62d4cc7a929d5a518d6cd74a392613fdfb010.tar.gz
update v1.6.1
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD10
-rw-r--r--remove_update_checking.patch8
3 files changed, 14 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 57040e742722..243164396ad5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = rpi-imager
pkgdesc = Raspberry Pi Imaging Utility
- pkgver = 1.6
- pkgrel = 2
+ pkgver = 1.6.1
+ pkgrel = 1
url = https://github.com/raspberrypi/rpi-imager
arch = x86_64
arch = aarch64
@@ -16,10 +16,10 @@ pkgbase = rpi-imager
depends = qt5-quickcontrols2
depends = qt5-svg
depends = qt5-tools
- source = rpi-imager-1.6.tar.gz::https://github.com/raspberrypi/rpi-imager/archive/v1.6.tar.gz
+ source = rpi-imager-1.6.1.tar.gz::https://github.com/raspberrypi/rpi-imager/archive/1.6.1.tar.gz
source = remove_update_checking.patch
- sha256sums = 811f9c261f82f75eefb9129570c47ff6653c1e9af08d9ed0b877261b4d184685
- sha256sums = eaffe8e2f1a958575d746b06460f39157427e894fb13bd78264a0d443cdeaf2f
+ sha256sums = 166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509
+ sha256sums = 8569a55e3a98ea955dc95a7492e3e45db25c7e6a53660f8ba971b8fefb7b0e1e
pkgname = rpi-imager
diff --git a/PKGBUILD b/PKGBUILD
index 258526880af5..aee868d06af5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
#Maintainer: Dmytro Aleksandrov <alkersan@gmail.com>
pkgname=rpi-imager
-pkgver=1.6
-pkgrel=2
+pkgver=1.6.1
+pkgrel=1
pkgdesc="Raspberry Pi Imaging Utility"
depends=('curl' 'libarchive' 'qt5-base' 'qt5-declarative' 'qt5-quickcontrols2' 'qt5-svg' 'qt5-tools')
makedepends=('gcc' 'make' 'cmake')
@@ -11,12 +11,12 @@ url="https://github.com/raspberrypi/rpi-imager"
license=("Apache")
source=(
- "${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
+ "${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
"remove_update_checking.patch"
)
-sha256sums=('811f9c261f82f75eefb9129570c47ff6653c1e9af08d9ed0b877261b4d184685'
- 'eaffe8e2f1a958575d746b06460f39157427e894fb13bd78264a0d443cdeaf2f')
+sha256sums=('166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509'
+ '8569a55e3a98ea955dc95a7492e3e45db25c7e6a53660f8ba971b8fefb7b0e1e')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/remove_update_checking.patch b/remove_update_checking.patch
index eb1c492c7c85..6e61491842bb 100644
--- a/remove_update_checking.patch
+++ b/remove_update_checking.patch
@@ -4,9 +4,9 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/main.qml b/main.qml
---- a/main.qml (revision 906ceabaecf060e0720dd2c71e140f8347101b42)
-+++ b/main.qml (date 1616171499168)
-@@ -955,16 +955,6 @@
+--- a/main.qml (revision a82fe15d5467cf6af5bd382524dd83da285ab54f)
++++ b/main.qml (date 1617095732205)
+@@ -960,16 +960,6 @@
for (var i in oslist) {
osmodel.insert(osmodel.count-2, oslist[i])
}
@@ -14,7 +14,7 @@ diff --git a/main.qml b/main.qml
- if ("imager" in o) {
- var imager = o["imager"]
- if ("latest_version" in imager && "url" in imager) {
-- if (imageWriter.isVersionNewer(imager["latest_version"])) {
+- if (!imageWriter.isEmbeddedMode() && imageWriter.isVersionNewer(imager["latest_version"])) {
- updatepopup.url = imager["url"]
- updatepopup.openPopup()
- }