From 298bbff12ff4263bd9d2ecc7bd3ca2ec9a54a069 Mon Sep 17 00:00:00 2001 From: kn Date: Fri, 15 Aug 2025 13:58:49 +0000 Subject: [PATCH] use ports GSL again upstream forced its bundle in 2023, but I forgot to ignore system GSL during configure; tb noticed it is picked up (again) and causes bulk builds to fail if GSL is junked before/during build. upstream reverted the change, so switch from bundle to port again. --- net/tdesktop/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/tdesktop/Makefile b/net/tdesktop/Makefile index 1c16d3c941b..df0f035d461 100644 --- a/net/tdesktop/Makefile +++ b/net/tdesktop/Makefile @@ -6,6 +6,7 @@ NOT_FOR_ARCHS = ${BE_ARCHS} i386 COMMENT = Telegram Desktop messenger PORTROACH = limit:-full$$ V = 6.0.2 +REVISION = 0 DISTNAME = tdesktop-${V}-full PKGNAME = ${DISTNAME:-full=} CATEGORIES = net @@ -23,7 +24,6 @@ MAINTAINER = Andrew Krasavin , \ Klemens Nanni # tdesktop: GPLv3 with OpenSSL exception -# GSL: MIT # cld3: Apache 2.0 # libprisma: MIT # minizip: zlib @@ -56,6 +56,7 @@ BUILD_DEPENDS = devel/boost,-main \ devel/crc32c \ devel/fmt \ devel/gobject-introspection \ + devel/microsoft-gsl \ devel/range-v3>=0.11.0p0 \ devel/tl-expected \ net/tdlib/tde2e @@ -109,9 +110,6 @@ NEEDED_BUNDLES = cld3 libprisma rlottie tgcalls # archivers/minizip is minizip-ng, telegram requires incompatible original zlib NEEDED_BUNDLES += minizip -# tdesktop 4.9.5 forced bundled GSL due to libstdc++ and CMake bugs -NEEDED_BUNDLES += GSL - # ported but CMake code hardcodes bundled file paths NEEDED_BUNDLES += xdg-desktop-portal