From c271ebab016a875194b63b992dcb44517d06b99b Mon Sep 17 00:00:00 2001 From: Kimiblock Moe Date: Tue, 19 Mar 2024 00:22:22 +0800 Subject: [PATCH 1/4] addpkg: fractal-git --- archlinuxcn/fractal-git/PKGBUILD | 37 ++++++++++++++++++++++++++++++ archlinuxcn/fractal-git/lilac.yaml | 16 +++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 archlinuxcn/fractal-git/PKGBUILD create mode 100644 archlinuxcn/fractal-git/lilac.yaml diff --git a/archlinuxcn/fractal-git/PKGBUILD b/archlinuxcn/fractal-git/PKGBUILD new file mode 100644 index 000000000000..5fa48da4331f --- /dev/null +++ b/archlinuxcn/fractal-git/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: xiretza +# Contributor: Falk Alexander Seidl + +pkgname=fractal-git +_gitname=fractal +epoch=1 +pkgver=5.beta1.r6.g5816bdbb +pkgrel=2 +pkgdesc="Matrix messaging app for GNOME written in Rust" +arch=('i686' 'x86_64') +license=('GPL3') +url="https://gitlab.gnome.org/GNOME/fractal" +depends=('gtk4' 'gtksourceview5' 'gst-plugins-base-libs' 'gst-editing-services' + 'libadwaita>=1:1.3alpha' 'pipewire' 'libshumate' 'org.freedesktop.secrets' + 'xdg-desktop-portal') +conflicts=('fractal') +provides=("fractal=$pkgver" 'fractal-next') +replaces=('fractal-next') +makedepends=('rust' 'git' 'meson' 'clang') +source=("git+https://gitlab.gnome.org/GNOME/fractal.git") +md5sums=('SKIP') + +pkgver() { + cd "$_gitname" + git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +} + +build() { + cd "${srcdir}/${_gitname}/" + arch-meson . _build + ninja -C _build +} + +package() { + cd "${srcdir}/${_gitname}/" + DESTDIR="${pkgdir}" ninja -C _build install +} diff --git a/archlinuxcn/fractal-git/lilac.yaml b/archlinuxcn/fractal-git/lilac.yaml new file mode 100644 index 000000000000..3a6374428907 --- /dev/null +++ b/archlinuxcn/fractal-git/lilac.yaml @@ -0,0 +1,16 @@ +maintainers: + - github: Kimiblock + +build_prefix: gnome-unstable + +update_on: + - source: git + git: https://gitlab.gnome.org/World/fractal.git + use_commit: true + lilac_throttle: 7d + - source: alpm + alpm: libadwaita + provided: libadwaita-1.so + - source: alpm + alpm: libshumate + provided: libshumate-1.0.so From 77f819983c93eea549dcb9a16ddd03ad2be2ee78 Mon Sep 17 00:00:00 2001 From: Kimiblock Moe Date: Wed, 20 Mar 2024 19:52:34 +0800 Subject: [PATCH 2/4] Attempt to fix this package (credits q234rty) --- archlinuxcn/fractal-git/PKGBUILD | 10 +++++----- archlinuxcn/fractal-git/lilac.yaml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/archlinuxcn/fractal-git/PKGBUILD b/archlinuxcn/fractal-git/PKGBUILD index 5fa48da4331f..015e2951efdc 100644 --- a/archlinuxcn/fractal-git/PKGBUILD +++ b/archlinuxcn/fractal-git/PKGBUILD @@ -4,25 +4,25 @@ pkgname=fractal-git _gitname=fractal epoch=1 -pkgver=5.beta1.r6.g5816bdbb -pkgrel=2 +pkgver=6.r150.g462b5cd5 +pkgrel=1 pkgdesc="Matrix messaging app for GNOME written in Rust" arch=('i686' 'x86_64') license=('GPL3') url="https://gitlab.gnome.org/GNOME/fractal" depends=('gtk4' 'gtksourceview5' 'gst-plugins-base-libs' 'gst-editing-services' - 'libadwaita>=1:1.3alpha' 'pipewire' 'libshumate' 'org.freedesktop.secrets' + 'libadwaita>=1:1.5alpha' 'pipewire' 'libshumate' 'org.freedesktop.secrets' 'xdg-desktop-portal') conflicts=('fractal') provides=("fractal=$pkgver" 'fractal-next') -replaces=('fractal-next') makedepends=('rust' 'git' 'meson' 'clang') +options=('!lto') source=("git+https://gitlab.gnome.org/GNOME/fractal.git") md5sums=('SKIP') pkgver() { cd "$_gitname" - git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' + git describe --tags | sed -r 's/\.([a-z])/\1/;s/[^-]*-g/r&/;s/-/./g' } build() { diff --git a/archlinuxcn/fractal-git/lilac.yaml b/archlinuxcn/fractal-git/lilac.yaml index 3a6374428907..d02dd4500694 100644 --- a/archlinuxcn/fractal-git/lilac.yaml +++ b/archlinuxcn/fractal-git/lilac.yaml @@ -13,4 +13,4 @@ update_on: provided: libadwaita-1.so - source: alpm alpm: libshumate - provided: libshumate-1.0.so + provided: libshumate-1.0.so \ No newline at end of file From 32351a97d728efb8da630b3ca972a10e41aad369 Mon Sep 17 00:00:00 2001 From: Kimiblock Moe Date: Sat, 6 Apr 2024 10:41:21 +0800 Subject: [PATCH 3/4] Update LICENSE --- archlinuxcn/fractal-git/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archlinuxcn/fractal-git/PKGBUILD b/archlinuxcn/fractal-git/PKGBUILD index 015e2951efdc..59cdefd4cacb 100644 --- a/archlinuxcn/fractal-git/PKGBUILD +++ b/archlinuxcn/fractal-git/PKGBUILD @@ -8,7 +8,7 @@ pkgver=6.r150.g462b5cd5 pkgrel=1 pkgdesc="Matrix messaging app for GNOME written in Rust" arch=('i686' 'x86_64') -license=('GPL3') +license=('GPL-3.0-only') url="https://gitlab.gnome.org/GNOME/fractal" depends=('gtk4' 'gtksourceview5' 'gst-plugins-base-libs' 'gst-editing-services' 'libadwaita>=1:1.5alpha' 'pipewire' 'libshumate' 'org.freedesktop.secrets' From 0fc4911aa6275971fa5619e2ceddcc776650bc74 Mon Sep 17 00:00:00 2001 From: Kimiblock Moe Date: Mon, 8 Apr 2024 20:48:20 +0800 Subject: [PATCH 4/4] Remove build prefix --- archlinuxcn/fractal-git/lilac.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/archlinuxcn/fractal-git/lilac.yaml b/archlinuxcn/fractal-git/lilac.yaml index d02dd4500694..b8e6a1665402 100644 --- a/archlinuxcn/fractal-git/lilac.yaml +++ b/archlinuxcn/fractal-git/lilac.yaml @@ -1,8 +1,6 @@ maintainers: - github: Kimiblock -build_prefix: gnome-unstable - update_on: - source: git git: https://gitlab.gnome.org/World/fractal.git @@ -13,4 +11,4 @@ update_on: provided: libadwaita-1.so - source: alpm alpm: libshumate - provided: libshumate-1.0.so \ No newline at end of file + provided: libshumate-1.0.so