diff --git a/.SRCINFO b/.SRCINFO index dc97e10..c022b54 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,19 +1,48 @@ -pkgbase = jjr-newsflash-git - pkgdesc = The spiritual successor to FeedReader (development version) - pkgver = 1141.40ff7cf +pkgbase = nheko-git + pkgdesc = Desktop client for the Matrix protocol + pkgver = 0.10.2.r142.ged889c32 pkgrel = 1 - url = https://gitlab.com/news-flash/news_flash_gtk + url = https://github.com/Nheko-Reborn/nheko + arch = i686 arch = x86_64 + arch = aarch64 license = GPL3 makedepends = git - makedepends = meson - makedepends = rust - depends = libadwaita - depends = gtk4 - depends = webkit2gtk-5.0 - conflicts = newsflash - conflicts = newsflash-git - source = news_flash_gtk::git+https://gitlab.com/news-flash/news_flash_gtk.git + makedepends = cmake + makedepends = gcc + makedepends = fontconfig + makedepends = qt5-tools + makedepends = nlohmann-json + makedepends = asciidoc + depends = qt5-base + depends = lmdb + 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 -pkgname = jjr-newsflash-git +pkgname = nheko-git diff --git a/.gitignore b/.gitignore deleted file mode 100644 index c6a9b95..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -* - -!.gitignore -!PKGBUILD -!.SRCINFO diff --git a/.woodpecker.yml b/.woodpecker.yml deleted file mode 100644 index f228c4e..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,34 +0,0 @@ -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 diff --git a/PKGBUILD b/PKGBUILD index 26f2295..5558ccd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,53 +1,63 @@ -# vim: ft=bash -# Maintainer: Jef Roosens -# Contributor: Felix Bühler +# Maintainer: Konstantinos Sideris +# Maintainer: Joseph Donofry -_pkgname='news_flash_gtk' -pkgname='jjr-newsflash-git' -pkgver=1141.40ff7cf +pkgname=nheko-git +pkgver=0.10.2.r142.ged889c32 pkgrel=1 -pkgdesc='The spiritual successor to FeedReader (development version)' -arch=('x86_64') +pkgdesc="Desktop client for the Matrix protocol" +arch=("i686" "x86_64" "aarch64") -url='https://gitlab.com/news-flash/news_flash_gtk' -license=('GPL3') -depends=( - 'libadwaita' - 'gtk4' - 'webkit2gtk-5.0' -) -makedepends=( - 'git' - 'meson' - 'rust' -) +url="https://github.com/Nheko-Reborn/nheko" +license=("GPL3") -conflicts=('newsflash' 'newsflash-git') -source=("${_pkgname}::git+https://gitlab.com/news-flash/news_flash_gtk.git") +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") +makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "asciidoc") +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") -pkgver() { - cd "${_pkgname}" - - echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD) +prepare() { + cd "$pkgname" } -prepare() { - cd "${_pkgname}" - - # Trustdns likes to bug out when not on a stable network - sed -i 's/\.trust_dns(true)/\.trust_dns(false)/' src/util/mod.rs +pkgver() { + cd "$pkgname" + git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } build() { - cd "${_pkgname}" + cd "$pkgname" - arch-meson _build - ninja -C _build + rm -f cmake/FindOlm.cmake + + 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() { - cd "${_pkgname}" + # Creating needed directories + install -dm755 "$pkgdir/usr/bin" + install -dm755 "$pkgdir/usr/share/pixmaps/" + install -dm755 "$pkgdir/usr/share/applications/" - env DESTDIR="${pkgdir}" ninja -C _build install + # Program + 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 }