From 34aa3cf04ab8189b4acba76ae0ca919854dbfbf8 Mon Sep 17 00:00:00 2001 From: mujx Date: Tue, 9 May 2017 22:18:47 +0300 Subject: [PATCH 01/78] Initial commit --- .SRCINFO | 18 ++++++++++++++++++ PKGBUILD | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 .SRCINFO create mode 100644 PKGBUILD diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..94af8b3 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,18 @@ +pkgbase = nheko-git + pkgdesc = Desktop client for the Matrix protocol + pkgver = 0.1.0.e78e43c86a39 + pkgrel = 1 + url = https://github.com/mujx/nheko + arch = i686 + arch = x86_64 + license = GPL3 + makedepends = git + makedepends = cmake + makedepends = gcc + makedepends = fontconfig + depends = qt5-base + source = nheko-git::git+https://github.com/mujx/nheko.git + md5sums = SKIP + +pkgname = nheko-git + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..5057250 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Konstantinos Sideris + +pkgname=nheko-git +pkgver=0.1.0.e78e43c86a39 +pkgrel=1 +pkgdesc="Desktop client for the Matrix protocol" +arch=('i686' 'x86_64') + +url="https://github.com/mujx/nheko" +license=('GPL3') + +depends=('qt5-base') +makedepends=('git' 'cmake' 'gcc' 'fontconfig') + +source=($pkgname::git+https://github.com/mujx/nheko.git) +md5sums=('SKIP') + +pkgver() { + cd "$pkgname" + printf "0.1.0.%s" "$(git rev-parse --short HEAD)" +} + +build() { + cd "$pkgname" + cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release + make -C build -j2 +} + +package() { + # Creating needed directories + install -dm755 "$pkgdir/usr/bin" + install -dm755 "$pkgdir/usr/share/pixmaps/" + install -dm755 "$pkgdir/usr/share/applications/" + + # 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/resources/nheko.desktop" "$pkgdir/usr/share/applications/nheko.desktop" + + # 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 +} From e494dd4cefededdad1ab9afb88445242f20d398b Mon Sep 17 00:00:00 2001 From: mujx Date: Mon, 29 May 2017 20:17:28 +0300 Subject: [PATCH 02/78] Add qt5-tools in order to create translations --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 5057250..065b077 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,7 +10,7 @@ url="https://github.com/mujx/nheko" license=('GPL3') depends=('qt5-base') -makedepends=('git' 'cmake' 'gcc' 'fontconfig') +makedepends=('git' 'cmake' 'gcc' 'fontconfig' 'qt5-tools') source=($pkgname::git+https://github.com/mujx/nheko.git) md5sums=('SKIP') From ed8f3c15bfab2039f7e2248010deee22caca05ec Mon Sep 17 00:00:00 2001 From: mujx Date: Mon, 29 May 2017 20:19:55 +0300 Subject: [PATCH 03/78] Update srcinfo --- .SRCINFO | 1 + 1 file changed, 1 insertion(+) diff --git a/.SRCINFO b/.SRCINFO index 94af8b3..36d3d11 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -10,6 +10,7 @@ pkgbase = nheko-git makedepends = cmake makedepends = gcc makedepends = fontconfig + makedepends = qt5-tools depends = qt5-base source = nheko-git::git+https://github.com/mujx/nheko.git md5sums = SKIP From 425afb6a875b1c1314af9c59b33f4fc0fa9224b8 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Thu, 10 Aug 2017 23:36:34 +0300 Subject: [PATCH 04/78] Use submodules and depend on lmdb --- .SRCINFO | 6 ++++-- PKGBUILD | 24 ++++++++++++++++-------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 36d3d11..6936f56 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.1.0.e78e43c86a39 + pkgver = 0.1.0.r174.c428ef4b pkgrel = 1 url = https://github.com/mujx/nheko arch = i686 @@ -12,7 +12,9 @@ pkgbase = nheko-git makedepends = fontconfig makedepends = qt5-tools depends = qt5-base - source = nheko-git::git+https://github.com/mujx/nheko.git + depends = lmdb + source = git://github.com/mujx/nheko.git + source = git://github.com/bendiken/lmdbxx.git md5sums = SKIP pkgname = nheko-git diff --git a/PKGBUILD b/PKGBUILD index 065b077..6ab61e0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,23 +1,31 @@ # Maintainer: Konstantinos Sideris pkgname=nheko-git -pkgver=0.1.0.e78e43c86a39 +pkgver=0.1.0.r174.c428ef4b pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" -arch=('i686' 'x86_64') +arch=("i686" "x86_64") url="https://github.com/mujx/nheko" -license=('GPL3') +license=("GPL3") -depends=('qt5-base') -makedepends=('git' 'cmake' 'gcc' 'fontconfig' 'qt5-tools') +depends=("qt5-base" "lmdb") +makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") -source=($pkgname::git+https://github.com/mujx/nheko.git) -md5sums=('SKIP') +source=("git://github.com/mujx/nheko.git" + "git://github.com/bendiken/lmdbxx.git") +md5sums=("SKIP") + +prepare() { + cd nheko + git submodule init + git config submodule.lmdbxx.url $srcdir/libs/lmdbxx + git submodule update +} pkgver() { cd "$pkgname" - printf "0.1.0.%s" "$(git rev-parse --short HEAD)" + printf "0.1.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } build() { From 84d47a215fdc189e4a6325b1f1d65ca1dc004f84 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Thu, 10 Aug 2017 23:44:36 +0300 Subject: [PATCH 05/78] Skip md5sums for all the repos --- .SRCINFO | 3 ++- PKGBUILD | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6936f56..47e2962 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -13,9 +13,10 @@ pkgbase = nheko-git makedepends = qt5-tools depends = qt5-base depends = lmdb - source = git://github.com/mujx/nheko.git + source = nheko-git::git://github.com/mujx/nheko.git source = git://github.com/bendiken/lmdbxx.git md5sums = SKIP + md5sums = SKIP pkgname = nheko-git diff --git a/PKGBUILD b/PKGBUILD index 6ab61e0..3ec5708 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,12 +12,11 @@ license=("GPL3") depends=("qt5-base" "lmdb") makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") -source=("git://github.com/mujx/nheko.git" - "git://github.com/bendiken/lmdbxx.git") -md5sums=("SKIP") +source=($pkgname::git://github.com/mujx/nheko.git git://github.com/bendiken/lmdbxx.git) +md5sums=("SKIP" "SKIP") prepare() { - cd nheko + cd "$pkgname" git submodule init git config submodule.lmdbxx.url $srcdir/libs/lmdbxx git submodule update From af34b08c17cb8177902c48af2338df163151882d Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Mon, 4 Dec 2017 21:43:10 +0200 Subject: [PATCH 06/78] Integration with matrix structs --- .SRCINFO | 6 +++--- PKGBUILD | 18 ++++++++---------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 47e2962..921e81e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.1.0.r174.c428ef4b + pkgver = 0.1.0.r340.b9c4a819 pkgrel = 1 url = https://github.com/mujx/nheko arch = i686 @@ -11,11 +11,11 @@ pkgbase = nheko-git makedepends = gcc makedepends = fontconfig makedepends = qt5-tools + makedepends = ninja depends = qt5-base depends = lmdb + depends = qt5-multimedia source = nheko-git::git://github.com/mujx/nheko.git - source = git://github.com/bendiken/lmdbxx.git - md5sums = SKIP md5sums = SKIP pkgname = nheko-git diff --git a/PKGBUILD b/PKGBUILD index 3ec5708..0be2bd7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Konstantinos Sideris pkgname=nheko-git -pkgver=0.1.0.r174.c428ef4b +pkgver=0.1.0.r340.b9c4a819 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -9,17 +9,15 @@ arch=("i686" "x86_64") url="https://github.com/mujx/nheko" license=("GPL3") -depends=("qt5-base" "lmdb") -makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") +depends=("qt5-base" "lmdb" "qt5-multimedia") +makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "ninja") -source=($pkgname::git://github.com/mujx/nheko.git git://github.com/bendiken/lmdbxx.git) -md5sums=("SKIP" "SKIP") +source=($pkgname::git://github.com/mujx/nheko.git) +md5sums=("SKIP") prepare() { cd "$pkgname" - git submodule init - git config submodule.lmdbxx.url $srcdir/libs/lmdbxx - git submodule update + git submodule update --init --recursive } pkgver() { @@ -29,8 +27,8 @@ pkgver() { build() { cd "$pkgname" - cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release - make -C build -j2 + cmake -H. -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Release + cmake --build build } package() { From 86226c37750b8a77371e5ce5df55e2020a9cbab3 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Wed, 6 Dec 2017 21:38:34 +0200 Subject: [PATCH 07/78] Remove ninja --- .SRCINFO | 3 +-- PKGBUILD | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 921e81e..45be775 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.1.0.r340.b9c4a819 + pkgver = 0.1.0.r347.e1a4458a pkgrel = 1 url = https://github.com/mujx/nheko arch = i686 @@ -11,7 +11,6 @@ pkgbase = nheko-git makedepends = gcc makedepends = fontconfig makedepends = qt5-tools - makedepends = ninja depends = qt5-base depends = lmdb depends = qt5-multimedia diff --git a/PKGBUILD b/PKGBUILD index 0be2bd7..0468873 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Konstantinos Sideris pkgname=nheko-git -pkgver=0.1.0.r340.b9c4a819 +pkgver=0.1.0.r347.e1a4458a pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -10,7 +10,7 @@ url="https://github.com/mujx/nheko" license=("GPL3") depends=("qt5-base" "lmdb" "qt5-multimedia") -makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "ninja") +makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") source=($pkgname::git://github.com/mujx/nheko.git) md5sums=("SKIP") @@ -27,7 +27,7 @@ pkgver() { build() { cd "$pkgname" - cmake -H. -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Release + cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo cmake --build build } From dceca9ffa8842f9ce1844ef9978012363cd54fc1 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Mon, 5 Mar 2018 20:29:21 +0200 Subject: [PATCH 08/78] Update to v0.2.0 & remove submodules --- .SRCINFO | 2 +- PKGBUILD | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 45be775..25ea40c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.1.0.r347.e1a4458a + pkgver = 0.2.0.r347.e1a4458a pkgrel = 1 url = https://github.com/mujx/nheko arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 0468873..d6513c8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Konstantinos Sideris pkgname=nheko-git -pkgver=0.1.0.r347.e1a4458a +pkgver=0.2.0.r520.d703377a pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -17,12 +17,11 @@ md5sums=("SKIP") prepare() { cd "$pkgname" - git submodule update --init --recursive } pkgver() { cd "$pkgname" - printf "0.1.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "0.2.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } build() { From 9628c9f42008cf93feca2bb60e589820a40d3a28 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Wed, 14 Mar 2018 19:33:36 +0200 Subject: [PATCH 09/78] Update version to v0.2.1 --- .SRCINFO | 2 +- PKGBUILD | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 25ea40c..7f4c180 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.2.0.r347.e1a4458a + pkgver = 0.2.1.r520.d703377a pkgrel = 1 url = https://github.com/mujx/nheko arch = i686 diff --git a/PKGBUILD b/PKGBUILD index d6513c8..6aa2efc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Konstantinos Sideris pkgname=nheko-git -pkgver=0.2.0.r520.d703377a +pkgver=0.2.1.r520.d703377a pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -21,7 +21,7 @@ prepare() { pkgver() { cd "$pkgname" - printf "0.2.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "0.2.1.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } build() { From 73d4b0877bbbcc170a4cb6e7c75d88a839530fed Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Thu, 12 Apr 2018 23:44:36 +0300 Subject: [PATCH 10/78] Bump version to v0.3.0 --- .SRCINFO | 4 +++- PKGBUILD | 9 ++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7f4c180..e0930a0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.2.1.r520.d703377a + pkgver = 0.3.0.r520.d703377a pkgrel = 1 url = https://github.com/mujx/nheko arch = i686 @@ -14,6 +14,8 @@ pkgbase = nheko-git depends = qt5-base depends = lmdb depends = qt5-multimedia + provides = nheko + conflicts = nheko source = nheko-git::git://github.com/mujx/nheko.git md5sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 6aa2efc..d3dc93b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Konstantinos Sideris pkgname=nheko-git -pkgver=0.2.1.r520.d703377a +pkgver=0.3.0.r571.e032f293 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -12,6 +12,9 @@ license=("GPL3") depends=("qt5-base" "lmdb" "qt5-multimedia") makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") +provides=("nheko") +conflicts=("nheko") + source=($pkgname::git://github.com/mujx/nheko.git) md5sums=("SKIP") @@ -21,12 +24,12 @@ prepare() { pkgver() { cd "$pkgname" - printf "0.2.1.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "0.3.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } build() { cd "$pkgname" - cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo + cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release cmake --build build } From b0d3488973ee6659faab123834a69ab4c5d79592 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Thu, 3 May 2018 21:37:59 +0300 Subject: [PATCH 11/78] Bump version & add qt5-svg as dependency --- .SRCINFO | 3 ++- PKGBUILD | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e0930a0..fbd19ee 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.3.0.r520.d703377a + pkgver = 0.4.0.r571.e032f293 pkgrel = 1 url = https://github.com/mujx/nheko arch = i686 @@ -14,6 +14,7 @@ pkgbase = nheko-git depends = qt5-base depends = lmdb depends = qt5-multimedia + depends = qt5-svg provides = nheko conflicts = nheko source = nheko-git::git://github.com/mujx/nheko.git diff --git a/PKGBUILD b/PKGBUILD index d3dc93b..151be57 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Konstantinos Sideris pkgname=nheko-git -pkgver=0.3.0.r571.e032f293 +pkgver=0.4.0.r571.e032f293 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -9,7 +9,7 @@ arch=("i686" "x86_64") url="https://github.com/mujx/nheko" license=("GPL3") -depends=("qt5-base" "lmdb" "qt5-multimedia") +depends=("qt5-base" "lmdb" "qt5-multimedia" "qt5-svg") makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") provides=("nheko") @@ -24,7 +24,7 @@ prepare() { pkgver() { cd "$pkgname" - printf "0.3.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "0.4.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } build() { From a6bff6cde87acbf4217484136ca4f3e20c122343 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Sun, 17 Jun 2018 20:09:01 +0300 Subject: [PATCH 12/78] Update with the new dependencies --- .SRCINFO | 5 ++++- PKGBUILD | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fbd19ee..884ccaf 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.4.0.r571.e032f293 + pkgver = 0.4.3.r678.87042659 pkgrel = 1 url = https://github.com/mujx/nheko arch = i686 @@ -15,6 +15,9 @@ pkgbase = nheko-git depends = lmdb depends = qt5-multimedia depends = qt5-svg + depends = boost + depends = libsodium + depends = openssl provides = nheko conflicts = nheko source = nheko-git::git://github.com/mujx/nheko.git diff --git a/PKGBUILD b/PKGBUILD index 151be57..677f1cb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Konstantinos Sideris pkgname=nheko-git -pkgver=0.4.0.r571.e032f293 +pkgver=0.4.3.r678.87042659 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -9,7 +9,7 @@ arch=("i686" "x86_64") url="https://github.com/mujx/nheko" license=("GPL3") -depends=("qt5-base" "lmdb" "qt5-multimedia" "qt5-svg") +depends=("qt5-base" "lmdb" "qt5-multimedia" "qt5-svg" "boost" "libsodium" "openssl") makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") provides=("nheko") @@ -24,11 +24,14 @@ prepare() { pkgver() { cd "$pkgname" - printf "0.4.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "0.4.3.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } build() { cd "$pkgname" + cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF + cmake --build .deps + cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release cmake --build build } From 89211c97da02775a21fa176165fd4d2b53db8297 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Sun, 8 Jul 2018 18:48:19 +0300 Subject: [PATCH 13/78] Update build steps to include header-only libs --- PKGBUILD | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 677f1cb..2ba146f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -32,7 +32,9 @@ build() { cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF cmake --build .deps - cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release + cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release \ + -DLMDBXX_INCLUDE_DIR=.deps/usr/include \ + -DTWEENY_INCLUDE_DIR=.deps/usr/include cmake --build build } From 2ceab10e22cd0e5373b7f5e9857167f3d0a749b4 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Mon, 16 Jul 2018 22:15:37 +0300 Subject: [PATCH 14/78] Update to v0.5.0 --- .SRCINFO | 2 +- PKGBUILD | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 884ccaf..55918bf 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.4.3.r678.87042659 + pkgver = 0.5.0.r732.96a2c614 pkgrel = 1 url = https://github.com/mujx/nheko arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 2ba146f..80e69e7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Konstantinos Sideris pkgname=nheko-git -pkgver=0.4.3.r678.87042659 +pkgver=0.5.0.r732.96a2c614 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -24,11 +24,14 @@ prepare() { pkgver() { cd "$pkgname" - printf "0.4.3.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "0.5.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } build() { cd "$pkgname" + + rm -f cmake/FindOlm.cmake + cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF cmake --build .deps From 13bd54ff7f1d69d8b8310b3611cfdc5fc9eec4c1 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Tue, 18 Sep 2018 22:35:05 +0300 Subject: [PATCH 15/78] Add libcmark as dependency --- .SRCINFO | 1 + PKGBUILD | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 55918bf..15ca4a8 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -18,6 +18,7 @@ pkgbase = nheko-git depends = boost depends = libsodium depends = openssl + depends = cmark provides = nheko conflicts = nheko source = nheko-git::git://github.com/mujx/nheko.git diff --git a/PKGBUILD b/PKGBUILD index 80e69e7..0ece076 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ arch=("i686" "x86_64") url="https://github.com/mujx/nheko" license=("GPL3") -depends=("qt5-base" "lmdb" "qt5-multimedia" "qt5-svg" "boost" "libsodium" "openssl") +depends=("qt5-base" "lmdb" "qt5-multimedia" "qt5-svg" "boost" "libsodium" "openssl" "cmark") makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") provides=("nheko") @@ -24,7 +24,7 @@ prepare() { pkgver() { cd "$pkgname" - printf "0.5.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "0.5.5.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } build() { @@ -32,7 +32,7 @@ build() { rm -f cmake/FindOlm.cmake - cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF + cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF cmake --build .deps cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release \ From e07b4dbb5276d1cb56c8872127265e76d3d29133 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sat, 11 May 2019 20:28:49 -0400 Subject: [PATCH 16/78] Add new maintainer info --- PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/PKGBUILD b/PKGBUILD index 0ece076..eddb389 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer: Konstantinos Sideris +# Maintainer: Joseph Donofry pkgname=nheko-git pkgver=0.5.0.r732.96a2c614 From 87b4c85be3ef1cc48e82c6ceae990f208ab0a9f4 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 12 May 2019 14:32:16 -0400 Subject: [PATCH 17/78] Update to Nheko-Reborn repo and change version info. --- PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index eddb389..cb13e15 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,21 +2,21 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.5.0.r732.96a2c614 +pkgver=0.6.3.r1020.be5287a pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") -url="https://github.com/mujx/nheko" +url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") depends=("qt5-base" "lmdb" "qt5-multimedia" "qt5-svg" "boost" "libsodium" "openssl" "cmark") -makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") +makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json") provides=("nheko") conflicts=("nheko") -source=($pkgname::git://github.com/mujx/nheko.git) +source=($pkgname::git://github.com/Nheko-Reborn/nheko.git) md5sums=("SKIP") prepare() { @@ -25,7 +25,7 @@ prepare() { pkgver() { cd "$pkgname" - printf "0.5.5.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "0.6.3.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } build() { From 12a49c19926441a0292522013c56d362b3aebae3 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 12 May 2019 14:33:16 -0400 Subject: [PATCH 18/78] Update .SRCINFO --- .SRCINFO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index 15ca4a8..77c6e28 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.5.0.r732.96a2c614 + pkgver = 0.6.3.r1020.be5287a pkgrel = 1 url = https://github.com/mujx/nheko arch = i686 From fb6ffb460fc45d7dc1a877ce6828edabbd95983e Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 12 May 2019 14:36:54 -0400 Subject: [PATCH 19/78] Use bundled nlohmann --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index cb13e15..c0f85d6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,7 +11,7 @@ url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") depends=("qt5-base" "lmdb" "qt5-multimedia" "qt5-svg" "boost" "libsodium" "openssl" "cmark") -makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json") +makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") provides=("nheko") conflicts=("nheko") @@ -33,7 +33,7 @@ build() { rm -f cmake/FindOlm.cmake - cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF + cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF -DUSE_BUNDLED_JSON=ON cmake --build .deps cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release \ From 8a276020af69e6c202ca421047a1bd5bc87758f7 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 12 May 2019 14:42:31 -0400 Subject: [PATCH 20/78] Update .SRCINFO --- .SRCINFO | 5 +++-- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 77c6e28..21b826d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -2,7 +2,7 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol pkgver = 0.6.3.r1020.be5287a pkgrel = 1 - url = https://github.com/mujx/nheko + url = https://github.com/Nheko-Reborn/nheko arch = i686 arch = x86_64 license = GPL3 @@ -11,6 +11,7 @@ pkgbase = nheko-git makedepends = gcc makedepends = fontconfig makedepends = qt5-tools + makedepends = nlohmann-json depends = qt5-base depends = lmdb depends = qt5-multimedia @@ -21,7 +22,7 @@ pkgbase = nheko-git depends = cmark provides = nheko conflicts = nheko - source = nheko-git::git://github.com/mujx/nheko.git + source = nheko-git::git://github.com/Nheko-Reborn/nheko.git md5sums = SKIP pkgname = nheko-git diff --git a/PKGBUILD b/PKGBUILD index c0f85d6..cb13e15 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,7 +11,7 @@ url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") depends=("qt5-base" "lmdb" "qt5-multimedia" "qt5-svg" "boost" "libsodium" "openssl" "cmark") -makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") +makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json") provides=("nheko") conflicts=("nheko") @@ -33,7 +33,7 @@ build() { rm -f cmake/FindOlm.cmake - cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF -DUSE_BUNDLED_JSON=ON + cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF cmake --build .deps cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release \ From 66d1b1067ca188b5df1b518bad857caf8455c96b Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 12 May 2019 16:28:11 -0400 Subject: [PATCH 21/78] Don't use bundled JSON lib --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index cb13e15..c156a54 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -33,7 +33,7 @@ build() { rm -f cmake/FindOlm.cmake - cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF + cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF -DUSE_BUNDLED_JSON=OFF cmake --build .deps cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release \ From c493ef95aa5bba1c1222f56679b3a5af4c8d0835 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 12 May 2019 16:33:08 -0400 Subject: [PATCH 22/78] Update JSON include path --- PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/PKGBUILD b/PKGBUILD index c156a54..4f686ad 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -39,6 +39,7 @@ build() { cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release \ -DLMDBXX_INCLUDE_DIR=.deps/usr/include \ -DTWEENY_INCLUDE_DIR=.deps/usr/include + -DJSON_INCLUDE_DIR=/usr/include cmake --build build } From 159a82420a49e9f1ef4888bdf08949bba1675802 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 12 May 2019 16:57:55 -0400 Subject: [PATCH 23/78] Use included JSON --- .SRCINFO | 1 - PKGBUILD | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 21b826d..41ac253 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -11,7 +11,6 @@ pkgbase = nheko-git makedepends = gcc makedepends = fontconfig makedepends = qt5-tools - makedepends = nlohmann-json depends = qt5-base depends = lmdb depends = qt5-multimedia diff --git a/PKGBUILD b/PKGBUILD index 4f686ad..b81d73c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,7 +11,7 @@ url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") depends=("qt5-base" "lmdb" "qt5-multimedia" "qt5-svg" "boost" "libsodium" "openssl" "cmark") -makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json") +makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") provides=("nheko") conflicts=("nheko") @@ -33,13 +33,13 @@ build() { rm -f cmake/FindOlm.cmake - cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF -DUSE_BUNDLED_JSON=OFF + cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF -DUSE_BUNDLED_JSON=ON cmake --build .deps cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release \ -DLMDBXX_INCLUDE_DIR=.deps/usr/include \ - -DTWEENY_INCLUDE_DIR=.deps/usr/include - -DJSON_INCLUDE_DIR=/usr/include + -DTWEENY_INCLUDE_DIR=.deps/usr/include \ + -DCMAKE_INSTALL_PREFIX=.deps/usr cmake --build build } From 18aa00170209b2bf755ce356fea2c4fe1ee2b599 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 12 May 2019 23:33:16 -0400 Subject: [PATCH 24/78] Use statically linked mtxclient so we're using the correct one for a rolling build --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index b81d73c..b0758ae 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -33,7 +33,7 @@ build() { rm -f cmake/FindOlm.cmake - cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF -DUSE_BUNDLED_JSON=ON + cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF -DUSE_BUNDLED_JSON=ON -DMTX_STATIC=ON cmake --build .deps cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release \ From f7723b905c316ff1af03b3c8375be7831c5c7601 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 12 May 2019 23:36:56 -0400 Subject: [PATCH 25/78] Use more cores for build --- PKGBUILD | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PKGBUILD b/PKGBUILD index b0758ae..912ee57 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -33,6 +33,8 @@ build() { rm -f cmake/FindOlm.cmake + # build with more cores than the default + export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l) cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF -DUSE_BUNDLED_JSON=ON -DMTX_STATIC=ON cmake --build .deps From f002961f219176cb7d02d054f7b5d92309058aa0 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Thu, 23 May 2019 21:54:33 -0400 Subject: [PATCH 26/78] Update to 0.6.4 --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 41ac253..8610eb7 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.6.3.r1020.be5287a + pkgver = 0.6.4.r1020.be5287a pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 912ee57..afccbde 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -25,7 +25,7 @@ prepare() { pkgver() { cd "$pkgname" - printf "0.6.3.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "0.6.4.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } build() { From 64037a08bcec491c6b35c3dc3825c4aab622e53c Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Tue, 18 Jun 2019 14:10:41 -0400 Subject: [PATCH 27/78] Update to 0.7.0 development branch --- .SRCINFO | 2 +- PKGBUILD | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8610eb7..bdd1763 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.6.4.r1020.be5287a + pkgver = 0.7.0.r1020.be5287a pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 diff --git a/PKGBUILD b/PKGBUILD index afccbde..5f014f0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.6.3.r1020.be5287a +pkgver=0.7.0.r1050.cfd6c57 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -16,7 +16,7 @@ makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") provides=("nheko") conflicts=("nheko") -source=($pkgname::git://github.com/Nheko-Reborn/nheko.git) +source=($pkgname::git://github.com/Nheko-Reborn/nheko.git#branch=0.7.0-dev) md5sums=("SKIP") prepare() { @@ -25,7 +25,7 @@ prepare() { pkgver() { cd "$pkgname" - printf "0.6.4.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "0.7.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } build() { From 04d17302c657665c5386912de36a4501fe53c432 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Tue, 18 Jun 2019 15:46:26 -0400 Subject: [PATCH 28/78] Fix .SRCINFO pkgver --- .SRCINFO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index bdd1763..c110da2 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.7.0.r1020.be5287a + pkgver = 0.7.0.r1050.cfd6c57 pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 From 987eedb6eac19c72d54404932c76a122189fcd22 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Thu, 30 Jan 2020 18:10:01 -0500 Subject: [PATCH 29/78] Update PKGBUILD to support new build configuration --- PKGBUILD | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 5f014f0..a4a2699 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.7.0.r1050.cfd6c57 +pkgver=0.7.0.r1380.7350863 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -10,7 +10,7 @@ arch=("i686" "x86_64") url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") -depends=("qt5-base" "lmdb" "qt5-multimedia" "qt5-svg" "boost" "libsodium" "openssl" "cmark") +depends=("qt5-base" "lmdb" "qt5-multimedia" "qt5-svg" "boost" "libsodium" "openssl" "cmark" ) makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") provides=("nheko") @@ -35,14 +35,9 @@ build() { # build with more cores than the default export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l) - cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF -DUSE_BUNDLED_JSON=ON -DMTX_STATIC=ON - cmake --build .deps - - cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release \ - -DLMDBXX_INCLUDE_DIR=.deps/usr/include \ - -DTWEENY_INCLUDE_DIR=.deps/usr/include \ - -DCMAKE_INSTALL_PREFIX=.deps/usr - cmake --build build + cmake -H. -Bbuild -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_OPENSSL=OFF -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF -DUSE_BUNDLED_JSON=ON \ + -DCMAKE_INSTALL_PREFIX=.deps/usr + cmake --build build --config Release } package() { From 58f842e72d05cdcd7c91472c6310b82574d6ba71 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Thu, 30 Jan 2020 18:11:26 -0500 Subject: [PATCH 30/78] Update .SRCINFO --- .SRCINFO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index c110da2..5d3a2eb 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.7.0.r1050.cfd6c57 + pkgver = 0.7.0.r1050.d6d407 pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 From 7576d77b18097654acdea42f9ba04ae85497cc8f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 4 Feb 2020 21:19:51 +0100 Subject: [PATCH 31/78] initial commit --- .SRCINFO | 15 +++++++++++++++ .gitignore | 4 ++++ PKGBUILD | 31 +++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 .SRCINFO create mode 100644 .gitignore create mode 100644 PKGBUILD diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..08c2399 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,15 @@ +pkgbase = newsflash-git + pkgdesc = The spiritual successor to FeedReader + pkgver = 402.510b8c6 + pkgrel = 1 + url = https://gitlab.com/news-flash/news_flash_gtk + arch = any + license = GPL3 + makedepends = rust + makedepends = cargo + makedepends = meson + source = git+https://gitlab.com/news-flash/news_flash_gtk.git + sha512sums = SKIP + +pkgname = newsflash-git + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a271796 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +PKGBUILD +.SRCINFO +.gitignore +* diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..f5d69fd --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Felix Bühler + +pkgname=newsflash-git +_pkgname=news_flash_gtk +pkgver=402.510b8c6 +pkgrel=1 +pkgdesc="The spiritual successor to FeedReader" +arch=(any) +url="https://gitlab.com/news-flash/news_flash_gtk" +license=(GPL3) +depends=() +makedepends=(rust cargo meson) +source=("git+https://gitlab.com/news-flash/news_flash_gtk.git") +sha512sums=("SKIP") + +pkgver() { + cd "${_pkgname}" + echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD) +} + +build() { + cd "${_pkgname}" + rm -rf _build + arch-meson _build + ninja -C _build +} + +package() { + cd "${_pkgname}" + env DESTDIR="$pkgdir" ninja -C _build install +} From c938b7621fb727ed597769d5e4f227c061529175 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 4 Feb 2020 21:43:34 +0100 Subject: [PATCH 32/78] add newsflash conflict --- .SRCINFO | 1 + PKGBUILD | 1 + 2 files changed, 2 insertions(+) diff --git a/.SRCINFO b/.SRCINFO index 08c2399..4dad8e5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -8,6 +8,7 @@ pkgbase = newsflash-git makedepends = rust makedepends = cargo makedepends = meson + conflicts = newsflash source = git+https://gitlab.com/news-flash/news_flash_gtk.git sha512sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index f5d69fd..6724d79 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,6 +10,7 @@ url="https://gitlab.com/news-flash/news_flash_gtk" license=(GPL3) depends=() makedepends=(rust cargo meson) +conflicts=(newsflash) source=("git+https://gitlab.com/news-flash/news_flash_gtk.git") sha512sums=("SKIP") From 54475993ff473d9d6580dc5442fe07126db2ce62 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 9 Feb 2020 16:56:08 -0500 Subject: [PATCH 33/78] Add missing quickcontrols2 dep --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index a4a2699..3e20565 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.7.0.r1380.7350863 +pkgver=0.7.0.r1394.3237551 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -10,7 +10,7 @@ arch=("i686" "x86_64") url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") -depends=("qt5-base" "lmdb" "qt5-multimedia" "qt5-svg" "boost" "libsodium" "openssl" "cmark" ) +depends=("qt5-base" "lmdb" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "boost" "libsodium" "openssl" "cmark" ) makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") provides=("nheko") From 39cd1ee3e95233d51fef6c62479f9f6a00bbac00 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 9 Feb 2020 16:59:04 -0500 Subject: [PATCH 34/78] Update .SRCINFO --- .SRCINFO | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5d3a2eb..3827006 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.7.0.r1050.d6d407 + pkgver = 0.7.0.r1394.3237551 pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -15,13 +15,14 @@ pkgbase = nheko-git depends = lmdb depends = qt5-multimedia depends = qt5-svg + depends = qt5-quickcontrols2 depends = boost depends = libsodium depends = openssl depends = cmark provides = nheko conflicts = nheko - source = nheko-git::git://github.com/Nheko-Reborn/nheko.git + source = nheko-git::git://github.com/Nheko-Reborn/nheko.git#branch=0.7.0-dev md5sums = SKIP pkgname = nheko-git From 5bcec9143f26455548602a1dd7bd3c9d71b03733 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Mon, 2 Mar 2020 21:41:28 -0500 Subject: [PATCH 35/78] Update AUR to follow master branch --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3827006..096f222 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -22,7 +22,7 @@ pkgbase = nheko-git depends = cmark provides = nheko conflicts = nheko - source = nheko-git::git://github.com/Nheko-Reborn/nheko.git#branch=0.7.0-dev + source = nheko-git::git://github.com/Nheko-Reborn/nheko.git#branch=master md5sums = SKIP pkgname = nheko-git diff --git a/PKGBUILD b/PKGBUILD index 3e20565..5cc1384 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -16,7 +16,7 @@ makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") provides=("nheko") conflicts=("nheko") -source=($pkgname::git://github.com/Nheko-Reborn/nheko.git#branch=0.7.0-dev) +source=($pkgname::git://github.com/Nheko-Reborn/nheko.git#branch=master) md5sums=("SKIP") prepare() { From eb6e8e1cd95079a639bbb3b4c2892dbce16d4017 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Mon, 2 Mar 2020 21:45:18 -0500 Subject: [PATCH 36/78] Update revisions to correct values --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 096f222..dedd0d5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.7.0.r1394.3237551 + pkgver = 0.7.0.r1483.0f9c9df pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 5cc1384..092c686 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.7.0.r1394.3237551 +pkgver=0.7.0.r1483.0f9c9df pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") From f61c73324dea41efead308b5bd12ea6f803d805b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 13 Mar 2020 00:52:21 +0100 Subject: [PATCH 37/78] add missing dependencies --- .SRCINFO | 6 ++++-- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 4dad8e5..5075079 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,13 +1,15 @@ pkgbase = newsflash-git pkgdesc = The spiritual successor to FeedReader pkgver = 402.510b8c6 - pkgrel = 1 + pkgrel = 2 url = https://gitlab.com/news-flash/news_flash_gtk arch = any license = GPL3 - makedepends = rust makedepends = cargo + makedepends = libhandy makedepends = meson + makedepends = rust + makedepends = webkit2gtk conflicts = newsflash source = git+https://gitlab.com/news-flash/news_flash_gtk.git sha512sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 6724d79..046b8dc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,13 +3,13 @@ pkgname=newsflash-git _pkgname=news_flash_gtk pkgver=402.510b8c6 -pkgrel=1 +pkgrel=2 pkgdesc="The spiritual successor to FeedReader" arch=(any) url="https://gitlab.com/news-flash/news_flash_gtk" license=(GPL3) depends=() -makedepends=(rust cargo meson) +makedepends=(cargo libhandy meson rust webkit2gtk) conflicts=(newsflash) source=("git+https://gitlab.com/news-flash/news_flash_gtk.git") sha512sums=("SKIP") From 58af39a394761ee708a6edfd2d1293e98918f2c6 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 5 Apr 2020 13:34:38 -0400 Subject: [PATCH 38/78] Update dependencies Include missing qt5-graphicaleffects dep --- .SRCINFO | 3 ++- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index dedd0d5..73f5a6b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.7.0.r1483.0f9c9df + pkgver = 0.7.0.r1532.384ef13 pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -13,6 +13,7 @@ pkgbase = nheko-git makedepends = qt5-tools depends = qt5-base depends = lmdb + depends = qt5-graphicaleffects depends = qt5-multimedia depends = qt5-svg depends = qt5-quickcontrols2 diff --git a/PKGBUILD b/PKGBUILD index 092c686..706dda3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.7.0.r1483.0f9c9df +pkgver=0.7.0.r1532.384ef13 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -10,7 +10,7 @@ arch=("i686" "x86_64") url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") -depends=("qt5-base" "lmdb" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "boost" "libsodium" "openssl" "cmark" ) +depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "boost" "libsodium" "openssl" "cmark" ) makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") provides=("nheko") From 269d963d24afec88fb5981b0777a90036a6a2033 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 20 Apr 2020 23:03:31 +0200 Subject: [PATCH 39/78] keep build files, cargo will take care --- .SRCINFO | 4 ++-- PKGBUILD | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5075079..2ad5343 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = newsflash-git pkgdesc = The spiritual successor to FeedReader - pkgver = 402.510b8c6 - pkgrel = 2 + pkgver = 473.cd41e93 + pkgrel = 1 url = https://gitlab.com/news-flash/news_flash_gtk arch = any license = GPL3 diff --git a/PKGBUILD b/PKGBUILD index 046b8dc..61a44ac 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,8 +2,8 @@ pkgname=newsflash-git _pkgname=news_flash_gtk -pkgver=402.510b8c6 -pkgrel=2 +pkgver=473.cd41e93 +pkgrel=1 pkgdesc="The spiritual successor to FeedReader" arch=(any) url="https://gitlab.com/news-flash/news_flash_gtk" @@ -21,7 +21,7 @@ pkgver() { build() { cd "${_pkgname}" - rm -rf _build + #rm -rf _build arch-meson _build ninja -C _build } From d8cb81ea0c7f827f042a479b3ca138a12da72ac1 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Thu, 23 Apr 2020 21:20:21 -0400 Subject: [PATCH 40/78] Update to 0.7.1 version --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 73f5a6b..a6cb4f1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.7.0.r1532.384ef13 + pkgver = 0.7.1.r1586.14ce840 pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 706dda3..badaeec 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.7.0.r1532.384ef13 +pkgver=0.7.1.r1586.14ce840 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") From 0ebd9ed5b907a9b4dc4c2da3186ccdb546a33a12 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Thu, 14 May 2020 21:23:42 -0400 Subject: [PATCH 41/78] Fix pkgver issue and hopefully add some missing deps --- .SRCINFO | 9 ++++++--- PKGBUILD | 10 +++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a6cb4f1..a99e675 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.7.1.r1586.14ce840 + pkgver = 0.7.1.r1647.eb4b02e pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -11,16 +11,19 @@ pkgbase = nheko-git makedepends = gcc makedepends = fontconfig makedepends = qt5-tools + makedepends = nlohmann-json depends = qt5-base depends = lmdb depends = qt5-graphicaleffects depends = qt5-multimedia depends = qt5-svg depends = qt5-quickcontrols2 - depends = boost + depends = qt5-declarative + depends = boost-libs depends = libsodium - depends = openssl depends = cmark + depends = openssl + depends = hicolor-icon-theme provides = nheko conflicts = nheko source = nheko-git::git://github.com/Nheko-Reborn/nheko.git#branch=master diff --git a/PKGBUILD b/PKGBUILD index badaeec..d130ef7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.7.1.r1586.14ce840 +pkgver=0.7.1.r1647.eb4b02e pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -10,8 +10,8 @@ arch=("i686" "x86_64") url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") -depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "boost" "libsodium" "openssl" "cmark" ) -makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") +depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "boost-libs" "libsodium" "cmark" "openssl" "hicolor-icon-theme") +makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json") provides=("nheko") conflicts=("nheko") @@ -25,7 +25,7 @@ prepare() { pkgver() { cd "$pkgname" - printf "0.7.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "0.7.1.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } build() { @@ -35,7 +35,7 @@ build() { # build with more cores than the default export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l) - cmake -H. -Bbuild -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_OPENSSL=OFF -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF -DUSE_BUNDLED_JSON=ON \ + cmake -H. -Bbuild -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_OPENSSL=OFF -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF -DUSE_BUNDLED_JSON=OFF \ -DCMAKE_INSTALL_PREFIX=.deps/usr cmake --build build --config Release } From 6cf0d10bb10cc4f39bae31e732852267d72d107e Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Tue, 16 Jun 2020 17:47:53 -0400 Subject: [PATCH 42/78] Update to 0.7.2 and fix build deps, Change to release build --- .SRCINFO | 3 ++- PKGBUILD | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a99e675..0f44133 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.7.1.r1647.eb4b02e + pkgver = 0.7.2.r1745.887ad25 pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -12,6 +12,7 @@ pkgbase = nheko-git makedepends = fontconfig makedepends = qt5-tools makedepends = nlohmann-json + makedepends = boost depends = qt5-base depends = lmdb depends = qt5-graphicaleffects diff --git a/PKGBUILD b/PKGBUILD index d130ef7..020c87b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.7.1.r1647.eb4b02e +pkgver=0.7.2.r1745.887ad25 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -11,7 +11,7 @@ url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "boost-libs" "libsodium" "cmark" "openssl" "hicolor-icon-theme") -makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json") +makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "boost") provides=("nheko") conflicts=("nheko") @@ -25,7 +25,7 @@ prepare() { pkgver() { cd "$pkgname" - printf "0.7.1.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "0.7.2.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } build() { @@ -36,7 +36,7 @@ build() { # build with more cores than the default export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l) cmake -H. -Bbuild -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_OPENSSL=OFF -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF -DUSE_BUNDLED_JSON=OFF \ - -DCMAKE_INSTALL_PREFIX=.deps/usr + -DCMAKE_INSTALL_PREFIX=.deps/usr -DCMAKE_BUILD_TYPE=Release cmake --build build --config Release } From 429fff4ead28f860c17a5190feb2f4eed38ef107 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 30 Jun 2020 13:25:11 +0200 Subject: [PATCH 43/78] add git as makedependency --- .SRCINFO | 3 ++- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2ad5343..fbe87b2 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,10 +1,11 @@ pkgbase = newsflash-git pkgdesc = The spiritual successor to FeedReader - pkgver = 473.cd41e93 + pkgver = 617.edae91e pkgrel = 1 url = https://gitlab.com/news-flash/news_flash_gtk arch = any license = GPL3 + makedepends = git makedepends = cargo makedepends = libhandy makedepends = meson diff --git a/PKGBUILD b/PKGBUILD index 61a44ac..4e351cc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,14 +2,14 @@ pkgname=newsflash-git _pkgname=news_flash_gtk -pkgver=473.cd41e93 +pkgver=617.edae91e pkgrel=1 pkgdesc="The spiritual successor to FeedReader" arch=(any) url="https://gitlab.com/news-flash/news_flash_gtk" license=(GPL3) depends=() -makedepends=(cargo libhandy meson rust webkit2gtk) +makedepends=(git cargo libhandy meson rust webkit2gtk) conflicts=(newsflash) source=("git+https://gitlab.com/news-flash/news_flash_gtk.git") sha512sums=("SKIP") From cfd7125f085e74febd96dff76550e0cdad39e735 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 1 Jul 2020 12:22:58 +0200 Subject: [PATCH 44/78] move libhandy to dependecies --- .SRCINFO | 2 +- PKGBUILD | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fbe87b2..05ee533 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -7,10 +7,10 @@ pkgbase = newsflash-git license = GPL3 makedepends = git makedepends = cargo - makedepends = libhandy makedepends = meson makedepends = rust makedepends = webkit2gtk + depends = libhandy conflicts = newsflash source = git+https://gitlab.com/news-flash/news_flash_gtk.git sha512sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 4e351cc..de1e4f3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,8 +8,8 @@ pkgdesc="The spiritual successor to FeedReader" arch=(any) url="https://gitlab.com/news-flash/news_flash_gtk" license=(GPL3) -depends=() -makedepends=(git cargo libhandy meson rust webkit2gtk) +depends=(libhandy) +makedepends=(git cargo meson rust webkit2gtk) conflicts=(newsflash) source=("git+https://gitlab.com/news-flash/news_flash_gtk.git") sha512sums=("SKIP") From 3b13a733c1df39214c2324dedc25bf4b9b7adbdb Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Wed, 16 Sep 2020 18:53:10 -0400 Subject: [PATCH 45/78] Add GStreamer dependency --- .SRCINFO | 3 ++- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0f44133..facaecf 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.7.2.r1745.887ad25 + pkgver = 0.7.2.r1888.66d63072 pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -25,6 +25,7 @@ pkgbase = nheko-git depends = cmark depends = openssl depends = hicolor-icon-theme + depends = gstreamer provides = nheko conflicts = nheko source = nheko-git::git://github.com/Nheko-Reborn/nheko.git#branch=master diff --git a/PKGBUILD b/PKGBUILD index 020c87b..71015a4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.7.2.r1745.887ad25 +pkgver=0.7.2.r1888.66d63072 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -10,7 +10,7 @@ arch=("i686" "x86_64") url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") -depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "boost-libs" "libsodium" "cmark" "openssl" "hicolor-icon-theme") +depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "boost-libs" "libsodium" "cmark" "openssl" "hicolor-icon-theme" "gstreamer") makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "boost") provides=("nheko") From fdff292f737a4f2e70864e7225434aa598e86c3f Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Thu, 17 Sep 2020 17:55:48 -0400 Subject: [PATCH 46/78] Add missing gstreamer plugins --- .SRCINFO | 4 ++++ PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index facaecf..9d1480a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -26,6 +26,10 @@ pkgbase = nheko-git depends = openssl depends = hicolor-icon-theme depends = gstreamer + depends = gst-plugins-base + depends = gst-plugins-good + depends = gst-plugins-bad + depends = libnice provides = nheko conflicts = nheko source = nheko-git::git://github.com/Nheko-Reborn/nheko.git#branch=master diff --git a/PKGBUILD b/PKGBUILD index 71015a4..05c2928 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.7.2.r1888.66d63072 +pkgver=0.7.2.r1902.791a0148 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -10,7 +10,7 @@ arch=("i686" "x86_64") url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") -depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "boost-libs" "libsodium" "cmark" "openssl" "hicolor-icon-theme" "gstreamer") +depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "boost-libs" "libsodium" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "libnice") makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "boost") provides=("nheko") From 4c2c3f9fbc0713f423dad066d02bf45c23a86ef2 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Fri, 18 Sep 2020 13:20:30 -0400 Subject: [PATCH 47/78] Modify cmake configure line to fix gstreamer issues --- .SRCINFO | 2 +- PKGBUILD | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 9d1480a..9a25a7f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.7.2.r1888.66d63072 + pkgver = 0.7.2.r1902.791a0148 pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 05c2928..8221869 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -35,8 +35,7 @@ build() { # build with more cores than the default export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l) - cmake -H. -Bbuild -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_OPENSSL=OFF -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF -DUSE_BUNDLED_JSON=OFF \ - -DCMAKE_INSTALL_PREFIX=.deps/usr -DCMAKE_BUILD_TYPE=Release + cmake -H. -Bbuild -DHUNTER_ENABLED=OFF -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_MTXCLIENT=ON -DCMAKE_INSTALL_PREFIX=.deps/usr -DCMAKE_BUILD_TYPE=Release cmake --build build --config Release } From 9b6f5973c9ba5ab620261e46e94d5d095244dfe0 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sat, 19 Sep 2020 12:01:29 -0400 Subject: [PATCH 48/78] Add libolm to depends --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 8221869..b5e6488 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.7.2.r1902.791a0148 +pkgver=0.7.2.r1925.fe325f92 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -10,7 +10,7 @@ arch=("i686" "x86_64") url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") -depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "boost-libs" "libsodium" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "libnice") +depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "boost-libs" "libsodium" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "libnice" "libolm") makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "boost") provides=("nheko") From e04d132bacfcbbeb8125c1312681d0b826b9dcfe Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Mon, 21 Sep 2020 17:31:58 -0400 Subject: [PATCH 49/78] Add more deps --- .SRCINFO | 6 +++++- PKGBUILD | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 9a25a7f..8843e58 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.7.2.r1902.791a0148 + pkgver = 0.7.2.r1925.fe325f92 pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -30,6 +30,10 @@ pkgbase = nheko-git depends = gst-plugins-good depends = gst-plugins-bad depends = libnice + depends = libolm + depends = spdlog + depends = tweeny + depends = lmdbxx provides = nheko conflicts = nheko source = nheko-git::git://github.com/Nheko-Reborn/nheko.git#branch=master diff --git a/PKGBUILD b/PKGBUILD index b5e6488..ed0a0fd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.7.2.r1925.fe325f92 +pkgver=0.7.2.r1932.9169a26e pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -10,7 +10,7 @@ arch=("i686" "x86_64") url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") -depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "boost-libs" "libsodium" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "libnice" "libolm") +depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "boost-libs" "libsodium" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "libnice" "libolm" "spdlog" "tweeny" "lmdbxx") makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "boost") provides=("nheko") From a4ee8798902517899ddd29a7f3eb3f5bff48ee6e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Sep 2020 19:58:25 +0200 Subject: [PATCH 50/78] add libhandy1 as dependency --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 05ee533..80ac617 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = newsflash-git pkgdesc = The spiritual successor to FeedReader - pkgver = 617.edae91e + pkgver = 684.fea372a pkgrel = 1 url = https://gitlab.com/news-flash/news_flash_gtk arch = any @@ -10,7 +10,7 @@ pkgbase = newsflash-git makedepends = meson makedepends = rust makedepends = webkit2gtk - depends = libhandy + depends = libhandy>=1 conflicts = newsflash source = git+https://gitlab.com/news-flash/news_flash_gtk.git sha512sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index de1e4f3..2cc6269 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,13 +2,13 @@ pkgname=newsflash-git _pkgname=news_flash_gtk -pkgver=617.edae91e +pkgver=684.fea372a pkgrel=1 pkgdesc="The spiritual successor to FeedReader" arch=(any) url="https://gitlab.com/news-flash/news_flash_gtk" license=(GPL3) -depends=(libhandy) +depends=("libhandy>=1") makedepends=(git cargo meson rust webkit2gtk) conflicts=(newsflash) source=("git+https://gitlab.com/news-flash/news_flash_gtk.git") From d9e06bfadc10c2cdfecd1f1d6892db5f9d16a330 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Mon, 11 Jan 2021 18:20:35 -0500 Subject: [PATCH 51/78] Add qtkeychain-qt5 dependency --- .SRCINFO | 3 ++- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8843e58..129aef4 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.7.2.r1925.fe325f92 + pkgver = 0.7.2.r2316.b6f2acfe pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -20,6 +20,7 @@ pkgbase = nheko-git depends = qt5-svg depends = qt5-quickcontrols2 depends = qt5-declarative + depends = qtkeychain-qt5 depends = boost-libs depends = libsodium depends = cmark diff --git a/PKGBUILD b/PKGBUILD index ed0a0fd..be52307 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.7.2.r1932.9169a26e +pkgver=0.7.2.r2316.b6f2acfe pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -10,7 +10,7 @@ arch=("i686" "x86_64") url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") -depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "boost-libs" "libsodium" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "libnice" "libolm" "spdlog" "tweeny" "lmdbxx") +depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "qtkeychain-qt5" "boost-libs" "libsodium" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "libnice" "libolm" "spdlog" "tweeny" "lmdbxx") makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "boost") provides=("nheko") From e94767222fa48f20a14a9f24727d1853f306f4d5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 26 Jan 2021 12:45:12 +0100 Subject: [PATCH 52/78] move webkit2gtk to depends --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 80ac617..2bdf3c6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -9,8 +9,8 @@ pkgbase = newsflash-git makedepends = cargo makedepends = meson makedepends = rust - makedepends = webkit2gtk - depends = libhandy>=1 + depends = libhandy + depends = webkit2gtk conflicts = newsflash source = git+https://gitlab.com/news-flash/news_flash_gtk.git sha512sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 2cc6269..8b75153 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,8 +8,8 @@ pkgdesc="The spiritual successor to FeedReader" arch=(any) url="https://gitlab.com/news-flash/news_flash_gtk" license=(GPL3) -depends=("libhandy>=1") -makedepends=(git cargo meson rust webkit2gtk) +depends=(libhandy webkit2gtk) +makedepends=(git cargo meson rust) conflicts=(newsflash) source=("git+https://gitlab.com/news-flash/news_flash_gtk.git") sha512sums=("SKIP") From 66d53a133ba24aa206762ba5ff5ff8661ef8bb49 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Thu, 4 Mar 2021 19:04:59 -0500 Subject: [PATCH 53/78] Update version number generation and add support for lmdbxx hoytech fork --- .SRCINFO | 5 ++--- PKGBUILD | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 129aef4..723d44e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.7.2.r2316.b6f2acfe + pkgver = 0.8.1.r189.g87bf761d pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -34,10 +34,9 @@ pkgbase = nheko-git depends = libolm depends = spdlog depends = tweeny - depends = lmdbxx provides = nheko conflicts = nheko - source = nheko-git::git://github.com/Nheko-Reborn/nheko.git#branch=master + source = nheko-git::git+https://github.com/Nheko-Reborn/nheko.git#branch=master md5sums = SKIP pkgname = nheko-git diff --git a/PKGBUILD b/PKGBUILD index be52307..2b8b0b1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.7.2.r2316.b6f2acfe +pkgver=0.8.1.r189.g87bf761d pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -10,13 +10,13 @@ arch=("i686" "x86_64") url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") -depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "qtkeychain-qt5" "boost-libs" "libsodium" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "libnice" "libolm" "spdlog" "tweeny" "lmdbxx") +depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "qtkeychain-qt5" "boost-libs" "libsodium" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "libnice" "libolm" "spdlog" "tweeny") makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "boost") provides=("nheko") conflicts=("nheko") -source=($pkgname::git://github.com/Nheko-Reborn/nheko.git#branch=master) +source=($pkgname::git+https://github.com/Nheko-Reborn/nheko.git#branch=master) md5sums=("SKIP") prepare() { @@ -25,7 +25,7 @@ prepare() { pkgver() { cd "$pkgname" - printf "0.7.2.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } build() { @@ -35,7 +35,7 @@ build() { # build with more cores than the default export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l) - cmake -H. -Bbuild -DHUNTER_ENABLED=OFF -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_MTXCLIENT=ON -DCMAKE_INSTALL_PREFIX=.deps/usr -DCMAKE_BUILD_TYPE=Release + cmake -H. -Bbuild -DHUNTER_ENABLED=OFF -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_MTXCLIENT=ON -DUSE_BUNDLED_LMDBXX=ON -DCMAKE_INSTALL_PREFIX=.deps/usr -DCMAKE_BUILD_TYPE=Release cmake --build build --config Release } From fad8f206cced3038cb112cae9ee3c144bc40d79c Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sat, 26 Jun 2021 17:31:33 -0400 Subject: [PATCH 54/78] Remove unneeded dependencies and update version information --- .SRCINFO | 4 +--- PKGBUILD | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 723d44e..b611876 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.8.1.r189.g87bf761d + pkgver = 0.8.2.r156.gfddc558b pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -22,7 +22,6 @@ pkgbase = nheko-git depends = qt5-declarative depends = qtkeychain-qt5 depends = boost-libs - depends = libsodium depends = cmark depends = openssl depends = hicolor-icon-theme @@ -33,7 +32,6 @@ pkgbase = nheko-git depends = libnice depends = libolm depends = spdlog - depends = tweeny provides = nheko conflicts = nheko source = nheko-git::git+https://github.com/Nheko-Reborn/nheko.git#branch=master diff --git a/PKGBUILD b/PKGBUILD index 2b8b0b1..0d2d1e4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.8.1.r189.g87bf761d +pkgver=0.8.2.r156.gfddc558b pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -10,7 +10,7 @@ arch=("i686" "x86_64") url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") -depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "qtkeychain-qt5" "boost-libs" "libsodium" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "libnice" "libolm" "spdlog" "tweeny") +depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "qtkeychain-qt5" "boost-libs" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "libnice" "libolm" "spdlog" ) makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "boost") provides=("nheko") From ab0e72ae9ee32d8e1c2c4163bc4d8e94aecd6386 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Thu, 1 Jul 2021 20:29:46 -0400 Subject: [PATCH 55/78] Update Dependencies mtxclient no longer depends on boost and instead uses a custom library (coeurl) built on top of curl. As such, curl and libevent are now required. --- .SRCINFO | 7 +++---- PKGBUILD | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b611876..8b72111 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.8.2.r156.gfddc558b + pkgver = 0.8.2.r169.g5b016cbc pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -12,7 +12,6 @@ pkgbase = nheko-git makedepends = fontconfig makedepends = qt5-tools makedepends = nlohmann-json - makedepends = boost depends = qt5-base depends = lmdb depends = qt5-graphicaleffects @@ -21,7 +20,6 @@ pkgbase = nheko-git depends = qt5-quickcontrols2 depends = qt5-declarative depends = qtkeychain-qt5 - depends = boost-libs depends = cmark depends = openssl depends = hicolor-icon-theme @@ -32,10 +30,11 @@ pkgbase = nheko-git depends = libnice depends = libolm depends = spdlog + depends = curl + depends = libevent provides = nheko conflicts = nheko source = nheko-git::git+https://github.com/Nheko-Reborn/nheko.git#branch=master md5sums = SKIP pkgname = nheko-git - diff --git a/PKGBUILD b/PKGBUILD index 0d2d1e4..71ed40f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.8.2.r156.gfddc558b +pkgver=0.8.2.r169.g5b016cbc pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -10,8 +10,8 @@ arch=("i686" "x86_64") url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") -depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "qtkeychain-qt5" "boost-libs" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "libnice" "libolm" "spdlog" ) -makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "boost") +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" "libnice" "libolm" "spdlog" "curl" "libevent") +makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json") provides=("nheko") conflicts=("nheko") @@ -35,7 +35,7 @@ build() { # build with more cores than the default export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l) - cmake -H. -Bbuild -DHUNTER_ENABLED=OFF -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_MTXCLIENT=ON -DUSE_BUNDLED_LMDBXX=ON -DCMAKE_INSTALL_PREFIX=.deps/usr -DCMAKE_BUILD_TYPE=Release + 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 } From a1c9076c1911a353f6939ebb7658f400354ba34b Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Thu, 1 Jul 2021 20:44:53 -0400 Subject: [PATCH 56/78] Add aarch64 architecture --- .SRCINFO | 1 + PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index 8b72111..efbe074 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -5,6 +5,7 @@ pkgbase = nheko-git url = https://github.com/Nheko-Reborn/nheko arch = i686 arch = x86_64 + arch = aarch64 license = GPL3 makedepends = git makedepends = cmake diff --git a/PKGBUILD b/PKGBUILD index 71ed40f..dcbe13f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=nheko-git pkgver=0.8.2.r169.g5b016cbc pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" -arch=("i686" "x86_64") +arch=("i686" "x86_64" "aarch64") url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") From 06267edb5f8aac62e87389cf6e639f30ea97ebfe Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sat, 7 Aug 2021 21:09:12 -0400 Subject: [PATCH 57/78] Add missing qmlgl plugin for video calls --- .SRCINFO | 3 ++- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index efbe074..58d0ac0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.8.2.r169.g5b016cbc + pkgver = 0.8.2.r386.g35b36e24 pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -28,6 +28,7 @@ pkgbase = nheko-git depends = gst-plugins-base depends = gst-plugins-good depends = gst-plugins-bad + depends = gst-plugin-qmlgl depends = libnice depends = libolm depends = spdlog diff --git a/PKGBUILD b/PKGBUILD index dcbe13f..d1b49ba 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.8.2.r169.g5b016cbc +pkgver=0.8.2.r386.g35b36e24 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64" "aarch64") @@ -10,7 +10,7 @@ arch=("i686" "x86_64" "aarch64") url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") -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" "libnice" "libolm" "spdlog" "curl" "libevent") +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") makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json") provides=("nheko") From 59b803863d573954c808dbcdb4ae0163977b5068 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Tue, 16 Nov 2021 23:44:14 -0500 Subject: [PATCH 58/78] Add qt-jdenticon optdepends and remove cmake variable in build --- .SRCINFO | 3 ++- PKGBUILD | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 58d0ac0..1381a8f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.8.2.r386.g35b36e24 + pkgver = 0.8.2.r786.gc40fbf42 pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -34,6 +34,7 @@ pkgbase = nheko-git depends = spdlog depends = curl depends = libevent + optdepends = qt-jdenticon provides = nheko conflicts = nheko source = nheko-git::git+https://github.com/Nheko-Reborn/nheko.git#branch=master diff --git a/PKGBUILD b/PKGBUILD index d1b49ba..13a194b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.8.2.r386.g35b36e24 +pkgver=0.8.2.r786.gc40fbf42 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64" "aarch64") @@ -12,7 +12,7 @@ license=("GPL3") 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") makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json") - +optdepends=("qt-jdenticon") provides=("nheko") conflicts=("nheko") @@ -33,8 +33,6 @@ build() { rm -f cmake/FindOlm.cmake - # build with more cores than the default - export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l) 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 } From 3e423be5fb1d462df452d745fd4ea00d4fd06707 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Tue, 21 Dec 2021 15:53:22 -0500 Subject: [PATCH 59/78] Update version string --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1381a8f..f2ab9a8 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.8.2.r786.gc40fbf42 + pkgver = 0.9.1.r7.gbccab87a pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 13a194b..dacf66f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.8.2.r786.gc40fbf42 +pkgver=0.9.1.r7.gbccab87a pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64" "aarch64") From 47be08bcf36e51e3abccdc9e500e457428b2b89b Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Sun, 2 Jan 2022 08:41:00 +0100 Subject: [PATCH 60/78] Added CI config --- .gitignore | 1 - .woodpecker.yml | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 .woodpecker.yml diff --git a/.gitignore b/.gitignore index a271796..39cf456 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ PKGBUILD .SRCINFO .gitignore -* diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..7a82b2d --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,22 @@ +pipeline: + build: + image: 'archlinux:latest' + 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 -F "file=@$(ls *.pkg*)" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish' + secrets: + - api_key From 14c13e2078371f1a3c7edd7715d59f87a9f2ad24 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Sun, 2 Jan 2022 11:27:32 +0100 Subject: [PATCH 61/78] Changed package name; disabled trustdns --- PKGBUILD | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 8b75153..8375a44 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Felix Bühler -pkgname=newsflash-git +pkgname=jjr-newsflash _pkgname=news_flash_gtk pkgver=684.fea372a pkgrel=1 @@ -19,6 +19,12 @@ pkgver() { echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD) } +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 +} + build() { cd "${_pkgname}" #rm -rf _build From 52e76aee0bcba0c1b354aacb97f8f67f5aa5ba62 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 2 Jan 2022 13:12:10 -0500 Subject: [PATCH 62/78] Add asciidoc makedepends and install man page --- .SRCINFO | 3 ++- PKGBUILD | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index f2ab9a8..55b41f6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.9.1.r7.gbccab87a + pkgver = 0.9.1.r73.g1c83ce1e pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -13,6 +13,7 @@ pkgbase = nheko-git makedepends = fontconfig makedepends = qt5-tools makedepends = nlohmann-json + makedepends = asciidoc depends = qt5-base depends = lmdb depends = qt5-graphicaleffects diff --git a/PKGBUILD b/PKGBUILD index dacf66f..7b8d41b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.9.1.r7.gbccab87a +pkgver=0.9.1.r73.g1c83ce1e pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64" "aarch64") @@ -11,7 +11,7 @@ url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") 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") -makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json") +makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "asciidoc") optdepends=("qt-jdenticon") provides=("nheko") conflicts=("nheko") @@ -50,6 +50,9 @@ package() { install -Dm644 "$srcdir/$pkgname/resources/nheko-256.png" "$pkgdir/usr/share/pixmaps/nheko.png" install -Dm644 "$srcdir/$pkgname/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 From 410b4acc3ea4140389ed71353317f008e9d64444 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Wed, 5 Jan 2022 20:54:42 +0100 Subject: [PATCH 63/78] Hopefully added sccache support --- .woodpecker.yml | 8 ++++++++ PKGBUILD | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 7a82b2d..90bfc87 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,6 +1,14 @@ pipeline: build: image: 'archlinux:latest' + environment: + - SCCACHE_BUCKET=bur + - SCCACHE_ENDPOINT=s3.rustybever.be + - SCCACHE_S3_USE_SSL=true + - SCCACHE_S3_KEY_PREFIX=jjr-newsflash + secrets: + - aws_access_key_id + - aws_secret_access_key commands: # Update packages - pacman -Syu --needed --noconfirm base-devel diff --git a/PKGBUILD b/PKGBUILD index 8375a44..2407a4b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ arch=(any) url="https://gitlab.com/news-flash/news_flash_gtk" license=(GPL3) depends=(libhandy webkit2gtk) -makedepends=(git cargo meson rust) +makedepends=(git cargo meson rust sccache) conflicts=(newsflash) source=("git+https://gitlab.com/news-flash/news_flash_gtk.git") sha512sums=("SKIP") From 6b436792e667a07be2c2e33bfcefc43e8fd4ef04 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Wed, 5 Jan 2022 20:56:59 +0100 Subject: [PATCH 64/78] Forgot RUSTC_WRAPPER --- .woodpecker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 90bfc87..11f49d9 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -6,6 +6,7 @@ pipeline: - 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 From 9619f3ca27fadb9fb0796af613db4c7daa5f79ab Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Sat, 29 Jan 2022 09:13:46 +0100 Subject: [PATCH 65/78] Pinned platform --- .woodpecker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 7a82b2d..d511120 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,3 +1,5 @@ +platform: linux/amd64 + pipeline: build: image: 'archlinux:latest' From 865e887a0937ae17d3b56f5b377daa3ca9c69f9a Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Sat, 29 Jan 2022 09:14:43 +0100 Subject: [PATCH 66/78] Always pull --- .woodpecker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 67f9704..323a9d4 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,6 +3,7 @@ platform: linux/amd64 pipeline: build: image: 'archlinux:latest' + pull: true environment: - SCCACHE_BUCKET=bur - SCCACHE_ENDPOINT=s3.rustybever.be From 42e48769b7d03541155fea44ca106ae1f3cb2b14 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Wed, 2 Feb 2022 11:32:10 +0100 Subject: [PATCH 67/78] Switched to vieter server --- .woodpecker.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 11f49d9..6e65157 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,3 +1,5 @@ +platform: linux/amd64 + pipeline: build: image: 'archlinux:latest' @@ -26,6 +28,6 @@ pipeline: image: 'archlinux:latest' commands: # Publish the package - - 'curl -F "file=@$(ls *.pkg*)" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish' + - 'curl -s -XPOST -H "X-API-KEY: $API_KEY" -T "$(ls *.pkg*)" https://arch.r8r.be/publish' secrets: - api_key From b53d0521c3a22b201f629e34abd8544c966f46e3 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Wed, 2 Feb 2022 11:38:26 +0100 Subject: [PATCH 68/78] Updated dependencies --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 2407a4b..23d6e1c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,7 +8,7 @@ pkgdesc="The spiritual successor to FeedReader" arch=(any) url="https://gitlab.com/news-flash/news_flash_gtk" license=(GPL3) -depends=(libhandy webkit2gtk) +depends=(libadwaita gtk4 webkit2gtk-5.0) makedepends=(git cargo meson rust sccache) conflicts=(newsflash) source=("git+https://gitlab.com/news-flash/news_flash_gtk.git") From a6b36a01b5b58ce7f81169e1824f8c86e1033b61 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 14 Feb 2022 14:51:17 +0100 Subject: [PATCH 69/78] bump gtk4 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2bdf3c6..8d4ffd0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = newsflash-git pkgdesc = The spiritual successor to FeedReader - pkgver = 684.fea372a + pkgver = 1070.0d9f8d9 pkgrel = 1 url = https://gitlab.com/news-flash/news_flash_gtk arch = any @@ -9,11 +9,11 @@ pkgbase = newsflash-git makedepends = cargo makedepends = meson makedepends = rust + depends = libadwaita depends = libhandy - depends = webkit2gtk + depends = webkit2gtk-5.0 conflicts = newsflash source = git+https://gitlab.com/news-flash/news_flash_gtk.git sha512sums = SKIP pkgname = newsflash-git - diff --git a/PKGBUILD b/PKGBUILD index 8b75153..9585b4d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,13 +2,13 @@ pkgname=newsflash-git _pkgname=news_flash_gtk -pkgver=684.fea372a +pkgver=1070.0d9f8d9 pkgrel=1 pkgdesc="The spiritual successor to FeedReader" arch=(any) url="https://gitlab.com/news-flash/news_flash_gtk" license=(GPL3) -depends=(libhandy webkit2gtk) +depends=(libadwaita libhandy webkit2gtk-5.0) makedepends=(git cargo meson rust) conflicts=(newsflash) source=("git+https://gitlab.com/news-flash/news_flash_gtk.git") From d1d438d60b4326a35d898f2e77d1aa862abe53aa Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Tue, 19 Apr 2022 11:02:49 -0400 Subject: [PATCH 70/78] Update desktop file in build --- .SRCINFO | 4 ++-- PKGBUILD | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 55b41f6..d4fa8d5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.9.1.r73.g1c83ce1e + pkgver = 0.9.3.r66.g7138c7a4 pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -36,7 +36,7 @@ pkgbase = nheko-git depends = curl depends = libevent optdepends = qt-jdenticon - provides = nheko + provides = nheko=0.9.3.r66.g7138c7a4 conflicts = nheko source = nheko-git::git+https://github.com/Nheko-Reborn/nheko.git#branch=master md5sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 7b8d41b..00a52a9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.9.1.r73.g1c83ce1e +pkgver=0.9.3.r66.g7138c7a4 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64" "aarch64") @@ -13,7 +13,7 @@ license=("GPL3") 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") makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "asciidoc") optdepends=("qt-jdenticon") -provides=("nheko") +provides=("nheko=${pkgver}") conflicts=("nheko") source=($pkgname::git+https://github.com/Nheko-Reborn/nheko.git#branch=master) @@ -48,7 +48,7 @@ package() { # Desktop launcher install -Dm644 "$srcdir/$pkgname/resources/nheko-256.png" "$pkgdir/usr/share/pixmaps/nheko.png" - install -Dm644 "$srcdir/$pkgname/resources/nheko.desktop" "$pkgdir/usr/share/applications/nheko.desktop" + 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" From 25eb4c6166ba400ba3961effb8d9dd21acc929c1 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Tue, 24 May 2022 11:49:25 +0200 Subject: [PATCH 71/78] Cleaned up PKGBUILD --- .SRCINFO | 18 +++++++++--------- .gitignore | 8 +++++--- PKGBUILD | 43 +++++++++++++++++++++++++++++-------------- 3 files changed, 43 insertions(+), 26 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8d4ffd0..dc97e10 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,19 +1,19 @@ -pkgbase = newsflash-git - pkgdesc = The spiritual successor to FeedReader - pkgver = 1070.0d9f8d9 +pkgbase = jjr-newsflash-git + pkgdesc = The spiritual successor to FeedReader (development version) + pkgver = 1141.40ff7cf pkgrel = 1 url = https://gitlab.com/news-flash/news_flash_gtk - arch = any + arch = x86_64 license = GPL3 makedepends = git - makedepends = cargo makedepends = meson makedepends = rust depends = libadwaita - depends = libhandy + depends = gtk4 depends = webkit2gtk-5.0 conflicts = newsflash - source = git+https://gitlab.com/news-flash/news_flash_gtk.git - sha512sums = SKIP + conflicts = newsflash-git + source = news_flash_gtk::git+https://gitlab.com/news-flash/news_flash_gtk.git + md5sums = SKIP -pkgname = newsflash-git +pkgname = jjr-newsflash-git diff --git a/.gitignore b/.gitignore index 39cf456..c6a9b95 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ -PKGBUILD -.SRCINFO -.gitignore +* + +!.gitignore +!PKGBUILD +!.SRCINFO diff --git a/PKGBUILD b/PKGBUILD index 163c864..26f2295 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,38 +1,53 @@ -# Maintainer: Felix Bühler +# vim: ft=bash +# Maintainer: Jef Roosens +# Contributor: Felix Bühler -pkgname=jjr-newsflash -_pkgname=news_flash_gtk -pkgver=1070.0d9f8d9 +_pkgname='news_flash_gtk' +pkgname='jjr-newsflash-git' +pkgver=1141.40ff7cf pkgrel=1 -pkgdesc="The spiritual successor to FeedReader" +pkgdesc='The spiritual successor to FeedReader (development version)' arch=('x86_64') -url="https://gitlab.com/news-flash/news_flash_gtk" -license=(GPL3) -depends=(libadwaita gtk4 webkit2gtk-5.0) -makedepends=(git cargo meson rust sccache) -conflicts=(newsflash) -source=("git+https://gitlab.com/news-flash/news_flash_gtk.git") -sha512sums=("SKIP") + +url='https://gitlab.com/news-flash/news_flash_gtk' +license=('GPL3') +depends=( + 'libadwaita' + 'gtk4' + 'webkit2gtk-5.0' +) +makedepends=( + 'git' + 'meson' + 'rust' +) + +conflicts=('newsflash' 'newsflash-git') +source=("${_pkgname}::git+https://gitlab.com/news-flash/news_flash_gtk.git") +md5sums=("SKIP") pkgver() { cd "${_pkgname}" + echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD) } 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 } build() { cd "${_pkgname}" - #rm -rf _build + arch-meson _build ninja -C _build } package() { cd "${_pkgname}" - env DESTDIR="$pkgdir" ninja -C _build install + + env DESTDIR="${pkgdir}" ninja -C _build install } From 38bb787c527a3ff672a71d0a3bed9d1a00f37acf Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sat, 28 May 2022 23:21:53 -0400 Subject: [PATCH 72/78] Add pkg-config as a dependency --- .SRCINFO | 5 +++-- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d4fa8d5..8d42ae5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.9.3.r66.g7138c7a4 + pkgver = 0.9.3.r149.g537d363d pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -35,8 +35,9 @@ pkgbase = nheko-git depends = spdlog depends = curl depends = libevent + depends = pkg-config optdepends = qt-jdenticon - provides = nheko=0.9.3.r66.g7138c7a4 + provides = nheko=0.9.3.r149.g537d363d conflicts = nheko source = nheko-git::git+https://github.com/Nheko-Reborn/nheko.git#branch=master md5sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 00a52a9..ba200eb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.9.3.r66.g7138c7a4 +pkgver=0.9.3.r149.g537d363d pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64" "aarch64") @@ -10,7 +10,7 @@ arch=("i686" "x86_64" "aarch64") url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") -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") +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") makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "asciidoc") optdepends=("qt-jdenticon") provides=("nheko=${pkgver}") From f7ed7faed0922a58476a8af4a2c365a768b01926 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Mon, 15 Aug 2022 15:25:53 -0400 Subject: [PATCH 73/78] Update .SRCINFO and PKGBUILD to appease the 'out-of-date' package overlords --- .SRCINFO | 4 ++-- PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8d42ae5..eed81ba 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.9.3.r149.g537d363d + pkgver = 0.10.0.r51.ge8d5829c pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -37,7 +37,7 @@ pkgbase = nheko-git depends = libevent depends = pkg-config optdepends = qt-jdenticon - provides = nheko=0.9.3.r149.g537d363d + provides = nheko=0.10.0.r51.ge8d5829c conflicts = nheko source = nheko-git::git+https://github.com/Nheko-Reborn/nheko.git#branch=master md5sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index ba200eb..4ec7502 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.9.3.r149.g537d363d +pkgver=0.10.0.r51.ge8d5829c pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64" "aarch64") From fda9af56bc9c12e5f8492429a4ba6f24608ba729 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Wed, 14 Sep 2022 17:56:38 -0400 Subject: [PATCH 74/78] bump version --- .SRCINFO | 4 ++-- PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index eed81ba..fe1c171 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.10.0.r51.ge8d5829c + pkgver = 0.10.1.1.r7.g59eb09cf pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -37,7 +37,7 @@ pkgbase = nheko-git depends = libevent depends = pkg-config optdepends = qt-jdenticon - provides = nheko=0.10.0.r51.ge8d5829c + provides = nheko=0.10.1.1.r7.g59eb09cf conflicts = nheko source = nheko-git::git+https://github.com/Nheko-Reborn/nheko.git#branch=master md5sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 4ec7502..c043126 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.10.0.r51.ge8d5829c +pkgver=0.10.1.1.r7.g59eb09cf pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64" "aarch64") From c1265a0ab6f38db5e22fc61f286e8a7c91f187dc Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Mon, 26 Sep 2022 18:46:04 -0400 Subject: [PATCH 75/78] Version update --- .SRCINFO | 4 ++-- PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fe1c171..797d078 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.10.1.1.r7.g59eb09cf + pkgver = 0.10.1.1.r44.gd103f793 pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -37,7 +37,7 @@ pkgbase = nheko-git depends = libevent depends = pkg-config optdepends = qt-jdenticon - provides = nheko=0.10.1.1.r7.g59eb09cf + provides = nheko=0.10.1.1.r44.gd103f793 conflicts = nheko source = nheko-git::git+https://github.com/Nheko-Reborn/nheko.git#branch=master md5sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index c043126..852c190 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.10.1.1.r7.g59eb09cf +pkgver=0.10.1.1.r44.gd103f793 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64" "aarch64") From 9765d4f26c81413b5e096024261440cd5836639c Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Wed, 28 Sep 2022 17:22:40 -0400 Subject: [PATCH 76/78] Bump to 0.10.2 --- .SRCINFO | 4 ++-- PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 797d078..5e3bf6c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.10.1.1.r44.gd103f793 + pkgver = 0.10.2.r48.gbffa0115 pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -37,7 +37,7 @@ pkgbase = nheko-git depends = libevent depends = pkg-config optdepends = qt-jdenticon - provides = nheko=0.10.1.1.r44.gd103f793 + provides = nheko=0.10.2.r48.gbffa0115 conflicts = nheko source = nheko-git::git+https://github.com/Nheko-Reborn/nheko.git#branch=master md5sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 852c190..47454ec 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.10.1.1.r44.gd103f793 +pkgver=0.10.2.r48.gbffa0115 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64" "aarch64") From 73efa07860c52ace2f462bc1c95c4323583ca1ae Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Fri, 14 Oct 2022 17:34:57 -0400 Subject: [PATCH 77/78] Bump revision --- .SRCINFO | 4 ++-- PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5e3bf6c..8a06b39 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.10.2.r48.gbffa0115 + pkgver = 0.10.2.r98.gac48c332 pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -37,7 +37,7 @@ pkgbase = nheko-git depends = libevent depends = pkg-config optdepends = qt-jdenticon - provides = nheko=0.10.2.r48.gbffa0115 + provides = nheko=0.10.2.r98.gac48c332 conflicts = nheko source = nheko-git::git+https://github.com/Nheko-Reborn/nheko.git#branch=master md5sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 47454ec..1a38c6e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.10.2.r48.gbffa0115 +pkgver=0.10.2.r98.gac48c332 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64" "aarch64") From 6ee5522513d8ef3f2bb53d8fc09b93876f919a8a Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Mon, 14 Nov 2022 18:42:05 -0500 Subject: [PATCH 78/78] Add re2 module to depends; image plugins to opt-depends --- .SRCINFO | 7 +++++-- PKGBUILD | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8a06b39..c022b54 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.10.2.r98.gac48c332 + pkgver = 0.10.2.r142.ged889c32 pkgrel = 1 url = https://github.com/Nheko-Reborn/nheko arch = i686 @@ -36,8 +36,11 @@ pkgbase = nheko-git depends = curl depends = libevent depends = pkg-config + depends = re2 + optdepends = kimageformats + optdepends = qt5-imageformats optdepends = qt-jdenticon - provides = nheko=0.10.2.r98.gac48c332 + provides = nheko=0.10.2.r142.ged889c32 conflicts = nheko source = nheko-git::git+https://github.com/Nheko-Reborn/nheko.git#branch=master md5sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 1a38c6e..5558ccd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=nheko-git -pkgver=0.10.2.r98.gac48c332 +pkgver=0.10.2.r142.ged889c32 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64" "aarch64") @@ -10,9 +10,9 @@ arch=("i686" "x86_64" "aarch64") url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") -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") +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=("qt-jdenticon") +optdepends=("kimageformats" "qt5-imageformats" "qt-jdenticon") provides=("nheko=${pkgver}") conflicts=("nheko")