summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Gorski2018-06-16 18:33:38 +0200
committerPiotr Gorski2018-06-16 18:33:38 +0200
commit542e9d3df2ef9bf146ed31cc9317f7fa85e124d6 (patch)
treeab856284cd65cbb2b14f82e8624bc3d2e441483a
parentaaca50cc1f0d65232f42caebf9286f363ab5db70 (diff)
downloadaur-542e9d3df2ef9bf146ed31cc9317f7fa85e124d6.tar.gz
Switch to psi-im repo
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD44
2 files changed, 48 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 675b2f76f77b..498b114a7ec5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = psi-plus-plugins-git
pkgdesc = Additional plugins for Psi+ (built with Qt 5.x)
- pkgver = 1.3.334.0.g124c1822
+ pkgver = 1.1.98.ga8cf677
pkgrel = 1
url = https://psi-plus.com
arch = x86_64
@@ -14,11 +14,19 @@ pkgbase = psi-plus-plugins-git
depends = qt5-webengine
optdepends = libotr: for OTR plugin
optdepends = tidy: for OTR plugin
- provides = psi-plus-plugins=1.3.334.0.g124c1822
- provides = psi-plus-plugins-qt5-git=1.3.334.0.g124c1822
+ provides = psi-plus-plugins=1.1.98.ga8cf677
+ provides = psi-plus-plugins-qt5-git=1.1.98.ga8cf677
conflicts = psi-plus-plugins
conflicts = psi-plus-plugins-qt5-git
- source = git://github.com/psi-plus/psi-plus-snapshots
+ source = git://github.com/psi-im/plugins
+ 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
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
md5sums = SKIP
pkgname = psi-plus-plugins-git
diff --git a/PKGBUILD b/PKGBUILD
index c3371dfac454..84972843f210 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Alexey D. <lq07829icatm@rambler.ru>
pkgname=psi-plus-plugins-git
-pkgver=1.3.334.0.g124c1822
+pkgver=1.1.98.ga8cf677
pkgrel=1
pkgdesc="Additional plugins for Psi+ (built with Qt 5.x)"
arch=('x86_64')
@@ -15,24 +15,52 @@ provides=("psi-plus-plugins=$pkgver" "psi-plus-plugins-qt5-git=$pkgver")
makedepends=('libotr' 'tidy' 'git')
optdepends=('libotr: for OTR plugin'
'tidy: for OTR plugin')
-source=('git://github.com/psi-plus/psi-plus-snapshots')
-md5sums=('SKIP')
+source=('git://github.com/psi-im/plugins'
+ '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')
+md5sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP')
pkgver() {
- cd psi-plus-snapshots
+ cd plugins
git describe --long --tags | sed 's/^v//;s/-/./g'
-}
+}
+
+prepare() {
+ 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
+
+ cp -r $srcdir/psi/cmake $srcdir/plugins/cmake
+ cp -r $srcdir/plugins $srcdir/psi/src/
+}
build() {
- cd psi-plus-snapshots
+ cd $srcdir/psi/src/plugins
mkdir -p build
cd build
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DONLY_PLUGINS=ON ..
+ cmake -DCMAKE_INSTALL_PREFIX=/usr ..
make
}
package() {
- cd psi-plus-snapshots/build
+ cd $srcdir/psi/src/plugins/build
make DESTDIR="$pkgdir" install
}