[arch-commits] Commit in psi-plus/trunk (PKGBUILD conf.diff)

[Sergej Pupykin]

    Date: Monday, January 8, 2018 @ 14:15:46
  Author: spupykin
Revision: 280528

upgpkg: psi-plus 1.2.154-1

Modified:
  psi-plus/trunk/PKGBUILD
Deleted:
  psi-plus/trunk/conf.diff

-----------+
 PKGBUILD  |   14 +++++---------
 conf.diff |   12 ------------
 2 files changed, 5 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-08 14:15:35 UTC (rev 280527)
+++ PKGBUILD	2018-01-08 14:15:46 UTC (rev 280528)
@@ -2,7 +2,7 @@
 # Maintainer: Sergej Pupykin <arch+pub at sergej.pp.ru>
 
 pkgname="psi-plus"
-pkgver=1.2.146
+pkgver=1.2.154
 pkgrel=1
 pkgdesc="Psi+ is a powerful Jabber client (Qt, C++) designed for the Jabber power users (built with Qt 5.x)"
 url="http://psi-plus.com"
@@ -10,25 +10,21 @@
 arch=('x86_64')
 depends=('qt5-base' 'qt5-webkit' 'qt5-multimedia' 'qt5-x11extras' 'qca-qt5'
 	 'libidn' 'aspell' 'libxss' 'qt5-svg' 'hunspell')
-makedepends=('git' 'patch' 'qconf' 'cmake' 'qca-qt4')
+makedepends=('git' 'patch' 'qconf' 'cmake')
 conflicts=('psi-plus-qt5-git' 'psi-plus-webkit-qt5-git' 'psi-plus-webkit-git' 'psi-plus-git')
 source=("git://github.com/psi-plus/psi-plus-snapshots#tag=$pkgver"
 	"git://github.com/psi-plus/main.git#tag=${pkgver%.*}"
-	'conf.diff'
+	"no-qca-qt4.patch::https://aur.archlinux.org/cgit/aur.git/plain/no-qca-qt4.patch?h=psi-plus-git"
 	'join.patch')
 sha256sums=('SKIP'
             'SKIP'
-            '690770c7c8976d536d8c4078d01c28f187f510574ddffe91251f5045fa672e53'
+            'a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23'
             'ea25a58c7efe25979b8d257598608187380e8f35ace25e96cab9c357dcdbc974')
 
 prepare() {
   cd psi-plus-snapshots
-  # make build date in --version output a bit more readable
-  #sed "s/yyyyMMdd/yyyy-MM-dd/" -i qcm/conf.qcm
-#  mkdir -p iconsets
-#  cp -r "$srcdir"/main/iconsets/* ./iconsets
-#  echo "$pkgver ($(date +"%Y-%m-%d"))" >version
   patch -p1 <"$srcdir"/join.patch
+  patch -p1 <"$srcdir"/no-qca-qt4.patch
 }
 
 build() {

Deleted: conf.diff
===================================================================
--- conf.diff	2018-01-08 14:15:35 UTC (rev 280527)
+++ conf.diff	2018-01-08 14:15:46 UTC (rev 280528)
@@ -1,12 +0,0 @@
---- configure.old	2016-04-16 16:10:54.312012000 +0300
-+++ configure	2016-04-16 16:11:15.062012000 +0300
-@@ -994,7 +994,8 @@
- 			conf->addIncludePath(inc);
- 		}
- 		conf->addLib(libs);
--
-+		conf->addExtra("CONFIG += psi-minizip");
-+		return true;
- #ifdef Q_OS_WIN
- 		// HACK: on windows, always use psi's bundled minizip
- 		conf->addExtra("CONFIG += psi-minizip");