Switch to cmake and psi-plus repo

3 files changed, 17 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9963c0f28b99..0d75f906c62b 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.1.21.g8161e5c
+	pkgver = 1.2.161.1.gf3b641d3
 	pkgrel = 1
 	url = http://psi-plus.com
 	arch = x86_64
@@ -8,20 +8,17 @@ pkgbase = psi-plus-plugins-git
 	makedepends = libotr
 	makedepends = tidyhtml
 	depends = qt5-base
-	depends = qt5-webkit
 	depends = qt5-multimedia
 	depends = psi-plus-git
 	depends = qt5-webengine
 	optdepends = libotr: for OTR plugin
 	optdepends = tidyhtml: for OTR plugin
-	provides = psi-plus-plugins=1.1.21.g8161e5c
-	provides = psi-plus-plugins-qt5-git=1.1.21.g8161e5c
+	provides = psi-plus-plugins=1.2.161.1.gf3b641d3
+	provides = psi-plus-plugins-qt5-git=1.2.161.1.gf3b641d3
 	conflicts = psi-plus-plugins
 	conflicts = psi-plus-plugins-qt5-git
-	source = psi-plus-plugins::git://github.com/psi-im/plugins.git
-	source = psiplugin.pri
+	source = git://github.com/psi-plus/psi-plus-snapshots
 	md5sums = SKIP
-	md5sums = c224bb773d98782c6dbaf4e27d560c60
 
 pkgname = psi-plus-plugins-git
 
diff --git a/PKGBUILD b/PKGBUILD
index cddd0986834d..0080bcad8228 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,55 +3,37 @@
 # Contributor: Alexey D. <lq07829icatm@rambler.ru>
 
 pkgname=psi-plus-plugins-git
-pkgver=1.1.21.g8161e5c
+pkgver=1.2.161.1.gf3b641d3
 pkgrel=1
 pkgdesc="Additional plugins for Psi+ (built with Qt 5.x)"
 arch=('x86_64')
 url="http://psi-plus.com"
 license=('GPL2')
-depends=('qt5-base' 'qt5-webkit' 'qt5-multimedia' 'psi-plus-git' 'qt5-webengine')
+depends=('qt5-base' 'qt5-multimedia' 'psi-plus-git' 'qt5-webengine')
 conflicts=('psi-plus-plugins' 'psi-plus-plugins-qt5-git')
 provides=("psi-plus-plugins=$pkgver" "psi-plus-plugins-qt5-git=$pkgver")
 makedepends=('libotr' 'tidyhtml')
 optdepends=('libotr: for OTR plugin'
             'tidyhtml: for OTR plugin')
-source=('psi-plus-plugins::git://github.com/psi-im/plugins.git'
-        'psiplugin.pri')
-md5sums=('SKIP'
-         'bbe29ce7c37a0511212798f17993c7dd')
+source=('git://github.com/psi-plus/psi-plus-snapshots')
+md5sums=('SKIP')
 
 pkgver() {
-  cd psi-plus-plugins
+  cd psi-plus-snapshots
   git describe --long --tags | sed 's/^v//;s/-/./g'
 }            
     
-prepare() {
-    cp -v psiplugin.pri psi-plus-plugins/
-    
-}
-
 build() {
-    cd psi-plus-plugins
-    # Kill broken plugins
-    rm -rf generic/juickplugin
-    for plugin in generic/*; do
-        if [ -d "$srcdir/psi-plus-plugins/$plugin" ]; then
-            cd "$srcdir/psi-plus-plugins/$plugin"
-            qmake-qt5 PREFIX="/usr" QMAKE_STRIP=
-            make
-        fi
-    done
+  cd psi-plus-snapshots
+  mkdir -p build
+  cd build
+  cmake -DONLY_PLUGINS=ON  ..
+  make
 }
 
 package() {
-    cd psi-plus-plugins
-    for plugin in generic/* unix/*; do
-        if [ -d "$srcdir/psi-plus-plugins/$plugin" ]; then
-            cd "$srcdir/psi-plus-plugins/$plugin"
-            make INSTALL_ROOT="$pkgdir" install
-        fi
-    done
+  cd psi-plus-snapshots/build
+
+  make DESTDIR="$pkgdir" install
 }
 
-md5sums=('SKIP'
-         'c224bb773d98782c6dbaf4e27d560c60')
diff --git a/psiplugin.pri b/psiplugin.pri
deleted file mode 100644
index ff8a22c104ea..000000000000
--- a/psiplugin.pri
+++ /dev/null
@@ -1,18 +0,0 @@
-TEMPLATE = lib
-CONFIG += plugin
-QT += xml
-QT += widgets
-
-MOC_DIR = .moc/
-OBJECTS_DIR = .obj/
-RCC_DIR = .rcc/
-UI_DIR = .ui/
-
-INCLUDEPATH += .ui/
-
-target.path = /usr/lib/psi-plus/plugins
-INSTALLS += target
-
-INCLUDEPATH += /usr/include/psi-plus/plugins
-
-DEFINES += HAVE_QT5
\ No newline at end of file