modrinth-enhanced, modrinth-enhanced-bin: source from git.felo.gg [skip ci]
This commit is contained in:
1 parent
d888476513
commit
3d98558f75
4 files changed
+19
-17
No files matched your search
@@ -1,13 +1,13 @@
|
|||||||
# Maintainer: Felitendo
|
# Maintainer: Felitendo
|
||||||
# This PKGBUILD is updated automatically:
|
# This PKGBUILD is updated automatically:
|
||||||
# https://github.com/Felitendo/PKGBUILDS
|
# https://git.felo.gg/Felitendo/PKGBUILDS
|
||||||
|
|
||||||
pkgname=modrinth-enhanced-bin
|
pkgname=modrinth-enhanced-bin
|
||||||
pkgver=0.21.6
|
pkgver=0.21.6
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Modrinth App without ads or telemetry, with offline and Ely.by accounts and Linux fixes (upstream binary)"
|
pkgdesc="Modrinth App without ads or telemetry, with offline and Ely.by accounts and Linux fixes (upstream binary)"
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
url="https://github.com/Felitendo/Modrinth-Enhanced"
|
url="https://git.felo.gg/Felitendo/Modrinth-Enhanced"
|
||||||
license=('GPL-3.0-only')
|
license=('GPL-3.0-only')
|
||||||
depends=('cairo' 'dbus' 'gdk-pixbuf2' 'glib2' 'glibc' 'gtk3' 'hicolor-icon-theme'
|
depends=('cairo' 'dbus' 'gdk-pixbuf2' 'glib2' 'glibc' 'gtk3' 'hicolor-icon-theme'
|
||||||
'libdrm' 'libgcc' 'libsoup3' 'webkit2gtk-4.1'
|
'libdrm' 'libgcc' 'libsoup3' 'webkit2gtk-4.1'
|
||||||
@@ -25,7 +25,7 @@ _asset="Modrinth.Enhanced_0.21.6_amd64.deb"
|
|||||||
# the monitor's refresh rate. vblank-shim.c, preloaded by modrinth-enhanced.sh,
|
# the monitor's refresh rate. vblank-shim.c, preloaded by modrinth-enhanced.sh,
|
||||||
# paces it at the monitor's rate instead and keeps the app on X11, the only
|
# paces it at the monitor's rate instead and keeps the app on X11, the only
|
||||||
# place that works; it is not part of upstream's release.
|
# place that works; it is not part of upstream's release.
|
||||||
source=("${pkgname}-${pkgver}.deb::https://github.com/Felitendo/Modrinth-Enhanced/releases/download/${_tag}/${_asset}"
|
source=("${pkgname}-${pkgver}.deb::https://git.felo.gg/Felitendo/Modrinth-Enhanced/releases/download/${_tag}/${_asset}"
|
||||||
"vblank-shim.c"
|
"vblank-shim.c"
|
||||||
"modrinth-enhanced.sh")
|
"modrinth-enhanced.sh")
|
||||||
noextract=("${pkgname}-${pkgver}.deb")
|
noextract=("${pkgname}-${pkgver}.deb")
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# modrinth-enhanced-bin - Modrinth Enhanced (https://github.com/Felitendo/Modrinth-Enhanced),
|
# modrinth-enhanced-bin - Modrinth Enhanced (https://git.felo.gg/Felitendo/Modrinth-Enhanced),
|
||||||
# the Modrinth App (Tauri) with a series of patches applied: no ads, no
|
# the Modrinth App (Tauri) with a series of patches applied: no ads, no
|
||||||
# telemetry, offline and Ely.by accounts, Linux fixes.
|
# telemetry, offline and Ely.by accounts, Linux fixes.
|
||||||
#
|
#
|
||||||
@@ -23,7 +23,8 @@ UPSTREAM_REPO="Felitendo/Modrinth-Enhanced"
|
|||||||
BUILD_DEPS=(glib2 libdrm)
|
BUILD_DEPS=(glib2 libdrm)
|
||||||
|
|
||||||
latest_version() {
|
latest_version() {
|
||||||
gh api "repos/$UPSTREAM_REPO/releases/latest" --jq '.tag_name' | sed 's/^v//; s/-/.r/'
|
curl -sf "https://git.felo.gg/api/v1/repos/$UPSTREAM_REPO/releases/latest" \
|
||||||
|
| jq -r '.tag_name' | sed 's/^v//; s/-/.r/'
|
||||||
}
|
}
|
||||||
|
|
||||||
# refresh_checksums <version> <pkgbuild-path>
|
# refresh_checksums <version> <pkgbuild-path>
|
||||||
@@ -35,14 +36,14 @@ refresh_checksums() {
|
|||||||
sha_shim="$(sha256sum "$dir/vblank-shim.c" | cut -d' ' -f1)"
|
sha_shim="$(sha256sum "$dir/vblank-shim.c" | cut -d' ' -f1)"
|
||||||
sha_script="$(sha256sum "$dir/modrinth-enhanced.sh" | cut -d' ' -f1)"
|
sha_script="$(sha256sum "$dir/modrinth-enhanced.sh" | cut -d' ' -f1)"
|
||||||
|
|
||||||
asset="$(gh api "repos/$UPSTREAM_REPO/releases/tags/$tag" \
|
asset="$(curl -sf "https://git.felo.gg/api/v1/repos/$UPSTREAM_REPO/releases/tags/$tag" \
|
||||||
--jq '.assets[].name | select(endswith("_amd64.deb"))')"
|
| jq -r '.assets[].name | select(endswith("_amd64.deb"))')"
|
||||||
if [[ -z "$asset" || "$asset" == *$'\n'* ]]; then
|
if [[ -z "$asset" || "$asset" == *$'\n'* ]]; then
|
||||||
echo "could not find exactly one amd64 .deb in release $tag" >&2
|
echo "could not find exactly one amd64 .deb in release $tag" >&2
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sha="$(curl -sfL "https://github.com/$UPSTREAM_REPO/releases/download/$tag/$asset" \
|
sha="$(curl -sfL "https://git.felo.gg/$UPSTREAM_REPO/releases/download/$tag/$asset" \
|
||||||
| sha256sum | cut -d' ' -f1)"
|
| sha256sum | cut -d' ' -f1)"
|
||||||
|
|
||||||
sed -i \
|
sed -i \
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
# Maintainer: Felitendo
|
# Maintainer: Felitendo
|
||||||
# This PKGBUILD is updated automatically:
|
# This PKGBUILD is updated automatically:
|
||||||
# https://github.com/Felitendo/PKGBUILDS
|
# https://git.felo.gg/Felitendo/PKGBUILDS
|
||||||
|
|
||||||
pkgname=modrinth-enhanced
|
pkgname=modrinth-enhanced
|
||||||
pkgver=0.21.6
|
pkgver=0.21.6
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Modrinth App without ads or telemetry, with offline and Ely.by accounts and Linux fixes"
|
pkgdesc="Modrinth App without ads or telemetry, with offline and Ely.by accounts and Linux fixes"
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
url="https://github.com/Felitendo/Modrinth-Enhanced"
|
url="https://git.felo.gg/Felitendo/Modrinth-Enhanced"
|
||||||
license=('GPL-3.0-only')
|
license=('GPL-3.0-only')
|
||||||
depends=('cairo' 'dbus' 'gdk-pixbuf2' 'glib2' 'glibc' 'gtk3' 'hicolor-icon-theme'
|
depends=('cairo' 'dbus' 'gdk-pixbuf2' 'glib2' 'glibc' 'gtk3' 'hicolor-icon-theme'
|
||||||
'libdrm' 'libgcc' 'libsoup3' 'webkit2gtk-4.1'
|
'libdrm' 'libgcc' 'libsoup3' 'webkit2gtk-4.1'
|
||||||
@@ -31,7 +31,7 @@ _base="v0.21.6"
|
|||||||
# the monitor's refresh rate. vblank-shim.c, preloaded by modrinth-enhanced.sh,
|
# the monitor's refresh rate. vblank-shim.c, preloaded by modrinth-enhanced.sh,
|
||||||
# paces it at the monitor's rate instead and keeps the app on X11, the only
|
# paces it at the monitor's rate instead and keeps the app on X11, the only
|
||||||
# place that works; it is not part of upstream's release.
|
# place that works; it is not part of upstream's release.
|
||||||
source=("${pkgname}-${_tag}.tar.gz::https://github.com/Felitendo/Modrinth-Enhanced/archive/refs/tags/${_tag}.tar.gz"
|
source=("${pkgname}-${_tag}.tar.gz::https://git.felo.gg/Felitendo/Modrinth-Enhanced/archive/${_tag}.tar.gz"
|
||||||
"modrinth-code-${_upstream}.tar.gz::https://github.com/modrinth/code/archive/refs/tags/${_upstream}.tar.gz"
|
"modrinth-code-${_upstream}.tar.gz::https://github.com/modrinth/code/archive/refs/tags/${_upstream}.tar.gz"
|
||||||
"vblank-shim.c"
|
"vblank-shim.c"
|
||||||
"modrinth-enhanced.sh")
|
"modrinth-enhanced.sh")
|
||||||
@@ -40,7 +40,7 @@ if [[ "$_base" != "$_upstream" ]]; then
|
|||||||
source+=("modrinth-code-${_base}.tar.gz::https://github.com/modrinth/code/archive/refs/tags/${_base}.tar.gz")
|
source+=("modrinth-code-${_base}.tar.gz::https://github.com/modrinth/code/archive/refs/tags/${_base}.tar.gz")
|
||||||
noextract+=("modrinth-code-${_base}.tar.gz")
|
noextract+=("modrinth-code-${_base}.tar.gz")
|
||||||
fi
|
fi
|
||||||
sha256sums=('ae076f375b826e77dc60e7060752fc7d71fc42ec297b4f4bea05b75d11164f73' 'dd058ca164096a0f9aeeffec5dfa7905979719a33976643895806b0c82b6f409' '0190921b8ff2fb1deec3209cba71c01541ca1f013e3ba41680f1636e185fd455' 'b24872f82645c52ee4804599cd678d138876fb193c754403fa9c5cf92bd745b9')
|
sha256sums=('0bf2326e345ba2c6f25a6954538d20b4b63d7010ccdd54281186bac1196ef493' 'dd058ca164096a0f9aeeffec5dfa7905979719a33976643895806b0c82b6f409' '0190921b8ff2fb1deec3209cba71c01541ca1f013e3ba41680f1636e185fd455' 'b24872f82645c52ee4804599cd678d138876fb193c754403fa9c5cf92bd745b9')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
# What upstream's scripts/prepare.sh does with two shallow tags: apply the
|
# What upstream's scripts/prepare.sh does with two shallow tags: apply the
|
||||||
@@ -71,7 +71,7 @@ prepare() {
|
|||||||
git tag upstream
|
git tag upstream
|
||||||
git checkout -q -b enhanced base
|
git checkout -q -b enhanced base
|
||||||
fi
|
fi
|
||||||
git am -q --3way --whitespace=nowarn "$srcdir/Modrinth-Enhanced-${_tag#v}/patches/"*.patch
|
git am -q --3way --whitespace=nowarn "$srcdir/modrinth-enhanced/patches/"*.patch
|
||||||
if [[ "$_base" != "$_upstream" ]]; then
|
if [[ "$_base" != "$_upstream" ]]; then
|
||||||
git rebase -q --onto upstream base enhanced
|
git rebase -q --onto upstream base enhanced
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# modrinth-enhanced - Modrinth Enhanced (https://github.com/Felitendo/Modrinth-Enhanced),
|
# modrinth-enhanced - Modrinth Enhanced (https://git.felo.gg/Felitendo/Modrinth-Enhanced),
|
||||||
# the Modrinth App (Tauri) with a series of patches applied: no ads, no
|
# the Modrinth App (Tauri) with a series of patches applied: no ads, no
|
||||||
# telemetry, offline and Ely.by accounts, Linux fixes.
|
# telemetry, offline and Ely.by accounts, Linux fixes.
|
||||||
#
|
#
|
||||||
@@ -26,12 +26,13 @@ UPSTREAM_REPO="Felitendo/Modrinth-Enhanced"
|
|||||||
BUILD_DEPS=(rust git jdk17-openjdk node-gyp nodejs npm pnpm webkit2gtk-4.1 gtk3 libsoup3 libdrm)
|
BUILD_DEPS=(rust git jdk17-openjdk node-gyp nodejs npm pnpm webkit2gtk-4.1 gtk3 libsoup3 libdrm)
|
||||||
|
|
||||||
latest_version() {
|
latest_version() {
|
||||||
gh api "repos/$UPSTREAM_REPO/releases/latest" --jq '.tag_name' | sed 's/^v//; s/-/.r/'
|
curl -sf "https://git.felo.gg/api/v1/repos/$UPSTREAM_REPO/releases/latest" \
|
||||||
|
| jq -r '.tag_name' | sed 's/^v//; s/-/.r/'
|
||||||
}
|
}
|
||||||
|
|
||||||
# read_tag_file <tag> <path> - a file of the release tag, whitespace stripped
|
# read_tag_file <tag> <path> - a file of the release tag, whitespace stripped
|
||||||
read_tag_file() {
|
read_tag_file() {
|
||||||
gh api "repos/$UPSTREAM_REPO/contents/$2?ref=$1" -H 'Accept: application/vnd.github.raw' \
|
curl -sf "https://git.felo.gg/$UPSTREAM_REPO/raw/tag/$1/$2" \
|
||||||
| tr -d '[:space:]'
|
| tr -d '[:space:]'
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -48,7 +49,7 @@ refresh_checksums() {
|
|||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sha_patches="$(curl -sfL "https://github.com/$UPSTREAM_REPO/archive/refs/tags/$tag.tar.gz" \
|
sha_patches="$(curl -sfL "https://git.felo.gg/$UPSTREAM_REPO/archive/$tag.tar.gz" \
|
||||||
| sha256sum | cut -d' ' -f1)"
|
| sha256sum | cut -d' ' -f1)"
|
||||||
sha_upstream="$(curl -sfL "https://github.com/modrinth/code/archive/refs/tags/$upstream.tar.gz" \
|
sha_upstream="$(curl -sfL "https://github.com/modrinth/code/archive/refs/tags/$upstream.tar.gz" \
|
||||||
| sha256sum | cut -d' ' -f1)"
|
| sha256sum | cut -d' ' -f1)"
|
||||||
|
|||||||
Reference in new issue
Block a user