upgpkg: mastodon 4.2.10-1

Remove gem compilation hacks
Add ordering constraints to mastodon.target so that mastodon-* start after postgresql and redis
This commit is contained in:
Anthony Wang 2024-07-04 19:32:38 +00:00
parent 8c5c0d0d42
commit 3d81f2456c
Signed by: a
SSH key fingerprint: SHA256:B5ADfMCqd2M7d/jtXDoihAV/yfXOAbWWri9+GdCN4hQ
3 changed files with 9 additions and 25 deletions

View file

@ -1,6 +1,6 @@
pkgbase = mastodon
pkgdesc = Your self-hosted, globally interconnected microblogging community
pkgver = 4.2.9
pkgver = 4.2.10
pkgrel = 1
url = https://github.com/mastodon/mastodon
install = mastodon.install
@ -24,12 +24,12 @@ pkgbase = mastodon
depends = zlib
options = !strip
backup = etc/mastodon.conf
source = https://github.com/mastodon/mastodon/archive/v4.2.9.tar.gz
source = https://github.com/mastodon/mastodon/archive/v4.2.10.tar.gz
source = mastodon.target
source = mastodon.sysusers.d
source = mastodon.tmpfiles.d
sha512sums = a90d7e68c1c0dd493119a1347f7093c466bc08c26d24fbee0dbf88735938bd79f5a6ba1dc0cc972cae08748a258a54b7bf9185f60f6e4c3ccc47bc484c609dc9
sha512sums = c9820c2a83d08bd5d842a78e924682db97ebd5c7291b682603ad30dafcdcc5816c13e717ad39554f042b9d9ed71ab902ce3f604952264a900a72612ee8060acb
sha512sums = 1fe5417136bc020a83b83eaccef7f1f46c13fc8318681f12ba556b1b6b03e25ef7b6335c28f4e6722101e97b63020cbd0d3fbacdaf9b3b5a4b73c3cf3e230813
sha512sums = bbce4ff9142265fc7d5f7669637c112240bc6d1b39dedf212faf8acb09fb9b4b2acc07038df5e790c60baff51bc44ffef9318f9fce043c6831ae5e5f02fea5a6
sha512sums = 4ee4210bde391e6dc782cb7c14f2cb968c95ad541aa0efcf843a811f8cc5f0d1067ee3c8346bb412aa9fd1dd5a8bd05a4524df7dc4a106957009853dd237074a
sha512sums = 27c4eb01d462c525b59e5808a3b2501b63a34425752128388fbde82f7eb5944b20d2f8d8b1be8ed8adb165cab4cfb8e13f90215f20989ca671a0422ffa37001f

View file

@ -5,7 +5,7 @@
# Contributor: Fredrick Brennan <copypaste@kittens.ph>
pkgname=mastodon
pkgver=4.2.9
pkgver=4.2.10
pkgrel=1
pkgdesc='Your self-hosted, globally interconnected microblogging community'
arch=(any)
@ -34,35 +34,17 @@ source=(https://github.com/mastodon/mastodon/archive/v$pkgver.tar.gz
mastodon.target
mastodon.sysusers.d
mastodon.tmpfiles.d)
sha512sums=('a90d7e68c1c0dd493119a1347f7093c466bc08c26d24fbee0dbf88735938bd79f5a6ba1dc0cc972cae08748a258a54b7bf9185f60f6e4c3ccc47bc484c609dc9'
'c9820c2a83d08bd5d842a78e924682db97ebd5c7291b682603ad30dafcdcc5816c13e717ad39554f042b9d9ed71ab902ce3f604952264a900a72612ee8060acb'
sha512sums=('1fe5417136bc020a83b83eaccef7f1f46c13fc8318681f12ba556b1b6b03e25ef7b6335c28f4e6722101e97b63020cbd0d3fbacdaf9b3b5a4b73c3cf3e230813'
'bbce4ff9142265fc7d5f7669637c112240bc6d1b39dedf212faf8acb09fb9b4b2acc07038df5e790c60baff51bc44ffef9318f9fce043c6831ae5e5f02fea5a6'
'4ee4210bde391e6dc782cb7c14f2cb968c95ad541aa0efcf843a811f8cc5f0d1067ee3c8346bb412aa9fd1dd5a8bd05a4524df7dc4a106957009853dd237074a'
'27c4eb01d462c525b59e5808a3b2501b63a34425752128388fbde82f7eb5944b20d2f8d8b1be8ed8adb165cab4cfb8e13f90215f20989ca671a0422ffa37001f')
prepare() {
cd mastodon-$pkgver
# HUGE HACK: manual Gemfile.lock editing time!
# Only the latest version from git supports overriding C++ std: https://github.com/brianmario/charlock_holmes/commit/48e4e2db61f1f4133c0f36e476cc4af09566ebce
sed -i "s/gem 'charlock_holmes', '~> 0.7.7'/gem 'charlock_holmes', github: 'brianmario\/charlock_holmes'/g" Gemfile
sed -i '/charlock_holmes (0.7.7)/d' Gemfile.lock
sed -i 's/charlock_holmes (~> 0.7.7)/charlock_holmes!/g' Gemfile.lock
echo "GIT
remote: https://github.com/brianmario/charlock_holmes.git
revision: 3f4f57cfbee6dcd11941f54f9d4da0ebc1402421
specs:
charlock_holmes (0.7.7)
$(cat Gemfile.lock)" > Gemfile.lock
}
build() {
cd mastodon-$pkgver
sed -i '/husky install/d' package.json # Stop husky from hijacking git hooks
bundle config deployment 'true'
bundle config without 'development test'
bundle config with 'pam_authentication'
bundle config build.cbor --with-cflags="-Wno-incompatible-pointer-types"
bundle config build.posix-spawn --with-cflags="-Wno-incompatible-pointer-types"
bundle config build.charlock_holmes --with-cxxflags="-std=c++17"
bundle install -j$(getconf _NPROCESSORS_ONLN)
yarn install --pure-lockfile
}

View file

@ -2,6 +2,8 @@
Description=Mastodon
Wants=mastodon-web.service mastodon-sidekiq.service mastodon-streaming.service
Wants=postgresql.service redis.service
Before=mastodon-web.service mastodon-sidekiq.service mastodon-streaming.service
After=postgresql.service redis.service
[Install]
WantedBy=multi-user.target