bump

4 files changed, 175 insertions, 142 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d1cb72e86dda..0c72c5d25be0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = quassel
 	pkgdesc = QT-based distributed IRC client
-	pkgver = 0.14.0.r7.gb2deed91
+	pkgver = 0.14.0.r8.g020c1634
 	pkgrel = 1
 	url = http://quassel-irc.org
 	arch = i686
@@ -12,15 +12,14 @@ pkgbase = quassel
 	makedepends = cmake
 	makedepends = extra-cmake-modules
 	makedepends = hicolor-icon-theme
-	makedepends = knotifyconfig
+	makedepends = knotifyconfig5
 	makedepends = python
-	makedepends = qca
+	makedepends = qca-qt5
 	makedepends = qt5-base
 	makedepends = qt5-script
 	makedepends = qt5-tools
 	makedepends = qt5-webengine
 	makedepends = boost
-	makedepends = rsync
 	source = git+https://github.com/quassel/quassel.git
 	source = git+https://github.com/quassel/quassel-i18n.git
 	md5sums = SKIP
@@ -29,8 +28,8 @@ pkgbase = quassel
 pkgname = quassel-git
 	pkgdesc = KDE-based IRC client (monolithic version)
 	depends = quassel-common-git
-	depends = knotifyconfig
-	depends = qca
+	depends = knotifyconfig5
+	depends = qca-qt5
 	depends = qt5-base
 	depends = qt5-script
 	depends = qt5-webengine
@@ -55,7 +54,7 @@ pkgname = quassel-light-webengine-git
 pkgname = quassel-client-git
 	pkgdesc = KDE-based distributed IRC client (client only)
 	depends = quassel-common-git
-	depends = knotifyconfig
+	depends = knotifyconfig5
 	depends = qt5-base
 	depends = qt5-webengine
 	provides = quassel-client
@@ -79,7 +78,7 @@ pkgname = quassel-client-light-webengine-git
 pkgname = quassel-core-git
 	pkgdesc = KDE/Qt-based distributed IRC client (core only)
 	depends = icu
-	depends = qca
+	depends = qca-qt5
 	depends = qt5-script
 	provides = quassel-core
 	conflicts = quassel-core
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 8ebfacab0c9f..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!.SRCINFO
-!PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index f019510cc6dd..1e2742d08c9f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,14 +15,14 @@ pkgname=("${pkgbase}-git"
          "${pkgbase}-common-git"
         )
 
-pkgver=0.14.0.r7.gb2deed91
+pkgver=0.14.0.r8.g020c1634
 pkgrel=1
 url='http://quassel-irc.org'
 license=('GPL')
 arch=('i686' 'x86_64' 'arm' 'aarch64')
 makedepends=('git' 'cmake' 'extra-cmake-modules' 'hicolor-icon-theme'
-             'knotifyconfig' 'python' 'qca' 'qt5-base' 'qt5-script'
-             'qt5-tools' 'qt5-webengine' 'boost' 'rsync')
+             'knotifyconfig5' 'python' 'qca-qt5' 'qt5-base' 'qt5-script'
+             'qt5-tools' 'qt5-webengine' 'boost')
 source=(
   'git+https://github.com/quassel/quassel.git'
   'git+https://github.com/quassel/quassel-i18n.git'
@@ -146,8 +146,7 @@ package_quassel-common-git() {
 }
 
 package_quassel-client-git() {
-
-  depends=("${pkgbase}-common-git" 'knotifyconfig' 'qt5-base' 'qt5-webengine')
+  depends=("${pkgbase}-common-git" 'knotifyconfig5' 'qt5-base' 'qt5-webengine')
   pkgdesc='KDE-based distributed IRC client (client only)'
   provides=("${pkgbase}-client")
   conflicts=("${pkgbase}-client")
@@ -156,7 +155,6 @@ package_quassel-client-git() {
 }
 
 package_quassel-client-light-git() {
- 
   pkgdesc='Qt-based distributed IRC client (client only, w/o kde deps)'
   depends=("${pkgbase}-common-git" 'qt5-base')
   provides=("${pkgbase}-client")
@@ -166,18 +164,17 @@ package_quassel-client-light-git() {
 }
 
 package_quassel-client-light-webengine-git() {
-
   pkgdesc='Qt-based distributed IRC client (client only, w/o kde deps)'
   depends=("${pkgbase}-common-git" 'qt5-base' 'qt5-webengine')
   provides=("${pkgbase}-client")
   conflicts=("${pkgbase}-client")
-    _install
+
+  _install
 }
 
 package_quassel-core-git() {
-
   pkgdesc='KDE/Qt-based distributed IRC client (core only)'
-  depends=('icu' 'qca' 'qt5-script')
+  depends=('icu' 'qca-qt5' 'qt5-script')
   provides=("${pkgbase}-core")
   conflicts=("${pkgbase}-core")
 
@@ -185,9 +182,8 @@ package_quassel-core-git() {
 }
 
 package_quassel-git() {
-
   pkgdesc='KDE-based IRC client (monolithic version)'
-  depends=("${pkgbase}-common-git" 'knotifyconfig' 'qca' 'qt5-base'
+  depends=("${pkgbase}-common-git" 'knotifyconfig5' 'qca-qt5' 'qt5-base'
            'qt5-script' 'qt5-webengine')
   provides=("${pkgbase}-monolithic")
   conflicts=("${pkgbase}-monolithic")
@@ -196,7 +192,6 @@ package_quassel-git() {
 }
 
 package_quassel-light-git() {
-
   pkgdesc='Qt-based IRC client (monolithic version, w/o kde deps)'
   depends=("${pkgbase}-common-git" 'qt5-base')
   provides=("${pkgbase}-monolithic")
@@ -210,5 +205,6 @@ package_quassel-light-webengine-git() {
   depends=("${pkgbase}-common-git" 'qt5-base' 'qt5-webengine')
   provides=("${pkgbase}-monolithic")
   conflicts=("${pkgbase}-monolithic")
+
   _install
 }
diff --git a/PKGBUILD.in b/PKGBUILD.in
index 039fad3c8ca2..70cc35fcbc62 100644
--- a/PKGBUILD.in
+++ b/PKGBUILD.in
@@ -1,12 +1,18 @@
 # Maintainer: Daniel Albers <daniel@lbe.rs>
+# Co-Maintainer: Mubashshir <ahmubashshir@gmail.com>
 # Source: <https://github.com/AlD/archlinux/tree/master/pkgbuilds/quassel>
+# from: git
 
 pkgbase='quassel'
+pkgdesc='QT-based distributed IRC client'
 pkgname=("${pkgbase}-git"
          "${pkgbase}-light-git"
+         "${pkgbase}-light-webengine-git"
          "${pkgbase}-client-git"
          "${pkgbase}-client-light-git"
+         "${pkgbase}-client-light-webengine-git"
          "${pkgbase}-core-git"
+         "${pkgbase}-common-git"
         )
 
 pkgver=0
@@ -15,155 +21,190 @@ url='http://quassel-irc.org'
 license=('GPL')
 arch=('i686' 'x86_64' 'arm' 'aarch64')
 makedepends=('git' 'cmake' 'extra-cmake-modules' 'hicolor-icon-theme'
-             'knotifyconfig' 'python' 'qca' 'qt5-base' 'qt5-script'
-             'qt5-tools' 'qt5-webkit' 'boost')
+             'knotifyconfig5' 'python' 'qca-qt5' 'qt5-base' 'qt5-script'
+             'qt5-tools' 'qt5-webengine' 'boost')
 source=(
   'git+https://github.com/quassel/quassel.git'
+  'git+https://github.com/quassel/quassel-i18n.git'
+)
+md5sums=('SKIP'
+         'SKIP')
+## Common build options
+_build_common=(
+  -Wno-dev
+  -DCMAKE_INSTALL_PREFIX=/usr
+  -DCMAKE_INSTALL_LIBDIR=lib
+  -DHAVE_SSL=ON
+)
+_build_client_common=(
+  -DWANT_MONO=OFF
+  -DWANT_CORE=OFF
+  -DWANT_QTCLIENT=ON
+  -DWITH_WEBKIT=OFF
+)
+_build_mono_common=(
+  -DWANT_MONO=ON
+  -DWANT_CORE=OFF
+  -DWANT_QTCLIENT=OFF
+  -DWITH_WEBKIT=OFF
+)
+
+## pkg specific build options
+_build_git=(
+  "${_build_mono_common[@]}"
+  -DWITH_KDE=ON
+  -DWITH_WEBENGINE=ON
+)
+_build_light_git=(
+  "${_build_mono_common[@]}"
+  -DWITH_KDE=OFF
+  -DWITH_WEBENGINE=OFF
+)
+_build_light_webengine_git=(
+  "${_build_mono_common[@]}"
+  -DWITH_KDE=OFF
+  -DWITH_WEBENGINE=ON
+)
+_build_client_git=(
+  "${_build_client_common[@]}"
+  -DWITH_KDE=ON
+  -DWITH_WEBENGINE=ON
+)
+_build_client_light_git=(
+  "${_build_client_common[@]}"
+  -DWITH_KDE=OFF
+  -DWITH_WEBENGINE=OFF
+)
+_build_client_light_webengine_git=(
+  "${_build_client_common[@]}"
+  -DWITH_KDE=OFF
+  -DWITH_WEBENGINE=ON
+)
+_build_core_git=(
+  -DWANT_MONO=OFF
+  -DWANT_CORE=ON
+  -DWANT_QTCLIENT=OFF
 )
-md5sums=('SKIP')
 
-_builddir="${startdir}/build"
-_cmakecache="CMakeCache.txt"
+prepare() {
+  cd "${srcdir}/${pkgbase}"
+  git submodule init
+  git config submodule.mysubmodule.url "$srcdir/quassel-i18n"
+  git -c protocol.file.allow=always submodule update
+}
 
 pkgver() {
-  pushd "${srcdir}/${pkgbase}" > /dev/null
   #git describe --always | sed 's/-beta/.0.beta/; s/-/./g;'
-  git describe --always | sed 's/-/./g;'
-  popd > /dev/null
+  git -C "${srcdir}/${pkgbase}" describe --always |
+    sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
 }
 
-_prepare_build() {
-  msg 'Preparing build directory...'
-  mkdir -p "$_builddir"
-  pushd "$_builddir" > /dev/null
-  rm -f "$_cmakecache"
-  popd > /dev/null
+build() {
+  local pkg
+  for pkg in "${pkgname[@]#$pkgbase-*}";do
+    _build "${pkg}"
+  done
 }
 
 _build() {
-  pushd "$_builddir" > /dev/null
+  [[ $1 == common-git ]] && ln -sf git common-git && return 0
+  local -n _build_opts="_build_${1//-/_}"
+  if ((${#_build_opts[@]} == 0));then
+    error 'No build option configured: %s' "$pkgbase-$1"
+    return 1
+  fi
+
+  msg2 'Preparing build directory: %s...' "$pkgbase-$1"
+  if [[ -d git && ! -d "$1" ]];then
+    rm -f "$1"
+    rsync -aqzP --del git/ "$1"/
+    rm -f "$1/CMakeCache.txt"
+  fi
+  cmake -S "${srcdir}/${pkgbase}" \
+        -B "${srcdir}/$1" \
+        "${_build_common[@]}" \
+        "${_build_opts[@]}"
+  msg2 'Compiling: %s...' "$pkgbase-$1"
+  make -C "$1"
+}
+
+_install() {
+  make -C "${pkgname#$pkgbase-*}" DESTDIR="$pkgdir" install
+  case "${pkgname#$pkgbase-*}" in
+    common*) rm -rf "$pkgdir/usr"/{bin,lib,share/applications} ;;
+    *) rm -rf "$pkgdir/usr/share"/{icons,knotifications5,quassel} ;;
+  esac
+}
 
-  msg 'Compiling...'
-  make
+package_quassel-common-git() {
+  depends=('hicolor-icon-theme')
+  pkgdesc='Common files for Quassel'
+  provides=("${pkgbase}-common")
+  conflicts=("${pkgbase}-common")
 
-  make DESTDIR="$pkgdir" install
+  _install
 }
 
 package_quassel-client-git() {
-  depends=('hicolor-icon-theme' 'knotifyconfig' 'qt5-base' 'qt5-webkit')
+  depends=("${pkgbase}-common-git" 'knotifyconfig5' 'qt5-base' 'qt5-webengine')
   pkgdesc='KDE-based distributed IRC client (client only)'
-  provides=('quassel-client')
-  conflicts=('quassel-client')
-
-  _prepare_build
-
-  pushd "$_builddir" >/dev/null
-
-  msg 'Configuring build options...'
-  cmake -DWANT_MONO=OFF             \
-        -DWANT_CORE=OFF             \
-        -DWANT_QTCLIENT=ON          \
-        -DHAVE_SSL=ON               \
-        -DWITH_KDE=ON               \
-        -DWITH_WEBKIT=ON            \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_LIBDIR=lib  \
-        "${srcdir}/${pkgbase}"
-
-  popd >/dev/null
-  _build
+  provides=("${pkgbase}-client")
+  conflicts=("${pkgbase}-client")
+
+  _install
 }
 
 package_quassel-client-light-git() {
-  pkgdesc='Qt-based distributed IRC client (client only)'
-  depends=('hicolor-icon-theme' 'qt5-base')
-  provides=('quassel-client')
-  conflicts=('quassel-client')
-
-  _prepare_build
-
-  pushd "$_builddir" >/dev/null
-
-  msg 'Configuring build options...'
-  cmake -DWANT_MONO=OFF             \
-        -DWANT_CORE=OFF             \
-        -DWANT_QTCLIENT=ON          \
-        -DHAVE_SSL=ON               \
-        -DWITH_KDE=OFF              \
-        -DWITH_WEBKIT=OFF           \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_LIBDIR=lib  \
-        "${srcdir}/${pkgbase}"
-
-  popd >/dev/null
-  _build
-}
+  pkgdesc='Qt-based distributed IRC client (client only, w/o kde deps)'
+  depends=("${pkgbase}-common-git" 'qt5-base')
+  provides=("${pkgbase}-client")
+  conflicts=("${pkgbase}-client")
 
-package_quassel-core-git() {
-  pkgdesc='KDE/Qt-based distributed IRC client (core only)'
-  depends=('icu' 'qca' 'qt5-script')
-  provides=('quassel-core')
-  conflicts=('quassel-core')
+  _install
+}
 
-  _prepare_build
+package_quassel-client-light-webengine-git() {
+  pkgdesc='Qt-based distributed IRC client (client only, w/o kde deps)'
+  depends=("${pkgbase}-common-git" 'qt5-base' 'qt5-webengine')
+  provides=("${pkgbase}-client")
+  conflicts=("${pkgbase}-client")
 
-  pushd "$_builddir" >/dev/null
+  _install
+}
 
-  msg 'Configuring build options...'
-  cmake -DWANT_MONO=OFF             \
-        -DWANT_CORE=ON              \
-        -DWANT_QTCLIENT=OFF         \
-        -DHAVE_SSL=ON               \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_LIBDIR=lib  \
-        "${srcdir}/${pkgbase}"
+package_quassel-core-git() {
+  pkgdesc='KDE/Qt-based distributed IRC client (core only)'
+  depends=('icu' 'qca-qt5' 'qt5-script')
+  provides=("${pkgbase}-core")
+  conflicts=("${pkgbase}-core")
 
-  popd >/dev/null
-  _build
+  _install
 }
 
 package_quassel-git() {
   pkgdesc='KDE-based IRC client (monolithic version)'
-  depends=('hicolor-icon-theme' 'knotifyconfig' 'qca' 'qt5-base'
-           'qt5-script' 'qt5-webkit')
-
-  _prepare_build
-
-  pushd "$_builddir" >/dev/null
-
-  msg 'Configuring build options...'
-  cmake -DWANT_MONO=ON              \
-        -DWANT_CORE=OFF             \
-        -DWANT_QTCLIENT=OFF         \
-        -DHAVE_SSL=ON               \
-        -DWITH_KDE=ON               \
-        -DWITH_WEBKIT=ON            \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_LIBDIR=lib  \
-        "${srcdir}/${pkgbase}"
-
-  popd >/dev/null
-  _build
+  depends=("${pkgbase}-common-git" 'knotifyconfig5' 'qca-qt5' 'qt5-base'
+           'qt5-script' 'qt5-webengine')
+  provides=("${pkgbase}-monolithic")
+  conflicts=("${pkgbase}-monolithic")
+
+  _install
 }
 
 package_quassel-light-git() {
-  pkgdesc='Qt-based IRC client (monolithic version)'
-  depends=('hicolor-icon-theme' 'qt5-base')
-  _prepare_build
-
-  pushd "$_builddir" >/dev/null
-
-  msg 'Configuring build options...'
-  cmake -DWANT_MONO=ON              \
-        -DWANT_CORE=OFF             \
-        -DWANT_QTCLIENT=OFF         \
-        -DHAVE_SSL=ON               \
-        -DWITH_KDE=OFF              \
-        -DWITH_WEBKIT=OFF           \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_LIBDIR=lib  \
-        "${srcdir}/${pkgbase}"
-
-  popd >/dev/null
-  _build
+  pkgdesc='Qt-based IRC client (monolithic version, w/o kde deps)'
+  depends=("${pkgbase}-common-git" 'qt5-base')
+  provides=("${pkgbase}-monolithic")
+  conflicts=("${pkgbase}-monolithic")
+
+  _install
+}
+
+package_quassel-light-webengine-git() {
+  pkgdesc='Qt-based IRC client (monolithic version, w/o kde deps)'
+  depends=("${pkgbase}-common-git" 'qt5-base' 'qt5-webengine')
+  provides=("${pkgbase}-monolithic")
+  conflicts=("${pkgbase}-monolithic")
+
+  _install
 }