From 467dfbd1490c3e0b01a61fd02cdbb822a664e850 Mon Sep 17 00:00:00 2001 From: Linus Date: Wed, 8 Mar 2023 19:00:28 +0100 Subject: [PATCH 1/7] Update plato to 0.9.34 --- package/plato/package | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/package/plato/package b/package/plato/package index 9e26440b3..8272af4b2 100644 --- a/package/plato/package +++ b/package/plato/package @@ -5,8 +5,8 @@ pkgnames=(plato) pkgdesc="Document reader" url=https://github.com/LinusCDE/plato -pkgver=0.9.25-2 -timestamp=2022-02-08T23:54Z +pkgver=0.9.34-1 +timestamp=2023-03-08T17:58Z section="readers" maintainer="Linus K. " license=AGPL-3.0-or-later @@ -14,14 +14,11 @@ installdepends=(display jq) makedepends=(build:jq build:unzip build:wget) flags=(patch_rm2fb) -image=rust:v2.2.2 -source=("https://github.com/LinusCDE/plato/archive/${pkgver%-*}-rm-release-12.zip") -sha256sums=(42e18e882e7e6853e299234a44eea9b9e3c4170076eec0577a0644dcf7005cf9) +image=rust:v2.3 +source=("https://github.com/LinusCDE/plato/archive/${pkgver%-*}-rm-release-13.zip") +sha256sums=(82ef5786704ecdb4fe11ce16e7e4ae10b518a592965c292977bb33962c891d48) build() { - # Fall back to system-wide config - rm .cargo/config - # 'cargo pkgid' seems to output something different with most # recent nightly builds. This adjusts the filtering. sed -i "s/version=.*$/version=\'$(cargo pkgid | cut -d "#" -f 2 | cut -d ":" -f 2)\'/g" download.sh @@ -30,7 +27,6 @@ build() { export AR=arm-linux-gnueabihf-ar export CC=arm-linux-gnueabihf-gcc export STRIP=arm-linux-gnueabihf-strip - sed -i '/source \/usr\/local\/oecore-x86_64/d' src/mupdf_wrapper/build-kobo.sh # Compile all to dist/ ./clean.sh From 4476b9a7219a62ad21433fb7c88a322ad0644784 Mon Sep 17 00:00:00 2001 From: Linus Date: Wed, 8 Mar 2023 19:35:55 +0100 Subject: [PATCH 2/7] Bugfix --- package/plato/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/plato/package b/package/plato/package index 8272af4b2..0621093f2 100644 --- a/package/plato/package +++ b/package/plato/package @@ -21,7 +21,7 @@ sha256sums=(82ef5786704ecdb4fe11ce16e7e4ae10b518a592965c292977bb33962c891d48) build() { # 'cargo pkgid' seems to output something different with most # recent nightly builds. This adjusts the filtering. - sed -i "s/version=.*$/version=\'$(cargo pkgid | cut -d "#" -f 2 | cut -d ":" -f 2)\'/g" download.sh + sed -i "s/version=.*$/version=\'$(cargo pkgid -p plato | cut -d "#" -f 2 | cut -d ":" -f 2)\'/g" download.sh # Use our toolchain export AR=arm-linux-gnueabihf-ar From f0eb4925bdeccac961bd7745d2e06a0e75053f3f Mon Sep 17 00:00:00 2001 From: Linus Date: Tue, 16 May 2023 22:22:03 +0200 Subject: [PATCH 3/7] Empty commit to trigger build From 779f5ca9d1a8eb9bafc72168bea462dc99a4d682 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Thu, 8 Jun 2023 11:33:07 -0600 Subject: [PATCH 4/7] Use rust:v2.3.1 --- package/plato/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/plato/package b/package/plato/package index 0621093f2..0e36cdfb4 100644 --- a/package/plato/package +++ b/package/plato/package @@ -14,7 +14,7 @@ installdepends=(display jq) makedepends=(build:jq build:unzip build:wget) flags=(patch_rm2fb) -image=rust:v2.3 +image=rust:v2.3.1 source=("https://github.com/LinusCDE/plato/archive/${pkgver%-*}-rm-release-13.zip") sha256sums=(82ef5786704ecdb4fe11ce16e7e4ae10b518a592965c292977bb33962c891d48) From a2133766c992f4c02afc147886ac2b67bfdba0bd Mon Sep 17 00:00:00 2001 From: Linus Date: Thu, 8 Jun 2023 20:26:11 +0200 Subject: [PATCH 5/7] Default to building armv7 Will be fixed in next commit: https://github.com/LinusCDE/plato/commit/fbfaf3d7b4eb22205ad819a3dc12e4eb999cda15 --- package/plato/package | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/plato/package b/package/plato/package index 0e36cdfb4..db7f88c29 100644 --- a/package/plato/package +++ b/package/plato/package @@ -23,6 +23,9 @@ build() { # recent nightly builds. This adjusts the filtering. sed -i "s/version=.*$/version=\'$(cargo pkgid -p plato | cut -d "#" -f 2 | cut -d ":" -f 2)\'/g" download.sh + # Temporary fix until next release (TODO: Remove for next released version as included with commit fbfaf3d7) + sed -i "s/--target=arm-unknown-linux-gnueabihf/--target=armv7-unknown-linux-gnueabihf/g" build.sh + # Use our toolchain export AR=arm-linux-gnueabihf-ar export CC=arm-linux-gnueabihf-gcc From 4adbfd17fd7a2a730eb5f913311b0319c5aa9d05 Mon Sep 17 00:00:00 2001 From: Linus Date: Thu, 8 Jun 2023 20:28:32 +0200 Subject: [PATCH 6/7] Add new build-dependency: patchelf --- package/plato/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/plato/package b/package/plato/package index db7f88c29..a48a75c79 100644 --- a/package/plato/package +++ b/package/plato/package @@ -11,7 +11,7 @@ section="readers" maintainer="Linus K. " license=AGPL-3.0-or-later installdepends=(display jq) -makedepends=(build:jq build:unzip build:wget) +makedepends=(build:jq build:unzip build:wget, build:patchelf) flags=(patch_rm2fb) image=rust:v2.3.1 From b776366eefae2e824ca303aa7f1473e9f33ddfe0 Mon Sep 17 00:00:00 2001 From: Linus Date: Thu, 8 Jun 2023 20:30:24 +0200 Subject: [PATCH 7/7] Fix syntax error --- package/plato/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/plato/package b/package/plato/package index a48a75c79..45ddcacd3 100644 --- a/package/plato/package +++ b/package/plato/package @@ -11,7 +11,7 @@ section="readers" maintainer="Linus K. " license=AGPL-3.0-or-later installdepends=(display jq) -makedepends=(build:jq build:unzip build:wget, build:patchelf) +makedepends=(build:jq build:unzip build:wget build:patchelf) flags=(patch_rm2fb) image=rust:v2.3.1