diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 15 | ||||
-rw-r--r-- | setuptools_fix.patch | 13 |
3 files changed, 6 insertions, 28 deletions
@@ -1,6 +1,6 @@ pkgbase = onioncircuits pkgdesc = GTK application to display Tor circuits and streams - pkgver = 0.7 + pkgver = 0.8 pkgrel = 1 url = https://gitlab.tails.boum.org/tails/onioncircuits arch = any @@ -15,9 +15,7 @@ pkgbase = onioncircuits depends = python-stem>=1.2.2 depends = gobject-introspection depends = python-pycountry - source = git+https://gitlab.tails.boum.org/tails/onioncircuits.git#commit=6efeff2e7cdbfbab7d73ea5825a64c002fa8e3b9 - source = setuptools_fix.patch + source = git+https://gitlab.tails.boum.org/tails/onioncircuits.git#commit=ca2cfc399ca72446258c85300ad0ff975c5e213c sha256sums = SKIP - sha256sums = 6f2bab5e0337d0c62eb261b1a907e614f54e096b217e3c1e412d2a8086818f3d pkgname = onioncircuits @@ -2,7 +2,7 @@ # Contributor: Michael J. Pento <mjpento at verizon dot net> pkgname=onioncircuits -pkgver=0.7 +pkgver=0.8 pkgrel=1 pkgdesc="GTK application to display Tor circuits and streams" arch=('any') @@ -10,22 +10,15 @@ url="https://gitlab.tails.boum.org/tails/onioncircuits" license=('GPL3') depends=('tor' 'hicolor-icon-theme' 'python>=3.4.2' 'python-gobject>=3.14.0' 'python-stem>=1.2.2' 'gobject-introspection' 'python-pycountry') makedepends=('git' 'python-setuptools' 'python-distutils-extra') -_commit=6efeff2e7cdbfbab7d73ea5825a64c002fa8e3b9 # tags/0.7^0 -source=("git+https://gitlab.tails.boum.org/tails/onioncircuits.git#commit=${_commit}" - "setuptools_fix.patch") -sha256sums=('SKIP' - '6f2bab5e0337d0c62eb261b1a907e614f54e096b217e3c1e412d2a8086818f3d') +_commit=ca2cfc399ca72446258c85300ad0ff975c5e213c # tags/0.8^0 +source=("git+https://gitlab.tails.boum.org/tails/onioncircuits.git#commit=${_commit}") +sha256sums=('SKIP') pkgver() { cd "${srcdir}/${pkgname}" git describe --tags | sed 's/-/+/g' } -prepare() { - cd "${srcdir}/${pkgname}" - patch -Np1 -i "${srcdir}/setuptools_fix.patch" -} - build() { cd "${srcdir}/${pkgname}" python setup.py build diff --git a/setuptools_fix.patch b/setuptools_fix.patch deleted file mode 100644 index 678c0a5934d4..000000000000 --- a/setuptools_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index b064ff7..051bc98 100755 ---- a/setup.py -+++ b/setup.py -@@ -26,6 +26,8 @@ setup(name='onioncircuits', - author_email='tails@boum.org', - license='GNU GPL v3', - scripts=['onioncircuits'], -+ packages=[], -+ py_modules=[], - data_files=[('share/icons/hicolor/scalable/apps', ['onioncircuits.svg']), - ('share/applications', ['onioncircuits.desktop'])], - requires=['stem', 'gi'], |