diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-03-05 23:48:49 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-03-05 23:48:49 +0000 |
| commit | 2768824f1685e3ea444b0c66e1c1ab9be25298b2 (patch) | |
| tree | cecacdc843c56e518d396d6bd00538c866faa005 | |
| parent | 2024-03-05 23:19:03 UTC (diff) | |
| parent | net-im/telegram-desktop: drop 4.13.1 (diff) | |
| download | gentoo-2768824f1685e3ea444b0c66e1c1ab9be25298b2.tar.gz gentoo-2768824f1685e3ea444b0c66e1c1ab9be25298b2.tar.bz2 gentoo-2768824f1685e3ea444b0c66e1c1ab9be25298b2.zip | |
Merge updates from master
| -rw-r--r-- | net-im/telegram-desktop/Manifest | 1 | ||||
| -rw-r--r-- | net-im/telegram-desktop/telegram-desktop-4.15.0-r1.ebuild (renamed from net-im/telegram-desktop/telegram-desktop-4.13.1.ebuild) | 13 |
2 files changed, 7 insertions, 7 deletions
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index dd1f872869d4..f7ebf7e53649 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,3 +1,2 @@ -DIST tdesktop-4.13.1-full.tar.gz 67876971 BLAKE2B 6743aabae75f06e8691ed77ff22836a0276313756240ec864ac93eba7c04cd2d41c4f844fdea6f89d482e5e0e70793dc7d1fb3f19b788397abab56f631134866 SHA512 4cbbfaf6e5ecc90b429fc2207a106988ab839aa42d0d225841069d20bf2152fada489c28e6816eefa143724f5b8ea4db6995a0612f0df195d8dbd5f40d8a63a3 DIST tdesktop-4.14.15-full.tar.gz 68147116 BLAKE2B 32e2719260cc48948ed85644e4079014ba5d44d003f00f8c274ea5e9ad6af0f893ffbc56d523e37a382080f13ebd1d46f0059927c6bafe9710f5eee11e44b449 SHA512 12812fa1fd067fca03b2e5cb04502ef05e98368b91a4ed5458a61a0bea8b3d6daf6c32b7632c170fe0904acb63eb422f6fa6364e4af18f73e49659e2d50f531b DIST tdesktop-4.15.0-full.tar.gz 68286818 BLAKE2B 2bd4d59370a4f97aa3c1b1d64fa7eea114539edcff46ea30a5361cefeeb1de8a1954be91a1a420ddc1b1a30970944387c2cd3749badaa494e53862066c624ac3 SHA512 95aa5f14a9a88b9c6421049445f59f1c5c5d7ab4ca4e8b8f4ab7389bdb8f3cc6b29fea270574881633035acec769ba271261f84ec269010c63af28a03719da98 diff --git a/net-im/telegram-desktop/telegram-desktop-4.13.1.ebuild b/net-im/telegram-desktop/telegram-desktop-4.15.0-r1.ebuild index 57c9d938cc37..efdb363d8989 100644 --- a/net-im/telegram-desktop/telegram-desktop-4.13.1.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-4.15.0-r1.ebuild @@ -25,7 +25,7 @@ REQUIRED_USE=" KIMAGEFORMATS_RDEPEND=" media-libs/libavif:= media-libs/libheif:= - >=media-libs/libjxl-0.8.0 + >=media-libs/libjxl-0.8.0:= " CDEPEND=" !net-im/telegram-desktop-bin @@ -45,7 +45,6 @@ CDEPEND=" ~media-libs/tg_owt-0_pre20230921:=[screencast=,X=] media-video/ffmpeg:=[opus,vpx] sys-libs/zlib:=[minizip] - virtual/opengl !enchant? ( >=app-text/hunspell-1.7:= ) enchant? ( app-text/enchant:= ) !qt6? ( @@ -83,8 +82,9 @@ RDEPEND="${CDEPEND} webkit? ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:6 ) " DEPEND="${CDEPEND} - >=dev-cpp/cppgir-0_p20230926 + >=dev-cpp/cppgir-0_p20240110 >=dev-cpp/ms-gsl-4 + dev-cpp/expected-lite dev-cpp/range-v3 " BDEPEND=" @@ -164,6 +164,10 @@ src_configure() { local mycmakeargs=( -DQT_VERSION_MAJOR=${qt} + # Override new cmake.eclass defaults (https://bugs.gentoo.org/921939) + # Upstream never tests this any other way + -DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF + # Control automagic dependencies on certain packages ## Header-only lib, some git version. -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON @@ -181,9 +185,6 @@ src_configure() { -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) ## Use system fonts instead of bundled ones -DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts) - - # TEMP: Override for new cmake.eclass defaults (https://bugs.gentoo.org/921939) - -DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF ) if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then |