[arch-commits] Commit in psi-plugins/trunk (PKGBUILD psiplugin.pri)

[Sergej Pupykin]

    Date: Tuesday, February 20, 2018 @ 19:09:29
  Author: spupykin
Revision: 296580

upgpkg: psi-plugins 1.3-1

Modified:
  psi-plugins/trunk/PKGBUILD
  psi-plugins/trunk/psiplugin.pri

---------------+
 PKGBUILD      |   25 +++++++++++--------------
 psiplugin.pri |    2 +-
 2 files changed, 12 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-20 19:09:22 UTC (rev 296579)
+++ PKGBUILD	2018-02-20 19:09:29 UTC (rev 296580)
@@ -11,37 +11,34 @@
 depends=('qt5-base' 'qt5-webkit' 'qt5-multimedia' 'psi' 'qt5-webengine')
 conflicts=('psi-plus-plugins-git' 'psi-plus-plugins-qt5-git' 'psi-plus-plugins')
 replaces=('psi-plus-plugins')
-makedepends=('libotr' 'tidyhtml' 'git')
+makedepends=('libotr' 'tidyhtml')
 optdepends=('libotr: for OTR plugin'
             'tidyhtml: for OTR plugin')
-source=("psi-plus-plugins::git://github.com/psi-im/plugins.git#tag=$pkgver"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/psi-im/plugins/archive/$pkgver.tar.gz"
         'psiplugin.pri')
-sha256sums=('SKIP'
-            '2be7b26400faecf69d552b89ed8470cb461ba1c8c56e3e8646d166feb0de56c6')
+sha256sums=('aef310c98c5a43399505a71a6b61f6ad64c97e0529d398462ce669249b4ffb9b'
+            'd7753327ab4896f6f7ce2d42b9b7a4f7c62fdf225d34833a629543cb5764969e')
 
 prepare() {
-    cp -v psiplugin.pri psi-plus-plugins/
+    cp -v psiplugin.pri plugins-$pkgver/
 }
 
 build() {
-    cd psi-plus-plugins
+    cd plugins-$pkgver
     # 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
+        if [ -d "$plugin" ]; then
+            (cd "$plugin" && qmake-qt5 PREFIX="/usr" QMAKE_STRIP= && make)
         fi
     done
 }
 
 package() {
-    cd psi-plus-plugins
+    cd plugins-$pkgver
     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
+        if [ -d "$plugin" ]; then
+            (cd "$plugin" && make INSTALL_ROOT="$pkgdir" install)
         fi
     done
 }

Modified: psiplugin.pri
===================================================================
--- psiplugin.pri	2018-02-20 19:09:22 UTC (rev 296579)
+++ psiplugin.pri	2018-02-20 19:09:29 UTC (rev 296580)
@@ -13,6 +13,6 @@
 target.path = /usr/lib/psi-plus/plugins
 INSTALLS += target
 
-INCLUDEPATH += /usr/include/psi-plus/plugins
+INCLUDEPATH += /usr/include/psi/plugins
 
 DEFINES += HAVE_QT5
\ No newline at end of file