From 155e44f367cb2e4bfd464c5e7cadbb84496ee51d0ba8f9a18ad8b805cb07a922 Mon Sep 17 00:00:00 2001 From: Xu Zhao Date: Mon, 28 Nov 2016 16:55:02 +0000 Subject: [PATCH] Fixed build on 42.2 OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=10 --- patch.diff | 2 +- telegram-desktop.spec | 45 ++++++++++++++++--------------------------- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/patch.diff b/patch.diff index e1e407f..2f9580f 100644 --- a/patch.diff +++ b/patch.diff @@ -130,7 +130,7 @@ index 24ededb..bb9b56b 100644 + ' /dev/null --libs libpcre16)', + ' /dev/null --libs zlib)', + ' /dev/null --libs libpng16)', -+ ' /dev/null --libs libjpeg)', ++ 'jpeg', + ' /dev/null --libs libwebp)', + ' /dev/null --libs xcb-shm xcb-xfixes xcb-render xcb-renderutil xcb-sync xcb-randr xcb-xinerama xcb-xkb xcb-icccm xcb-image xcb-shape xcb-keysyms xcb-util)', + 'proxy', diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 85b2afc..d781d35 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -13,24 +13,32 @@ ExclusiveArch: x86_64 BuildRequires: libtelegram-qt5-devel-static BuildRequires: gcc5-c++ BuildRequires: libappindicator-devel -BuildRequires: libpng16-devel BuildRequires: libtiff-devel BuildRequires: libmng-devel -BuildRequires: libwebp-devel +BuildRequires: pcre-devel +BuildRequires: ffmpeg-devel +BuildRequires: libopus-devel +BuildRequires: zlib-devel +BuildRequires: portaudio-devel +BuildRequires: desktop-file-utils +BuildRequires: chrpath BuildRequires: cmake -BuildRequires: pkgconfig(libwebp) BuildRequires: libopus-devel BuildRequires: xorg-x11-devel BuildRequires: xz BuildRequires: openal-soft-devel BuildRequires: xcb-util-wm-devel -BuildRequires: xcb-util-devel BuildRequires: xcb-util-image-devel BuildRequires: xcb-util-renderutil-devel BuildRequires: xcb-util-keysyms-devel -BuildRequires: mtdev-devel -BuildRequires: tslib-devel -BuildRequires: harfbuzz-devel +BuildRequires: libproxy-devel +BuildRequires: libjpeg-devel +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(xcb-util) +BuildRequires: pkgconfig(mtdev) +BuildRequires: pkgconfig(tslib) +BuildRequires: pkgconfig(harfbuzz) +BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(xkbcommon-x11) BuildRequires: pkgconfig(dee-1.0) @@ -38,27 +46,15 @@ BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(liblzma) -BuildRequires: libavfilter-devel -BuildRequires: libavdevice-devel -BuildRequires: libproxy-devel +BuildRequires: pkgconfig(libavfilter) +BuildRequires: pkgconfig(libavdevice) BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(fontconfig) -BuildRequires: pcre-devel -BuildRequires: xcb-util-image-devel -BuildRequires: xcb-util-keysyms-devel -BuildRequires: xcb-util-renderutil-devel -BuildRequires: xcb-util-wm-devel BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(libva-glx) BuildRequires: pkgconfig(libva-x11) -BuildRequires: ffmpeg-devel -BuildRequires: libopus-devel -BuildRequires: zlib-devel -BuildRequires: portaudio-devel -BuildRequires: desktop-file-utils -BuildRequires: chrpath # Runtime requirements Requires: ffmpeg @@ -66,10 +62,6 @@ Requires: openssl Requires: hicolor-icon-theme Requires: icu Requires: jasper -Requires: libopenal1 -Requires: libinput10 -Requires: libproxy1 -Requires: libmng2 %description @@ -159,9 +151,6 @@ for icon_size in 16 32 48 64 128 256 512; do "${icon_dir}/telegram-desktop.png" done -%clean -rm -rf %{buildroot} - %files %defattr (-, root, root, -) /usr/bin/telegram-desktop