From d85e98825575434ac208fc95f3321585b374a492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Poisson?= Date: Sat, 16 Mar 2019 16:10:05 +0100 Subject: [PATCH] [omemo-backend-signal] updated to 0.2.3 "wireformat.patch" has been removed because it is not needed anymore since the recent update of protobuf recipe. --- .../recipes/omemo-backend-signal/__init__.py | 3 +- .../omemo-backend-signal/wireformat.patch | 101 ------------------ 2 files changed, 1 insertion(+), 103 deletions(-) delete mode 100644 pythonforandroid/recipes/omemo-backend-signal/wireformat.patch diff --git a/pythonforandroid/recipes/omemo-backend-signal/__init__.py b/pythonforandroid/recipes/omemo-backend-signal/__init__.py index c87034ce7d..cc9fa08f1c 100644 --- a/pythonforandroid/recipes/omemo-backend-signal/__init__.py +++ b/pythonforandroid/recipes/omemo-backend-signal/__init__.py @@ -3,7 +3,7 @@ class OmemoBackendSignalRecipe(PythonRecipe): name = 'omemo-backend-signal' - version = '0.2.2' + version = '0.2.3' url = 'https://pypi.python.org/packages/source/o/omemo-backend-signal/omemo-backend-signal-{version}.tar.gz' site_packages_name = 'omemo-backend-signal' depends = [ @@ -15,7 +15,6 @@ class OmemoBackendSignalRecipe(PythonRecipe): 'cryptography', 'omemo', ] - patches = ['wireformat.patch'] call_hostpython_via_targetpython = False diff --git a/pythonforandroid/recipes/omemo-backend-signal/wireformat.patch b/pythonforandroid/recipes/omemo-backend-signal/wireformat.patch deleted file mode 100644 index 7881d05ef1..0000000000 --- a/pythonforandroid/recipes/omemo-backend-signal/wireformat.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff -urN omemo-backend-signal-0.2.2.ori/omemo_backend_signal/whispertextprotocol_pb2.py omemo-backend-signal-0.2.2/omemo_backend_signal/whispertextprotocol_pb2.py ---- omemo-backend-signal-0.2.2.ori/omemo_backend_signal/whispertextprotocol_pb2.py 2018-09-02 21:04:26.000000000 +0200 -+++ omemo-backend-signal-0.2.2/omemo_backend_signal/whispertextprotocol_pb2.py 2018-11-02 10:39:15.196715321 +0100 -@@ -21,7 +21,6 @@ - syntax='proto2', - serialized_pb=_b('\n\x19WhisperTextProtocol.proto\"R\n\rSignalMessage\x12\x16\n\x0e\x64h_ratchet_key\x18\x01 \x01(\x0c\x12\t\n\x01n\x18\x02 \x01(\r\x12\n\n\x02pn\x18\x03 \x01(\r\x12\x12\n\nciphertext\x18\x04 \x01(\x0c\"\x7f\n\x13PreKeySignalMessage\x12\x17\n\x0fregistration_id\x18\x05 \x01(\r\x12\x0f\n\x07otpk_id\x18\x01 \x01(\r\x12\x0e\n\x06spk_id\x18\x06 \x01(\r\x12\n\n\x02\x65k\x18\x02 \x01(\x0c\x12\n\n\x02ik\x18\x03 \x01(\x0c\x12\x16\n\x0esignal_message\x18\x04 \x01(\x0c') - ) --_sym_db.RegisterFileDescriptor(DESCRIPTOR) - - - -@@ -39,28 +38,28 @@ - has_default_value=False, default_value=_b(""), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, -- options=None), -+ options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='n', full_name='SignalMessage.n', index=1, - number=2, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, -- options=None), -+ options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='pn', full_name='SignalMessage.pn', index=2, - number=3, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, -- options=None), -+ options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='ciphertext', full_name='SignalMessage.ciphertext', index=3, - number=4, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, -- options=None), -+ options=None, file=DESCRIPTOR), - ], - extensions=[ - ], -@@ -91,42 +90,42 @@ - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, -- options=None), -+ options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='otpk_id', full_name='PreKeySignalMessage.otpk_id', index=1, - number=1, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, -- options=None), -+ options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='spk_id', full_name='PreKeySignalMessage.spk_id', index=2, - number=6, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, -- options=None), -+ options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='ek', full_name='PreKeySignalMessage.ek', index=3, - number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, -- options=None), -+ options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='ik', full_name='PreKeySignalMessage.ik', index=4, - number=3, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, -- options=None), -+ options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='signal_message', full_name='PreKeySignalMessage.signal_message', index=5, - number=4, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, -- options=None), -+ options=None, file=DESCRIPTOR), - ], - extensions=[ - ], -@@ -145,6 +144,7 @@ - - DESCRIPTOR.message_types_by_name['SignalMessage'] = _SIGNALMESSAGE - DESCRIPTOR.message_types_by_name['PreKeySignalMessage'] = _PREKEYSIGNALMESSAGE -+_sym_db.RegisterFileDescriptor(DESCRIPTOR) - - SignalMessage = _reflection.GeneratedProtocolMessageType('SignalMessage', (_message.Message,), dict( - DESCRIPTOR = _SIGNALMESSAGE,