rpm/telegram-desktop
SHA256
1
0
Fork 0
forked from pool/telegram-desktop
Code Pull Requests Activity

Accepting request 773970 from home:tux93

Browse Source 
- Update to 1.9.12
  * Switch to the Picture-in-Picture mode to watch your video in a
    small window.
  * Change video playback speed in the playback controls '...' menu.
  * Rotate photos and videos in the media viewer using the rotate
    button in the bottom right corner.

OBS-URL: https://build.opensuse.org/request/show/773970
OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=124
This commit is contained in:
Marguerite Su 2020-02-12 17:55:33 +00:00 committed by Git OBS Bridge
parent e675299d36
commit 8a580e5fb9
6 changed files with 38 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
0000-gtk2-default.patch
View File

@ -1,37 +1,15 @@
diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
index 5071d63..f8c0f20 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
@@ -237,15 +237,15 @@ void start() {
bool indicatorLoaded = false;
--- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp.orig 2020-02-06 11:24:06.271620992 +0100
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp 2020-02-06 11:27:36.265427510 +0100
@@ -222,10 +222,10 @@ void start() {
bool isWayland = QGuiApplication::platformName().startsWith(qsl("wayland"), Qt::CaseInsensitive);
QLibrary lib_gtk, lib_indicator;
- if (loadLibrary(lib_indicator, "ayatana-appindicator3", 1) || loadLibrary(lib_indicator, "appindicator3", 1)) {
- if (loadLibrary(lib_gtk, "gtk-3", 0)) {
+ if (loadLibrary(lib_indicator, "ayatana-appindicator", 1) || loadLibrary(lib_indicator, "appindicator", 1)) {
+ if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
gtkLoaded = setupGtkBase(lib_gtk);
indicatorLoaded = setupAppIndicator(lib_indicator);
}
}
if ((!gtkLoaded || !indicatorLoaded) && !isWayland) {
- if (loadLibrary(lib_indicator, "ayatana-appindicator", 1) || loadLibrary(lib_indicator, "appindicator", 1)) {
- if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
+ if (loadLibrary(lib_indicator, "ayatana-appindicator3", 1) || loadLibrary(lib_indicator, "appindicator3", 1)) {
+ if (loadLibrary(lib_gtk, "gtk-3", 0)) {
gtkLoaded = indicatorLoaded = false;
gtkLoaded = setupGtkBase(lib_gtk);
indicatorLoaded = setupAppIndicator(lib_indicator);
@@ -255,10 +255,10 @@ void start() {
QLibrary lib_gtk;
// If no appindicator, try at least load gtk.
if (!gtkLoaded && !indicatorLoaded) {
- if (loadLibrary(lib_gtk, "gtk-3", 0)) {
+ if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
gtkLoaded = setupGtkBase(lib_gtk);
}
- if (!gtkLoaded && !isWayland && loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
+ if (!gtkLoaded && !isWayland && loadLibrary(lib_gtk, "gtk-3", 0)) {
gtkLoaded = setupGtkBase(lib_gtk);
}
- if (loadLibrary(lib_gtk, "gtk-3", 0)) {
+ if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
gtkLoaded = setupGtkBase(lib_gtk);
}
- if (!gtkLoaded && !isWayland && loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
+ if (!gtkLoaded && !isWayland && loadLibrary(lib_gtk, "gtk-3", 0)) {
gtkLoaded = setupGtkBase(lib_gtk);
}

27
0001-use-bundled-range.patch
View File

@ -1,26 +1,15 @@
--- a/cmake/external/ranges/CMakeLists.txt.orig 2020-01-17 21:56:04.561905759 +0100
+++ b/cmake/external/ranges/CMakeLists.txt 2020-01-17 21:56:46.034629133 +0100
@@ -7,15 +7,10 @@
--- a/cmake/external/ranges/CMakeLists.txt.orig 2020-02-06 12:12:05.613006285 +0100
+++ b/cmake/external/ranges/CMakeLists.txt 2020-02-06 12:12:20.200020349 +0100
@@ -7,7 +7,7 @@
add_library(external_ranges INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_ranges ALIAS external_ranges)
-if (DESKTOP_APP_USE_PACKAGED)
- find_package(range-v3 REQUIRED)
- target_link_libraries(external_ranges INTERFACE range-v3::range-v3)
-else()
- target_include_directories(external_ranges SYSTEM
- INTERFACE
- ${libs_loc}/range-v3/include
- )
-endif()
+target_include_directories(external_ranges SYSTEM
+INTERFACE
+ ${libs_loc}/range-v3/include
+)
if (WIN32)
target_compile_options(external_ranges
@@ -23,4 +18,4 @@ if (WIN32)
+if (!DESKTOP_APP_USE_PACKAGED)
find_package(range-v3 REQUIRED)
target_link_libraries(external_ranges INTERFACE range-v3::range-v3)
else()
@@ -23,4 +23,4 @@ if (WIN32)
/experimental:preprocessor # need for range-v3 see https://github.com/ericniebler/range-v3#supported-compilers
/wd5105 # needed for `/experimental:preprocessor`, suppressing C5105 "macro expansion producing 'defined' has undefined behavior"
)

3
tdesktop-1.9.12-full.tar.gz Normal file
View File

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

3
tdesktop-1.9.9-full.tar.gz
View File

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

10
telegram-desktop.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Feb 11 20:30:02 UTC 2020 - Marcel Kuehlhorn <tux93@opensuse.org>
- Update to 1.9.12
* Switch to the Picture-in-Picture mode to watch your video in a
small window.
* Change video playback speed in the playback controls '...' menu.
* Rotate photos and videos in the media viewer using the rotate
button in the bottom right corner.
-------------------------------------------------------------------
Wed Jan 29 07:58:21 UTC 2020 - Marcel Kuehlhorn <tux93@opensuse.org>

8
telegram-desktop.spec
View File

@ -24,7 +24,7 @@
%define __builder ninja
Name: telegram-desktop
Version: 1.9.9
Version: 1.9.12
Release: 0
Summary: Messaging application with a focus on speed and security
License: GPL-3.0-only
@ -61,7 +61,7 @@ BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(ayatana-appindicator3-0.1)
BuildRequires: pkgconfig(dbusmenu-qt5)
BuildRequires: pkgconfig(dee-1.0)
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(fontconfig)
@ -115,7 +115,6 @@ BuildRequires: pkgconfig(zlib)
Requires: ffmpeg
Requires: hicolor-icon-theme
Requires: icu
Requires: libappindicator1
Requires: openssl
ExclusiveArch: x86_64
@ -145,8 +144,11 @@ mv %{_builddir}/Libraries/range-v3-master %{_builddir}/Libraries/range-v3
-DTDESKTOP_API_HASH=98a22f733eac40f1bd187a30d19271de \
-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \
-DDESKTOP_APP_USE_PACKAGED=ON \
-DDESKTOP_APP_USE_PACKAGED_GSL=OFF \
-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF \
-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \
-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF \
-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF \
-DDESKTOP_APP_USE_PACKAGED_FONTS=ON \
-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \
-DTDESKTOP_DISABLE_AUTOUPDATE=ON \