From d4f6d10bcdd6786ec92813bd9def0efe2af95447 Mon Sep 17 00:00:00 2001 From: Joel Date: Fri, 1 Jul 2022 09:51:35 +0930 Subject: [PATCH 1/4] quamash -> qasync Signed-off-by: Joel --- package/archlinux/PKGBUILD | 4 ++-- setup.py | 3 +-- virtscreen/__main__.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index b5ae795..8d1b39d 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -8,7 +8,7 @@ arch=("i686" "x86_64") url="https://github.com/kbumsik/VirtScreen" license=('GPL') groups=() -depends=('xorg-xrandr' 'x11vnc' 'python-pyqt5' 'qt5-quickcontrols2' 'python-quamash-git' 'python-netifaces') +depends=('xorg-xrandr' 'x11vnc' 'python-pyqt5' 'qt5-quickcontrols2' 'python-qasync' 'python-netifaces') makedepends=('python-pip' 'perl') optdepends=( 'arandr: for display settings option' @@ -38,4 +38,4 @@ package() { # 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" -} \ No newline at end of file +} diff --git a/setup.py b/setup.py index 36eeb37..b81c2a3 100644 --- a/setup.py +++ b/setup.py @@ -143,8 +143,7 @@ setup( # # For an analysis of "install_requires" vs pip's requirements files see: # https://packaging.python.org/en/latest/requirements.html - install_requires=['PyQt5>=5.10.1', - 'Quamash>=0.6.0', + install_requires=['Quasync>=0.9.1', 'netifaces>=0.10.6'], # Optional # List additional groups of dependencies here (e.g. development diff --git a/virtscreen/__main__.py b/virtscreen/__main__.py index 5237741..80d3316 100755 --- a/virtscreen/__main__.py +++ b/virtscreen/__main__.py @@ -22,7 +22,7 @@ from PyQt5.QtWidgets import QApplication from PyQt5.QtQml import qmlRegisterType, QQmlApplicationEngine from PyQt5.QtGui import QIcon from PyQt5.QtCore import Qt, QUrl -from quamash import QEventLoop +from qasync import QEventLoop from .display import DisplayProperty from .xrandr import XRandR From 0bcdc8afab96703e1ff425699142b7aa251977c9 Mon Sep 17 00:00:00 2001 From: Joel Date: Fri, 1 Jul 2022 10:01:47 +0930 Subject: [PATCH 2/4] typo --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b81c2a3..512b7af 100644 --- a/setup.py +++ b/setup.py @@ -143,7 +143,7 @@ setup( # # For an analysis of "install_requires" vs pip's requirements files see: # https://packaging.python.org/en/latest/requirements.html - install_requires=['Quasync>=0.9.1', + install_requires=['qasync>=0.23.0', 'netifaces>=0.10.6'], # Optional # List additional groups of dependencies here (e.g. development From d4ea69d16db0cc268d59c601f80d9a0c0dbbaccf Mon Sep 17 00:00:00 2001 From: Joel Date: Fri, 1 Jul 2022 10:03:12 +0930 Subject: [PATCH 3/4] bumped version --- Makefile | 2 +- package/archlinux/PKGBUILD | 8 ++++---- package/debian/build.sh | 20 ++++++++++---------- setup.py | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 9ccaa05..47f4359 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # See https://packaging.python.org/tutorials/distributing-packages/#packaging-your-project # for python packaging reference. -VERSION ?= 0.3.1 +VERSION ?= 0.3.2 DOCKER_NAME=kbumsik/virtscreen DOCKER_RUN=docker run --interactive --tty -v $(shell pwd):/app $(DOCKER_NAME) diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index 8d1b39d..febc990 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Bumsik Kim _pkgname_camelcase=VirtScreen pkgname=virtscreen -pkgver=0.3.1 +pkgver=0.3.2 pkgrel=1 pkgdesc="Make your iPad/tablet/computer as a secondary monitor on Linux" arch=("i686" "x86_64") @@ -11,7 +11,7 @@ groups=() depends=('xorg-xrandr' 'x11vnc' 'python-pyqt5' 'qt5-quickcontrols2' 'python-qasync' 'python-netifaces') makedepends=('python-pip' 'perl') optdepends=( - 'arandr: for display settings option' + 'arandr: for display settings option' ) provides=($pkgname) conflicts=() @@ -27,9 +27,9 @@ md5sums=('SKIP') prepare() { cd $srcdir/src # Delete PyQt5 from install_requires because python-pyqt5 does not have PyPI metadata. - # See https://bugs.archlinux.org/task/58887 + # See https://bugs.archlinux.org/task/58887 perl -pi -e "s/\'PyQt5>=\d+\.\d+\.\d+\',//" \ - setup.py + setup.py } package() { diff --git a/package/debian/build.sh b/package/debian/build.sh index dea5e40..1e16156 100755 --- a/package/debian/build.sh +++ b/package/debian/build.sh @@ -1,12 +1,12 @@ #!/bin/bash -PKGVER=0.3.1 +PKGVER=0.3.2 # Required for debmake DEBEMAIL="k.bumsik@gmail.com" DEBFULLNAME="Bumsik Kim" export PKGVER DEBEMAIL DEBFULLNAME -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" ROOT=$SCRIPT_DIR/../.. # Generate necessary files for package building (generated by debmake) @@ -14,7 +14,7 @@ cd $ROOT/package/debian cp $ROOT/virtscreen-$PKGVER.tar.gz . tar -xzmf virtscreen-$PKGVER.tar.gz cp $ROOT/package/debian/Makefile \ - $ROOT/package/debian/virtscreen-$PKGVER/Makefile + $ROOT/package/debian/virtscreen-$PKGVER/Makefile cd $ROOT/package/debian/virtscreen-$PKGVER debmake --yes -b':sh' @@ -22,18 +22,18 @@ debmake --yes -b':sh' # debmake files mkdir -p $ROOT/package/debian/build cp -R $ROOT/package/debian/virtscreen-$PKGVER/debian \ - $ROOT/package/debian/build/debian + $ROOT/package/debian/build/debian cp $ROOT/package/debian/Makefile \ - $ROOT/package/debian/build/ + $ROOT/package/debian/build/ cp $ROOT/package/debian/{control,README.Debian} \ - $ROOT/package/debian/build/debian/ + $ROOT/package/debian/build/debian/ # binary and data files cp $ROOT/package/appimage/VirtScreen.AppImage \ - $ROOT/package/debian/build/ + $ROOT/package/debian/build/ cp $ROOT/virtscreen.desktop \ - $ROOT/package/debian/build/ + $ROOT/package/debian/build/ cp -R $ROOT/data \ - $ROOT/package/debian/build/ + $ROOT/package/debian/build/ # Build .deb package cd $ROOT/package/debian/build @@ -41,4 +41,4 @@ dpkg-buildpackage -b # cleanup rm -rf $ROOT/package/debian/virtscreen-$PKGVER \ - $ROOT/package/debian/*.tar.gz + $ROOT/package/debian/*.tar.gz diff --git a/setup.py b/setup.py index 512b7af..4ece353 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ setup( # For a discussion on single-sourcing the version across setup.py and the # project code, see # https://packaging.python.org/en/latest/single_source_version.html - version='0.3.1', # Required + version='0.3.2', # Required # This is a one-line description or tagline of what your project does. This # corresponds to the "Summary" metadata field: From 6b293bd366fe93761468aa835d9980f22baa684c Mon Sep 17 00:00:00 2001 From: Joel Date: Fri, 1 Jul 2022 10:17:34 +0930 Subject: [PATCH 4/4] updated PKGBUILD from upsteam aur.archlinux.org --- package/archlinux/PKGBUILD | 48 +++++++++++++------------------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index febc990..c7f7bc7 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -1,41 +1,25 @@ -# Maintainer: Bumsik Kim -_pkgname_camelcase=VirtScreen +# Maintainer: Luis Martinez +# Contributor: Bumsik Kim + pkgname=virtscreen pkgver=0.3.2 -pkgrel=1 +pkgrel=0 pkgdesc="Make your iPad/tablet/computer as a secondary monitor on Linux" -arch=("i686" "x86_64") -url="https://github.com/kbumsik/VirtScreen" -license=('GPL') -groups=() +arch=('any') +url="https://github.com/dderjoel/VirtScreen" +license=('GPL3') depends=('xorg-xrandr' 'x11vnc' 'python-pyqt5' 'qt5-quickcontrols2' 'python-qasync' 'python-netifaces') -makedepends=('python-pip' 'perl') -optdepends=( - 'arandr: for display settings option' -) -provides=($pkgname) -conflicts=() -replaces=() -backup=() -options=() -install= -changelog= -source=(src::git+https://github.com/kbumsik/$_pkgname_camelcase.git#tag=$pkgver) -noextract=() -md5sums=('SKIP') +makedepends=('python-setuptools') +optdepends=('arandr: for display settings option') +source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz") +sha256sums=('fdf4192829a1b2c2554e2f33b1c12756d34b691aad280bee207db3c9cd62f11d') -prepare() { - cd $srcdir/src - # Delete PyQt5 from install_requires because python-pyqt5 does not have PyPI metadata. - # See https://bugs.archlinux.org/task/58887 - perl -pi -e "s/\'PyQt5>=\d+\.\d+\.\d+\',//" \ - setup.py +build() { + cd "VirtScreen-$pkgver" + python setup.py build } package() { - cd $srcdir/src - PIP_CONFIG_FILE=/dev/null /usr/bin/pip install --isolated --root="$pkgdir" --ignore-installed --ignore-requires-python --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" + cd "VirtScreen-$pkgver" + python setup.py install --root="$pkgdir" --optimize=1 --skip-build }