Christian Heusel pushed to branch main at Arch Linux / Packaging / Packages / rpi-imager
Commits: 4f4c16ad by Dmytro Aleksandrov at 2024-09-14T12:07:28-04:00 updpkg: 1.8.5-4: remove unnecessary patching Originally there was no knob to disable version checking during startup, thus it was manually patched out. Since v1.7.2 there is a proper CMake option 'ENABLE_CHECK_VERSION' to disable this feature [1], thus it would be more readable to just use it. [1] https://github.com/raspberrypi/rpi-imager/commit/5d971375f6594e1e19ef0b071e487967c12a527e - - - - - 3 changed files: - .SRCINFO - PKGBUILD - − remove_update_checking.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = rpi-imager pkgdesc = Raspberry Pi Imaging Utility pkgver = 1.8.5 - pkgrel = 3 + pkgrel = 4 url = https://github.com/raspberrypi/rpi-imager arch = x86_64 license = Apache-2.0 @@ -21,8 +21,6 @@ pkgbase = rpi-imager optdepends = dosfstools: SD card bootloader support optdepends = udisks2: Needed if you want to be able to run rpi-imager as a regular user source = rpi-imager-1.8.5.tar.gz::https://github.com/raspberrypi/rpi-imager/archive/v1.8.5.tar.gz - source = remove_update_checking.patch b2sums = a3268674a9d8345c23b765beef041404185eb31a25cefc2adee0d6de7910aa526c1b1f0073e4fd959ae3aa04764c9890355835295dab40149d07e37b0869a890 - b2sums = 18b8cb55be4e46279dfab42f8d742d52f5ad68d74b45195066d8d2422aa6875d644fbc81f293629f71bd12498a402a91a359a7793058429d5d60a20f061ceef2 pkgname = rpi-imager ===================================== PKGBUILD ===================================== @@ -4,7 +4,7 @@ pkgname=rpi-imager pkgver=1.8.5 -pkgrel=3 +pkgrel=4 pkgdesc="Raspberry Pi Imaging Utility" depends=( 'curl' @@ -31,23 +31,15 @@ arch=('x86_64') url="https://github.com/raspberrypi/rpi-imager"; license=("Apache-2.0") -source=( - "${pkgname}-${pkgver}.tar.gz::https://github.com/raspberrypi/${pkgname}/archive/v${pkgver}.tar.gz"; - "remove_update_checking.patch" -) - -b2sums=('a3268674a9d8345c23b765beef041404185eb31a25cefc2adee0d6de7910aa526c1b1f0073e4fd959ae3aa04764c9890355835295dab40149d07e37b0869a890' - '18b8cb55be4e46279dfab42f8d742d52f5ad68d74b45195066d8d2422aa6875d644fbc81f293629f71bd12498a402a91a359a7793058429d5d60a20f061ceef2') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/raspberrypi/${pkgname}/archive/v${pkgver}.tar.gz";) -prepare() { - cd "$srcdir/$pkgname-$pkgver" - patch --strip=1 --input="$srcdir/remove_update_checking.patch" -} +b2sums=('a3268674a9d8345c23b765beef041404185eb31a25cefc2adee0d6de7910aa526c1b1f0073e4fd959ae3aa04764c9890355835295dab40149d07e37b0869a890') build() { cmake -B build -S "${pkgname}-${pkgver}/src" \ -DCMAKE_BUILD_TYPE='None' \ - -DCMAKE_INSTALL_PREFIX='/usr' + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DENABLE_CHECK_VERSION=OFF cmake --build build } ===================================== remove_update_checking.patch deleted ===================================== @@ -1,17 +0,0 @@ -diff --color --unified --recursive --text orig/src/main.qml new/src/main.qml ---- orig/src/main.qml 2023-11-18 09:52:10.767398847 +0100 -+++ new/src/main.qml 2023-11-18 09:53:12.521334474 +0100 -@@ -1500,13 +1500,6 @@ - } - } - } -- -- if (imageWriter.getBoolSetting("check_version") && "latest_version" in imager && "url" in imager) { -- if (!imageWriter.isEmbeddedMode() && imageWriter.isVersionNewer(imager["latest_version"])) { -- updatepopup.url = imager["url"] -- updatepopup.openPopup() -- } -- } - if ("default_os" in imager) { - selectNamedOS(imager["default_os"], osmodel) - } View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/rpi-imager/-/commit/4f4c16ade513ce01798b66bd275dd14d4934c890 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/rpi-imager/-/commit/4f4c16ade513ce01798b66bd275dd14d4934c890 You're receiving this email because of your account on gitlab.archlinux.org.
