diff --git a/Makefile b/Makefile index 444adc3..2494db8 100644 --- a/Makefile +++ b/Makefile @@ -60,6 +60,10 @@ arch-install: arch-update cd package/archlinux makepkg -si +arch-build: arch-update + cd package/archlinux + makepkg + arch-upload: arch-update cd package/archlinux git clone ssh://aur@aur.archlinux.org/virtscreen.git diff --git a/package/archlinux/.SRCINFO b/package/archlinux/.SRCINFO index ad11961..a43f6f5 100644 --- a/package/archlinux/.SRCINFO +++ b/package/archlinux/.SRCINFO @@ -6,7 +6,7 @@ pkgbase = virtscreen arch = i686 arch = x86_64 license = GPL - makedepends = python-setuptools + makedepends = python-pip depends = xorg-xrandr depends = x11vnc depends = python-pyqt5 diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index 384f28e..af14cb9 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -9,7 +9,7 @@ url="https://github.com/kbumsik/VirtScreen" license=('GPL') groups=() depends=('xorg-xrandr' 'x11vnc' 'python-pyqt5' 'python-twisted' 'python-netifaces' 'python-qt5reactor') -makedepends=('python-setuptools') +makedepends=('python-pip') optdepends=( 'arandr: for display settings option' ) @@ -24,15 +24,9 @@ source=(https://github.com/kbumsik/$_pkgname_camelcase/archive/$pkgver.tar.gz) noextract=() sha256sums=('73cb4016b06ccb7a18a7aefc5822119655f1c260915bc34218d3b04ac86af3d8') -build() { - echo "$pkgdir" - cd $_pkgname_camelcase-$pkgver - /usr/bin/python3 setup.py build -} - package() { cd $_pkgname_camelcase-$pkgver - /usr/bin/python3 setup.py install --root="$pkgdir/" --optimize=1 --skip-build + PIP_CONFIG_FILE=/dev/null /usr/bin/pip install --isolated --root="$pkgdir" --ignore-installed --no-deps . # These are already installed by setup.py # install -Dm644 "data/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" # install -Dm644 "data/icon.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"