forked from pool/telegram-desktop
7c33048dfa
- Updated to 4.9.9. * Add support for Emoji 15. * Several crash fixes. - Updated to 4.9.8. * Fix t.me/botname?startapp=token deeplinks. * Fix a possible crash in media viewer on Wayland. - Require the same version of glib2 used to *build* the package - Updated to 4.9.7. * Fix direct bot web app links handling. * Close main menu when opening a web app. * Bump libwebp revision. - Updated to 4.9.6. * Some bot web-app improvements. * Bug fixes and other minor improvements. - Update 0002-use-bundled-rnnoise-expected-gsl-ranges-webrtc.patch - Requires glib-2.0 >= 2.77 - Requires glibmm-2.68 >= 2.77 OBS-URL: https://build.opensuse.org/request/show/1112495 OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=267
71 lines
3.0 KiB
Diff
71 lines
3.0 KiB
Diff
diff -rup a/cmake/external/expected/CMakeLists.txt b/cmake/external/expected/CMakeLists.txt
|
|
--- a/cmake/external/expected/CMakeLists.txt 2023-09-04 14:19:11.000000000 +0200
|
|
+++ b/cmake/external/expected/CMakeLists.txt 2023-09-14 09:56:02.804347761 +0200
|
|
@@ -7,7 +7,7 @@
|
|
add_library(external_expected INTERFACE IMPORTED GLOBAL)
|
|
add_library(desktop-app::external_expected ALIAS external_expected)
|
|
|
|
-if (DESKTOP_APP_USE_PACKAGED)
|
|
+if (NOT DESKTOP_APP_USE_PACKAGED)
|
|
if (DESKTOP_APP_USE_PACKAGED_LAZY)
|
|
find_package(tl-expected QUIET)
|
|
else()
|
|
Only in b/cmake/external/gsl: CMakeLists.txt.rej
|
|
diff -rup a/cmake/external/ranges/CMakeLists.txt b/cmake/external/ranges/CMakeLists.txt
|
|
--- a/cmake/external/ranges/CMakeLists.txt 2023-09-04 14:19:11.000000000 +0200
|
|
+++ b/cmake/external/ranges/CMakeLists.txt 2023-09-14 09:56:02.804347761 +0200
|
|
@@ -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)
|
|
+if (NOT DESKTOP_APP_USE_PACKAGED)
|
|
if (DESKTOP_APP_USE_PACKAGED_LAZY)
|
|
find_package(range-v3 QUIET)
|
|
else()
|
|
diff -rup a/cmake/external/rnnoise/CMakeLists.txt b/cmake/external/rnnoise/CMakeLists.txt
|
|
--- a/cmake/external/rnnoise/CMakeLists.txt 2023-09-04 14:19:11.000000000 +0200
|
|
+++ b/cmake/external/rnnoise/CMakeLists.txt 2023-09-14 09:56:02.804347761 +0200
|
|
@@ -4,7 +4,7 @@
|
|
# For license and copyright information please follow this link:
|
|
# https://github.com/desktop-app/legal/blob/master/LEGAL
|
|
|
|
-if (DESKTOP_APP_USE_PACKAGED)
|
|
+if (NOT DESKTOP_APP_USE_PACKAGED)
|
|
add_library(external_rnnoise INTERFACE IMPORTED GLOBAL)
|
|
add_library(desktop-app::external_rnnoise ALIAS external_rnnoise)
|
|
|
|
@@ -18,7 +18,7 @@ endif()
|
|
add_library(external_rnnoise STATIC IMPORTED GLOBAL)
|
|
add_library(desktop-app::external_rnnoise ALIAS external_rnnoise)
|
|
|
|
-set(rnnoise_lib_loc ${libs_loc}/rnnoise/out)
|
|
+set(rnnoise_lib_loc ${libs_loc}/rnnoise/.libs)
|
|
if (WIN32)
|
|
target_include_directories(external_rnnoise SYSTEM
|
|
INTERFACE
|
|
@@ -40,9 +40,9 @@ elseif (APPLE)
|
|
else()
|
|
target_include_directories(external_rnnoise SYSTEM
|
|
INTERFACE
|
|
- /usr/local/include
|
|
+ ${libs_loc}/rnnoise/include
|
|
)
|
|
- find_library(DESKTOP_APP_RNNOISE_LIBRARIES librnnoise.a REQUIRED)
|
|
+ find_library(DESKTOP_APP_RNNOISE_LIBRARIES librnnoise.a HINTS "${rnnoise_lib_loc}" REQUIRED)
|
|
set_target_properties(external_rnnoise PROPERTIES
|
|
IMPORTED_LOCATION "${DESKTOP_APP_RNNOISE_LIBRARIES}"
|
|
)
|
|
diff -rup a/cmake/external/webrtc/CMakeLists.txt b/cmake/external/webrtc/CMakeLists.txt
|
|
--- a/cmake/external/webrtc/CMakeLists.txt 2023-09-04 14:19:11.000000000 +0200
|
|
+++ b/cmake/external/webrtc/CMakeLists.txt 2023-09-14 09:56:02.804347761 +0200
|
|
@@ -7,7 +7,7 @@
|
|
add_library(external_webrtc INTERFACE IMPORTED GLOBAL)
|
|
add_library(desktop-app::external_webrtc ALIAS external_webrtc)
|
|
|
|
-if (DESKTOP_APP_USE_PACKAGED)
|
|
+if (NOT DESKTOP_APP_USE_PACKAGED)
|
|
find_package(tg_owt REQUIRED)
|
|
target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt)
|
|
return()
|