Switch to psi-im repo

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>

3 files changed, 43 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 51b5e645e887..a76cc7d34837 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = psi-plus-git
 	pkgdesc = Psi+ is a powerful XMPP client (Qt, C++) designed for the XMPP power users (built with Qt 5.x)
-	pkgver = 1.3.307.1.g336c5f62
+	pkgver = 1.3.369.g1a3a94b7
 	pkgrel = 1
 	url = https://psi-plus.com
 	arch = x86_64
@@ -18,16 +18,20 @@ pkgbase = psi-plus-git
 	depends = qt5-svg
 	depends = hunspell
 	depends = qtkeychain
-	provides = psi-plus=1.3.307.1.g336c5f62
-	provides = psi-plus-qt5-git=1.3.307.1.g336c5f62
+	provides = psi-plus=1.3.369.g1a3a94b7
+	provides = psi-plus-qt5-git=1.3.369.g1a3a94b7
 	conflicts = psi-plus
 	conflicts = psi-plus-qt5-git
 	conflicts = psi-plus-webkit-qt5-git
 	conflicts = psi-plus-webkit-git
-	source = git://github.com/psi-plus/psi-plus-snapshots
-	source = join.patch
+	source = git://github.com/psi-im/psi.git
+	source = psi-plus::git://github.com/psi-plus/main.git
+	source = git://github.com/psi-im/iris.git
+	source = git://github.com/psi-im/libpsi.git
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = ea25a58c7efe25979b8d257598608187380e8f35ace25e96cab9c357dcdbc974
 
 pkgname = psi-plus-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 04cd79465481..acf9bdfdd6ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Alexey D. <lq07829icatm@rambler.ru>
 
 pkgname=psi-plus-git
-pkgver=1.3.307.1.g336c5f62
+pkgver=1.3.369.g1a3a94b7
 pkgrel=1
 pkgdesc="Psi+ is a powerful XMPP client (Qt, C++) designed for the XMPP power users (built with Qt 5.x)"
 url="https://psi-plus.com"
@@ -15,24 +15,47 @@ depends=('qt5-base' 'qt5-webengine' 'qt5-multimedia' 'qt5-x11extras' 'qca-qt5'
 makedepends=('git' 'patch' 'cmake')
 provides=("psi-plus=$pkgver" "psi-plus-qt5-git=$pkgver")
 conflicts=('psi-plus' 'psi-plus-qt5-git' 'psi-plus-webkit-qt5-git' 'psi-plus-webkit-git')
-source=("git://github.com/psi-plus/psi-plus-snapshots"
-	'join.patch')
+source=('git://github.com/psi-im/psi.git'
+        'psi-plus::git://github.com/psi-plus/main.git'
+        'git://github.com/psi-im/iris.git'
+        'git://github.com/psi-im/libpsi.git')
 sha256sums=('SKIP'
-            'ea25a58c7efe25979b8d257598608187380e8f35ace25e96cab9c357dcdbc974')
+            'SKIP'
+            'SKIP'
+            'SKIP')
 
 
 pkgver() {
-  cd psi-plus-snapshots
+  cd psi
   git describe --long --tags | sed 's/^v//;s/-/./g'
-}            
+}
             
 prepare() {
-  cd psi-plus-snapshots
-  patch -p1 <"$srcdir"/join.patch
+  cd psi
+  
+  # makepkg doesn't support --recursive
+  # so setup git modules manually
+  git submodule init
+  git config submodule.iris.url "$srcdir/iris"
+  git config submodule.src/libpsi.url "$srcdir/libpsi"
+  git submodule update
+
+  # patches from Psi+ project
+  for patch in "$srcdir"/psi-plus/patches/*.diff; do
+    echo "* Appling ${patch##*/}"
+    patch -p1 -i "$patch"
+  done
+
+  # additional icon themes
+  cp -a "$srcdir"/psi-plus/iconsets .
+  
+  # set version 
+  cd $srcdir/psi-plus/admin 
+  sh psi-plus-nightly-version $srcdir/psi  > $srcdir/psi/version
 }
 
 build() {
-  cd psi-plus-snapshots
+  cd psi
   mkdir -p build
   cd build
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release  ..
@@ -40,7 +63,7 @@ build() {
 }
 
 package() {
-  cd psi-plus-snapshots/build
+  cd psi/build
 
   make DESTDIR="$pkgdir" install
 }
diff --git a/join.patch b/join.patch
deleted file mode 100644
index 0000037100ec..000000000000
--- a/join.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -wbBur psi-plus-snapshots.org/src/groupchatdlg.cpp psi-plus-snapshots/src/groupchatdlg.cpp
---- psi-plus-snapshots.org/src/groupchatdlg.cpp	2018-01-05 19:34:53.698040879 +0300
-+++ psi-plus-snapshots/src/groupchatdlg.cpp	2018-01-05 19:35:35.934708491 +0300
-@@ -1518,7 +1518,7 @@
-         QString nick = d->self;
- 
-         if(!account()->groupChatJoin(host, room, nick, d->password)) {
--            appendSysMsg(tr("Error: You are in or joining this room already!"), true);
-+//            appendSysMsg(tr("Error: You are in or joining this room already!"), true);
-             d->state = Private::Idle;
-         }
-     }
-diff -wbBur psi-plus-snapshots.org/src/mucjoindlg.cpp psi-plus-snapshots/src/mucjoindlg.cpp
---- psi-plus-snapshots.org/src/mucjoindlg.cpp	2018-01-05 19:34:53.711374212 +0300
-+++ psi-plus-snapshots/src/mucjoindlg.cpp	2018-01-05 19:35:41.211375275 +0300
-@@ -262,7 +262,7 @@
- 
- 
-     if (!account_->groupChatJoin(host, room, nick, pass, !ui_.ck_history->isChecked())) {
--        QMessageBox::information(this, tr("Error"), tr("You are in or joining this room already!"));
-+//        QMessageBox::information(this, tr("Error"), tr("You are in or joining this room already!"));
-         return;
-     }
-