summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConrad Kostecki <conrad@kostecki.com>2018-12-17 20:03:50 +0100
committerPatrice Clement <monsieurp@gentoo.org>2018-12-29 00:01:14 +0100
commit59102683bac0b71ebe69770078d1d0c783574b29 (patch)
treecfac62406a51ef821a2cca56b031cdfcd6ed8ba4 /net-im/yowsup/files
parentdev-python/configargparse: bump to version 0.13.0. (diff)
downloadgentoo-59102683bac0b71ebe69770078d1d0c783574b29.tar.gz
gentoo-59102683bac0b71ebe69770078d1d0c783574b29.tar.bz2
gentoo-59102683bac0b71ebe69770078d1d0c783574b29.zip
net-im/yowsup: add python3.7 support
Also switch from dev-python/pycrpto to dev-python/pycrptodome, as it's more modern. Besides, renamed six patch, to have a proper file name. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Conrad Kostecki <conrad@kostecki.com> Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'net-im/yowsup/files')
-rw-r--r--net-im/yowsup/files/yowsup-2.5.7-add-python3.7-support.patch51
-rw-r--r--net-im/yowsup/files/yowsup-2.5.7-fix-install-path.patch28
-rw-r--r--net-im/yowsup/files/yowsup-2.5.7-fix-newer-six.patch (renamed from net-im/yowsup/files/fix_newer_six_version.patch)0
3 files changed, 79 insertions, 0 deletions
diff --git a/net-im/yowsup/files/yowsup-2.5.7-add-python3.7-support.patch b/net-im/yowsup/files/yowsup-2.5.7-add-python3.7-support.patch
new file mode 100644
index 00000000000..6d3f3c83004
--- /dev/null
+++ b/net-im/yowsup/files/yowsup-2.5.7-add-python3.7-support.patch
@@ -0,0 +1,51 @@
+Description: Fix compatibility with Python 3.7 since async has become a reserved word
+Author: Josue Ortega <josue@debian.org>
+Last-Update: 2018-07-29
+
+--- a/yowsup/demos/cli/layer.py
++++ b/yowsup/demos/cli/layer.py
+@@ -559,7 +559,7 @@
+ mediaUploader = MediaUploader(jid, self.getOwnJid(), filePath,
+ resultRequestUploadIqProtocolEntity.getUrl(),
+ resultRequestUploadIqProtocolEntity.getResumeOffset(),
+- successFn, self.onUploadError, self.onUploadProgress, async=False)
++ successFn, self.onUploadError, self.onUploadProgress, asyncronous=False)
+ mediaUploader.start()
+
+ def onRequestUploadError(self, jid, path, errorRequestUploadIqProtocolEntity, requestUploadIqProtocolEntity):
+--- a/yowsup/layers/interface/interface.py
++++ b/yowsup/layers/interface/interface.py
+@@ -125,7 +125,7 @@
+ mediaUploader = MediaUploader(builder.jid, self.getOwnJid(), builder.getFilepath(),
+ resultRequestUploadIqProtocolEntity.getUrl(),
+ resultRequestUploadIqProtocolEntity.getResumeOffset(),
+- successFn, errorFn, progress, async=True)
++ successFn, errorFn, progress, asyncronous=True)
+ mediaUploader.start()
+
+ def __onRequestUploadError(self, errorEntity, requestUploadEntity, builder, error = None):
+--- a/yowsup/layers/protocol_media/mediauploader.py
++++ b/yowsup/layers/protocol_media/mediauploader.py
+@@ -9,10 +9,11 @@
+ logger = logging.getLogger(__name__)
+
+ class MediaUploader(WARequest, threading.Thread):
+- def __init__(self, jid, accountJid, sourcePath, uploadUrl, resumeOffset = 0, successClbk = None, errorClbk = None, progressCallback = None, async = True):
++ def __init__(self, jid, accountJid, sourcePath, uploadUrl, resumeOffset=0, successClbk=None,
++ errorClbk=None, progressCallback=None, asyncronous=True):
+ WARequest.__init__(self)
+
+- self.async = async
++ self.asyncronous = asyncronous
+ self.jid = jid
+ self.accountJid = accountJid
+ self.sourcePath = sourcePath
+@@ -30,7 +31,7 @@
+ self.sock = socket.socket()
+
+ def start(self):
+- if self.async:
++ if self.asyncronous:
+ threading.Thread.__init__(self)
+ super(MediaUploader, self).start()
+ else:
diff --git a/net-im/yowsup/files/yowsup-2.5.7-fix-install-path.patch b/net-im/yowsup/files/yowsup-2.5.7-fix-install-path.patch
new file mode 100644
index 00000000000..63b0fbfc91c
--- /dev/null
+++ b/net-im/yowsup/files/yowsup-2.5.7-fix-install-path.patch
@@ -0,0 +1,28 @@
+Description: Fixes wrong installation of mime.types file.
+Author: Josue Ortega <josue@debian.org>
+Last-Update: 2016-09-04
+
+--- a/setup.py
++++ b/setup.py
+@@ -33,7 +33,7 @@
+ #long_description=long_description,
+ packages= find_packages(),
+ include_package_data=True,
+- data_files = [('yowsup/common', ['yowsup/common/mime.types'])],
++ #data_files = [('yowsup/common', ['yowsup/common/mime.types'])],
+ platforms='any',
+ #test_suite='',
+ classifiers = [
+--- a/yowsup/common/tools.py
++++ b/yowsup/common/tools.py
+@@ -150,7 +150,9 @@
+ return preview
+
+ class MimeTools:
+- MIME_FILE = os.path.join(os.path.dirname(__file__), 'mime.types')
++ # Replaces mime.types path for the debian path installation
++ # MIME_FILE = os.path.join(os.path.dirname(__file__), 'mime.types')
++ MIME_FILE = os.path.join('/usr/share/yowsup/common', 'mime.types')
+ mimetypes.init() # Load default mime.types
+ try:
+ mimetypes.init([MIME_FILE]) # Append whatsapp mime.types
diff --git a/net-im/yowsup/files/fix_newer_six_version.patch b/net-im/yowsup/files/yowsup-2.5.7-fix-newer-six.patch
index d1bfb27ce29..d1bfb27ce29 100644
--- a/net-im/yowsup/files/fix_newer_six_version.patch
+++ b/net-im/yowsup/files/yowsup-2.5.7-fix-newer-six.patch