1
0

Accepting request 612183 from home:nuklly:branches:server:messaging

- Update to 1.2.22
  * Use markdown in media captions (bold, italic, tag and code).
  * Use emoji replacement in media captions, group and channel titles and descriptions (:like: etc.)
  * Markdown replacement now happens immediately after typing (instead of after sending) and can be rolled back using Backspace or Ctrl/Cmd + Z.
    Replacement no longer happens when pasting text.

OBS-URL: https://build.opensuse.org/request/show/612183
OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=38
This commit is contained in:
Xu Zhao 2018-05-25 07:00:24 +00:00 committed by Git OBS Bridge
parent 93af47fd41
commit 26c17ef9c5
12 changed files with 36 additions and 269 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aaa2037e8635f192739bde7e20523a88a03bbfa51fd83fd20a2158f798b5caa4
size 5304734
oid sha256:fc129ec0faf08c93bff361bf39bc92a3ceb8d5e7b260cdbc68b27682af5a7368
size 5197580

View File

@ -1,233 +0,0 @@
diff --git a/client/linux/dump_writer_common/ucontext_reader.cc b/client/linux/dump_writer_common/ucontext_reader.cc
index c80724d..052ce37 100644
--- a/client/linux/dump_writer_common/ucontext_reader.cc
+++ b/client/linux/dump_writer_common/ucontext_reader.cc
@@ -36,19 +36,19 @@
// Minidump defines register structures which are different from the raw
// structures which we get from the kernel. These are platform specific
-// functions to juggle the ucontext and user structures into minidump format.
+// functions to juggle the ucontext_t and user structures into minidump format.
#if defined(__i386__)
-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
return uc->uc_mcontext.gregs[REG_ESP];
}
-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
return uc->uc_mcontext.gregs[REG_EIP];
}
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
const struct _libc_fpstate* fp) {
const greg_t* regs = uc->uc_mcontext.gregs;
@@ -88,15 +88,15 @@
#elif defined(__x86_64)
-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
return uc->uc_mcontext.gregs[REG_RSP];
}
-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
return uc->uc_mcontext.gregs[REG_RIP];
}
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
const struct _libc_fpstate* fpregs) {
const greg_t* regs = uc->uc_mcontext.gregs;
@@ -145,15 +145,15 @@
#elif defined(__ARM_EABI__)
-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
return uc->uc_mcontext.arm_sp;
}
-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
return uc->uc_mcontext.arm_pc;
}
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
out->context_flags = MD_CONTEXT_ARM_FULL;
out->iregs[0] = uc->uc_mcontext.arm_r0;
@@ -184,15 +184,15 @@
#elif defined(__aarch64__)
-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
return uc->uc_mcontext.sp;
}
-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
return uc->uc_mcontext.pc;
}
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
const struct fpsimd_context* fpregs) {
out->context_flags = MD_CONTEXT_ARM64_FULL;
@@ -210,15 +210,15 @@
#elif defined(__mips__)
-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
}
-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
return uc->uc_mcontext.pc;
}
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
#if _MIPS_SIM == _ABI64
out->context_flags = MD_CONTEXT_MIPS64_FULL;
#elif _MIPS_SIM == _ABIO32
diff --git a/client/linux/dump_writer_common/ucontext_reader.h b/client/linux/dump_writer_common/ucontext_reader.h
index b6e77b4..2de80b7 100644
--- a/client/linux/dump_writer_common/ucontext_reader.h
+++ b/client/linux/dump_writer_common/ucontext_reader.h
@@ -39,23 +39,23 @@
namespace google_breakpad {
-// Wraps platform-dependent implementations of accessors to ucontext structs.
+// Wraps platform-dependent implementations of accessors to ucontext_t structs.
struct UContextReader {
- static uintptr_t GetStackPointer(const struct ucontext* uc);
+ static uintptr_t GetStackPointer(const ucontext_t* uc);
- static uintptr_t GetInstructionPointer(const struct ucontext* uc);
+ static uintptr_t GetInstructionPointer(const ucontext_t* uc);
- // Juggle a arch-specific ucontext into a minidump format
+ // Juggle a arch-specific ucontext_t into a minidump format
// out: the minidump structure
// info: the collection of register structures.
#if defined(__i386__) || defined(__x86_64)
- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
const struct _libc_fpstate* fp);
#elif defined(__aarch64__)
- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
const struct fpsimd_context* fpregs);
#else
- static void FillCPUContext(RawContextCPU *out, const ucontext *uc);
+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
#endif
};
diff --git a/client/linux/handler/exception_handler.cc b/client/linux/handler/exception_handler.cc
index 586d84e..05936d2 100644
--- a/client/linux/handler/exception_handler.cc
+++ b/client/linux/handler/exception_handler.cc
@@ -457,9 +457,9 @@
// Fill in all the holes in the struct to make Valgrind happy.
memset(&g_crash_context_, 0, sizeof(g_crash_context_));
memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t));
- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext));
+ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t));
#if defined(__aarch64__)
- struct ucontext* uc_ptr = (struct ucontext*)uc;
+ ucontext_t* uc_ptr = (ucontext_t*)uc;
struct fpsimd_context* fp_ptr =
(struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
if (fp_ptr->head.magic == FPSIMD_MAGIC) {
@@ -468,9 +468,9 @@
}
#elif !defined(__ARM_EABI__) && !defined(__mips__)
// FP state is not part of user ABI on ARM Linux.
- // In case of MIPS Linux FP state is already part of struct ucontext
+ // In case of MIPS Linux FP state is already part of ucontext_t
// and 'float_state' is not a member of CrashContext.
- struct ucontext* uc_ptr = (struct ucontext*)uc;
+ ucontext_t* uc_ptr = (ucontext_t*)uc;
if (uc_ptr->uc_mcontext.fpregs) {
memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs,
sizeof(g_crash_context_.float_state));
@@ -494,7 +494,7 @@
// ExceptionHandler::HandleSignal().
siginfo.si_code = SI_USER;
siginfo.si_pid = getpid();
- struct ucontext context;
+ ucontext_t context;
getcontext(&context);
return HandleSignal(sig, &siginfo, &context);
}
diff --git a/client/linux/handler/exception_handler.h b/client/linux/handler/exception_handler.h
index daba57e..d246f60 100644
--- a/client/linux/handler/exception_handler.h
+++ b/client/linux/handler/exception_handler.h
@@ -191,11 +191,11 @@
struct CrashContext {
siginfo_t siginfo;
pid_t tid; // the crashing thread.
- struct ucontext context;
+ ucontext_t context;
#if !defined(__ARM_EABI__) && !defined(__mips__)
// #ifdef this out because FP state is not part of user ABI for Linux ARM.
- // In case of MIPS Linux FP state is already part of struct
- // ucontext so 'float_state' is not required.
+ // In case of MIPS Linux FP state is already part of ucontext_t so
+ // 'float_state' is not required.
fpstate_t float_state;
#endif
};
diff --git a/client/linux/microdump_writer/microdump_writer.cc b/client/linux/microdump_writer/microdump_writer.cc
index 5c3c751..41dc450 100644
--- a/client/linux/microdump_writer/microdump_writer.cc
+++ b/client/linux/microdump_writer/microdump_writer.cc
@@ -604,7 +604,7 @@
void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
- const struct ucontext* const ucontext_;
+ const ucontext_t* const ucontext_;
#if !defined(__ARM_EABI__) && !defined(__mips__)
const google_breakpad::fpstate_t* const float_state_;
#endif
diff --git a/client/linux/minidump_writer/minidump_writer.cc b/client/linux/minidump_writer/minidump_writer.cc
index d11ba6e..c716143 100644
--- a/client/linux/minidump_writer/minidump_writer.cc
+++ b/client/linux/minidump_writer/minidump_writer.cc
@@ -1323,7 +1323,7 @@
const int fd_; // File descriptor where the minidum should be written.
const char* path_; // Path to the file where the minidum should be written.
- const struct ucontext* const ucontext_; // also from the signal handler
+ const ucontext_t* const ucontext_; // also from the signal handler
#if !defined(__ARM_EABI__) && !defined(__mips__)
const google_breakpad::fpstate_t* const float_state_; // ditto
#endif

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:beb97cd41b64f984219cc0e3a392943570617656b034ad1fbe58a4feb551ad1b
size 50136
oid sha256:f38713af36de85f99d412db579dbbba7db0fa0cd426e7d5e7d4f8df38f6750d2
size 37864

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e8965d477c62d7eac987df253be8ab2e4b3a54c1c40f83d244108f0794bdf26c
size 628466
oid sha256:4289b029cf99a42898141e23444dace9ec9d32019a9e6343dbd0974352fca113
size 628766

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4189a42a0d59f7c650bfb65db43c8db0eb0d87a3250bf8ac37e85dca3a6b8692
size 565470
oid sha256:e0b16d9c9cc6b6d249e49959df6fb7ad2df3215c81fbc237f9c6b9ae6ba3c21d
size 589142

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:84a67a948080c52354fe27ff8b1c9d74046bf083f7ca28472916597072843133
size 30117
oid sha256:071416fd17b7e16b71a036d535f7eff7967e6ebae50f5c1fc5648d1cc3a1df1a
size 30287

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fe02b500ce92077c9a603eba02c2aa3fe6a946e93face31dc8ce2c17b38b2264
size 808624
oid sha256:acf53d99c8e0d3651cfb1019b51fd8a035f8ec51df9757a1f9e1f8876ede02fb
size 820724

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri May 25 06:04:47 UTC 2018 - i@xuzhao.net
- Update to 1.2.22
* Use markdown in media captions (bold, italic, tag and code).
* Use emoji replacement in media captions, group and channel titles and descriptions (:like: etc.)
* Markdown replacement now happens immediately after typing (instead of after sending) and can be rolled back using Backspace or Ctrl/Cmd + Z.
Replacement no longer happens when pasting text.
-------------------------------------------------------------------
Mon Apr 16 18:32:29 UTC 2018 - ilya@ilya.pp.ua

View File

@ -16,7 +16,7 @@
#
Name: telegram-desktop
Version: 1.2.17
Version: 1.2.22
Release: 0
Summary: Telegram is a messaging app with a focus on speed and security
License: GPL-3.0-only
@ -42,9 +42,7 @@ Source8: catch.hpp
Source9: range-v3-master.zip
# curl https://codeload.github.com/telegramdesktop/crl/zip/master -o crl-master.zip
Source10: crl-master.zip
# PATCH-FIX-UPSTREAM breakpad-ucontext_t-glibc2_26.patch badshah400@gmail.com -- Replace `struct ucontext` by `ucontext_t` to make compatible with glib-2.26; merged upstream
Patch0: breakpad-ucontext_t-glibc2_26.patch
Patch1: tdesktop.patch
Patch0: tdesktop.patch
BuildRequires: chrpath
BuildRequires: cmake
BuildRequires: desktop-file-utils
@ -156,7 +154,7 @@ mv crl %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/
cp %{_sourcedir}/tdesktop.patch %{_builddir}/tdesktop-%{version}
cd %{_builddir}/tdesktop-%{version}
patch -p1 < tdesktop.patch
%patch0 -p1
cp %{_sourcedir}/patch.py . && python3 ./patch.py
cp %{_sourcedir}/catch.hpp ./Telegram/SourceFiles/
@ -165,10 +163,6 @@ cp %{_sourcedir}/catch.hpp ./Telegram/SourceFiles/
%setup -q -T -c -n breakpad-lss -a 2
%setup -q -T -c -n gyp -a 3
pushd %{_builddir}/breakpad/src
%patch0 -p1
popd
%build
mv %{_builddir}/tdesktop-%{version} %{_builddir}/tdesktop
@ -182,13 +176,10 @@ patch -p1 < gyp.diff
# Build breakpad
cd %{_builddir}/breakpad
ln -s %{_builddir}/breakpad-lss src/third_party/lss
# FIXME: you should use the %%configure macro
./configure --prefix=%{_builddir}/Libraries/breakpad
make %{?_smp_mflags}
make install
%configure
%make_build
make install DESTDIR=%{_builddir}/Libraries/breakpad
# FIXME: you should use %%cmake macros
# use gyp to generate cmake files
cd %{_builddir}/tdesktop/Telegram/gyp
# patch qt.gypi to change libxkbcommon path
%{_builddir}/Libraries/gyp/gyp \
@ -196,21 +187,21 @@ cd %{_builddir}/tdesktop/Telegram/gyp
-Dlinux_lib_crypto=-lcrypto \
-Dlinux_lib_icu="-licuuc -licutu -licui18n" \
-Dlinux_path_opus_include="%{_includedir}/opus" \
-Dlinux_path_breakpad="%{_builddir}/Libraries/breakpad" \
-Dlinux_path_breakpad="%{_builddir}/Libraries/breakpad%{_prefix}" \
-Gconfig=Release \
--depth=. --generator-output="%{_builddir}/tdesktop" -Goutput_dir=out Telegram.gyp --format=cmake
# build Telegram
cd %{_builddir}/tdesktop/out/Release
# FIXME: you should use %%cmake macros
cmake -LA .
%cmake ..
sed -i 's,breakpad/usr/lib,breakpad%{_libdir},' ./CMakeFiles/Telegram.dir/link.txt
make %{?_smp_mflags}
chrpath --delete Telegram
%install
# Install binary
install -dm755 %{buildroot}%{_bindir}
install -m755 %{_builddir}/tdesktop/out/Release/Telegram %{buildroot}%{_bindir}/%{name}
install -m755 %{_builddir}/tdesktop/out/Release/build/Telegram %{buildroot}%{_bindir}/%{name}
# Install desktop file
install -d %{buildroot}%{_datadir}/applications

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:775614e70372b2e18ef1b2940fa043599240975597e4c5e4431c6deb041a613d
size 16916625

3
v1.2.22.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e2e9ea903f3b747664078c83afda777a0698b297ea5f53707b6a5aec59608c7e
size 16957433

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a8eade59e7425b2670a2e6c84c7f1921979e765fff0d08aef3ceb607747bb8ad
size 126356
oid sha256:9252c982437edd2824611676f428a53a13743fc8e72129a30bfd3454665c12b1
size 141313