Compare commits

..

No commits in common. "patch-6ee5522513d8ef3f2bb53d8fc09b93876f919a8a" and "main" have entirely different histories.

4 changed files with 88 additions and 88 deletions

View File

@ -1,48 +1,19 @@
pkgbase = nheko-git pkgbase = jjr-newsflash-git
pkgdesc = Desktop client for the Matrix protocol pkgdesc = The spiritual successor to FeedReader (development version)
pkgver = 0.10.2.r142.ged889c32 pkgver = 1141.40ff7cf
pkgrel = 1 pkgrel = 1
url = https://github.com/Nheko-Reborn/nheko url = https://gitlab.com/news-flash/news_flash_gtk
arch = i686
arch = x86_64 arch = x86_64
arch = aarch64
license = GPL3 license = GPL3
makedepends = git makedepends = git
makedepends = cmake makedepends = meson
makedepends = gcc makedepends = rust
makedepends = fontconfig depends = libadwaita
makedepends = qt5-tools depends = gtk4
makedepends = nlohmann-json depends = webkit2gtk-5.0
makedepends = asciidoc conflicts = newsflash
depends = qt5-base conflicts = newsflash-git
depends = lmdb source = news_flash_gtk::git+https://gitlab.com/news-flash/news_flash_gtk.git
depends = qt5-graphicaleffects
depends = qt5-multimedia
depends = qt5-svg
depends = qt5-quickcontrols2
depends = qt5-declarative
depends = qtkeychain-qt5
depends = cmark
depends = openssl
depends = hicolor-icon-theme
depends = gstreamer
depends = gst-plugins-base
depends = gst-plugins-good
depends = gst-plugins-bad
depends = gst-plugin-qmlgl
depends = libnice
depends = libolm
depends = spdlog
depends = curl
depends = libevent
depends = pkg-config
depends = re2
optdepends = kimageformats
optdepends = qt5-imageformats
optdepends = qt-jdenticon
provides = nheko=0.10.2.r142.ged889c32
conflicts = nheko
source = nheko-git::git+https://github.com/Nheko-Reborn/nheko.git#branch=master
md5sums = SKIP md5sums = SKIP
pkgname = nheko-git pkgname = jjr-newsflash-git

5
.gitignore vendored 100644
View File

@ -0,0 +1,5 @@
*
!.gitignore
!PKGBUILD
!.SRCINFO

34
.woodpecker.yml 100644
View File

@ -0,0 +1,34 @@
platform: linux/amd64
pipeline:
build:
image: 'archlinux:latest'
pull: true
environment:
- SCCACHE_BUCKET=bur
- SCCACHE_ENDPOINT=s3.rustybever.be
- SCCACHE_S3_USE_SSL=true
- SCCACHE_S3_KEY_PREFIX=jjr-newsflash
- RUSTC_WRAPPER=/usr/bin/sccache
secrets:
- aws_access_key_id
- aws_secret_access_key
commands:
# Update packages
- pacman -Syu --needed --noconfirm base-devel
# Create non-root user to perform build & switch to their home
- groupadd -g 1000 builder
- useradd -mg builder builder
- chown -R builder:builder "$PWD"
- "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
- su builder
# Build the package
- MAKEFLAGS="-j$(nproc)" makepkg -s --noconfirm --needed
publish:
image: 'archlinux:latest'
commands:
# Publish the package
- 'curl -s -XPOST -H "X-API-KEY: $API_KEY" -T "$(ls *.pkg*)" https://arch.r8r.be/publish'
secrets:
- api_key

View File

@ -1,63 +1,53 @@
# Maintainer: Konstantinos Sideris <siderisk at auth dot gr> # vim: ft=bash
# Maintainer: Joseph Donofry <joe at joedonofry dot com> # Maintainer: Jef Roosens
# Contributor: Felix Bühler <account at buehler dot rocks>
pkgname=nheko-git _pkgname='news_flash_gtk'
pkgver=0.10.2.r142.ged889c32 pkgname='jjr-newsflash-git'
pkgver=1141.40ff7cf
pkgrel=1 pkgrel=1
pkgdesc="Desktop client for the Matrix protocol" pkgdesc='The spiritual successor to FeedReader (development version)'
arch=("i686" "x86_64" "aarch64") arch=('x86_64')
url="https://github.com/Nheko-Reborn/nheko" url='https://gitlab.com/news-flash/news_flash_gtk'
license=("GPL3") license=('GPL3')
depends=(
'libadwaita'
'gtk4'
'webkit2gtk-5.0'
)
makedepends=(
'git'
'meson'
'rust'
)
depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "qtkeychain-qt5" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "gst-plugin-qmlgl" "libnice" "libolm" "spdlog" "curl" "libevent" "pkg-config" "re2") conflicts=('newsflash' 'newsflash-git')
makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "asciidoc") source=("${_pkgname}::git+https://gitlab.com/news-flash/news_flash_gtk.git")
optdepends=("kimageformats" "qt5-imageformats" "qt-jdenticon")
provides=("nheko=${pkgver}")
conflicts=("nheko")
source=($pkgname::git+https://github.com/Nheko-Reborn/nheko.git#branch=master)
md5sums=("SKIP") md5sums=("SKIP")
prepare() { pkgver() {
cd "$pkgname" cd "${_pkgname}"
echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
} }
pkgver() { prepare() {
cd "$pkgname" cd "${_pkgname}"
git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
# Trustdns likes to bug out when not on a stable network
sed -i 's/\.trust_dns(true)/\.trust_dns(false)/' src/util/mod.rs
} }
build() { build() {
cd "$pkgname" cd "${_pkgname}"
rm -f cmake/FindOlm.cmake arch-meson _build
ninja -C _build
cmake -H. -Bbuild -DHUNTER_ENABLED=OFF -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_MTXCLIENT=ON -DUSE_BUNDLED_COEURL=ON -DUSE_BUNDLED_LMDBXX=ON -DCMAKE_INSTALL_PREFIX=.deps/usr -DCMAKE_BUILD_TYPE=Release
cmake --build build --config Release
} }
package() { package() {
# Creating needed directories cd "${_pkgname}"
install -dm755 "$pkgdir/usr/bin"
install -dm755 "$pkgdir/usr/share/pixmaps/"
install -dm755 "$pkgdir/usr/share/applications/"
# Program env DESTDIR="${pkgdir}" ninja -C _build install
install -Dm755 "$pkgname/build/nheko" "$pkgdir/usr/bin/nheko"
# Desktop launcher
install -Dm644 "$srcdir/$pkgname/resources/nheko-256.png" "$pkgdir/usr/share/pixmaps/nheko.png"
install -Dm644 "$srcdir/$pkgname/build/resources/nheko.desktop" "$pkgdir/usr/share/applications/nheko.desktop"
# Man entry
install -Dm644 "$srcdir/$pkgname/build/man/nheko.1" "$pkgdir/usr/share/man/man1/nheko.1"
# Icons
local icon_size icon_dir
for icon_size in 16 32 48 64 128 256 512; do
icon_dir="$pkgdir/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps"
install -d "$icon_dir"
install -m644 "$srcdir/$pkgname/resources/nheko-${icon_size}.png" "$icon_dir/nheko.png"
done
} }