[quassel]: rebuild against latest libldap

1 files changed, 84 insertions, 30 deletions

diff --git a/libre/quassel/PKGBUILD b/libre/quassel/PKGBUILD
index 3802c9964..3cccb2ef2 100644
--- a/libre/quassel/PKGBUILD
+++ b/libre/quassel/PKGBUILD
@@ -4,47 +4,58 @@
 
 # parabola changes and rationale:
 # - repalce qt5-webengine with qt5-webkit (for URL previews)
-
+# - set duckduckgo as default search engine
 
 pkgbase=quassel
 pkgname=('quassel-core'
          'quassel-client'
-         'quassel-client-small'
-         'quassel-monolithic')
+         'quassel-client-qt'
+         'quassel-monolithic'
+         'quassel-monolithic-qt'
+         'quassel-common')
 pkgver=0.13.1
-pkgrel=4
+pkgrel=9
 pkgrel+=.parabola1
 pkgdesc="Next-generation distributed IRC client"
 arch=('x86_64')
 arch+=('armv7h' 'i686')
 url="https://quassel-irc.org/"
 license=('GPL')
-makedepends=('qt5-base' 'qt5-tools' 'qt5-webengine' 'qca-qt5' 'qt5-script'
+makedepends=('qt5-base' 'qt5-tools' 'qt5-webengine' 'qca' 'qt5-script'
              'qt5-multimedia' 'knotifyconfig' 'sonnet' 'libldap' 'cmake'
              'extra-cmake-modules' 'python' 'hicolor-icon-theme')
 makedepends=(${makedepends[*]/qt5-webengine/qt5-webkit})
 source=(https://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2
         0001-qtui-Set-desktop-file-name.patch
-        quassel-0.13.1-qt5.14.patch
-        search-duck.patch
+        0002-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch
+        0003-Removed-mozilla-IRC-network-from-networks.ini.patch
+        0004-This-commit-changes-the-official-Quassel-IRC-channel.patch
         $pkgbase.service
         $pkgbase.sysusers
         $pkgbase.tmpfiles
         $pkgbase.conf)
+source+=(9000-search-duck.patch)
 sha256sums=('48efee9778743b1db9f44efb91d1c913104db01190c57f2ff57483c39a97e855'
-            '695ff3b605ea62ccfdf9ec4b9e6ffa74f3e2c0ac81402d51a74d263c47886c92'
-            '3d43f498df04db59a5199e0a81b8fd7ac37ef46fffb0c69ab5a17bcafb6d8c65'
-            '3d90a7edfa2b2e27e5f56b25f7583585efbcd35219c04a3bf138d9fe9bb9eab2'
+            '7a64214024dc047f35ec8af3c5d543853a5c89c0506766c69c2e1072ca8f5ec7'
+            'a1f874558f31c786b2fb483454d14e74a0dfc01382e1ba58bd610a65e02f4df4'
+            '0f92f3a51d2e3272d71b21a563047d7fae93bc2dd6676f405a2d63a20d48521b'
+            'f59d4138f5fc8c9e84b5626fcbe16eec21b22344dc6c28d784c511677de661e1'
             '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f'
             '3c72441a99e2668c6a8a751fa07beeb44f937576c8a1b5f615e4a55f841d93d9'
             '2afd4340c7713f6533e5d175a86b28fd118ecd907776c2b10925d1a4fb31cdca'
             'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
+sha256sums+=('3d90a7edfa2b2e27e5f56b25f7583585efbcd35219c04a3bf138d9fe9bb9eab2')
+
 
 prepare() {
   cd $pkgbase-$pkgver
   patch -Np1 -i ../0001-qtui-Set-desktop-file-name.patch
-  patch -Np1 -i ../quassel-0.13.1-qt5.14.patch
-  patch -Np1 -i ../search-duck.patch
+  patch -Np1 -i ../0002-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch
+  patch -Np1 -i ../0003-Removed-mozilla-IRC-network-from-networks.ini.patch
+  patch -Np1 -i ../0004-This-commit-changes-the-official-Quassel-IRC-channel.patch
+
+  # parabola patches
+  patch -Np1 -i ../9000-search-duck.patch
 }
 
 _build() (
@@ -77,6 +88,15 @@ build() {
     -DWITH_WEBENGINE=OFF \
     -DWITH_KDE=ON
 
+  _build monolithic-qt \
+    -DWANT_CORE=OFF \
+    -DWANT_QTCLIENT=OFF \
+    -DWITH_WEBKIT=OFF \
+    -DWITH_WEBENGINE=OFF \
+    -DCMAKE_DISABLE_FIND_PACKAGE_dbusmenu-qt5=ON \
+    -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=ON \
+    -DCMAKE_DISABLE_FIND_PACKAGE_Phonon4Qt5=ON
+
   _build client \
     -DWANT_CORE=OFF \
     -DWANT_MONO=OFF \
@@ -84,7 +104,7 @@ build() {
     -DWITH_WEBENGINE=OFF \
     -DWITH_KDE=ON
 
-  _build client-small \
+  _build client-qt \
     -DWANT_CORE=OFF \
     -DWANT_MONO=OFF \
     -DWITH_WEBKIT=OFF \
@@ -96,7 +116,7 @@ build() {
 
 package_quassel-core() {
 pkgdesc="Next-generation distributed IRC client - core only"
-depends=('icu' 'qca-qt5' 'qt5-script' 'libldap')
+depends=('icu' 'qca' 'qt5-script' 'libldap')
 optdepends=('postgresql: PostgreSQL database support')
 backup=(etc/conf.d/quassel)
 
@@ -116,41 +136,75 @@ backup=(etc/conf.d/quassel)
 }
 
 package_quassel-client() {
-pkgdesc="Next-generation distributed IRC client - client only"
-pkgdesc+=" (with webkit HTML rendering)"
-depends=('qt5-base' 'qt5-webengine' 'qt5-multimedia' 'knotifyconfig'
-         'hicolor-icon-theme')
+pkgdesc="Next-generation distributed IRC client - client only, KDE version"
+depends=('quassel-common' 'qt5-base' 'qt5-webengine' 'qt5-multimedia' 'knotifyconfig')
+pkgdesc+=" with webkit HTML rendering"
 depends=(${depends[*]/qt5-webengine/qt5-webkit})
 optdepends=('perl: for builtin /exec scripts')
-conflicts=('quassel-monolithic' 'quassel-client-small')
+conflicts=('quassel-client-qt')
 
   _install client
   install -Dm644 $pkgbase-$pkgver/data/quasselclient.appdata.xml "$pkgdir/usr/share/metainfo/quasselclient.appdata.xml"
+
+  # Split quassel-common
+  rm -r "$pkgdir"/usr/share/{icons,knotifications5,pixmaps,quassel}
 }
 
-package_quassel-client-small() {
-pkgdesc="Next-generation distributed IRC client - client only, reduced deps"
-depends=('qt5-base' 'qt5-svg' 'sonnet' 'hicolor-icon-theme')
+package_quassel-client-qt() {
+pkgdesc="Next-generation distributed IRC client - client only, Qt version with reduced deps"
+depends=('quassel-common' 'qt5-base' 'qt5-svg' 'sonnet')
 optdepends=('perl: for builtin /exec scripts')
-conflicts=('quassel-monolithic' 'quassel-client')
-replaces=('quassel-remote')
+conflicts=('quassel-client')
+replaces=('quassel-client-small' 'quassel-remote')
+
+  _install client-qt
 
-  _install client-small
+  # Split quassel-common
+  rm -r "$pkgdir"/usr/share/{icons,pixmaps,quassel}
 
   # Ignore package by AppStream to avoid duplicated IDs
   echo 'X-AppStream-Ignore=true' >> "$pkgdir/usr/share/applications/quasselclient.desktop"
 }
 
 package_quassel-monolithic() {
-pkgdesc="Next-generation distributed IRC client - monolithic"
-pkgdesc+=" (with webkit HTML rendering)"
-depends=('qt5-base' 'qt5-webengine' 'qt5-multimedia' 'qt5-script' 'qca-qt5'
-         'knotifyconfig' 'libldap' 'hicolor-icon-theme')
+pkgdesc="Next-generation distributed IRC client - monolithic, KDE version"
+depends=('quassel-common' 'qt5-base' 'qt5-webengine' 'qt5-multimedia' 'qt5-script' 'qca'
+         'knotifyconfig' 'libldap')
+pkgdesc+=" with webkit HTML rendering"
 depends=(${depends[*]/qt5-webengine/qt5-webkit})
 optdepends=('perl: for builtin /exec scripts'
             'postgresql: PostgreSQL database support')
-conflicts=('quassel-client' 'quassel-client-small')
+conflicts=('quassel-monolithic-qt')
 
   _install monolithic
   install -Dm644 $pkgbase-$pkgver/data/quassel.appdata.xml "$pkgdir/usr/share/metainfo/quassel.appdata.xml"
+
+  # Split quassel-common
+  mkdir "$srcdir/quassel-common"
+  mv "$pkgdir"/usr/share/{icons,knotifications5,pixmaps,quassel} \
+     "$srcdir/quassel-common/"
+}
+
+package_quassel-monolithic-qt() {
+pkgdesc="Next-generation distributed IRC client - monolithic, Qt version with reduced deps"
+depends=('quassel-common' 'qca' 'qt5-base' 'qt5-svg' 'qt5-script' 'sonnet')
+optdepends=('perl: for builtin /exec scripts'
+            'postgresql: PostgreSQL database support')
+conflicts=('quassel-monolithic')
+
+  _install monolithic-qt
+
+  # Split quassel-common
+  rm -r "$pkgdir"/usr/share/{icons,pixmaps,quassel}
+
+  # Ignore package by AppStream to avoid duplicated IDs
+  echo 'X-AppStream-Ignore=true' >> "$pkgdir/usr/share/applications/quassel.desktop"
+}
+
+package_quassel-common() {
+  pkgdesc="Common files for Quassel"
+  depends=('hicolor-icon-theme')
+
+  install -dm755 "$pkgdir/usr/share"
+  mv quassel-common/* "$pkgdir/usr/share"
 }