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

- update patch.py to remove dee-1.0 dependency, which is not in
  use any more, and not available from factory, thus resolving
  unresolvable status.
- Update minimal versions of gcc and cmake in BuildRequires in
  keeping with upstream: gcc >= 7 (7.2) is now needed. Also update
  the gcc command exported before building on openSUSE <= 1320 to
  gcc-7.

OBS-URL: https://build.opensuse.org/request/show/557715
OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=29

patch.py

@@ -152,6 +152,8 @@ def process_telegram_linux(jsonobj):
     child.append("'<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))'")
     child = jsonobj["'conditions'"][0][1]["'cflags_cc'"]
     child.append("'<!(pkg-config --cflags <@(pkgconfig_libs))'")
+    child = jsonobj["'conditions'"][0][1]["'conditions'"][1][1]["'cflags_cc'"]
+    child.remove("'<!(pkg-config 2> /dev/null --cflags dee-1.0)'")
     return json.dumps(jsonobj)
 
 def process_qt(jsonobj):

telegram-desktop.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Dec 15 23:11:10 UTC 2017 - badshah400@gmail.com
+
+- update patch.py to remove dee-1.0 dependency, which is not in
+  use any more, and not available from factory, thus resolving
+  unresolvable status.
+
+-------------------------------------------------------------------
+Wed Dec 13 07:09:19 UTC 2017 - badshah400@gmail.com
+
+- Update minimal versions of gcc and cmake in BuildRequires in
+  keeping with upstream: gcc >= 7 (7.2) is now needed. Also update
+  the gcc command exported before building on openSUSE <= 1320 to
+  gcc-7.
+
 -------------------------------------------------------------------
 Mon Dec 11 07:53:25 UTC 2017 - badshah400@gmail.com
 

telegram-desktop.spec

@@ -44,17 +44,13 @@ Source9:        range-v3-master.zip
 # PATCH-FIX-UPSTREAM breakpad-ucontext_t-glibc2_26.patch badshah400@gmail.com -- Replace `struct ucontext` by `ucontext_t` to make compatible with glib-2.26; merged upstream
 Patch0:         breakpad-ucontext_t-glibc2_26.patch
 BuildRequires:  chrpath
-BuildRequires:  cmake glibc-devel
+BuildRequires:  cmake >= 3.2
+BuildRequires:  glibc-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  ffmpeg-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype-devel
-%if 0%{?suse_version} <= 1320
-BuildRequires:  gcc6-c++ >= 6.2
-BuildRequires:  libgcc_s1 >= 6.2
-%else
-BuildRequires:  gcc-c++
-%endif
+BuildRequires:  gcc-c++ >= 7
 BuildRequires:  python3
 BuildRequires:  libXfixes-devel
 BuildRequires:  libexpat-devel
@@ -79,7 +75,6 @@ BuildRequires:  xz
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(appindicator-0.1)
-BuildRequires:  pkgconfig(dee-1.0)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -178,8 +173,8 @@ ln -s %{_libdir}/libtelegram-qt5 ./QtStatic
 cd %{_builddir}/breakpad
 ln -s %{_builddir}/breakpad-lss ./src/third_party/lss
 %if 0%{?suse_version} <= 1320
-export CXX='g++-6'
-export GCC='gcc-6'
+export CXX='g++-7'
+export GCC='gcc-7'
 %endif
 # FIXME: you should use the %%configure macro
 ./configure --prefix=`pwd`/../Libraries/breakpad
@@ -192,7 +187,7 @@ cd %{_builddir}/tdesktop/Telegram/gyp
 # patch qt.gypi to change libxkbcommon path
 ../../../Libraries/gyp/gyp \
 %if 0%{?suse_version} <= 1320
-    -DCMAKE_CXX_COMPILER='g++-6' \
+    -DCMAKE_CXX_COMPILER='g++-7' \
 %endif
     -Dlinux_path_qt="%{_builddir}/Libraries/QtStatic" \
     -Dqt_version="5.6.2" \
@@ -207,9 +202,9 @@ cd %{_builddir}/tdesktop/Telegram/gyp
 cd %{_builddir}/tdesktop/out/Release
 # FIXME: you should use %%cmake macros
 %if 0%{?suse_version} <= 1320
-export CXX='g++-6'
-export GCC='gcc-6'
-CC=gcc-6 CXX=g++-6 cmake .
+export CXX='g++-7'
+export GCC='gcc-7'
+CC=gcc-7 CXX=g++-7 cmake .
 %else
 cmake .
 %endif