diff options
Diffstat (limited to 'user/quassel')
| -rw-r--r-- | user/quassel/APKBUILD | 47 | ||||
| -rw-r--r-- | user/quassel/unterminated-mIRC-codes.patch | 40 |
2 files changed, 33 insertions, 54 deletions
diff --git a/user/quassel/APKBUILD b/user/quassel/APKBUILD index a52be97cb..dbea3d65e 100644 --- a/user/quassel/APKBUILD +++ b/user/quassel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=quassel -pkgver=0.13.1 +pkgver=0.14.0 pkgrel=1 pkgdesc="Modern, cross-platform IRC client" url="https://quassel-irc.org/" @@ -11,12 +11,11 @@ depends="$pkgname-client $pkgname-core" makedepends="qt5-qtbase-dev qt5-qtmultimedia-dev libdbusmenu-qt-dev sonnet-dev extra-cmake-modules kconfigwidgets-dev kcoreaddons-dev kxmlgui-dev knotifications-dev knotifyconfig-dev ktextwidgets-dev qt5-qtscript-dev - kwidgetsaddons-dev qca-dev qt5-qttools-dev zlib-dev libexecinfo-dev" + kwidgetsaddons-dev qca-dev qt5-qttools-dev zlib-dev libexecinfo-dev + cmake boost-dev" langdir="/usr/share/quassel/translations" -subpackages="$pkgname-core $pkgname-client $pkgname-lang" -source="https://quassel-irc.org/pub/quassel-$pkgver.tar.bz2 - unterminated-mIRC-codes.patch - " +subpackages="$pkgname-core $pkgname-client $pkgname-lang $pkgname-libs" +source="https://quassel-irc.org/pub/quassel-$pkgver.tar.bz2" # secfixes: # 0.12.5-r0: @@ -24,7 +23,6 @@ source="https://quassel-irc.org/pub/quassel-$pkgver.tar.bz2 # - CVE-2018-1000179 build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -38,17 +36,15 @@ build() { -DUSE_QT5=ON \ -DWITH_KDE=ON \ -DWITH_WEBENGINE=OFF \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -58,8 +54,7 @@ client() { mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/quasselclient "$subpkgdir"/usr/bin/ - local dir - for dir in applications icons pixmaps knotifications5; do + for dir in applications icons knotifications5; do mkdir -p "$subpkgdir"/usr/share/$dir mv "$pkgdir"/usr/share/$dir "$subpkgdir"/usr/share/ done @@ -67,14 +62,38 @@ client() { mkdir -p "$subpkgdir"/usr/share/quassel mv "$pkgdir"/usr/share/quassel/stylesheets \ "$subpkgdir"/usr/share/quassel/ + mv "$pkgdir"/usr/share/quassel/icons \ + "$subpkgdir"/usr/share/quassel/ + + mkdir -p "$subpkgdir"/usr/lib + for component in client qtui uisupport; do + mv "$pkgdir"/usr/lib/libquassel-$component.* \ + "$subpkgdir"/usr/lib/ + done } core() { pkgdesc="Modern, cross-platform IRC daemon (core only)" depends="" + mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/quasselcore "$subpkgdir"/usr/bin/ + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libquassel-core* "$subpkgdir"/usr/lib/ +} + +libs() { + pkgdesc="Modern, cross-platform IRC daemon (libraries)" + depends="" + + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libquassel-common* "$subpkgdir"/usr/lib/ + + mkdir -p "$subpkgdir"/usr/share/quassel + for component in networks.ini scripts; do + mv "$pkgdir"/usr/share/quassel/$component \ + "$subpkgdir"/usr/share/quassel/ + done } -sha512sums="4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c quassel-0.13.1.tar.bz2 -7f5ffa64d0620061ac2b6eab2e163d5862d43b16e3d7572415b5819f9ee19a5482791c3cee20c3b99722f05ffed3f1f3ba6c82e7f78b6bea9170037675dd3b4a unterminated-mIRC-codes.patch" +sha512sums="ea6b9723acab5ce73f760692770c1340c03bf277d2c99a2520345bfb6a7bb6fdc64a01dccfd7026341b46ee727821e1bcc2f487be72dfbc155f1de1ad264763f quassel-0.14.0.tar.bz2" diff --git a/user/quassel/unterminated-mIRC-codes.patch b/user/quassel/unterminated-mIRC-codes.patch deleted file mode 100644 index 8cedeb461..000000000 --- a/user/quassel/unterminated-mIRC-codes.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 391cdf6c2595060ff3b2adb54f5b2fc8ebd7cc04 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Mon, 3 Jun 2019 00:16:30 -0500 -Subject: [PATCH] multilineedit: handle unterminated mIRC codes - -Currently, if an unterminated mIRC code is pasted into Quassel, trying to -go through input line history will cause a deadlock. This breaks the loop -at the cost of possibly mangling the formatting of the line somewhat. -This is seen as more acceptable than locking up, and the line is invalid -anyway. - -Reproducer: - -```sh -printf '\00303,08HONK' | xclip -selection clipboard -``` - -Paste into Quassel, send, press Up arrow key. ---- - src/uisupport/multilineedit.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp -index 133a2433..b13834c5 100644 ---- a/src/uisupport/multilineedit.cpp -+++ b/src/uisupport/multilineedit.cpp -@@ -645,6 +645,10 @@ QString MultiLineEdit::convertMircCodesToHtml(const QString &text) - } - - posRight = text.indexOf(mircCode.cap(), posRight + 1); -+ if (posRight == -1) { -+ words << text.mid(posLeft); -+ break; // unclosed color code; can't process -+ } - words << text.mid(posLeft, posRight + 1 - posLeft); - posLeft = posRight + 1; - } --- -2.21.0 - |