[arch-commits] Commit in quassel/trunk (PKGBUILD)

[Balló György]

    Date: Monday, April 26, 2021 @ 20:18:03
  Author: bgyorgy
Revision: 924562

upgpkg: quassel 0.13.1-7: Introduce new quassel-common package to remove conflict between quassel-client and quassel-monolithic

Modified:
  quassel/trunk/PKGBUILD

----------+
 PKGBUILD |   46 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-26 18:51:33 UTC (rev 924561)
+++ PKGBUILD	2021-04-26 20:18:03 UTC (rev 924562)
@@ -6,9 +6,10 @@
          'quassel-client'
          'quassel-client-qt'
          'quassel-monolithic'
-         'quassel-monolithic-qt')
+         'quassel-monolithic-qt'
+         'quassel-common')
 pkgver=0.13.1
-pkgrel=6
+pkgrel=7
 pkgdesc="Next-generation distributed IRC client"
 arch=('x86_64')
 url="https://quassel-irc.org/"
@@ -109,24 +110,29 @@
 
 package_quassel-client() {
 pkgdesc="Next-generation distributed IRC client - client only, KDE version"
-depends=('qt5-base' 'qt5-webengine' 'qt5-multimedia' 'knotifyconfig'
-         'hicolor-icon-theme')
+depends=('quassel-common' 'qt5-base' 'qt5-webengine' 'qt5-multimedia' 'knotifyconfig')
 optdepends=('perl: for builtin /exec scripts')
-conflicts=('quassel-client-qt' 'quassel-monolithic' 'quassel-monolithic-qt')
+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-qt() {
 pkgdesc="Next-generation distributed IRC client - client only, Qt version with reduced deps"
-depends=('qt5-base' 'qt5-svg' 'sonnet' 'hicolor-icon-theme')
+depends=('quassel-common' 'qt5-base' 'qt5-svg' 'sonnet')
 optdepends=('perl: for builtin /exec scripts')
-conflicts=('quassel-client' 'quassel-monolithic' 'quassel-monolithic-qt')
+conflicts=('quassel-client')
 replaces=('quassel-client-small' 'quassel-remote')
 
   _install client-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/quasselclient.desktop"
 }
@@ -133,25 +139,41 @@
 
 package_quassel-monolithic() {
 pkgdesc="Next-generation distributed IRC client - monolithic, KDE version"
-depends=('qt5-base' 'qt5-webengine' 'qt5-multimedia' 'qt5-script' 'qca'
-         'knotifyconfig' 'libldap' 'hicolor-icon-theme')
+depends=('quassel-common' 'qt5-base' 'qt5-webengine' 'qt5-multimedia' 'qt5-script' 'qca'
+         'knotifyconfig' 'libldap')
 optdepends=('perl: for builtin /exec scripts'
             'postgresql: PostgreSQL database support')
-conflicts=('quassel-client' 'quassel-client-qt' 'quassel-monolithic-qt')
+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=('qca' 'qt5-base' 'qt5-svg' 'qt5-script' 'sonnet' 'hicolor-icon-theme')
+depends=('quassel-common' 'qca' 'qt5-base' 'qt5-svg' 'qt5-script' 'sonnet')
 optdepends=('perl: for builtin /exec scripts'
             'postgresql: PostgreSQL database support')
-conflicts=('quassel-client' 'quassel-client-qt' 'quassel-monolithic')
+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"
+}