Update to the latest

1 files changed, 33 insertions, 64 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7f28869f3485..3cf68e42a001 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,82 +1,51 @@
+# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Markus Hovorka <m.hovorka@live.de>
 # Contributor: Florian Pritz <bluewind@xinu.at>
 # Contributor: kachelaqa <kachelaqa at gmail dot com>
 
-pkgbase='pyside2-tools-git'
-pkgname=('python2-pyside2-tools-git' 'python-pyside2-tools-git' 'pyside2-tools-common-git')
-pkgver=5.11.1.r117.f1b7755
-_upver=5.11.1
+pkgname=pyside2-tools-git
+pkgver=r6554.6eb583d7
 pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-url='https://qt-project.org/wiki/PySide'
-makedepends=('git' 'cmake' 'python' 'python2' 'shiboken2-git' python{,2}-pyside2-git)
-source=("$pkgbase::git+https://code.qt.io/pyside/pyside-tools.git#branch=5.11")
-md5sums=('SKIP')
+arch=(x86_64)
+url='https://www.qt.io'
+license=(LGPL)
+pkgdesc='lupdate, rcc and uic tools for PySide2 (git version)'
+depends=(pyside2)
+makedepends=(cmake shiboken2 git)
+conflicts=(pyside2-tools)
+provides=(pyside2-tools)
+source=("${pkgname}::git+https://code.qt.io/pyside/pyside-setup.git"
+        "git+https://code.qt.io/pyside/pyside-tools.git")
+sha256sums=('SKIP'
+            'SKIP')
 
 pkgver() {
-    cd "$srcdir/$pkgbase"
-    printf "%s.r%s.%s" "$_upver" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-build() {
-    # Build for python2.
-    cd "$srcdir/$pkgbase"
-    mkdir -p build-py2 && cd build-py2
-    cmake \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DPYTHON_CONFIG_SUFFIX="-python2.7" \
-        -DCMAKE_BUILD_TYPE=Release ..
-    make
+  cd "${srcdir}/${pkgname}"
 
-    # Build for python3.
-    cd "$srcdir/$pkgbase"
-    mkdir -p build-py3 && cd build-py3
-    cmake \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=Release ..
-    make
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-package_pyside2-tools-common-git() {
-    pkgdesc='PySide lupdate, rcc, and uic development tools (Common Files)'
+prepare() {
+  cd "${srcdir}/${pkgname}"
 
-    cd "$srcdir/$pkgbase/build-py3"
-    make DESTDIR="${pkgdir}" install
+  git submodule init
+  git config submodule.sources/pyside2-tools.url "${srcdir}/pyside-tools"
+  git submodule update
 
-    rm -rf "${pkgdir}"/usr/lib
-    rm -f "${pkgdir}"/usr/bin/pyside2-uic
-    rm -f "${pkgdir}"/usr/share/man/man1/pyside2-uic*
+  mkdir -p build
 }
 
+build() {
+  cd "${srcdir}/${pkgname}/build"
 
-package_python2-pyside2-tools-git() {
-    depends=('python2-pyside2-git' 'pyside2-tools-common-git')
-    pkgdesc='PySide lupdate, rcc, and uic development tools (for Python 2)'
-
-    cd "$srcdir/$pkgbase/build-py2"
-    make DESTDIR="${pkgdir}" install
-
-    find "${pkgdir}" -type f -exec \
-    sed -i -e '1 s|^#! */usr/bin/python[0-9.]*|#!/usr/bin/python2|' \
-           -e '1 s|^#! */usr/bin/env python[0-9.]*|#!/usr/bin/env python2|' {} +
-
-    mv "${pkgdir}"/usr/bin/{,python2-}pyside2-uic
-    mv "${pkgdir}"/usr/share/man/man1/{,python2-}pyside2-uic.1
-
-    rm -rf "${pkgdir}"/usr/lib/python2*/site-packages/pyside2uic/{port_v3,pyside2-uic.1}
-    rm -f "${pkgdir}"/usr/bin/pyside2-{lupdate,rcc}
-    rm -f "${pkgdir}"/usr/share/man/man1/pyside2-{lupdate,rcc}*
+  cmake ../sources/pyside2-tools \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_TESTS=OFF
+  make
 }
 
-package_python-pyside2-tools-git() {
-    depends=('python-pyside2-git' 'pyside2-tools-common-git')
-    pkgdesc='PySide lupdate, rcc, and uic development tools (for Python 3)'
-
-    cd "$srcdir/$pkgbase/build-py3"
-    make DESTDIR="${pkgdir}" install
-
-    rm -rf "${pkgdir}"/usr/lib/python3*/site-packages/pyside2uic/{port_v2,pyside2-uic.1}
-    rm -f "${pkgdir}"/usr/bin/pyside2-{lupdate,rcc}
-    rm -f "${pkgdir}"/usr/share/man/man1/pyside2-{lupdate,rcc}*
+package() {
+  cd "${srcdir}/${pkgname}/build"
+  
+  make DESTDIR="$pkgdir" install
 }