rpm/telegram-desktop
SHA256
1
0
Fork 0
forked from pool/telegram-desktop
Code Pull Requests Activity

Accepting request 492271 from home:badshah400:branches:server:messaging

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/492271
OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=16
This commit is contained in:
Xu Zhao 2017-05-01 02:29:24 +00:00 committed by Git OBS Bridge
parent 249a70da1e
commit 00753864fc
5 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
patch-1.0.24.diff → patch-1.0.29.diff
View File

@ -1,8 +1,8 @@
diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
index 2503f1e..da2fe9d 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -79,8 +79,11 @@
Index: tdesktop-1.0.29/Telegram/gyp/Telegram.gyp
===================================================================
--- tdesktop-1.0.29.orig/Telegram/gyp/Telegram.gyp
+++ tdesktop-1.0.29/Telegram/gyp/Telegram.gyp
@@ -82,8 +82,11 @@
],
'defines': [
@ -15,10 +15,10 @@ index 2503f1e..da2fe9d 100644
],
'include_dirs': [
diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
index 24ededb..7002c13 100644
--- a/Telegram/gyp/qt.gypi
+++ b/Telegram/gyp/qt.gypi
Index: tdesktop-1.0.29/Telegram/gyp/qt.gypi
===================================================================
--- tdesktop-1.0.29.orig/Telegram/gyp/qt.gypi
+++ tdesktop-1.0.29/Telegram/gyp/qt.gypi
@@ -38,7 +38,6 @@
'Qt5Network',
'Qt5Widgets',
@ -26,8 +26,8 @@ index 24ededb..7002c13 100644
- 'qtharfbuzzng',
],
'qt_version%': '<(qt_version)',
'linux_path_qt%': '/usr/local/tdesktop/Qt-<(qt_version)',
@@ -56,7 +55,6 @@
'conditions': [
@@ -62,7 +61,6 @@
'qtmain',
'qwindows',
'qtfreetype',
@ -35,7 +35,7 @@ index 24ededb..7002c13 100644
],
}],
[ 'build_mac', {
@@ -75,7 +73,6 @@
@@ -81,7 +79,6 @@
'<@(qt_libs)',
'Qt5Core',
'qtfreetype',
@ -43,7 +43,7 @@ index 24ededb..7002c13 100644
],
}],
[ 'build_linux', {
@@ -91,19 +88,6 @@
@@ -97,20 +94,6 @@
'<@(qt_libs)',
'Qt5DBus',
'Qt5Core',
@ -56,6 +56,7 @@ index 24ededb..7002c13 100644
- 'fontconfig',
- 'expat',
- 'freetype',
- 'z',
- 'xcb-shm',
- 'xcb-xfixes',
- 'xcb-render',
@ -63,7 +64,7 @@ index 24ededb..7002c13 100644
],
}],
],
@@ -208,7 +192,6 @@
@@ -220,7 +203,6 @@
'<(qt_loc)/plugins/platforminputcontexts',
],
'libraries': [
@ -71,7 +72,7 @@ index 24ededb..7002c13 100644
'<@(qt_libs_release)',
'<(linux_lib_ssl)',
'<(linux_lib_crypto)',
@@ -219,14 +202,28 @@
@@ -231,14 +213,29 @@
'dbus-1',
'dl',
'gthread-2.0',
@ -85,6 +86,7 @@ index 24ededb..7002c13 100644
+ 'SM',
+ 'ICE',
+ 'proxy',
+ 'z',
+ '<!(pkg-config 2> /dev/null --libs xkbcommon xkbcommon-x11)',
+ '<!(pkg-config 2> /dev/null --libs libpcre16)',
+ '<!(pkg-config 2> /dev/null --libs zlib)',
@ -101,10 +103,10 @@ index 24ededb..7002c13 100644
'-pthread',
'-g',
'-rdynamic',
diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
index b42e744..d791379 100644
--- a/Telegram/gyp/telegram_linux.gypi
+++ b/Telegram/gyp/telegram_linux.gypi
Index: tdesktop-1.0.29/Telegram/gyp/telegram_linux.gypi
===================================================================
--- tdesktop-1.0.29.orig/Telegram/gyp/telegram_linux.gypi
+++ tdesktop-1.0.29/Telegram/gyp/telegram_linux.gypi
@@ -21,11 +21,20 @@
'conditions': [[ 'build_linux', {
'variables': {

3
tdesktop-1.0.24.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d4d7d12a3760a6fea63b482dac8faf4e55d6c34c1ed26684cdc6e3f353238901
size 15348022

12
telegram-desktop.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sun Apr 30 22:26:02 UTC 2017 - badshah400@gmail.com
- Update to version 1.0.29.
- Use full URL for telegram-desktop source.
- Require gcc-c++ >= 5.0, since support for -std=gnu++14 is now
required; on openSUSE versions <= 1320 using gcc5 or gcc6
nonetheless leads to build failures.
- Update icon file name in keeping with upstream.
- Rebase patch-1.0.24.diff for updated version; rename it to
patch-1.0.29.diff.
-------------------------------------------------------------------
Mon Jul 18 11:54:48 UTC 2016 - badshah400@gmail.com

14
telegram-desktop.spec
View File

@ -1,10 +1,10 @@
Name: telegram-desktop
Summary: A new era of messaging
Version: 1.0.24
Version: 1.0.29
Release: 1
License: GPL-3.0
URL: https://github.com/telegramdesktop/tdesktop
Source: tdesktop-%{version}.tar.gz
Source: https://github.com/telegramdesktop/tdesktop/archive/v%{version}.tar.gz
Source1: breakpad-master.tar.gz
Source2: linux-syscall-support-refs-heads-master.tar.gz
Source3: gyp-master.tar.gz
@ -14,8 +14,8 @@ Source6: variant-master.zip
ExclusiveArch: x86_64
BuildRequires: libtelegram-qt5-devel-static
BuildRequires: libappindicator-devel
BuildRequires: gcc-c++
BuildRequires: gcc-c++ >= 5.0
BuildRequires: libtiff-devel
BuildRequires: libmng-devel
BuildRequires: pcre-devel
@ -139,7 +139,7 @@ cd %{_builddir}/tdesktop/Telegram/gyp
# build Telegram
cd %{_builddir}/tdesktop/out/Release
cmake .
make
make %{?_smp_mflags}
chrpath --delete Telegram
%install
@ -165,7 +165,7 @@ for icon_size in 16 32 48 64 128 256 512; do
icon_dir="%{buildroot}/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps"
install -d "${icon_dir}"
install -m644 "%{_builddir}/tdesktop/Telegram/Resources/art/icon${icon_size}.png" \
"${icon_dir}/telegram-desktop.png"
"${icon_dir}/telegram.png"
done
%files
@ -175,4 +175,4 @@ done
%dir /usr/share/kde4
%dir /usr/share/kde4/services
/usr/share/kde4/services/tg.protocol
/usr/share/icons/hicolor/*/apps/telegram-desktop.png
/usr/share/icons/hicolor/*/apps/telegram.png

3
v1.0.29.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3277246e57e6605ba8d0444d1a218cac7409f3aa2d00e06b6ae6e365f1666bbb
size 16561823