From 0d1a071c413557ca4ed8f2c02ca865ceef341e77 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 14 Jun 2023 17:18:12 -0400 Subject: [PATCH 1/2] New package: lemmy-0.18.2 --- srcpkgs/lemmy/files/lemmy/run | 6 +++ .../disable-rustfmt-rosetta-build.patch | 19 +++++++++ srcpkgs/lemmy/template | 40 +++++++++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 srcpkgs/lemmy/files/lemmy/run create mode 100644 srcpkgs/lemmy/patches/disable-rustfmt-rosetta-build.patch create mode 100644 srcpkgs/lemmy/template diff --git a/srcpkgs/lemmy/files/lemmy/run b/srcpkgs/lemmy/files/lemmy/run new file mode 100644 index 000000000000..8e7871ac50ff --- /dev/null +++ b/srcpkgs/lemmy/files/lemmy/run @@ -0,0 +1,6 @@ +#!/bin/sh +exec 2>&1 +[ -r ./conf ] && . ./conf +export LEMMY_CONFIG_LOCATION=${LEMMY_CONFIG_LOCATION:-/etc/lemmy/lemmy.hjson} +cd /var/lib/lemmy || exit 1 +exec chpst -u _lemmy:_lemmy lemmy_server diff --git a/srcpkgs/lemmy/patches/disable-rustfmt-rosetta-build.patch b/srcpkgs/lemmy/patches/disable-rustfmt-rosetta-build.patch new file mode 100644 index 000000000000..8b05cdd016b2 --- /dev/null +++ b/srcpkgs/lemmy/patches/disable-rustfmt-rosetta-build.patch @@ -0,0 +1,19 @@ +From ea7f83c4dcae490752a45b0ab3c4d07613c40eda Mon Sep 17 00:00:00 2001 +From: Joel Beckmeyer +Date: Fri, 21 Jul 2023 05:50:47 -0400 +Subject: [PATCH] disable rustfmt feature on rosetta-build (#3679) + +--- + crates/utils/Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml +index b97ce8bdc..9cafd0c11 100644 +--- a/crates/utils/Cargo.toml ++++ b/crates/utils/Cargo.toml +@@ -55,4 +55,4 @@ enum-map = "2.6" + reqwest = { workspace = true } + + [build-dependencies] +-rosetta-build = "0.1.3" ++rosetta-build = { version = "0.1.3", default-features = false } diff --git a/srcpkgs/lemmy/template b/srcpkgs/lemmy/template new file mode 100644 index 000000000000..88ae628ebf7a --- /dev/null +++ b/srcpkgs/lemmy/template @@ -0,0 +1,40 @@ +# Template file for 'lemmy' +pkgname=lemmy +version=0.18.2 +revision=1 +_translation_commit=3638cde3b3d59a969872d5f8e65f80faa9d3ab1c +build_style=cargo +configure_args="--features=embed-pictrs" +hostmakedepends="pkg-config protobuf" +makedepends="openssl-devel libpqxx-devel libzstd-devel" +depends="ImageMagick ffmpeg exiftool" +short_desc="Link aggregator and forum for the fediverse" +maintainer="Joel Beckmeyer " +license="AGPL-3.0-only" +homepage="https://join-lemmy.org/" +changelog="https://raw.githubusercontent.com/LemmyNet/lemmy/main/RELEASES.md" +distfiles="https://github.com/LemmyNet/lemmy/archive/refs/tags/${version}.tar.gz + https://github.com/LemmyNet/lemmy-translations/archive/${_translation_commit}.tar.gz" +checksum="2a00f68d6250ea0da2c33facd96d4c08377f3285f394c787d05a27194e2b8452 + 170e9526be77fb6370aa76ce86f9f96a7c08460da91304518c047e819a1d26ab" +system_accounts="_lemmy" +make_dirs="/var/lib/lemmy 0700 _lemmy _lemmy" +_lemmy_homedir="/var/lib/lemmy" +conf_files="/etc/lemmy/lemmy.hjson" + +post_extract() { + cp -r lemmy-${version}/. . + cp -r lemmy-translations-${_translation_commit}/. crates/utils/translations + rm -rf lemmy-${version} lemmy-translations-${_translation_commit} +} + +post_patch() { + vsed -i "s/unknown version/$version/" crates/utils/src/version.rs +} + +post_install() { + vsconf config/defaults.hjson + vinstall config/config.hjson 644 etc/lemmy lemmy.hjson + vsv lemmy + vlicense LICENSE +} From cc5aad5dff88ece35f1d5420f9a9e6c8717f66b9 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 16 Jun 2023 10:09:22 -0400 Subject: [PATCH 2/2] New package: lemmy-ui-0.18.2 --- srcpkgs/lemmy-ui/files/lemmy-ui/run | 5 ++++ srcpkgs/lemmy-ui/template | 41 +++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 srcpkgs/lemmy-ui/files/lemmy-ui/run create mode 100644 srcpkgs/lemmy-ui/template diff --git a/srcpkgs/lemmy-ui/files/lemmy-ui/run b/srcpkgs/lemmy-ui/files/lemmy-ui/run new file mode 100644 index 000000000000..26535bea510c --- /dev/null +++ b/srcpkgs/lemmy-ui/files/lemmy-ui/run @@ -0,0 +1,5 @@ +#!/bin/sh +exec 2>&1 +[ -r ./conf ] && . ./conf +cd /usr/lib/lemmy-ui || exit 1 +exec chpst -u _lemmyui:_lemmyui node dist/js/server.js diff --git a/srcpkgs/lemmy-ui/template b/srcpkgs/lemmy-ui/template new file mode 100644 index 000000000000..fa3530e8b9f7 --- /dev/null +++ b/srcpkgs/lemmy-ui/template @@ -0,0 +1,41 @@ +# Template file for 'lemmy-ui' +pkgname=lemmy-ui +version=0.18.2 +revision=1 +_translation_commit=3638cde3b3d59a969872d5f8e65f80faa9d3ab1c +hostmakedepends="yarn" +depends="nodejs" +short_desc="Official web app for lemmy" +maintainer="Joel Beckmeyer " +license="AGPL-3.0-only" +homepage="https://join-lemmy.org/" +distfiles="https://github.com/LemmyNet/lemmy-ui/archive/refs/tags/${version}.tar.gz + https://github.com/LemmyNet/lemmy-translations/archive/${_translation_commit}.tar.gz" +checksum="ffadc85c71248379670943eecd6102d99b732425009c54ebad74c6559b9787bb + 170e9526be77fb6370aa76ce86f9f96a7c08460da91304518c047e819a1d26ab" +python_version=3 +system_accounts="_lemmyui" + +post_extract() { + cp -r lemmy-ui-${version}/. . + cp -r lemmy-translations-${_translation_commit}/. lemmy-translations + rm -rf lemmy-${version} lemmy-translations-${_translation_commit} + + yarn install --pure-lockfile +} + +post_patch() { + vsed -i "s/unknown version/$version/" src/shared/version.ts +} + +do_build() { + yarn build:prod +} + +do_install() { + vmkdir usr/lib/lemmy-ui + vcopy dist usr/lib/lemmy-ui + vcopy node_modules usr/lib/lemmy-ui + vlicense LICENSE + vsv lemmy-ui +}