upgpkg: onionshare 1.2-1

Add optional dependency, remove nautilus integration

3 files changed, 28 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e942269655db..53f068efd2a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Wed Feb  7 16:19:57 UTC 2018
+# Thu Feb  8 15:12:49 UTC 2018
 pkgbase = onionshare
 	pkgdesc = Lets you securely and anonymously share a file of any size with someone
 	pkgver = 1.2
@@ -13,8 +13,11 @@ pkgbase = onionshare
 	depends = python-flask
 	depends = tor
 	optdepends = python-pyqt5: to run onionshare-gui
+	optdepends = obfs4proxy: for tor bridge support
 	source = https://github.com/micahflee/onionshare/archive/v1.2.tar.gz
+	source = nautilus-python.patch
 	sha512sums = f410db0866a10d57cbc227a3539f92b3e4fe6b8fdb459abefc315ff3e342aad6876ab963e50ce2c74c8213d07291b9a950a0f61b9cf43767e9befd5f64de01ea
+	sha512sums = 6cc3b3d178bea9cd9fecaf735e82ad7ff7161ad4396086881d7e45a9a70bd55c1074ec65c6359a64417a42493f305caf7ba89e1c40c9a9def03dd1d11cb7efb7
 
 pkgname = onionshare
 
diff --git a/PKGBUILD b/PKGBUILD
index 9e5a6529983f..61555007ad6d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,14 +11,24 @@ checkdepends=('python-pytest')
 depends=('stem' 'python-flask' 'tor')
 optdepends=(
           'python-pyqt5: to run onionshare-gui'
+          'obfs4proxy: for tor bridge support'
           )
-source=(https://github.com/micahflee/onionshare/archive/v$pkgver.tar.gz)
-sha512sums=('f410db0866a10d57cbc227a3539f92b3e4fe6b8fdb459abefc315ff3e342aad6876ab963e50ce2c74c8213d07291b9a950a0f61b9cf43767e9befd5f64de01ea')
+source=(
+    https://github.com/micahflee/onionshare/archive/v$pkgver.tar.gz
+    nautilus-python.patch
+    )
+sha512sums=('f410db0866a10d57cbc227a3539f92b3e4fe6b8fdb459abefc315ff3e342aad6876ab963e50ce2c74c8213d07291b9a950a0f61b9cf43767e9befd5f64de01ea'
+            '6cc3b3d178bea9cd9fecaf735e82ad7ff7161ad4396086881d7e45a9a70bd55c1074ec65c6359a64417a42493f305caf7ba89e1c40c9a9def03dd1d11cb7efb7')
 
-build() {
+
+prepare() {
     cd "$srcdir/onionshare-$pkgver"
-    python setup.py build
+    patch  -i "${srcdir}/nautilus-python.patch"
 }
+#build() {
+#    cd "$srcdir/onionshare-$pkgver"
+#    python setup.py build
+#}
 
 check() {
     cd "$srcdir/onionshare-$pkgver"
diff --git a/nautilus-python.patch b/nautilus-python.patch
new file mode 100644
index 000000000000..d22fa78878f4
--- /dev/null
+++ b/nautilus-python.patch
@@ -0,0 +1,10 @@
+diff -ura onionshare-1.2.orig/setup.py onionshare-1.2.new/setup.py
+--- onionshare-1.2.orig/setup.py	2018-02-08 16:08:34.170828571 +0100
++++ onionshare-1.2.new/setup.py	2018-02-08 16:08:57.864345962 +0100
+@@ -62,6 +62,5 @@
+         (os.path.join(sys.prefix, 'share/onionshare/images'), file_list('share/images')),
+         (os.path.join(sys.prefix, 'share/onionshare/locale'), file_list('share/locale')),
+         (os.path.join(sys.prefix, 'share/onionshare/html'), file_list('share/html')),
+-        ('/usr/share/nautilus-python/extensions/', ['install/scripts/onionshare-nautilus.py'])
+     ]
+ )