From 8782252f2fc04be5826da33b2466d36aba36d155 Mon Sep 17 00:00:00 2001 From: John Zimmermann Date: Sun, 17 Jun 2018 15:17:09 +0000 Subject: [PATCH] telegram-desktop: fix i686 [ci skip] --- .../patches/06-remove-GLIBC-2.15-compat.patch | 15 +++++++++++++-- srcpkgs/telegram-desktop/template | 4 +--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/srcpkgs/telegram-desktop/patches/06-remove-GLIBC-2.15-compat.patch b/srcpkgs/telegram-desktop/patches/06-remove-GLIBC-2.15-compat.patch index 5a3b259c5e8..05bc47b9106 100644 --- a/srcpkgs/telegram-desktop/patches/06-remove-GLIBC-2.15-compat.patch +++ b/srcpkgs/telegram-desktop/patches/06-remove-GLIBC-2.15-compat.patch @@ -1,5 +1,5 @@ diff --git Telegram/gyp/qt.gypi Telegram/gyp/qt.gypi -index c9eca6ad..1404f91b 100644 +index c9eca6ad1..1404f91b1 100644 --- Telegram/gyp/qt.gypi +++ Telegram/gyp/qt.gypi @@ -176,14 +176,10 @@ @@ -18,7 +18,7 @@ index c9eca6ad..1404f91b 100644 '-lcrypto', '-lX11', diff --git Telegram/gyp/telegram_linux.gypi Telegram/gyp/telegram_linux.gypi -index 1e118538..c02e57a0 100644 +index 1e1185387..328424225 100644 --- Telegram/gyp/telegram_linux.gypi +++ Telegram/gyp/telegram_linux.gypi @@ -58,9 +58,6 @@ @@ -31,3 +31,14 @@ index 1e118538..c02e57a0 100644 '-Wl,--no-as-needed,-lrt', ], 'configurations': { +@@ -92,10 +89,6 @@ + 'ldflags': [ '-flto' ], + }, + }, +- }, { +- 'ldflags': [ +- '-Wl,-wrap,__divmoddi4', +- ], + }], ['not_need_gtk!="True"', { + 'cflags_cc': [ + ' /dev/null --cflags appindicator3-0.1)', diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index a37346ff160..ba5a501591d 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -35,9 +35,7 @@ checksum="cbb30bad15496848beda2db3481700a7292de6c453ee616cc62a2189a32dd7d8 nocross="gyp build script doesn't support cross compiling" case $XBPS_TARGET_MACHINE in - i686*) - nodebug=yes # ENOMEM - broken="https://build.voidlinux.eu/builders/i686_builder/builds/9630/steps/shell_3/logs/stdio";; + i686*) nodebug=yes;; # ENOMEM *-musl) makedepends+=" libexecinfo-devel";; mips*) broken="unsupported";; esac